[Mrbs-commits] SF.net Hg: hg-code [39f1d8d08194]: Added in mini calendars

[MRBS commits]

Changeset:
        39f1d8d08194
        
https://sourceforge.net/p/mrbs/hg-code/ci/39f1d8d0819482176b273e5ce86a6115ded46b21
Author:
        Campbell Morrison <cimorri...@hg.code.sf.net>
Date:
        Tue Mar 28 20:43:20 2017 +0100
Log message:

Added in mini calendars

diffstat:

 web/index.php   |  15 +++++++++++++--
 web/mincals.inc |   3 ++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r c2400689756f -r 39f1d8d08194 web/index.php
--- a/web/index.php     Tue Mar 28 20:33:42 2017 +0100
+++ b/web/index.php     Tue Mar 28 20:43:20 2017 +0100
@@ -2,6 +2,7 @@
 namespace MRBS;
 
 require "defaultincludes.inc";
+require_once "mincals.inc";
 
 
 function print_view_nav()
@@ -310,8 +311,18 @@
 
 // print the page header
 print_header($day, $month, $year, $area, isset($room) ? $room : null);
+
+echo "<div id=\"dwm_header\" class=\"screenonly\">\n";
+
 // Show all available areas
-echo make_area_select_html('index.php', $area, $year, $month, $day);
-print_view_nav();
+echo make_area_select_html('day.php', $area, $year, $month, $day);
+
+// Draw the three month calendars
+if (!$display_calendar_bottom)
+{
+  minicals($year, $month, $day, $area, $room, 'day');
+}
+
+echo "</div>\n";
 echo get_table($map);
 output_trailer();
diff -r c2400689756f -r 39f1d8d08194 web/mincals.inc
--- a/web/mincals.inc   Tue Mar 28 20:33:42 2017 +0100
+++ b/web/mincals.inc   Tue Mar 28 20:43:20 2017 +0100
@@ -250,7 +250,8 @@
     // Sanitize the date: the day may be negative
     $date = getdate(mktime(12, 0, 0, $month, $day, $year));
     
-    $result = "$page.php?" .
+    $result = "index.php?" .
+              "view=$page&amp;" .
               "year="  . $date['year'] . "&amp;" .
               "month=" . $date['mon']  . "&amp;" .
               "day="   . $date['mday'] . "&amp;" .

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