Revision: 2045
http://mrbs.svn.sourceforge.net/mrbs/?rev=2045&view=rev
Author: cimorrison
Date: 2011-09-30 16:06:17 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/datatables/web/edit_area_room.php
Property Changed:
----------------
mrbs/branches/datatables/
mrbs/branches/datatables/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/datatables
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1863-2042
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1863-2044
Modified: mrbs/branches/datatables/web/edit_area_room.php
===================================================================
--- mrbs/branches/datatables/web/edit_area_room.php 2011-09-30 16:03:05 UTC
(rev 2044)
+++ mrbs/branches/datatables/web/edit_area_room.php 2011-09-30 16:06:17 UTC
(rev 2045)
@@ -538,19 +538,22 @@
echo "</div>\n";
// Status (Enabled or Disabled)
- echo "<div>\n";
- echo "<label title=\"" . get_vocab("disabled_room_note") . "\">" .
get_vocab("status") . ":</label>\n";
- echo "<div class=\"group\">\n";
- echo "<label>\n";
- $checked = ($row['disabled']) ? "" : " checked=\"checked\"";
- echo "<input class=\"radio\" type=\"radio\" name=\"room_disabled\"
value=\"0\"${checked}${disabled}>\n";
- echo get_vocab("enabled") . "</label>\n";
- echo "<label>\n";
- $checked = ($row['disabled']) ? " checked=\"checked\"" : "";
- echo "<input class=\"radio\" type=\"radio\" name=\"room_disabled\"
value=\"1\"${checked}${disabled}>\n";
- echo get_vocab("disabled") . "</label>\n";
- echo "</div>\n";
- echo "</div>\n";
+ if ($is_admin)
+ {
+ echo "<div>\n";
+ echo "<label title=\"" . get_vocab("disabled_room_note") . "\">" .
get_vocab("status") . ":</label>\n";
+ echo "<div class=\"group\">\n";
+ echo "<label>\n";
+ $checked = ($row['disabled']) ? "" : " checked=\"checked\"";
+ echo "<input class=\"radio\" type=\"radio\" name=\"room_disabled\"
value=\"0\"${checked}${disabled}>\n";
+ echo get_vocab("enabled") . "</label>\n";
+ echo "<label>\n";
+ $checked = ($row['disabled']) ? " checked=\"checked\"" : "";
+ echo "<input class=\"radio\" type=\"radio\" name=\"room_disabled\"
value=\"1\"${checked}${disabled}>\n";
+ echo get_vocab("disabled") . "</label>\n";
+ echo "</div>\n";
+ echo "</div>\n";
+ }
// Sort key
if ($is_admin)
Property changes on: mrbs/branches/datatables/web/upgrade/5/pgsql.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1863-2042
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1863-2044
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
