Revision: 1476
http://mrbs.svn.sourceforge.net/mrbs/?rev=1476&view=rev
Author: cimorrison
Date: 2010-09-24 10:55:42 +0000 (Fri, 24 Sep 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/provisional_bookings_new_style/web/edit_users.php
mrbs/branches/provisional_bookings_new_style/web/lang.pt
mrbs/branches/provisional_bookings_new_style/web/mrbs.css.php
Property Changed:
----------------
mrbs/branches/provisional_bookings_new_style/
mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/provisional_bookings_new_style
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1407-1472
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1407-1475
Modified: mrbs/branches/provisional_bookings_new_style/web/edit_users.php
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/edit_users.php
2010-09-24 10:52:11 UTC (rev 1475)
+++ mrbs/branches/provisional_bookings_new_style/web/edit_users.php
2010-09-24 10:55:42 UTC (rev 1476)
@@ -508,7 +508,7 @@
if ($editing_last_admin)
{
- echo "<br><em>(" . get_vocab("warning_last_admin") . ")</em>\n";
+ echo "<p><em>(" . get_vocab("warning_last_admin") . ")</em></p>\n";
}
?>
<input type="hidden" name="Action" value="Update">
Modified: mrbs/branches/provisional_bookings_new_style/web/lang.pt
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/lang.pt 2010-09-24
10:52:11 UTC (rev 1475)
+++ mrbs/branches/provisional_bookings_new_style/web/lang.pt 2010-09-24
10:55:42 UTC (rev 1476)
@@ -45,7 +45,7 @@
$vocab["addentry"] = "Nova entrada";
$vocab["editentry"] = "Editar entrada";
$vocab["editseries"] = "Editar Serie";
-$vocab["namebooker"] = "Desci\xE7\xE3o breve";
+$vocab["namebooker"] = "Descri\xE7\xE3o breve";
$vocab["fulldescription"] = "Descri\xE7\xE3o
completa:<br> (Numero de Pessoas,<br> Internas/Externas
etc)";
$vocab["date"] = "Data";
$vocab["start_date"] = "Hora In\xEDcio";
@@ -86,7 +86,7 @@
$vocab["you_have_not_selected"] = "You have not selected a";
$vocab["valid_room"] = "room.";
$vocab["valid_time_of_day"] = "hora do dia v\xE1lida.";
-$vocab["brief_description"] = "Desci\xE7\xE3o breve.";
+$vocab["brief_description"] = "Descri\xE7\xE3o breve.";
$vocab["useful_n-weekly_value"] = "valor n-semanal vi\xE1vel.";
// Used in view_entry.php
Modified: mrbs/branches/provisional_bookings_new_style/web/mrbs.css.php
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/mrbs.css.php
2010-09-24 10:52:11 UTC (rev 1475)
+++ mrbs/branches/provisional_bookings_new_style/web/mrbs.css.php
2010-09-24 10:55:42 UTC (rev 1476)
@@ -642,7 +642,8 @@
}
#form_edit_users textarea {margin-bottom: 0.5em}
-#form_edit_users p {display: block; float: left; clear: left; padding: 0.5em 0
0.7em 0; margin: 0}
+#form_edit_users p {display: block; float: left; clear: left; padding: 0.5em 0
0.7em 0; margin: 0;
+ width: <?php echo $edit_users_label_width +
$edit_users_gap + $edit_users_input_width + 5?>em}
#form_edit_users ul {clear: left}
#form_edit_users input.submit {right: 2.0em}
/* and put the OK on the right */
#form_delete_users input.submit {left: 2.0em}
/* and put the Delete on the left */
Property changes on:
mrbs/branches/provisional_bookings_new_style/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/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1407-1472
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1407-1475
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
