Changeset:
8eb7b2bc4923
https://sourceforge.net/p/mrbs/hg-code/ci/8eb7b2bc4923991e9786668c2488357e5c065f86
Author:
Campbell Morrison <[email protected]>
Date:
Tue Jan 31 16:51:23 2017 +0000
Log message:
Restructured code
diffstat:
web/css/mrbs.css.php | 6 +++-
web/import.php | 69 +++++++++++++++++++++++++++------------------------
2 files changed, 41 insertions(+), 34 deletions(-)
diffs (126 lines):
diff -r 017e435c99b5 -r 8eb7b2bc4923 web/css/mrbs.css.php
--- a/web/css/mrbs.css.php Tue Jan 31 15:52:10 2017 +0000
+++ b/web/css/mrbs.css.php Tue Jan 31 16:51:23 2017 +0000
@@ -796,7 +796,11 @@
}
.form_general select {float: left; margin-left: <?php echo $general_gap ?>em;
margin-right: -0.5em; margin-bottom: 0.5em}
.form_general label.radio {font-weight: normal; width: auto}
-.form_general input.radio {margin-top: 0.1em; margin-right: 2px; width: auto}
+.form_general input.radio {
+ margin-top: 0.1em;
+ margin-right: 0.4em;
+ width: auto
+}
.form_general input.checkbox {width: auto; margin-top: 0.2em}
.edit_area_room .form_general input.checkbox {margin-left: <?php echo
$general_gap ?>em}
.edit_area_room .form_general #booking_policies input.text {width: 4em}
diff -r 017e435c99b5 -r 8eb7b2bc4923 web/import.php
--- a/web/import.php Tue Jan 31 15:52:10 2017 +0000
+++ b/web/import.php Tue Jan 31 16:51:23 2017 +0000
@@ -767,13 +767,13 @@
if (count($options) > 0)
{
+ echo "<div>\n";
$params = array('name' => 'import_default_room',
- 'label' => get_vocab("default_room") . ':',
- 'label_title' => get_vocab("default_room_note"),
+ 'label' => get_vocab('default_room') . ':',
+ 'label_title' => get_vocab('default_room_note'),
'options' => $options,
'force_assoc' => true,
'value' => $default_room);
- echo "<div>\n";
generate_select($params);
echo "</div>\n";
}
@@ -782,56 +782,59 @@
// Area-room order
echo "<div>\n";
-echo "<label title=\"" . get_vocab("area_room_order_note") . "\">" .
- get_vocab("area_room_order") . ":</label>\n";
-echo "<div class=\"group\">\n";
-echo "<label><input type=\"radio\" name=\"area_room_order\"
value=\"area_room\"" .
- (($area_room_order == "area_room") ? " checked=\"checked\"" : "") . ">" .
- get_vocab("area_room") . "</label>\n";
-echo "<label><input type=\"radio\" name=\"area_room_order\"
value=\"room_area\"" .
- (($area_room_order == "room_area") ? " checked=\"checked\"" : "") . ">" .
- get_vocab("room_area") . "</label>\n";
-echo "</div>\n";
+$params = array('label' => get_vocab('area_room_order') . ':',
+ 'label_title' => get_vocab('area_room_order_note'),
+ 'name' => 'area_room_order',
+ 'options' => array('area_room' => get_vocab('area_room'),
+ 'room_area' => get_vocab('room_area')),
+ 'value' => $area_room_order);
+generate_radio_group($params);
echo "</div>\n";
+// Area-room delimiter
echo "<div>\n";
-echo "<label for=\"area_room_delimiter\"" .
- " title=\"" . get_vocab("area_room_delimiter_note") . "\">" .
- get_vocab("area_room_delimiter") . ":</label>\n";
-echo "<input type=\"text\" name=\"area_room_delimiter\"
id=\"area_room_delimiter\"" .
- " value=\"" . htmlspecialchars($area_room_delimiter) . "\">\n";
+$params = array('label' => get_vocab('area_room_delimiter') . ':',
+ 'label_title' => get_vocab('area_room_delimiter_note'),
+ 'name' => 'area_room_delimiter',
+ 'value' => $area_room_delimiter);
+generate_input($params);
echo "</div>\n";
+// Area/room create
echo "<div>\n";
-echo "<label for=\"area_room_create\">" . get_vocab("area_room_create") .
":</label>\n";
-echo "<input type=\"checkbox\" name=\"area_room_create\"
id=\"area_room_create\" value=\"yes\"" .
- (($area_room_create) ? " checked=\"checked\"" : "") .
- ">\n";
+$params = array('label' => get_vocab('area_room_create') . ':',
+ 'name' => 'area_room_create',
+ 'value' => $area_room_create);
+generate_checkbox($params);
echo "</div>\n";
echo "</fieldset>\n";
+
echo "<fieldset>\n";
echo "<legend>" . get_vocab("other_settings") . "</legend>\n";
+// Default type
echo "<div>\n";
-echo "<label for=\"import_default_type\">" . get_vocab("default_type") .
":</label>\n";
-echo "<select name=\"import_default_type\" id=\"import_default_type\">\n";
+$options = array();
foreach ($booking_types as $type)
{
- echo "<option value=\"$type\"" .
- (($type == $import_default_type) ? " selected=\"selected\"" : '') .
- ">" . get_vocab("type.$type") . "</option>\n";
+ $options[$type] = get_type_vocab($type);
}
-echo "</select>\n";
+$params = array('label' => get_vocab('default_type') . ':',
+ 'name' => 'import_default_type',
+ 'options' => $options,
+ 'force_assoc' => true,
+ 'value' => $import_default_type);
+generate_select($params);
echo "</div>\n";
+// Skip conflicts
echo "<div>\n";
-echo "<label for=\"skip\">" . get_vocab("skip_conflicts") . ":</label>\n";
-echo "<input type=\"checkbox\" class=\"checkbox\" " .
- "id=\"skip\" name=\"skip\" value=\"1\" " .
- (($skip) ? " checked=\"checked\"" : "") .
- ">\n";
+$params = array('label' => get_vocab('skip_conflicts') . ':',
+ 'name' => 'skip',
+ 'value' => $skip);
+generate_checkbox($params);
echo "</div>\n";
echo "</fieldset>\n";
------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
