[open-ils-commits] r8994 - in branches/rel_1_2/Open-ILS/web/opac: locale/en-US skin/default/css skin/default/js skin/default/xml/myopac theme/default/css

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-03-12 15:02:22 -0400 (Wed, 12 Mar 2008)
New Revision: 8994

Modified:
   branches/rel_1_2/Open-ILS/web/opac/locale/en-US/opac.dtd
   branches/rel_1_2/Open-ILS/web/opac/skin/default/css/layout.css
   branches/rel_1_2/Open-ILS/web/opac/skin/default/js/myopac.js
   branches/rel_1_2/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
   branches/rel_1_2/Open-ILS/web/opac/theme/default/css/colors.css
Log:
repaired bug caused by parsing an empty date.  added some style to the thaw-date form

Modified: branches/rel_1_2/Open-ILS/web/opac/locale/en-US/opac.dtd
===================================================================
--- branches/rel_1_2/Open-ILS/web/opac/locale/en-US/opac.dtd	2008-03-12 16:04:21 UTC (rev 8993)
+++ branches/rel_1_2/Open-ILS/web/opac/locale/en-US/opac.dtd	2008-03-12 19:02:22 UTC (rev 8994)
@@ -220,7 +220,7 @@
 If an item has already been selected to fulfill the hold, it will not be suspended'>
 <!ENTITY myopac.holds.thaw.confirm 'Are you sure you wish to activate the selected holds?'>
 <!ENTITY myopac.holds.thaw_date.confirm 'Are you sure you wish to change the activate date for the selected holds?'>
-<!ENTITY myopac.holds.freeze.select_thaw "Select a 'Suspend' date.  This is the date at which the holds will become active again.  If no date is chosen, the holds will remain suspended until they are manually activated.">
+<!ENTITY myopac.holds.freeze.select_thaw "Select an automatic activation date.  If no date is chosen, the holds will remain suspended until they are manually activated.">
 
 <!ENTITY opac.holds.freeze "Suspend this hold">
 <!ENTITY opac.holds.freeze.help "A suspended hold will retain its place in the queue, but will not be fulfilled until it has been activated.">
@@ -249,7 +249,7 @@
 By default, holds will use the notification style you choose here.  
 However, you will still have the option to change individual holds regardless of this setting.">
 <!ENTITY myopac.holds.unfrozen "Active">
-<!ENTITY myopac.holds.frozen.until "Suspend Until...">
+<!ENTITY myopac.holds.frozen.until "Activate on...">
 
 <!--	================================================================= 
 	 MyOPAC Summary page

Modified: branches/rel_1_2/Open-ILS/web/opac/skin/default/css/layout.css
===================================================================
--- branches/rel_1_2/Open-ILS/web/opac/skin/default/css/layout.css	2008-03-12 16:04:21 UTC (rev 8993)
+++ branches/rel_1_2/Open-ILS/web/opac/skin/default/css/layout.css	2008-03-12 19:02:22 UTC (rev 8994)
@@ -245,3 +245,6 @@
 #opac.result.sort { margin-left: 5px; }
 
 #xul_recipient_me { margin-left: 25px; }
+#myopac_holds_thaw_date_form {padding: 10px; text-align: center;}
+#myopac_holds_freeze_select_thaw {margin-right: 100px; margin-left: 100px; }
+

Modified: branches/rel_1_2/Open-ILS/web/opac/skin/default/js/myopac.js
===================================================================
--- branches/rel_1_2/Open-ILS/web/opac/skin/default/js/myopac.js	2008-03-12 16:04:21 UTC (rev 8993)
+++ branches/rel_1_2/Open-ILS/web/opac/skin/default/js/myopac.js	2008-03-12 19:02:22 UTC (rev 8994)
@@ -1431,7 +1431,12 @@
 
 function myopacApplyThawDate() {
     var dateString = $('myopac_holds_thaw_date_input').value;
-    dateString = (dateString == null) ? null : Date.parseIso8601(dateString).iso8601Format('YMDHM', false, false, true);
+    if(dateString) {
+        dateString = (dateString == null) ? null : 
+            Date.parseIso8601(dateString).iso8601Format('YMDHM', false, false, true);
+    } else {
+        dateString = null;
+    }
     myopacProcessHolds('freeze', dateString);
 }
 

Modified: branches/rel_1_2/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
===================================================================
--- branches/rel_1_2/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml	2008-03-12 16:04:21 UTC (rev 8993)
+++ branches/rel_1_2/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml	2008-03-12 19:02:22 UTC (rev 8994)
@@ -27,7 +27,7 @@
     </table>
 
     <div id='myopac_holds_thaw_date_form' class='hide_me'>
-        <p>&myopac.holds.freeze.select_thaw;</p>
+        <div id='myopac_holds_freeze_select_thaw'>&myopac.holds.freeze.select_thaw;</div>
         <p>
             <input type='text' id='myopac_holds_thaw_date_input'/> 
             <img src="<!--#echo var='OILS_OPAC_JS_HOST'-->/common/js/jscalendar/img.gif"  id='myopac_holds_thaw_date_img' class='cal_img'/>

Modified: branches/rel_1_2/Open-ILS/web/opac/theme/default/css/colors.css
===================================================================
--- branches/rel_1_2/Open-ILS/web/opac/theme/default/css/colors.css	2008-03-12 16:04:21 UTC (rev 8993)
+++ branches/rel_1_2/Open-ILS/web/opac/theme/default/css/colors.css	2008-03-12 19:02:22 UTC (rev 8994)
@@ -93,3 +93,4 @@
 .x_mark { color: red; }
 .check_mark { color: green; }
 
+#myopac_holds_thaw_date_form { border: 1px solid #E0E0E0; }