Revision: 1314
http://mrbs.svn.sourceforge.net/mrbs/?rev=1314&view=rev
Author: cimorrison
Date: 2010-03-28 09:48:50 +0000 (Sun, 28 Mar 2010)
Log Message:
-----------
- added custom_html fields to the area and room tables. The HTML is displayed
in a div with id "custom_html" on the Rooms and edit_area_room pages. The div
can be styled and positioned using CSS. Useful, for example, for displaying an
embedded Google map showing the location of a room or area. See also
Sourceforge feature request ID 2976404
- Fixed a bug which prevented the edit and delete image buttons working with IE6
- Removed the sort_key from the list of room details shown to non-admins
Modified Paths:
--------------
mrbs/trunk/web/admin.php
mrbs/trunk/web/dbsys.inc
mrbs/trunk/web/edit_area_room.php
mrbs/trunk/web/edit_users.php
mrbs/trunk/web/lang.en
mrbs/trunk/web/mrbs-ie.css
mrbs/trunk/web/mrbs-ielte7.css.php
mrbs/trunk/web/mrbs.css.php
Added Paths:
-----------
mrbs/trunk/web/upgrade/12/
mrbs/trunk/web/upgrade/12/mysql.sql
mrbs/trunk/web/upgrade/12/pgsql.sql
Modified: mrbs/trunk/web/admin.php
===================================================================
--- mrbs/trunk/web/admin.php 2010-03-23 09:52:35 UTC (rev 1313)
+++ mrbs/trunk/web/admin.php 2010-03-28 09:48:50 UTC (rev 1314)
@@ -12,7 +12,10 @@
$room = get_form_var('room', 'int');
$area_name = get_form_var('area_name', 'string');
$error = get_form_var('error', 'string');
-$action = get_form_var('action', 'string');
+// the image buttons: need to specify edit_x rather than edit etc. because
+// IE6 only returns _x and _y
+$edit_x = get_form_var('edit_x', 'int');
+$delete_x = get_form_var('delete_x', 'int');
// If we dont know the right date then make it up
if (!isset($day) or !isset($month) or !isset($year))
@@ -27,29 +30,23 @@
$area = get_default_area();
}
+
// Check to see whether the Edit or Delete buttons have been pressed and
redirect
// as appropriate
-if (isset($action))
+$std_query_string = "area=$area&day=$day&month=$month&year=$year";
+if (isset($edit_x))
{
- $std_query_string = "area=$area&day=$day&month=$month&year=$year";
- switch($action) {
- case 'edit':
- $location = "edit_area_room.php?$std_query_string";
- break;
- case 'delete':
- $location = "del.php?type=area&$std_query_string";
- break;
- default:
- unset($location);
- break;
- }
- if (isset($location))
- {
- header("Location: $location");
- exit;
- }
+ $location = $location = "edit_area_room.php?$std_query_string";
+ header("Location: $location");
+ exit;
}
-
+if (isset($delete_x))
+{
+ $location = "del.php?type=area&$std_query_string";
+ header("Location: $location");
+ exit;
+}
+
// Users must be at least Level 1 for this page as we will be displaying
// information such as email addresses
if (!getAuthorised(1))
@@ -63,20 +60,18 @@
print_header($day, $month, $year, isset($area) ? $area : "", isset($room) ?
$room : "");
-// If area is set but area name is not known, get the name.
+// Get the details we need for this area
if (isset($area))
{
- if (empty($area_name))
+ $res = sql_query("SELECT area_name, custom_html FROM $tbl_area WHERE
id=$area LIMIT 1");
+ if (! $res) fatal_error(0, sql_error());
+ if (sql_count($res) == 1)
{
- $res = sql_query("SELECT area_name FROM $tbl_area WHERE id=$area");
- if (! $res) fatal_error(0, sql_error());
- if (sql_count($res) == 1)
- {
- $row = sql_row_keyed($res, 0);
- $area_name = $row['area_name'];
- }
- sql_free($res);
+ $row = sql_row_keyed($res, 0);
+ $area_name = $row['area_name'];
+ $custom_html = $row['custom_html'];
}
+ sql_free($res);
}
@@ -120,15 +115,11 @@
// and also a form for adding a new area
if ($is_admin)
{
- // The edit button
- echo "<button type=\"submit\" name=\"action\" value=\"edit\" title=\"" .
get_vocab("edit") . "\">\n";
- echo "<img src=\"images/edit.png\" width=\"16\" height=\"16\" alt=\"" .
get_vocab("edit") . "\">\n";
- echo "</button>\n";
-
- // The delete button
- echo "<button type=\"submit\" name=\"action\" value=\"delete\" title=\"" .
get_vocab("delete") . "\">\n";
- echo "<img src=\"images/delete.png\" width=\"16\" height=\"16\" alt=\"" .
get_vocab("delete") . "\">\n";
- echo "</button>\n";
+ // Can't use <button> because IE6 does not support those properly
+ echo "<input type=\"image\" class=\"button\" name=\"edit\"
src=\"images/edit.png\"
+ title=\"" . get_vocab("edit") . "\" alt=\"" . get_vocab("edit") .
"\">\n";
+ echo "<input type=\"image\" class=\"button\" name=\"delete\"
src=\"images/delete.png\"
+ title=\"" . get_vocab("delete") . "\" alt=\"" . get_vocab("delete")
. "\">\n";
}
echo "</fieldset>\n";
@@ -161,8 +152,15 @@
</form>
<?php
}
-echo "</div>";
+echo "</div>"; // area_form
+// Now the custom HTML
+echo "<div id=\"custom_html\">\n";
+// no htmlspecialchars() because we want the HTML!
+echo (!empty($custom_html)) ? "$custom_html\n" : "";
+echo "</div>\n";
+
+
// BOTTOM SECTION: ROOMS IN THE SELECTED AREA
echo "<h2>\n";
echo get_vocab("rooms");
@@ -254,7 +252,7 @@
echo "<tr>\n";
// ignore these columns, either because we don't want to display them,
// or because we have already displayed them in the header column
- $ignore = array('id', 'area_id', 'room_name', 'sort_key');
+ $ignore = array('id', 'area_id', 'room_name', 'sort_key', 'custom_html');
foreach($fields as $field)
{
if (!in_array($field['name'], $ignore))
Modified: mrbs/trunk/web/dbsys.inc
===================================================================
--- mrbs/trunk/web/dbsys.inc 2010-03-23 09:52:35 UTC (rev 1313)
+++ mrbs/trunk/web/dbsys.inc 2010-03-28 09:48:50 UTC (rev 1314)
@@ -15,7 +15,7 @@
$tbl_variables = $db_tbl_prefix . "variables";
-$db_schema_version = 11;
+$db_schema_version = 12;
$local_db_schema_version = 1;
Modified: mrbs/trunk/web/edit_area_room.php
===================================================================
--- mrbs/trunk/web/edit_area_room.php 2010-03-23 09:52:35 UTC (rev 1313)
+++ mrbs/trunk/web/edit_area_room.php 2010-03-28 09:48:50 UTC (rev 1314)
@@ -81,6 +81,7 @@
$area_private_default = get_form_var('area_private_default', 'int');
$area_private_mandatory = get_form_var('area_private_mandatory', 'string');
$area_private_override = get_form_var('area_private_override', 'string');
+$custom_html = get_form_var('custom_html', 'string'); // Used for both area
and room, but you only ever have one or the other
$change_done = get_form_var('change_done', 'string');
$change_room = get_form_var('change_room', 'string');
$change_area = get_form_var('change_area', 'string');
@@ -228,6 +229,9 @@
case 'room_admin_email':
$assign_array[] = "room_admin_email='" .
addslashes($room_admin_email) . "'";
break;
+ case 'custom_html':
+ $assign_array[] = "custom_html='" . addslashes($custom_html) .
"'";
+ break;
// then look at any user defined fields
default:
$var = "f_" . $field['name'];
@@ -347,29 +351,38 @@
// If everything is OK, update the database
if ((FALSE != $valid_email) && (FALSE != $valid_resolution) && (FALSE !=
$enough_slots))
{
- $sql = "UPDATE $tbl_area SET area_name='" . addslashes($area_name)
- . "', area_admin_email='" . addslashes($area_admin_email) . "'";
+ $sql = "UPDATE $tbl_area SET ";
+ $assign_array = array();
+ $assign_array[] = "area_name='" . addslashes($area_name) . "'";
+ $assign_array[] = "area_admin_email='" . addslashes($area_admin_email) .
"'";
+ $assign_array[] = "custom_html='" . addslashes($custom_html) . "'";
if (!$enable_periods)
{
// only update the min and max book_ahead_secs fields if the form values
// are set; they might be NULL because they've been disabled by
JavaScript
- $sql .= ", resolution=" . $area_res_mins * 60
- . ", default_duration=" . $area_def_duration_mins * 60
- . ", morningstarts=" . $area_morningstarts
- . ", morningstarts_minutes=" . $area_morningstarts_minutes
- . ", eveningends=" . $area_eveningends
- . ", eveningends_minutes=" . $area_eveningends_minutes
- . ", min_book_ahead_enabled=" . $area_min_ba_enabled
- . (isset($area_min_ba_value) ? ", min_book_ahead_secs=" .
$area_min_ba_value : "")
- . ", max_book_ahead_enabled=" . $area_max_ba_enabled
- . (isset($area_max_ba_value) ? ", max_book_ahead_secs=" .
$area_max_ba_value : "");
+ $assign_array[] = "resolution=" . $area_res_mins * 60;
+ $assign_array[] = "default_duration=" . $area_def_duration_mins * 60;
+ $assign_array[] = "morningstarts=" . $area_morningstarts;
+ $assign_array[] = "morningstarts_minutes=" . $area_morningstarts_minutes;
+ $assign_array[] = "eveningends=" . $area_eveningends;
+ $assign_array[] = "eveningends_minutes=" . $area_eveningends_minutes;
+ $assign_array[] = "min_book_ahead_enabled=" . $area_min_ba_enabled;
+ $assign_array[] = "max_book_ahead_enabled=" . $area_max_ba_enabled;
+ if (isset($area_min_ba_value))
+ {
+ $assign_array[] = "min_book_ahead_secs=" . $area_min_ba_value;
+ }
+ if (isset($area_max_ba_value))
+ {
+ $assign_array[] = "max_book_ahead_secs=" . $area_max_ba_value;
+ }
}
- $sql .= ", private_enabled=" . $area_private_enabled
- . ", private_default=" . $area_private_default
- . ", private_mandatory=" . $area_private_mandatory
- . ", private_override='" . $area_private_override . "'";
+ $assign_array[] = "private_enabled=" . $area_private_enabled;
+ $assign_array[] = "private_default=" . $area_private_default;
+ $assign_array[] = "private_mandatory=" . $area_private_mandatory;
+ $assign_array[] = "private_override='" . $area_private_override . "'";
- $sql .= " WHERE id=$area";
+ $sql .= implode(",", $assign_array) . " WHERE id=$area";
if (sql_command($sql) < 0)
{
fatal_error(0, get_vocab("update_area_failed") . sql_error());
@@ -407,12 +420,13 @@
}
$row = sql_row_keyed($res, 0);
+ echo "<h2>\n";
+ echo ($is_admin) ? get_vocab("editroom") : get_vocab("viewroom");
+ echo "</h2>\n";
?>
<form class="form_general" id="edit_room" action="edit_area_room.php"
method="post">
<fieldset class="admin">
- <legend>
- <?php echo ($is_admin) ? get_vocab("editroom") : get_vocab("viewroom")?>
- </legend>
+ <legend></legend>
<fieldset>
<legend></legend>
@@ -427,6 +441,8 @@
</span>
</fieldset>
+ <fieldset>
+ <legend></legend>
<input type="hidden" name="room" value="<?php echo $row["id"]?>">
<?php
@@ -471,8 +487,11 @@
echo "<input type=\"hidden\" name=\"old_room_name\" value=\"" .
htmlspecialchars($row["room_name"]) . "\">\n";
break;
case 'sort_key':
- echo "<label for=\"sort_key\" title=\"" .
get_vocab("sort_key_note") . "\">" . get_vocab("sort_key") . ":</label>\n";
- echo "<input type=\"text\" id=\"sort_key\" name=\"sort_key\"
value=\"" . htmlspecialchars($row["sort_key"]) . "\"$disabled>\n";
+ if ($is_admin)
+ {
+ echo "<label for=\"sort_key\" title=\"" .
get_vocab("sort_key_note") . "\">" . get_vocab("sort_key") . ":</label>\n";
+ echo "<input type=\"text\" id=\"sort_key\" name=\"sort_key\"
value=\"" . htmlspecialchars($row["sort_key"]) . "\"$disabled>\n";
+ }
break;
case 'description':
echo "<label for=\"description\">" . get_vocab("description") .
":</label>\n";
@@ -486,6 +505,16 @@
echo "<label for=\"room_admin_email\">" .
get_vocab("room_admin_email") . ":</label>\n";
echo "<input type=\"text\" id=\"room_admin_email\"
name=\"room_admin_email\" maxlength=\"75\" value=\"" .
htmlspecialchars($row["room_admin_email"]) . "\"$disabled>\n";
break;
+ case 'custom_html':
+ if ($is_admin)
+ {
+ // Only show the raw HTML to admins. Non-admins will see the
rendered HTML
+ echo "<label for=\"room_custom_html\" title=\"" .
get_vocab("custom_html_note") . "\">" . get_vocab("custom_html") .
":</label>\n";
+ echo "<textarea id=\"room_custom_html\" class=\"custom_html\"
name=\"custom_html\" rows=\"4\" cols=\"40\"$disabled>\n";
+ echo htmlspecialchars($row['custom_html']);
+ echo "</textarea>\n";
+ }
+ break;
// then look at any user defined fields
default:
$label_text = get_loc_field_name($tbl_room, $field['name']);
@@ -527,6 +556,7 @@
echo "</div>\n";
}
}
+ echo "</fieldset>\n";
// Submit and Back buttons (Submit only if they're an admin)
echo "<fieldset class=\"submit_buttons\">\n";
@@ -547,6 +577,11 @@
</form>
<?php
+ // Now the custom HTML
+ echo "<div id=\"custom_html\">\n";
+ // no htmlspecialchars() because we want the HTML!
+ echo (!empty($row['custom_html'])) ? $row['custom_html'] . "\n" : "";
+ echo "</div>\n";
}
// THE AREA FORM
@@ -608,8 +643,16 @@
<input type="text" id="area_admin_email" name="area_admin_email"
maxlength="75" value="<?php echo htmlspecialchars($row["area_admin_email"]);
?>">
</div>
</fieldset>
+
+ <?php
+ // The custom HTML
+ echo "<div>\n";
+ echo "<label for=\"area_custom_html\" title=\"" .
get_vocab("custom_html_note") . "\">" . get_vocab("custom_html") .
":</label>\n";
+ echo "<textarea id=\"area_custom_html\" class=\"custom_html\"
name=\"custom_html\" rows=\"4\" cols=\"40\">\n";
+ echo htmlspecialchars($row['custom_html']);
+ echo "</textarea>\n";
+ echo "</div>\n";
- <?php
if (!$enable_periods)
{
?>
Modified: mrbs/trunk/web/edit_users.php
===================================================================
--- mrbs/trunk/web/edit_users.php 2010-03-23 09:52:35 UTC (rev 1313)
+++ mrbs/trunk/web/edit_users.php 2010-03-28 09:48:50 UTC (rev 1314)
@@ -182,9 +182,8 @@
$html .= "<div>\n";
$html .= "<input type=\"hidden\" name=\"Action\" value=\"Edit\">\n";
$html .= "<input type=\"hidden\" name=\"Id\" value=\"" . $line['id'] .
"\">\n";
- $html .= "<button type=\"submit\" name=\"action\" value=\"edit\"
title=\"" . get_vocab("edit") . "\">\n";
- $html .= "<img src=\"images/edit.png\" width=\"16\" height=\"16\"
alt=\"" . get_vocab("edit") . "\">\n";
- $html .= "</button>\n";
+ $html .= "<input type=\"image\" class=\"button\"
src=\"images/edit.png\"
+ title=\"" . get_vocab("edit") . "\" alt=\"" .
get_vocab("edit") . "\">\n";
$html .= "</div>\n";
$html .= "</form>\n";
}
Modified: mrbs/trunk/web/lang.en
===================================================================
--- mrbs/trunk/web/lang.en 2010-03-23 09:52:35 UTC (rev 1313)
+++ mrbs/trunk/web/lang.en 2010-03-28 09:48:50 UTC (rev 1314)
@@ -325,6 +325,9 @@
$vocab["booking_policies"] = "Booking policies";
$vocab["min_book_ahead"] = "Advance booking - minimum";
$vocab["max_book_ahead"] = "Advance booking - maximum";
+$vocab["custom_html"] = "Custom HTML";
+$vocab["custom_html_note"] = "This field can be used for displaying
your own HTML, for example an embedded Google map";
+
// Used in edit_users.php
$vocab["name_empty"] = "You must enter a name.";
Modified: mrbs/trunk/web/mrbs-ie.css
===================================================================
--- mrbs/trunk/web/mrbs-ie.css 2010-03-23 09:52:35 UTC (rev 1313)
+++ mrbs/trunk/web/mrbs-ie.css 2010-03-28 09:48:50 UTC (rev 1314)
@@ -19,6 +19,7 @@
/* used in EDIT_ENTRY.PHP and REPORT.PHP */
.form_general legend {margin-bottom: 2.0em} /* by default IE gives no gap
between legend and first form element */
+.form_general#edit_room legend {margin-bottom: 0} /* no legend here, so we
don't want the margin */
.form_general fieldset fieldset legend {margin-bottom: 5px}
/* margin-bottom on some form controls does not work, so put it on the
relevant divs instead */
Modified: mrbs/trunk/web/mrbs-ielte7.css.php
===================================================================
--- mrbs/trunk/web/mrbs-ielte7.css.php 2010-03-23 09:52:35 UTC (rev 1313)
+++ mrbs/trunk/web/mrbs-ielte7.css.php 2010-03-28 09:48:50 UTC (rev 1314)
@@ -19,6 +19,11 @@
#areaChangeForm button {margin-top: -0.1em}
+/* ------------ FORM_GENERAL ------------------------*/
+
+.form_general#edit_room legend {font-size: 0} /* no legend in edit_room, so
stop IE allocating space */
+.form_general#edit_room select {margin-bottom: 0.2em}
+
/* ------------ DAY/WEEK/MONTH.PHP ------------------*/
<?php
Modified: mrbs/trunk/web/mrbs.css.php
===================================================================
--- mrbs/trunk/web/mrbs.css.php 2010-03-23 09:52:35 UTC (rev 1313)
+++ mrbs/trunk/web/mrbs.css.php 2010-03-28 09:48:50 UTC (rev 1314)
@@ -32,8 +32,6 @@
h2 {font-size: large}
img {border: 0}
-button {background-color: transparent; border: 0; padding: 0}
-button img {vertical-align: middle}
a:link {color: <?php echo $anchor_link_color ?>; text-decoration: none;
font-weight: bold}
a:visited {color: <?php echo $anchor_visited_color ?>; text-decoration: none;
font-weight: bold}
@@ -57,7 +55,7 @@
border: 1px solid <?php echo $admin_table_border_color ?>}
fieldset fieldset {position: relative; clear: left; width: 100%; padding: 0;
border: 0; margin: 0} /* inner fieldsets are invisible */
fieldset fieldset legend {font-size: 0} /* for IE: even if there is no
legend text, IE allocates space */
-
+
.naked {margin: 0; padding: 0; border-width: 0} /* Invisible tables used for
internal needs */
table.naked {width: 100%; height: 100%}
table:hover.naked {cursor: pointer} /* set cursor to pointer; if you don't
it doesn't show up when show_plus_link is false */
@@ -72,7 +70,8 @@
.admin_table td, .admin_table th {border-color: <?php echo
$admin_table_border_color ?>}
.admin_table th:first-child {border-left-color: <?php echo
$admin_table_header_back_color ?>}
.admin_table td.action {text-align: center}
-.admin_table td.action div {display: inline-block}
+.admin_table td.action div {display: inline-block}
+.admin_table td.action div div {display: table-cell}
div.freeze_panes {width: 100%; float: left}
.freeze_panes th div, .freeze_panes td div {display: table-cell;
vertical-align: middle; white-space: nowrap; overflow: hidden}
@@ -109,12 +108,15 @@
width: auto; margin-top: 1.2em; margin-left: <?php echo
number_format(($admin_form_gap + $admin_form_label_width), 1, '.', '')?>em
}
.admin h2 {clear: left}
-div#area_form, div#room_form {float: left; width: 95%; padding: 0 0 2em 1em}
+div#area_form, div#room_form {float: left; padding: 0 0 2em 1em}
+div#area_form {width: auto}
+div#room_form {width: 95%}
+div#custom_html {float: left; padding: 0 0 3em 1em}
#area_form form {float: left; margin-right: 1em}
#area_form label#area_label {display: block; float: left; font-weight: bold;
margin-right: <?php echo $admin_form_gap ?>em}
#areaChangeForm select {display: block; float: left; margin: -0.1em 1.5em 0 0}
#areaChangeForm input {float: left; margin: -0.2em 0.5em 0 0}
-#areaChangeForm button {display: block; float: left; margin: -0.2em 0.5em 0
0.5em}
+#areaChangeForm input.button {display: block; float: left; margin: 0 0.7em}
div.header_columns, div.body_columns {position: relative; float: left;
overflow-x: scroll; overflow-y: hidden}
div.header_columns {max-width: 20%}
@@ -446,9 +448,10 @@
.edit_area_room .form_general fieldset fieldset {padding-top: 0.5em;
padding-bottom: 0.5em}
.edit_area_room .form_general fieldset fieldset legend {font-size: small;
font-style: italic; font-weight: normal}
span#private_display_caution {display: block; margin-top: 1em; font-style:
italic; font-weight: normal}
+.edit_area_room textarea.custom_html {height: 6em; width: 25em}
+.edit_area_room div#custom_html {margin-top: 8px}
-
/* ------------ FORM_GENERAL ------------------------*/
/* */
/* used in EDIT_ENTRY.PHP, REPORT.PHP, */
@@ -493,9 +496,10 @@
$db_logon_form_min_width = number_format($db_logon_form_min_width, 1,
'.', ''); // get rid of any commas
// Specific to the "edit_area_room" form
-$edit_area_room_left_col_max_width = '16'; // em
+$edit_area_room_left_col_width = '15'; // em
+$edit_area_room_left_col_max_width = '30'; // em
$edit_area_room_input_width = '12'; // em
-$edit_area_room_form_min_width = $edit_area_room_left_col_max_width +
$edit_area_room_input_width + $general_gap;
+$edit_area_room_form_min_width = $edit_area_room_left_col_width +
$edit_area_room_input_width + $general_gap;
$edit_area_room_form_min_width =
number_format($edit_area_room_form_min_width, 1, '.', ''); // get rid of any
commas
@@ -507,6 +511,7 @@
.edit_area_room form.form_general {min-width: <?php echo
$edit_area_room_form_min_width ?>em}
form.form_general#logon {min-width: <?php echo $logon_form_min_width
?>em}
form.form_general#db_logon {min-width: <?php echo $db_logon_form_min_width
?>em}
+form#edit_room {float: left; width: auto; margin: 0 2em 1em 1em}
.form_general div {float: left; clear: left; width: 100%}
.form_general div div {float: none; clear: none; width: auto}
@@ -515,6 +520,8 @@
.edit_area_room div.group {clear: none}
.edit_area_room div.group#private_override div {clear: left}
.form_general fieldset {width: auto; border: 0; padding-top: 2.0em}
+#edit_room fieldset {width: 100%; float: left; padding: 0; margin: 0}
+#edit_room fieldset.submit_buttons {margin-top: 1em}
.form_general label {
display: block; float: left; overflow: hidden;
@@ -526,7 +533,7 @@
.edit_entry .form_general label {max-width: <?php echo
$edit_entry_left_col_max_width ?>em}
.report .form_general label {max-width: <?php echo
$report_left_col_max_width ?>em}
.search .form_general label {max-width: <?php echo
$search_left_col_max_width ?>em}
-.edit_area_room .form_general label {max-width: <?php echo
$edit_area_room_left_col_max_width ?>em}
+.edit_area_room .form_general label {max-width: <?php echo
$edit_area_room_left_col_max_width ?>em; width: <?php echo
$edit_area_room_left_col_width ?>em}
#logon label {max-width: <?php echo
$logon_left_col_max_width ?>em}
#db_logon label {max-width: <?php echo
$db_logon_left_col_max_width ?>em}
@@ -565,7 +572,7 @@
div#db_logon_submit {width: <?php echo $general_left_col_width ?>%;
max-width: <?php echo $db_logon_left_col_max_width ?>em}
#edit_entry_submit input, #report_submit input, #search_submit input,
#logon_submit input, #db_logon_submit input
{position: relative; left: 100%; width: auto}
-div#edit_area_room_submit_back {float: left; width: <?php echo
$general_left_col_width ?>%; max-width: <?php echo
$edit_area_room_left_col_max_width ?>em}
+div#edit_area_room_submit_back {float: left; width: <?php echo
$edit_area_room_left_col_width ?>em; max-width: <?php echo
$edit_area_room_left_col_max_width ?>em}
div#edit_area_room_submit_save {float: left; clear: none; width: auto}
#edit_area_room_submit_back input {float: right}
Added: mrbs/trunk/web/upgrade/12/mysql.sql
===================================================================
--- mrbs/trunk/web/upgrade/12/mysql.sql (rev 0)
+++ mrbs/trunk/web/upgrade/12/mysql.sql 2010-03-28 09:48:50 UTC (rev 1314)
@@ -0,0 +1,11 @@
+# $Id$
+#
+# Adds a 'custom_html' field to the area and room tables. Designed for
+# allowing, for example, an embedded Google Maps link to be displayed, but
+# could also contain any custom HTML.
+
+ALTER TABLE %DB_TBL_PREFIX%area
+ADD COLUMN custom_html text;
+
+ALTER TABLE %DB_TBL_PREFIX%room
+ADD COLUMN custom_html text;
Property changes on: mrbs/trunk/web/upgrade/12/mysql.sql
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: mrbs/trunk/web/upgrade/12/pgsql.sql
===================================================================
--- mrbs/trunk/web/upgrade/12/pgsql.sql (rev 0)
+++ mrbs/trunk/web/upgrade/12/pgsql.sql 2010-03-28 09:48:50 UTC (rev 1314)
@@ -0,0 +1,11 @@
+-- $Id$
+--
+-- Adds a 'custom_html' field to the area and room tables. Designed for
+-- allowing, for example, an embedded Google Maps link to be displayed, but
+-- could also contain any custom HTML.
+
+ALTER TABLE %DB_TBL_PREFIX%area
+ADD COLUMN custom_html text;
+
+ALTER TABLE %DB_TBL_PREFIX%room
+ADD COLUMN custom_html text;
Property changes on: mrbs/trunk/web/upgrade/12/pgsql.sql
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
