Merge 11215 from trunk; partially addresses #32 (remove concatenated strings)

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

diff --git a/Open-ILS/web/opac/locale/en-US/reports.dtd b/Open-ILS/web/opac/locale/en-US/reports.dtd
index 8730a31..7a7ffed 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/reports.dtd
+++ b/Open-ILS/web/opac/locale/en-US/reports.dtd
@@ -90,9 +90,7 @@
 <!ENTITY reports.oils_rpt_editor.days "Day(s)">
 <!ENTITY reports.oils_rpt_editor.weeks "Weeks(s)">
 <!ENTITY reports.oils_rpt_editor.months "Month(s)">
-<!ENTITY reports.oils_rpt_editor.run_asap "Run ASAP ">
-<!ENTITY reports.oils_rpt_editor.or_at "or at: ">
-<!ENTITY reports.oils_rpt_editor.at "at">
+<!ENTITY reports.oils_rpt_editor.run_asap "Run as soon as possible">
 <!ENTITY reports.oils_rpt_editor.sent_to_email "Send completion notification to this Email address:">
 <!ENTITY reports.oils_rpt_editor.midnight "Midnight">
 <!ENTITY reports.oils_rpt_editor.noon "Noon">

diff --git a/Open-ILS/web/reports/oils_rpt_editor.xhtml b/Open-ILS/web/reports/oils_rpt_editor.xhtml
index 11b884b..bc7bd5d 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_editor.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_editor.xhtml
@@ -156,51 +156,69 @@
                                </td>
                        </tr>
                        <tr>
-                               <th>
-                                       <span>&reports.oils_rpt_editor.run_asap;</span>
-                                               <input type='checkbox' id='oils_rpt_report_editor_run_now'
+                               <!-- XXX: This needs to be replaced with a radio button widget -->
+                               <th colspan="2">
+                                       <div>
+                                               <input type='checkbox' id='oils_rpt_report_editor_run_now' checked='checked'
                                                        onclick='
                                                                if(this.checked) {
                                                                        DOM.oils_rpt_param_editor_sched_start_date.disabled = true;
                                                                        DOM.oils_rpt_param_editor_sched_start_hour.disabled = true;
+                                                                       dojo.attr(dojo.byId("oils_rpt_report_editor_schedule"), "checked", false);
                                                                } else {
                                                                        DOM.oils_rpt_param_editor_sched_start_date.disabled = false;
                                                                        DOM.oils_rpt_param_editor_sched_start_hour.disabled = false;
+                                                                       dojo.attr(dojo.byId("oils_rpt_report_editor_schedule"), "checked", true);
                                                                }
                                                        '
                                                />
-                                       <span>&reports.oils_rpt_editor.or_at;</span>
+                                               <span>&reports.oils_rpt_editor.run_asap;</span>
+                                       </div>
+                                       <div>
+                                               <input type='checkbox' id='oils_rpt_report_editor_schedule'
+                                                       onclick='
+                                                               if(this.checked) {
+                                                                       DOM.oils_rpt_param_editor_sched_start_date.disabled = false;
+                                                                       DOM.oils_rpt_param_editor_sched_start_hour.disabled = false;
+                                                                       dojo.attr(dojo.byId("oils_rpt_report_editor_run_now"), "checked", false);
+                                                               } else {
+                                                                       DOM.oils_rpt_param_editor_sched_start_date.disabled = true;
+                                                                       DOM.oils_rpt_param_editor_sched_start_hour.disabled = true;
+                                                                       dojo.attr(dojo.byId("oils_rpt_report_editor_run_now"), "checked", true);
+                                                               }
+                                                       '
+                                               />
+
+                                               <!-- XXX: This should be replaced with a standard date/time picker for i18n purposes -->
+                                               <input id="oils_rpt_param_editor_sched_start_date" type="text" size="10" disabled="disabled"/>
+                                               <select id='oils_rpt_param_editor_sched_start_hour' disabled="disabled">
+                                                       <option value="00:00">&reports.oils_rpt_editor.midnight;</option>
+                                                       <option value="01:00">1 AM</option>
+                                                       <option value="02:00">2 AM</option>
+                                                       <option value="03:00">3 AM</option>
+                                                       <option value="04:00">4 AM</option>
+                                                       <option value="05:00">5 AM</option>
+                                                       <option value="06:00">6 AM</option>
+                                                       <option value="07:00">7 AM</option>
+                                                       <option value="09:00">8 AM</option>
+                                                       <option value="09:00">9 AM</option>
+                                                       <option value="10:00">10 AM</option>
+                                                       <option value="11:00">11 AM</option>
+                                                       <option value="12:00">&reports.oils_rpt_editor.noon;</option>
+                                                       <option value="13:00">1 PM</option>
+                                                       <option value="14:00">2 PM</option>
+                                                       <option value="15:00">3 PM</option>
+                                                       <option value="16:00">4 PM</option>
+                                                       <option value="17:00">5 PM</option>
+                                                       <option value="18:00">6 PM</option>
+                                                       <option value="19:00">7 PM</option>
+                                                       <option value="20:00">8 PM</option>
+                                                       <option value="21:00">9 PM</option>
+                                                       <option value="22:00">10 PM</option>
+                                                       <option value="23:00">11 PM</option>
+                                               </select>
+                                       </div>
                                </th>
-                               <td>
-                                       <input id="oils_rpt_param_editor_sched_start_date" type="text" size="10"/>
-                                               &reports.oils_rpt_editor.at;
-                                       <select id='oils_rpt_param_editor_sched_start_hour'>
-                                               <option value="00:00">&reports.oils_rpt_editor.midnight;</option>
-                                               <option value="01:00">1 AM</option>
-                                               <option value="02:00">2 AM</option>
-                                               <option value="03:00">3 AM</option>
-                                               <option value="04:00">4 AM</option>
-                                               <option value="05:00">5 AM</option>
-                                               <option value="06:00">6 AM</option>
-                                               <option value="07:00">7 AM</option>
-                                               <option value="09:00">8 AM</option>
-                                               <option value="09:00">9 AM</option>
-                                               <option value="10:00">10 AM</option>
-                                               <option value="11:00">11 AM</option>
-                                               <option value="12:00">&reports.oils_rpt_editor.noon;</option>
-                                               <option value="13:00">1 PM</option>
-                                               <option value="14:00">2 PM</option>
-                                               <option value="15:00">3 PM</option>
-                                               <option value="16:00">4 PM</option>
-                                               <option value="17:00">5 PM</option>
-                                               <option value="18:00">6 PM</option>
-                                               <option value="19:00">7 PM</option>
-                                               <option value="20:00">8 PM</option>
-                                               <option value="21:00">9 PM</option>
-                                               <option value="22:00">10 PM</option>
-                                               <option value="23:00">11 PM</option>
-                                       </select>
-                               </td>
                        </tr>
                        <tr>
                                <th>&reports.oils_rpt_editor.sent_to_email;</th>

diff --git a/build/i18n/po/en-US/reports.dtd.pot b/build/i18n/po/en-US/reports.dtd.pot
index 258bca6..69a4cb9 100644 (file)
--- a/build/i18n/po/en-US/reports.dtd.pot
+++ b/build/i18n/po/en-US/reports.dtd.pot
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-14 22:43-0400\n"
+"POT-Creation-Date: 2008-11-15 16:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -355,15 +355,7 @@ msgid "Month(s)"
 msgstr ""
 
 #: reports.oils_rpt_editor.run_asap
-msgid "Run ASAP "
-msgstr ""
-
-#: reports.oils_rpt_editor.or_at
-msgid "or at: "
-msgstr ""
-
-#: reports.oils_rpt_editor.at
-msgid "at"
+msgid "Run as soon as possible"
 msgstr ""
 
 #: reports.oils_rpt_editor.sent_to_email

diff --git a/build/i18n/po/fr-CA/reports.dtd.po b/build/i18n/po/fr-CA/reports.dtd.po
index e2f7751..f308e37 100644 (file)
--- a/build/i18n/po/fr-CA/reports.dtd.po
+++ b/build/i18n/po/fr-CA/reports.dtd.po
@@ -1,10 +1,11 @@
 # extracted from ../../Open-ILS/web/opac/locale/en-US/reports.dtd
+#. extracted from ../../Open-ILS/web/opac/locale/en-US/reports.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-14 22:43-0400\n"
+"POT-Creation-Date: 2008-11-15 16:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -355,15 +356,7 @@ msgid "Month(s)"
 msgstr ""
 
 #: reports.oils_rpt_editor.run_asap
-msgid "Run ASAP "
-msgstr ""
-
-#: reports.oils_rpt_editor.or_at
-msgid "or at: "
-msgstr ""
-
-#: reports.oils_rpt_editor.at
-msgid "at"
+msgid "Run as soon as possible"
 msgstr ""
 
 #: reports.oils_rpt_editor.sent_to_email

diff --git a/build/i18n/po/hy-AM/reports.dtd.po b/build/i18n/po/hy-AM/reports.dtd.po
index e2f7751..f308e37 100644 (file)
--- a/build/i18n/po/hy-AM/reports.dtd.po
+++ b/build/i18n/po/hy-AM/reports.dtd.po
@@ -1,10 +1,11 @@
 # extracted from ../../Open-ILS/web/opac/locale/en-US/reports.dtd
+#. extracted from ../../Open-ILS/web/opac/locale/en-US/reports.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-14 22:43-0400\n"
+"POT-Creation-Date: 2008-11-15 16:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -355,15 +356,7 @@ msgid "Month(s)"
 msgstr ""
 
 #: reports.oils_rpt_editor.run_asap
-msgid "Run ASAP "
-msgstr ""
-
-#: reports.oils_rpt_editor.or_at
-msgid "or at: "
-msgstr ""
-
-#: reports.oils_rpt_editor.at
-msgid "at"
+msgid "Run as soon as possible"
 msgstr ""
 
 #: reports.oils_rpt_editor.sent_to_email