Mercurial > hg > fapweb

changeset 585:cec36fd24d21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up the menu and HTML somewhat.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 17 Oct 2014 00:49:13 +0300
parents 5c39fef03f06
children 83dee3e7c36f
files index.php msite.inc.php
diffstat 2 files changed, 40 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/index.php	Thu Oct 16 21:12:19 2014 +0300
+++ b/index.php	Fri Oct 17 00:49:13 2014 +0300
@@ -39,57 +39,48 @@
 // Fetch non-"hardcoded" settings from SQL database
 stReloadSettings();
 
-?>
-<div id="header">
- <? echo stGetSetting("siteInfoText") ?>
-</div>
-
-<div id="menu">
-  <? echo stGetSetting("siteMenuHeader") ?>
-
-  <a href="about">About</a>
-<?
-if (stGetSetting("showNews"))
-  echo "<a href=\"news\">News</a>\n";
-?>
-  <a href="compos">Compos</a>
-  <a href="schedule">Schedule</a>
-<?
-$visibility = stAdmSessionAuth(TRUE);
-
-if (stGetSetting("showAttendees"))
-echo "  <a href=\"attendees\">Attendees</a>\n";
-else
-if (stChkSetting("allowRegister"))
-echo "  <a href=\"register\">Register</a>\n";
-
-if (stGetSetting("allowVoting"))
-echo "  <a href=\"vote\">Vote</a>\n";
-
-if ($visibility || stGetSetting("showResults"))
-echo "  <a href=\"results\">Results</a>\n";
-
-if ($visibility || stGetSetting("showAdmin"))
-echo "  <a href=\"admin.php\">Admin</a>\n";
-?>
-  <? echo stGetSetting("siteMenuFooter") ?>
-</div>
-
-<?
-echo stGetSetting("siteExtraHTML");
 
 // Get the name of the page
 $pagePath = "pages/";
 $pageExt  = ".inc.php";
 $pageName = isset($_GET["page"]) ? $_GET["page"] : stGetSetting("defaultPage");
 $pageBasename = basename($pageName);
+$currPagename = "";
 
 // Default to set default page if selected page does not exist
 if (!file_exists($pagePath.$pageBasename.$pageExt))
   $pageBasename = stGetSetting("defaultPage");
+else
+  $currPagename = $pageBasename;
 
 
-echo "<div id=\"infobox\">".strtoupper($pageBasename)."</div>\n";
+// Output the page menu etc.
+echo
+  "<div id=\"header\">\n".
+  stGetSetting("siteInfoText").
+  "  <div id=\"menu\">\n".
+  "    ".stGetSetting("siteMenuHeader")."\n".
+  stGetMainPageLink("about", "About").
+  stGetMainPageLink("news", "News", stGetSetting("showNews")).
+  stGetMainPageLink("compos", "Compos").
+  stGetMainPageLink("schedule", "Schedule");
+
+if (stGetSetting("showAttendees"))
+  echo stGetMainPageLink("attendees", "Attendees");
+else
+if (stChkSetting("allowRegister"))
+  echo stGetMainPageLink("register", "Register");
+
+$visibility = stAdmSessionAuth(TRUE);
+echo
+  stGetMainPageLink("vote", "Vote", stGetSetting("allowVoting")).
+  stGetMainPageLink("results", "Results", $visibility || stGetSetting("showResults")).
+  stGetMainPageLink("admin.php", "Admin", $visibility || stGetSetting("showAdmin")).
+  stGetSetting("siteMenuFooter").
+  "  </div>\n".
+  "</div>\n".
+  stGetSetting("siteExtraHTML").
+  "<div id=\"infobox\">".$pageBasename."</div>\n";
 ?>
 <div id="mainContent">
 <div>
--- a/msite.inc.php	Thu Oct 16 21:12:19 2014 +0300
+++ b/msite.inc.php	Fri Oct 17 00:49:13 2014 +0300
@@ -530,4 +530,14 @@
 }
 
 
+// Get link helper function
+function stGetMainPageLink($id, $name, $show = TRUE)
+{
+  global $currPagename;
+  if ($show)
+    return "    <a class=\"".($id == $currPagename ? "active" : "inactive")."\" href=\"".$id."\">".$name."</a>\n";
+  else
+    return "";
+}
+
 ?>
\ No newline at end of file