Changeset:
61302b068324
https://sourceforge.net/p/mrbs/hg-code/ci/61302b0683241faad209505c90847be54795440c
Author:
Campbell Morrison <cimorri...@hg.code.sf.net>
Date:
Sun Feb 26 11:10:31 2017 +0000
Log message:
Fixed merge
diffstat:
web/Themes/default/header.inc | 27 ++-------------------------
1 files changed, 2 insertions(+), 25 deletions(-)
diffs (46 lines):
diff -r 9dd0e62322d9 -r 61302b068324 web/Themes/default/header.inc
--- a/web/Themes/default/header.inc Sun Feb 26 10:55:22 2017 +0000
+++ b/web/Themes/default/header.inc Sun Feb 26 11:10:31 2017 +0000
@@ -166,32 +166,9 @@
print_header_site_info();
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__ . "\\print_logon_box"))
+ if (!$simple)
{
echo "<li>\n";
- echo "<div id=\"logon_box\">\n";
- print_logon_box();
- echo "</div>\n";
- echo "</li>\n";
-
- echo "<li>\n";
print_help($query_string);
echo "</li>\n";
@@ -208,7 +185,7 @@
echo "</li>\n";
// For session protocols that define their own logon box...
- if (function_exists(__NAMESPACE__ . "\\PrintLogonBox"))
+ if (function_exists(__NAMESPACE__ . "\\print_logon_box"))
{
echo "<li>\n";
print_logon();
------------------------------------------------------------------------------
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
