[Mrbs-commits] SF.net Hg: hg-code [754af658c049]: Made the "simple" banner work...

[MRBS commits]

Changeset:
        754af658c049
        
https://sourceforge.net/p/mrbs/hg-code/ci/754af658c049d3f2013dc8242fc368c95a5c5588
Author:
        Campbell Morrison <cimorri...@hg.code.sf.net>
Date:
        Sun Feb 26 07:37:57 2017 +0000
Log message:

Made the "simple" banner work, used when there's a fatal error.

diffstat:

 web/Themes/default/header.inc |  56 +++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 28 deletions(-)

diffs (83 lines):

diff -r 69eb423578d1 -r 754af658c049 web/Themes/default/header.inc
--- a/web/Themes/default/header.inc     Sat Feb 25 12:29:15 2017 +0000
+++ b/web/Themes/default/header.inc     Sun Feb 26 07:37:57 2017 +0000
@@ -155,7 +155,7 @@
 }
 
 
-function print_nav($day, $month, $year, $area, $room, $search_str = '')
+function print_nav($day, $month, $year, $area, $room, $search_str = '', 
$simple=false)
 {
   $query_string = "day=$day&amp;month=$month&amp;year=$year";
   if (!empty($area))
@@ -174,32 +174,35 @@
   print_header_site_info();
   echo "</li>\n";
   
-  echo "<li>\n";
-  print_goto_date($day, $month, $year, $area, $room);
-  echo "</li>\n";
-  
-  echo "<li>\n";
-  print_help($query_string);
-  echo "</li>\n";
-  
-  echo "<li>\n";
-  print_rooms($query_string);
-  echo "</li>\n";
-  
-  echo "<li>\n";
-  print_report($query_string);
-  echo "</li>\n";
-  
-  echo "<li>\n";
-  print_search($day, $month, $year, $area, $room, $search_str);
-  echo "</li>\n";
-  
-  // For session protocols that define their own logon box...
-  if (function_exists(__NAMESPACE__ . "\\PrintLogonBox"))
+  if (!$simple)
   {
     echo "<li>\n";
-    print_logon();
+    print_goto_date($day, $month, $year, $area, $room);
     echo "</li>\n";
+    
+    echo "<li>\n";
+    print_help($query_string);
+    echo "</li>\n";
+    
+    echo "<li>\n";
+    print_rooms($query_string);
+    echo "</li>\n";
+    
+    echo "<li>\n";
+    print_report($query_string);
+    echo "</li>\n";
+    
+    echo "<li>\n";
+    print_search($day, $month, $year, $area, $room, $search_str);
+    echo "</li>\n";
+    
+    // For session protocols that define their own logon box...
+    if (function_exists(__NAMESPACE__ . "\\PrintLogonBox"))
+    {
+      echo "<li>\n";
+      print_logon();
+      echo "</li>\n";
+    }
   }
   
   echo "</ul>\n";
@@ -277,10 +280,7 @@
   }
   
   echo "<header class=\"$class\">\n";
-  if (!$simple)
-  {
-    print_nav($day, $month, $year, $area, $room, $search_str);
-  }
+  print_nav($day, $month, $year, $area, $room, $search_str, $simple);
   echo "</header>\n";
 
   // This <div> should really be moved out of here so that we can always see

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
Mrbs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mrbs-commits