Revision: 2264
http://mrbs.svn.sourceforge.net/mrbs/?rev=2264&view=rev
Author: cimorrison
Date: 2012-01-27 19:32:52 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
Fixed styling of import form
Modified Paths:
--------------
mrbs/trunk/web/import.php
mrbs/trunk/web/lang.en
mrbs/trunk/web/mrbs.css.php
Modified: mrbs/trunk/web/import.php
===================================================================
--- mrbs/trunk/web/import.php 2012-01-27 18:27:26 UTC (rev 2263)
+++ mrbs/trunk/web/import.php 2012-01-27 19:32:52 UTC (rev 2264)
@@ -458,7 +458,7 @@
echo "</div>\n";
echo "<fieldset>\n";
-echo "<legend>hhh</legend>\n";
+echo "<legend>" . get_vocab("area_room_settings") . "</legend>\n";
echo "<div>\n";
echo "<label>" . get_vocab("area_room_order") . ":</label>\n";
@@ -487,6 +487,9 @@
echo "</fieldset>\n";
+echo "<fieldset>\n";
+echo "<legend>" . get_vocab("other_settings") . "</legend>\n";
+
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";
@@ -507,6 +510,8 @@
">\n";
echo "</div>\n";
+echo "</fieldset>\n";
+
// The Submit button
echo "<div id=\"import_submit\">\n";
echo "<input class=\"submit\" type=\"submit\" name=\"import\" value=\"" .
get_vocab("import") . "\">\n";
Modified: mrbs/trunk/web/lang.en
===================================================================
--- mrbs/trunk/web/lang.en 2012-01-27 18:27:26 UTC (rev 2263)
+++ mrbs/trunk/web/lang.en 2012-01-27 19:32:52 UTC (rev 2264)
@@ -418,6 +418,8 @@
// Used in import.php
$vocab["import_icalendar"] = "Import an iCalendar file";
+$vocab["area_room_settings"] = "Areas and rooms";
+$vocab["other_settings"] = "Other settings";
$vocab["import_intro"] = "This form allows you to import an RFC 5545
compliant " .
"iCalendar file into MRBS. Only those
repeating events " .
"that have a recurrence rule with an
equivalent repeat type in " .
Modified: mrbs/trunk/web/mrbs.css.php
===================================================================
--- mrbs/trunk/web/mrbs.css.php 2012-01-27 18:27:26 UTC (rev 2263)
+++ mrbs/trunk/web/mrbs.css.php 2012-01-27 19:32:52 UTC (rev 2264)
@@ -486,6 +486,9 @@
$edit_entry_form_min_width = $edit_entry_left_col_max_width +
$edit_entry_textarea_width + $general_gap;
$edit_entry_form_min_width = number_format($edit_entry_form_min_width, 1,
'.', ''); // get rid of any commas
+// Specific to the "import" form
+$import_left_col_max_width = '12'; // em
+
// Specific to the "report" form
$report_left_col_max_width = '12'; // em
$report_input_width = '12'; // em
@@ -548,6 +551,7 @@
}
.edit_entry .form_general label {max-width: <?php echo
$edit_entry_left_col_max_width ?>em}
+.import .form_general label {max-width: <?php echo
$import_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; width: <?php echo
$edit_area_room_left_col_width ?>em}
@@ -583,11 +587,12 @@
.edit_area_room .form_general #booking_policies input.text {width: 2.0em}
.form_general input.submit {display: block; width: auto; float: left; clear:
left; margin-top: 1.0em}
+div#import_submit {width: <?php echo $general_left_col_width ?>%;
max-width: <?php echo $import_left_col_max_width ?>em}
div#report_submit {width: <?php echo $general_left_col_width ?>%;
max-width: <?php echo $report_left_col_max_width ?>em}
div#search_submit {width: <?php echo $general_left_col_width ?>%;
max-width: <?php echo $search_left_col_max_width ?>em}
div#logon_submit {width: <?php echo $general_left_col_width ?>%;
max-width: <?php echo $logon_left_col_max_width ?>em}
div#db_logon_submit {width: <?php echo $general_left_col_width ?>%;
max-width: <?php echo $db_logon_left_col_max_width ?>em}
-#report_submit input, #search_submit input, #logon_submit input,
#db_logon_submit input
+#import_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
$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}
@@ -711,6 +716,11 @@
#version_info td {padding: 0 1.0em 0 0; vertical-align: bottom}
#version_info td:first-child {text-align: right}
+
+/* ------------ IMPORT.PHP ------------------------*/
+.import .form_general fieldset fieldset legend {font-size: small; font-style:
italic; font-weight: normal}
+
+
/* ------------ MINCALS.PHP ---------------------*/
div#cals {float: right}
div#cal_last {float: left}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
