Revision: 1462
http://mrbs.svn.sourceforge.net/mrbs/?rev=1462&view=rev
Author: cimorrison
Date: 2010-09-21 08:13:58 +0000 (Tue, 21 Sep 2010)
Log Message:
-----------
Added an optional display of the timezone to the day view. See SF Feature
Requests item #3065070
Modified Paths:
--------------
mrbs/trunk/web/day.php
mrbs/trunk/web/lang.en
mrbs/trunk/web/month.php
mrbs/trunk/web/mrbs.css.php
mrbs/trunk/web/systemdefaults.inc.php
mrbs/trunk/web/week.php
Modified: mrbs/trunk/web/day.php
===================================================================
--- mrbs/trunk/web/day.php 2010-09-20 14:13:17 UTC (rev 1461)
+++ mrbs/trunk/web/day.php 2010-09-21 08:13:58 UTC (rev 1462)
@@ -222,10 +222,18 @@
}
else
{
- // Show current date
- echo "<h2 id=\"dwm\">" . utf8_strftime("%A %d %B %Y", $am7) . "</h2>\n";
+ // Show current date and timezone
+ echo "<div id=\"dwm\">\n";
+ echo "<h2>" . utf8_strftime("%A %d %B %Y", $am7) . "</h2>\n";
+ if ($display_timezone)
+ {
+ echo "<div class=\"timezone\">";
+ echo get_vocab("timezone") . ": " . date('T', $am7) . " (UTC" . date('O',
$am7) . ")";
+ echo "</div>\n";
+ }
+ echo "</div>\n";
+
// Generate Go to day before and after links
-
$before_after_links_html = "
<div class=\"screenonly\">
<div class=\"date_nav\">
Modified: mrbs/trunk/web/lang.en
===================================================================
--- mrbs/trunk/web/lang.en 2010-09-20 14:13:17 UTC (rev 1461)
+++ mrbs/trunk/web/lang.en 2010-09-21 08:13:58 UTC (rev 1462)
@@ -34,6 +34,7 @@
$vocab["goto"] = "goto";
$vocab["highlight_line"] = "Highlight this line";
$vocab["click_to_reserve"] = "Click on the cell to make a reservation.";
+$vocab["timezone"] = "Timezone";
// Used in trailer.inc
$vocab["viewday"] = "View Day";
Modified: mrbs/trunk/web/month.php
===================================================================
--- mrbs/trunk/web/month.php 2010-09-20 14:13:17 UTC (rev 1461)
+++ mrbs/trunk/web/month.php 2010-09-21 08:13:58 UTC (rev 1462)
@@ -166,8 +166,10 @@
}
// Show Month, Year, Area, Room header:
-echo "<h2 id=\"dwm\">" . utf8_strftime("%B %Y", $month_start)
+echo "<div id=\"dwm\">\n";
+echo "<h2>" . utf8_strftime("%B %Y", $month_start)
. " - $this_area_name - $this_room_name</h2>\n";
+echo "</div>\n";
// Show Go to month before and after links
//y? are year and month and day of the previous month.
Modified: mrbs/trunk/web/mrbs.css.php
===================================================================
--- mrbs/trunk/web/mrbs.css.php 2010-09-20 14:13:17 UTC (rev 1461)
+++ mrbs/trunk/web/mrbs.css.php 2010-09-21 08:13:58 UTC (rev 1462)
@@ -166,7 +166,10 @@
#dwm_header ul {list-style-type: none; padding-left: 0; margin-left: 0;
margin-top: 0}
#dwm_header li {padding-left: 0; margin-left: 0}
-h2#dwm {text-align: center}
+div#dwm {margin-bottom: 0.5em}
+#dwm {text-align: center}
+#dwm h2 {margin-bottom: 0}
+#dwm div.timezone {opacity: 0.8}
div.date_nav {float: left; width: 100%; margin-top: 0.5em; margin-bottom:
0.5em; font-weight: bold}
div.date_before {float: left; width: 33%; text-align: left}
Modified: mrbs/trunk/web/systemdefaults.inc.php
===================================================================
--- mrbs/trunk/web/systemdefaults.inc.php 2010-09-20 14:13:17 UTC (rev
1461)
+++ mrbs/trunk/web/systemdefaults.inc.php 2010-09-21 08:13:58 UTC (rev
1462)
@@ -301,6 +301,9 @@
// in 24 hour format
$twentyfourhour_format = 1;
+// Whether or not to display the timezone
+$display_timezone = FALSE;
+
// Results per page for searching:
$search["count"] = 20;
Modified: mrbs/trunk/web/week.php
===================================================================
--- mrbs/trunk/web/week.php 2010-09-20 14:13:17 UTC (rev 1461)
+++ mrbs/trunk/web/week.php 2010-09-21 08:13:58 UTC (rev 1462)
@@ -159,7 +159,9 @@
}
// Show area and room:
-echo "<h2 id=\"dwm\">$this_area_name - $this_room_name</h2>\n";
+echo "<div id=\"dwm\">\n";
+echo "<h2>$this_area_name - $this_room_name</h2>\n";
+echo "</div>\n";
//y? are year, month and day of the previous week.
//t? are year, month and day of the next week.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
