repaired bug caused by parsing an empty date. added some style to the thaw-date...

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2@8994 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/locale/en-US/opac.dtd b/Open-ILS/web/opac/locale/en-US/opac.dtd
index 5606892..8bd836e 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/opac.dtd
+++ b/Open-ILS/web/opac/locale/en-US/opac.dtd
@@ -220,7 +220,7 @@ avoid using bookbags all together.  Thank you.">
 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 @@ If an item has already been selected to fulfill the hold, it will not be suspend
 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

diff --git a/Open-ILS/web/opac/skin/default/css/layout.css b/Open-ILS/web/opac/skin/default/css/layout.css
index 5becafe..c112356 100644 (file)
--- a/Open-ILS/web/opac/skin/default/css/layout.css
+++ b/Open-ILS/web/opac/skin/default/css/layout.css
@@ -245,3 +245,6 @@ table { border-collapse: collapse; }
 #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; }
+

diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index eeed89a..c2ad3d7 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -1431,7 +1431,12 @@ function myopacDrawHoldThawDateForm() {
 
 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);
 }
 

diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
index 47e386c..3d98e39 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
@@ -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'/>

diff --git a/Open-ILS/web/opac/theme/default/css/colors.css b/Open-ILS/web/opac/theme/default/css/colors.css
index 9c62201..f12fdb8 100644 (file)
--- a/Open-ILS/web/opac/theme/default/css/colors.css
+++ b/Open-ILS/web/opac/theme/default/css/colors.css
@@ -93,3 +93,4 @@ a:focus { background: #E0F0E0; color: #000000;}
 .x_mark { color: red; }
 .check_mark { color: green; }
 
+#myopac_holds_thaw_date_form { border: 1px solid #E0E0E0; }