Layout optimization for narrow screens.

Cleaning and rearranging menu items. Signed-off-by: E. Liddell <ejlddll@warpmail.net> Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
author: Slávek Banko <slavek.banko@axis.cz> 2021-02-15 23:15:09 +0100
committer: Slávek Banko <slavek.banko@axis.cz> 2021-03-11 19:03:51 +0100
commit: 782bc6fd8ecdf87011224a4abe4d49b594b8cb1f (patch)
tree: 0c524c3309f104ae84b3273bad85ad9aeaab9eb7
parent: 923512ebaa328076bfb577441fb9ee9f7dbba767 (diff)
download: website-core-782bc6fd8ecdf87011224a4abe4d49b594b8cb1f.tar.gz
website-core-782bc6fd8ecdf87011224a4abe4d49b594b8cb1f.zip
4 files changed, 170 insertions, 8 deletions
diff --git a/mainstyle.css b/mainstyle.css
index cef4f30..946044e 100644
--- a/mainstyle.css
+++ b/mainstyle.css
@@ -60,7 +60,7 @@ A:hover     {color:#001c7b;
                 height:125px;
                 width:125px}
 #titlewrap  {position:relative;
-                top:-120px;
+                top:-80px;
                 text-align:left;
                 margin-left:25ex;
                 margin-right:4ex;
@@ -73,7 +73,7 @@ A:hover     {color:#001c7b;
             }
 #title      {position:relative;
                 z-index:6;
-                top:15px;
+                top:-0.5em;
             }
 #sidebar    {background-color:#1f4ca4;
                 width:170px;
@@ -91,6 +91,7 @@ A:hover     {color:#001c7b;
                 background-repeat:repeat-x;
                 background-position:bottom left;
                 }
+#navblock   {display:block}
 .navhead    {font-size:larger;
                 font-weight:bold;
                 font-style:italic;
@@ -162,3 +163,28 @@ A:hover     {color:#001c7b;
                     vertical-align:top}
 .patchtable {width:100%;}
 /*.patchtable TR TD:last-child {width:50%;}*/
+
+
+/*For mobile and other very small screens*/
+@media screen and (max-width: 799px) {
+  BODY {background:white}
+  #intermediate {margin-left:10px}
+  #sidetext {top:0px;width:100%;display:flex;flex-wrap:wrap}
+  #sidebar {position:relative;width:100%;}
+  H1 {font-size: calc(100vw / 22);}
+  #titlenotif {left:195px;width:220px}
+  #titlewrap {margin-left: 170px;}
+  #navblock   {display:inline;margin-right:10px;}
+}
+@media screen and (max-width: 520px) {
+  #navblock   {display:block}
+  #sidetext {display:grid}
+  H1 {font-size: calc(100vw / 20);}
+}
+@media screen and (max-width: 424px) {
+  .snap {height:112px;width:183px}
+  #introsnap {left:-90px}
+  #logo {height:62px;width:62px;top:50px}
+  #titlewrap {margin-left: 12ex;top:-20px}
+  #titlenotif {left:16px;}
+}
diff --git a/news.php b/news.php
index ef25704..e55cff2 100644
--- a/news.php
+++ b/news.php
@@ -4,8 +4,7 @@
 	// Authors: Elizabeth Liddell, Timothy Pearson, and Calvin Morrison
 
 	include("globals.php");
-	include("header.php");
-	include("footer.php");
+	include("tde-head-and-foot.php");
 	doHeader("Trinity News", "Main", "News");
 
 	include ("media/news-javascript.php");
diff --git a/newsentry.php b/newsentry.php
index c4fe2f4..71389ef 100644
--- a/newsentry.php
+++ b/newsentry.php
@@ -4,8 +4,7 @@
 	// Authors: Elizabeth Liddell, Timothy Pearson, and Calvin Morrison
 
 	include("globals.php");
-	include("header.php");
-	include("footer.php");
+	include("tde-head-and-foot.php");
 	doHeader("Trinity News", "Main", "News");
 ?>
 
diff --git a/tde-head-and-foot.php b/tde-head-and-foot.php
index e344bf9..559fd9a 100644
--- a/tde-head-and-foot.php
+++ b/tde-head-and-foot.php
@@ -3,6 +3,144 @@
 	// All Rights Reserved
 	// Authors: Elizabeth Liddell, Timothy Pearson, and Calvin Morrison
 
-	include("header.php");
-	include("footer.php");
+	$GLOBALS['permnavcat'] = "";
+	$GLOBALS['permnavitem'] = "";
+	$GLOBALS['maindir'] = "";
+
+	# Outputs the Trinity page header, sidebar, and prefatory matter. $pageTitle is the title of the
+	# page as it will appear in both the top banner and the browser's title bar, and $navCategory
+	# and $navItem point at the sidebar navigation item that are to be highlighted for this page.
+	# If the string "_" is passed for $navItem, the top-level navigation category will be highlighted.
+	# $maindir is the path to the top level site directory. By default, it is empty.
+
+	function doHeader($pageTitle, $navCategory, $navItem, $maindir = "/") {
+		header('Content-Type: text/html; charset=utf-8');
+
+		echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">";
+		echo "<HTML>\n";
+		echo "<HEAD>\n";
+		echo "	<TITLE>$pageTitle</TITLE>\n";
+		echo "	<LINK REL=StyleSheet HREF=\"" . $maindir . "mainstyle.css\" TYPE=\"text/css\" MEDIA=\"screen,print\">\n";
+		if ($navItem == "Screenshots") {
+			echo "	<LINK REL=StyleSheet HREF=\"" . $maindir . "screenshots.css\" TYPE=\"text/css\" MEDIA=\"screen,print\">\n";
+			echo "	<LINK REL=StyleSheet HREF=\"" . $maindir . "highslide/highslide.css\" TYPE=\"text/css\" MEDIA=\"screen,print\">\n";
+		}
+		echo "	<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\">\n";
+		echo "</HEAD>\n";
+?>
+<BODY>
+	<DIV ID="all-wrapper">
+		<DIV ID="banner">
+		<IMG ALT="" ID="bannerimg" SRC=<?php echo('"' . $maindir . 'media/bannerswoosh.png"')?>>
+		<DIV ID="logowrap">
+			<A HREF="index.php"><IMG ALT="" ID="logo" SRC=<?php echo('"' . $maindir . 'media/tde-logo.png"')?>></A>
+		</DIV>
+		<DIV ID="titlewrap">
+			<DIV ID="titlecenter">
+			<H1 ID="title"><?php echo($pageTitle) ?></H1>
+		</DIV>
+		</DIV>
+<?php
+			if ($navItem != "Donations") {
+				echo "<DIV ID=\"titlenotif\">\n";
+				echo "	 <P CLASS=\"notifhead\"><A HREF=\"" . $maindir . "donate.php\">Help Keep TDE Alive - Donate Now!</A>\n";
+				echo "</DIV>\n";
+			}
+
+			$GLOBALS['permnavcat'] = $navCategory;
+			$GLOBALS['permnavitem'] = $navItem;
+			$GLOBALS['maindir'] = $maindir;
+?>
+		</DIV>
+	</DIV>
+	<DIV ID="intermediate">
+		<DIV ID="textblock">
+			<!--Content goes here-->
+<?php
+	} #end of doHeader
+
+
+	function doFooter(){
+        $navset = array(  #change this array to alter the navigation scheme
+        "Home" =>  array("_" => $GLOBALS['maindir'] . "index.php",
+                "News" => $GLOBALS['maindir'] . "news.php",
+                "About" => $GLOBALS['maindir'] . "about.php",
+                "Features" => $GLOBALS['maindir'] . "features.php",
+                "Screenshots" => $GLOBALS['maindir'] . "screenshots.php",
+                "Get Involved" => $GLOBALS['maindir'] . "helpwanted.php",
+                "Donations" => $GLOBALS['maindir'] . "donate.php",
+            ),
+        "Get Trinity" => array("_" => $GLOBALS['maindir'] . "releases.php",
+                "Packages" => $GLOBALS['maindir'] . "releases.php",
+                "LiveCDs" => "https://wiki.trinitydesktop.org/LiveCDs",
+            ),
+        "Documentation" => array("_" => $GLOBALS['maindir'] . "docs/index.php",
+                "Wiki" => "https://wiki.trinitydesktop.org/",
+                "Installation" => "https://wiki.trinitydesktop.org/Category:Documentation#Installing_from_a_Package_Manager",
+                "Applications" => $GLOBALS['maindir'] . "applications.php",
+                "FAQ" => $GLOBALS['maindir'] . "faq/index.php",
+            ),
+        "Support" => array("_" => $GLOBALS['maindir'] . "support.php",
+                "Bugs" => "https://bugs.trinitydesktop.org/buglist.cgi?quicksearch=ALL",
+                "Mailing Lists" => $GLOBALS['maindir'] . "mailinglist.php",
+                "Service Alerts" => $GLOBALS['maindir'] . "servicealerts/",
+                "Contact" => $GLOBALS['maindir'] . "support.php",
+            ),
+        "Development" => array("_" => $GLOBALS['maindir'] . "development.php",
+                "GIT" => "http://mirror.git.trinitydesktop.org/cgit/",
+                "Translations" => "https://mirror.git.trinitydesktop.org/weblate",
+                "Commit History" => $GLOBALS['maindir'] . "patches",
+                "Resources" => $GLOBALS['maindir'] . "devresources.php",
+
+            ),
+        );
+
+
+		echo('			<!--end content-->'."\n");
+		date_default_timezone_set('UTC');   #else the interpreter whines
+		echo('			<P ID="copyright">&copy; 2010-' . date('Y') . ' Trinity Desktop Project</P>'."\n");
+
+?>
+		</DIV>
+		</DIV>
+
+	</DIV>
+	<DIV CLASS="equal" ID="main">
+		<DIV CLASS="row">
+			<DIV ID="sidebar">
+			<DIV ID="sidetext">
+<?php
+     foreach ($navset as $navsectname => $urls){
+         if ($navsectname != "Documentation") {
+             echo("			<DIV CLASS=\"navblock\">\n");
+         }
+         if (($GLOBALS['permnavitem'] == "_") && ($navsectname == $GLOBALS['permnavcat'])) {
+             echo("			<P CLASS=\"navhead\" ID=\"curpage\"><A HREF=\"" . $urls["_"] . "\">$navsectname</A>\n");
+         }
+         else {
+             echo("			<P CLASS=\"navhead\"><A HREF=\"" . $urls["_"] . "\">$navsectname</A>\n");
+         }
+         foreach ($urls as $navname => $url){
+             if (!($navname == "_")) {
+             if ($GLOBALS['permnavitem'] == $navname) {
+                 echo("			<P CLASS='nav' ID='curpage'><A HREF=\"$url\">$navname</A>\n");
+             }
+             else {
+                 echo("			<P CLASS='nav'><A HREF=\"$url\">$navname</A>\n");
+             }
+             }
+         }
+         if ($navsectname != "Get Trinity") {
+            echo("			</DIV>\n");
+        }
+     }
+?>
+		</DIV>
+		</DIV>
+	</DIV>
+</BODY>
+</HTML>
+
+<?php
+	} #end of doFooter
 ?>
author	Slávek Banko <slavek.banko@axis.cz>	2021-02-15 23:15:09 +0100
committer	Slávek Banko <slavek.banko@axis.cz>	2021-03-11 19:03:51 +0100
commit	782bc6fd8ecdf87011224a4abe4d49b594b8cb1f (patch)
tree	0c524c3309f104ae84b3273bad85ad9aeaab9eb7
parent	923512ebaa328076bfb577441fb9ee9f7dbba767 (diff)
download	website-core-782bc6fd8ecdf87011224a4abe4d49b594b8cb1f.tar.gz website-core-782bc6fd8ecdf87011224a4abe4d49b594b8cb1f.zip