Revision: 2644
https://sourceforge.net/p/mrbs/code/2644/
Author: cimorrison
Date: 2013-01-17 12:04:47 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
Made the separator, currently ' - ', between the area and room names into a
configurable string
Modified Paths:
--------------
mrbs/branches/linked_bookings/web/import.php
mrbs/branches/linked_bookings/web/month.php
mrbs/branches/linked_bookings/web/mrbs_sql.inc
mrbs/branches/linked_bookings/web/systemdefaults.inc.php
mrbs/branches/linked_bookings/web/week.php
Modified: mrbs/branches/linked_bookings/web/import.php
===================================================================
--- mrbs/branches/linked_bookings/web/import.php 2013-01-17 11:40:08 UTC
(rev 2643)
+++ mrbs/branches/linked_bookings/web/import.php 2013-01-17 12:04:47 UTC
(rev 2644)
@@ -376,7 +376,7 @@
$import = get_form_var('import', 'string');
$area_room_order = get_form_var('area_room_order', 'string', 'area_room');
-$area_room_delimiter = get_form_var('area_room_delimiter', 'string', ';');
+$area_room_delimiter = get_form_var('area_room_delimiter', 'string',
$area_room_separator);
$area_room_create = get_form_var('area_room_create', 'string', '0');
$import_default_type = get_form_var('import_default_type', 'string',
$default_type);
$skip = get_form_var('skip', 'string', ((empty($skip_default)) ? '0' : '1'));
Modified: mrbs/branches/linked_bookings/web/month.php
===================================================================
--- mrbs/branches/linked_bookings/web/month.php 2013-01-17 11:40:08 UTC (rev
2643)
+++ mrbs/branches/linked_bookings/web/month.php 2013-01-17 12:04:47 UTC (rev
2644)
@@ -108,7 +108,7 @@
// Show Month, Year, Area, Room header:
echo "<div id=\"dwm\">\n";
echo "<h2>" . utf8_strftime($strftime_format['monthyear'], $month_start)
- . " - " . htmlspecialchars("$this_area_name - $this_room_name") . "</h2>\n";
+ . " - " . htmlspecialchars($this_area_name . $area_room_separator .
$this_room_name) . "</h2>\n";
echo "</div>\n";
// Show Go to month before and after links
Modified: mrbs/branches/linked_bookings/web/mrbs_sql.inc
===================================================================
--- mrbs/branches/linked_bookings/web/mrbs_sql.inc 2013-01-17 11:40:08 UTC
(rev 2643)
+++ mrbs/branches/linked_bookings/web/mrbs_sql.inc 2013-01-17 12:04:47 UTC
(rev 2644)
@@ -1102,6 +1102,7 @@
{
global $tbl_entry, $tbl_repeat, $tbl_room, $tbl_area;
global $tbl_room_repeat, $tbl_room_entry;
+ global $area_room_separator;
// Check that we've got an id
if (!isset($id))
@@ -1244,7 +1245,7 @@
$booking['area_admin_email'] = array();
$booking['room_admin_email'] = array();
}
- $booking['room_names'][] = $row['area_name'] . ' - ' . $row['room_name'];
+ $booking['room_names'][] = $row['area_name'] . $area_room_separator .
$row['room_name'];
$booking['areas'][] = $row['area_id'];
$booking['rooms'][] = $row['room_id'];
if (isset($row['area_admin_email']) && ($row['area_admin_email'] != ''))
Modified: mrbs/branches/linked_bookings/web/systemdefaults.inc.php
===================================================================
--- mrbs/branches/linked_bookings/web/systemdefaults.inc.php 2013-01-17
11:40:08 UTC (rev 2643)
+++ mrbs/branches/linked_bookings/web/systemdefaults.inc.php 2013-01-17
12:04:47 UTC (rev 2644)
@@ -436,7 +436,12 @@
// support <datalist> present the options in a scrollable select box]
$autocomplete_length_breaks = array(25, 250, 2500);
+// The string to use when combining an area name and a room name into a single
+// string. For example, with the default setting of ' - ' the room 'Room 1'
in
+// 'Area A' would become 'Area A - Room 1'.
+$area_room_separator = ' - ';
+
/************************
* Miscellaneous settings
************************/
Modified: mrbs/branches/linked_bookings/web/week.php
===================================================================
--- mrbs/branches/linked_bookings/web/week.php 2013-01-17 11:40:08 UTC (rev
2643)
+++ mrbs/branches/linked_bookings/web/week.php 2013-01-17 12:04:47 UTC (rev
2644)
@@ -57,7 +57,7 @@
$this_room_name = '';
}
echo "<div id=\"dwm\">\n";
-echo "<h2>" . htmlspecialchars("$this_area_name - $this_room_name") .
"</h2>\n";
+echo "<h2>" . htmlspecialchars($this_area_name . $area_room_separator .
$this_room_name) . "</h2>\n";
echo "</div>\n";
//y? are year, month and day of the previous week.
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
