Revision: 1622
http://mrbs.svn.sourceforge.net/mrbs/?rev=1622&view=rev
Author: cimorrison
Date: 2010-11-19 17:07:48 +0000 (Fri, 19 Nov 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/disabled_rooms/web/Themes/default/header.inc
mrbs/branches/disabled_rooms/web/edit_entry.php
mrbs/branches/disabled_rooms/web/internalconfig.inc.php
mrbs/branches/disabled_rooms/web/lang.fr
mrbs/branches/disabled_rooms/web/language.inc
mrbs/branches/disabled_rooms/web/mrbs-ie8.css
mrbs/branches/disabled_rooms/web/systemdefaults.inc.php
Property Changed:
----------------
mrbs/branches/disabled_rooms/
mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/disabled_rooms
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1601-1613
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1601-1621
Modified: mrbs/branches/disabled_rooms/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/disabled_rooms/web/Themes/default/header.inc 2010-11-19
16:59:23 UTC (rev 1621)
+++ mrbs/branches/disabled_rooms/web/Themes/default/header.inc 2010-11-19
17:07:48 UTC (rev 1622)
@@ -916,10 +916,11 @@
{
echo "<input type=\"hidden\" name=\"room\" value=\"$room\">\n";
}
- // We set class = "js_none" because if JavaScript is enabled we
want the
- // submit button to disappear because the form will be
automatically submitted
- // when the datepicker closes
- echo "<input class=\"js_none\" type=\"submit\" value=\"" .
get_vocab("goto") . "\">\n";
+ // Although the datepicker will automatically go to the new date
when
+ // the date is changed, we still need a submit button because there
+ // are occasions when you want to go to the date without changing
it -
+ // for example when you've been on a Search or Report page
+ echo "<input type=\"submit\" value=\"" . get_vocab("goto") .
"\">\n";
?>
</div>
</form>
Modified: mrbs/branches/disabled_rooms/web/edit_entry.php
===================================================================
--- mrbs/branches/disabled_rooms/web/edit_entry.php 2010-11-19 16:59:23 UTC
(rev 1621)
+++ mrbs/branches/disabled_rooms/web/edit_entry.php 2010-11-19 17:07:48 UTC
(rev 1622)
@@ -82,7 +82,7 @@
}
else
{
- $format = ($twentyfourhour_format) ? "%R" : "%l:%M %P";
+ $format = ($twentyfourhour_format) ? "%H:%M" : "%l:%M %P";
}
$html .= "<select style=\"display: $display\" id =
\"${prefix}seconds${area['id']}\" name=\"${prefix}seconds\"
onChange=\"adjustSlotSelectors(this.form)\"$disabled>\n";
for ($t = $first; $t <= $last; $t = $t + $resolution)
@@ -322,7 +322,7 @@
$name = "";
$create_by = $user;
$description = "";
- $type = "I";
+ $type = $default_type;
$room_id = $room;
$rep_id = 0;
$rep_type = REP_NONE;
Modified: mrbs/branches/disabled_rooms/web/internalconfig.inc.php
===================================================================
--- mrbs/branches/disabled_rooms/web/internalconfig.inc.php 2010-11-19
16:59:23 UTC (rev 1621)
+++ mrbs/branches/disabled_rooms/web/internalconfig.inc.php 2010-11-19
17:07:48 UTC (rev 1622)
@@ -9,10 +9,8 @@
* Checking
********************************************************/
// Do some consistency checking of user settings from config.inc.php
-// (and redefine $max_slots if we're using periods)
if ($enable_periods)
{
- $max_slots = count($periods); // We know exactly how many we need
if (count($periods) > 60)
{
die('Configuration error: too many periods defined');
Modified: mrbs/branches/disabled_rooms/web/lang.fr
===================================================================
--- mrbs/branches/disabled_rooms/web/lang.fr 2010-11-19 16:59:23 UTC (rev
1621)
+++ mrbs/branches/disabled_rooms/web/lang.fr 2010-11-19 17:07:48 UTC (rev
1622)
@@ -106,15 +106,15 @@
$vocab["invalid_entry_id"] = "N° de réservation invalide.";
$vocab["invalid_series_id"] = "N° de série invalide.";
$vocab["status"] = "Status";
-$vocab["confirmed"] = "Réservation confirmée";
-$vocab["provisional"] = "Réservation provisoire";
+$vocab["confirmed"] = "Réservation confirmée";
+$vocab["provisional"] = "Réservation provisoire";
$vocab["accept"] = "Accepter";
$vocab["reject"] = "Rejeter";
$vocab["more_info"] = "Plus Info";
$vocab["remind_admin"] = "Rappel Admin";
$vocab["series"] = "Series";
$vocab["request_more_info"] = "Lister les informations supplémentaires dont
vous avez besoin";
-$vocab["reject_reason"] = "Donner un motif de votre refus de cette
demande de réservation";
+$vocab["reject_reason"] = "Donner un motif de votre refus de cette
demande de réservation";
$vocab["send"] = "Envoyer";
$vocab["accept_failed"] = "La réservation n'a pas pu être confirmée.";
Modified: mrbs/branches/disabled_rooms/web/language.inc
===================================================================
--- mrbs/branches/disabled_rooms/web/language.inc 2010-11-19 16:59:23 UTC
(rev 1621)
+++ mrbs/branches/disabled_rooms/web/language.inc 2010-11-19 17:07:48 UTC
(rev 1622)
@@ -784,6 +784,8 @@
$format = preg_replace('/%p/', $ampm, $format);
}
+ // %R not supported on Windows
+ $format = str_replace("%R", "%H:%M", $format);
$result = strftime($format,$time);
return utf8_convert_from_locale($result);
Modified: mrbs/branches/disabled_rooms/web/mrbs-ie8.css
===================================================================
--- mrbs/branches/disabled_rooms/web/mrbs-ie8.css 2010-11-19 16:59:23 UTC
(rev 1621)
+++ mrbs/branches/disabled_rooms/web/mrbs-ie8.css 2010-11-19 17:07:48 UTC
(rev 1622)
@@ -10,7 +10,11 @@
.form_general label {overflow-y: visible}
.form_general #ad label {overflow-y: auto} /* undo for all-day checkbox */
.edit_area_room div.group {width: 25em} /* not necessary in IE7 or IE9 ?! */
+.edit_entry div.group {width: 50em} /* not necessary in IE7 or IE9 ?! */
+.edit_entry #div_start_date div.group {width: 20em}
+.report div.group {width: 40em} /* not necessary in IE7 or IE9 ?! */
+
/* ------------ TRAILER.INC ---------------------*/
/* opacity for IE8 is implemented with filter, but only works if the element */
Modified: mrbs/branches/disabled_rooms/web/systemdefaults.inc.php
===================================================================
--- mrbs/branches/disabled_rooms/web/systemdefaults.inc.php 2010-11-19
16:59:23 UTC (rev 1621)
+++ mrbs/branches/disabled_rooms/web/systemdefaults.inc.php 2010-11-19
17:07:48 UTC (rev 1622)
@@ -916,4 +916,7 @@
$typel["I"] = "I";
// $typel["J"] = "J";
+// Default type for new bookings
+$default_type = "I";
+
?>
\ No newline at end of file
Property changes on: mrbs/branches/disabled_rooms/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/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/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:1601-1613
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/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:1601-1621
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/msIE9-sfdev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
