[Mrbs-commits] SF.net Hg: hg-code [9dd0e62322d9]: Merge with default

[MRBS commits]

Changeset:
        9dd0e62322d9
        
https://sourceforge.net/p/mrbs/hg-code/ci/9dd0e62322d9cfd1055eae2e10b23da2379ae004
Author:
        Campbell Morrison <cimorri...@hg.code.sf.net>
Date:
        Sun Feb 26 10:55:22 2017 +0000
Log message:

Merge with default

diffstat:

 web/Themes/default/header.inc |  34 +++++++++++++++++++++++++++-------
 web/css/mrbs.css.php          |  11 +++++++----
 2 files changed, 34 insertions(+), 11 deletions(-)

diffs (112 lines):

diff -r a0ef9bc5d9a9 -r 9dd0e62322d9 web/Themes/default/header.inc
--- a/web/Themes/default/header.inc     Thu Feb 23 20:35:21 2017 +0000
+++ b/web/Themes/default/header.inc     Sun Feb 26 10:55:22 2017 +0000
@@ -147,7 +147,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))
@@ -163,7 +163,7 @@
   echo "<ul>\n";
   
   echo "<li>\n";
-  print_goto_date($day, $month, $year, $area, $room);
+  print_header_site_info();
   echo "</li>\n";
   
   echo "<li>\n";
@@ -190,6 +190,30 @@
     print_logon_box();
     echo "</div>\n";
     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";
@@ -267,11 +291,7 @@
   }
   
   echo "<header class=\"$class\">\n";
-  print_header_site_info();
-  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
diff -r a0ef9bc5d9a9 -r 9dd0e62322d9 web/css/mrbs.css.php
--- a/web/css/mrbs.css.php      Thu Feb 23 20:35:21 2017 +0000
+++ b/web/css/mrbs.css.php      Sun Feb 26 10:55:22 2017 +0000
@@ -916,7 +916,6 @@
 /* ------------ FUNCTIONS.INC -------------------*/
 
 .banner {
-  display: table;
   height: 100%;
   width: 100%;
   background-color: <?php echo $banner_back_color ?>;
@@ -926,12 +925,11 @@
   border-style: solid;
 }
 
-.banner.simple {
+.banner.simple, .banner.simple nav {
   height: auto;
 }
 
 .banner #company {
-  display: table-cell;
   font-size: large;
   padding: 0.3em 1em;
   text-align: center;
@@ -943,8 +941,9 @@
 }
 
 .banner nav {
-  display: table-cell;
+  display: table;
   height: 100%;
+  width: 100%;
 }
 
 .banner ul {
@@ -967,6 +966,10 @@
   padding: 0.3em 0.5em;
 }
 
+.banner li:first-child {
+  border-left-width: 0;
+}
+
 #logon_box a {
   display: block;
   width: 100%;

------------------------------------------------------------------------------
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