From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Sat, 15 Nov 2008 21:28:03 +0000 (+0000)
Subject: Get rid of some concatenated strings by adopting a radio-button-like toggle
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=00e088ce3d81c9b23334dc801695233966684abe;p=Evergreen.git

Get rid of some concatenated strings by adopting a radio-button-like toggle
  * Would be better to use a real radio-button grouping widget
  * Need to use a real date/time-picker for i18n purposes


git-svn-id: svn://svn.open-ils.org/ILS/trunk@11215 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 8730a31d53..7a7ffedb99 100644
--- 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 11b884b8a2..bc7bd5d1a2 100644
--- 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>