Revision: 1494
http://mrbs.svn.sourceforge.net/mrbs/?rev=1494&view=rev
Author: cimorrison
Date: 2010-10-11 10:49:08 +0000 (Mon, 11 Oct 2010)
Log Message:
-----------
Moved date and time/period onto the same line and renamed it "Start" (in
preparation for adding an "End" line)
Modified Paths:
--------------
mrbs/branches/from_to_bookings/web/edit_entry.php
mrbs/branches/from_to_bookings/web/lang.en
Modified: mrbs/branches/from_to_bookings/web/edit_entry.php
===================================================================
--- mrbs/branches/from_to_bookings/web/edit_entry.php 2010-10-11 09:56:58 UTC
(rev 1493)
+++ mrbs/branches/from_to_bookings/web/edit_entry.php 2010-10-11 10:49:08 UTC
(rev 1494)
@@ -570,20 +570,16 @@
generate_textarea($label_text, 'description', $description);
}
echo "</div>\n";
- ?>
- <div id="div_date">
- <?php
- echo "<label for=\"start_datepicker\">" . get_vocab("date") .
":</label>\n";
- gendateselector("start_", $start_day, $start_month, $start_year);
- ?>
- </div>
- <?php
+ echo "<div id=\"div_date\">\n";
+
+ echo "<label for=\"start_datepicker\">" . get_vocab("start") .
":</label>\n";
+ gendateselector("start_", $start_day, $start_month, $start_year);
+
if(! $enable_periods )
{
echo "<div class=\"div_time\">\n";
- echo "<label>" . get_vocab("time") . ":</label>\n";
echo "<input type=\"text\" class=\"time_hour\" name=\"hour\" value=\"";
if ($twentyfourhour_format)
{
@@ -618,26 +614,22 @@
else
{
- ?>
- <div id="div_period">
- <label for="period" ><?php echo get_vocab("period")?>:</label>
- <select id="period" name="period">
- <?php
- foreach ($periods as $p_num => $p_val)
- {
- echo "<option value=\"$p_num\"";
- if( ( isset( $period ) && $period == $p_num ) || $p_num ==
$start_min)
- {
- echo " selected=\"selected\"";
- }
- echo ">$p_val</option>\n";
- }
- ?>
- </select>
- </div>
-
- <?php
+ echo "<div id=\"div_period\">\n";
+ echo "<select id=\"period\" name=\"period\">\n";
+ foreach ($periods as $p_num => $p_val)
+ {
+ echo "<option value=\"$p_num\"";
+ if( ( isset( $period ) && $period == $p_num ) || $p_num == $start_min)
+ {
+ echo " selected=\"selected\"";
+ }
+ echo ">$p_val</option>\n";
+ }
+ echo "</select>\n";
+ echo "</div>\n";
}
+ echo "</div>\n";
+
?>
<div id="div_duration">
<label for="duration"><?php echo get_vocab("duration");?>:</label>
Modified: mrbs/branches/from_to_bookings/web/lang.en
===================================================================
--- mrbs/branches/from_to_bookings/web/lang.en 2010-10-11 09:56:58 UTC (rev
1493)
+++ mrbs/branches/from_to_bookings/web/lang.en 2010-10-11 10:49:08 UTC (rev
1494)
@@ -51,6 +51,7 @@
$vocab["namebooker"] = "Brief Description";
$vocab["fulldescription"] = "Full Description:<br> (Number of
people,<br> Internal/External etc)";
$vocab["date"] = "Date";
+$vocab["start"] = "Start";
$vocab["start_date"] = "Start Time";
$vocab["end_date"] = "End Time";
$vocab["time"] = "Time";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
