From cd921163c0b9edf3cbd42cb5d3ca69514d377195 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 3 Feb 2010 10:43:23 -0500
Subject: [PATCH] Fixes for Bug 3089, Date entry fields should indicate
 required date format

- Added include, date-format.inc, which shows format, e.g. "(DD/MM/YYYY)"
- Hint shows expected date format based on system preference
- Removing calendar.inc include from templates which don't use it

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---
 .../prog/en/css/staff-global.css              |  6 ++-
 .../prog/en/includes/date-format.inc          |  1 +
 .../prog/en/modules/acqui/histsearch.tmpl     |  2 +
 .../prog/en/modules/acqui/parcels.tmpl        |  3 +-
 .../en/modules/admin/aqbudgetperiods.tmpl     |  2 +
 .../prog/en/modules/admin/aqbudgets.tmpl      |  1 -
 .../prog/en/modules/admin/aqcontract.tmpl     |  2 +
 .../prog/en/modules/circ/circulation.tmpl     |  6 +--
 .../prog/en/modules/labels/search.tmpl        |  2 +
 .../en/modules/members/memberentrygen.tmpl    |  3 ++
 .../prog/en/modules/members/moremember.tmpl   |  1 +
 .../modules/reports/acquisitions_stats.tmpl   |  4 ++
 .../en/modules/reports/bor_issues_top.tmpl    |  4 +-
 .../en/modules/reports/borrowers_stats.tmpl   |  2 +-
 .../en/modules/reports/cat_issues_top.tmpl    |  4 +-
 .../prog/en/modules/reports/dictionary.tmpl   |  2 +
 .../modules/reports/guided_reports_start.tmpl |  2 +
 .../en/modules/reports/issues_avg_stats.tmpl  |  4 +-
 .../prog/en/modules/reports/issues_stats.tmpl |  2 +-
 .../en/modules/serials/checkexpiration.tmpl   |  3 +-
 .../prog/en/modules/serials/claims.tmpl       |  2 +-
 .../prog/en/modules/tags/review.tmpl          |  4 +-
 .../prog/en/modules/tools/batchMod-del.tmpl   |  1 -
 .../prog/en/modules/tools/batchMod-edit.tmpl  |  1 -
 .../prog/en/modules/tools/batchMod.tmpl       |  1 -
 .../prog/en/modules/tools/cleanborrowers.tmpl |  4 +-
 .../prog/en/modules/tools/inventory.tmpl      |  2 +
 .../prog/en/modules/tools/koha-news.tmpl      |  2 +
 .../prog/en/modules/tools/scheduler.tmpl      |  2 +-
 .../prog/en/modules/tools/viewlog.tmpl        | 49 +++++++------------
 30 files changed, 71 insertions(+), 53 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 5efd709db6..190c9da20c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -509,9 +509,13 @@ fieldset.brief ol, fieldset.brief li {
 	list-style-type : none;
 }
 
-fieldset.brief div.hint, fieldset.rows div.hint, div.yui-u div.hint {
+.hint {
 	color : #999999;
 	font-size : 95%;
+}
+
+fieldset.brief div.hint, fieldset.rows div.hint, div.yui-u div.hint {
+	font-size : 95%;
 	margin-bottom : .4em;
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
new file mode 100644
index 0000000000..2d902204a2
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
@@ -0,0 +1 @@
+<!-- TMPL_IF NAME="dateformat_us" -->(MM/DD/YYYY)<!-- TMPL_ELSIF NAME="dateformat_metric" -->(DD/MM/YYYY)<!-- TMPL_ELSE -->(YYYY/MM/DD)<!-- /TMPL_IF -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
index 3b29414ccc..d83516b4e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
@@ -25,6 +25,7 @@
 		<li><label for="from">From: </label> 
 			<input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR name="from_placed_on" -->" />
 			<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" />
+				<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
 		</li>
 		<li><label for="to">To: </label> 
 			<input type="text" size="10" id="to" name="to" value="<!-- TMPL_VAR name="to_placed_on" -->" />
@@ -48,6 +49,7 @@
 					dateStatusFunc : disable_to
    	             });
 			</script>
+				<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
 		</li>
 		</ol>
 	</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
index f74c647f93..a3bae10406 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
@@ -111,7 +111,8 @@
             ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
             button : "datereceived_button"          }
         );
-      </script>	</li>
+      </script>
+				<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>	</li>
 		</ol>
     </fieldset>
             <fieldset class="action"><input type="submit" class="button" value="Save" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->">Cancel</a></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
index 85661f40c1..a63fdcc346 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
@@ -157,6 +157,7 @@
         singleClick    :    false
         });
     </script>
+				<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
     </li>
     <li>
 
@@ -172,6 +173,7 @@
         align          :    "Tl",
         });
     </script>
+				<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
     </li>
 
     <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
index 1de452f214..baf13eab90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
@@ -1,7 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo; Funds<!-- TMPL_IF name="add_form" --> &rsaquo; <!--TMPL_IF NAME="budget_id" -->Modify Fund<!-- TMPL_IF NAME="budget_name" --> '<!-- TMPL_VAR NAME="budget_name" -->'<!-- /TMPL_IF --><!-- TMPL_ELSE -->Add Fund <!-- /TMPL_IF --><!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/acq.js"></script>
 
 <!-- TMPL_IF name="add_form" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl
index c9324c73de..62dfae9091 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl
@@ -120,6 +120,7 @@ function Check(ff) {
                                             }
                                             );
                                         </script>
+				<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
                                 </li>
                                 <li><label for="contractenddate" class="required">End date *</label> &nbsp;
                                         <input type="text" name="contractenddate" id="contractenddate" value="<!-- TMPL_VAR NAME="contractenddate" -->" maxlength="10"  size="10" />
@@ -133,6 +134,7 @@ function Check(ff) {
                                             }
                                             );
                                         </script>
+				<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
                                 </li>
                             </ol>
                         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 25eea7a14c..9e30d9211e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -19,14 +19,14 @@ $.tablesorter.addParser({
 	 $(document).ready(function() {
  		$('#patronlists > ul').tabs();
 		$.tablesorter.defaults.widgets = ['zebra'];
-		$("#issuest").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
+		$("#issuest").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
 		dateFormat: 'uk',<!-- /TMPL_IF -->
 		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
 		});
 		$("#issuest").bind("sortEnd",function() {
         	$("#previous").parents("tr").remove();  // 'previous checkouts' header chokes table sorter
 	    });
-		$("#holdst").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
+		$("#holdst").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
 		dateFormat: 'uk',<!-- /TMPL_IF -->
 			sortList: [[0,0]],
 			headers: { 1: { sorter: 'articles' }}
@@ -400,7 +400,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 	<input type="text" name="barcode" id="barcode" class="barcode focus" size="14" /> <input type="submit" value="Check Out" />
 
     <!-- TMPL_IF NAME="SpecifyDueDate" --><div class="date-select">
-        <div class="hint">Specify Due Date:</div>
+        <div class="hint">Specify Due Date <!-- TMPL_INCLUDE NAME="date-format.inc" -->: </div>
 		<!-- TMPL_IF NAME="duedatespec" --><input type="text" size="10" id="duedatespec" name="duedatespec" value="<!-- TMPL_VAR NAME="duedatespec" -->" /><!-- TMPL_ELSE --><input type="text" size="10" id="duedatespec" name="duedatespec" value="" />
 <!-- /TMPL_IF -->
 		<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar"  border="0" id="CalendarDueDate" style="cursor: pointer;" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
index 6a16cd674f..adcafbcb82 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
@@ -102,6 +102,7 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
         singleClick    :    false
     });
 </script>
+<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
 </li>
 <li>
 		<label for="dateto">Added on or before date</label>
@@ -116,6 +117,7 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
         align          :    "Tl",
     });
 </script>
+<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
 </li></ol>
 </fieldset>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index 63d9c45149..503fe549cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -226,6 +226,7 @@
         </script>
         <!-- TMPL_IF NAME="mandatorydateofbirth" --><span class="required">Required</span><!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="ERROR_dateofbirth" --><span class="required">(Error)</span><!-- /TMPL_IF -->
+		<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
             </li>
             <li>
                 <!-- TMPL_IF NAME="mandatoryinitials" -->
@@ -792,6 +793,7 @@
       </script>
 		<!-- TMPL_IF NAME="mandatorydateenrolled" --><span class="required">Required</span><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="ERROR_dateenrolled" --><span class="required">(Error)</span><!-- /TMPL_IF -->
+		<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
 		</li>
 		<li>
 			<!-- TMPL_IF NAME="mandatorydateexpiry" -->
@@ -813,6 +815,7 @@
       </script>
 		<!-- TMPL_IF NAME="mandatorydateexpiry" --><span class="required">Required</span><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="ERROR_dateexpiry" --><span class="required">(Error)</span><!-- /TMPL_IF -->
+		<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
 		</li>
 		<li>
 			<!-- TMPL_IF NAME="mandatoryopacnote" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index e064b9ccd6..023ffe8095 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -421,6 +421,7 @@ if (nodename =="barcodes[]"){
                         });
                         //]]>
                     </script>
+				<span style="display:block;color:#666;font-weight:normal;font-size:90%;"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
                 </p>
                 <p>
                     <label>Forgive fines on return: <input type="checkbox" name="exemptfine" value="1" /></label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
index 7c1304884f..0bf5daf995 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
@@ -109,6 +109,7 @@
 									);
 									//]]>
 								</script>
+				<span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
 					To <input size="10" id="to" name="Filter" type="text" value="" />
 						<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" />
 							<script type="text/javascript">
@@ -140,6 +141,7 @@
 								);
 							//]]>
 							</script>
+				<span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
 				</td>
 			</tr>
 			<tr class="hilighted">
@@ -189,6 +191,7 @@
 									);
 									//]]>
 									</script>
+				<span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
 					To <input type="text" size="10" id="toRO" name="Filter" value="" />
 						<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarToRO" style="cursor: pointer;" border="0" />
 								<script type="text/javascript">
@@ -220,6 +223,7 @@
 								);
 								//]]>
 								</script>
+				<span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
 				</td>
 			</tr>
 			<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
index 300e491fa2..689d4785ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
@@ -124,7 +124,7 @@ function Dopop(link) {
 										dateStatusFunc : validate2
 									}
 								);
-							</script></li>
+							</script><span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span></li>
 				<li> <label for="fromRO">Check-in date from:</label> <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" />
 							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFromRO" style="cursor: pointer;" alt="Show Calendar" />
 								<script language="JavaScript" type="text/javascript">
@@ -182,7 +182,7 @@ function Dopop(link) {
 										dateStatusFunc : validate2
 									}
 								);
-							</script></li>
+							</script><span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span></li>
 			<li> 
 				<label for="branch">Library: </label>
 <select name="Filter" id="branch"><option value="" > Any Library</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
index e2155d8351..5e8f6a2d8c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
@@ -205,7 +205,7 @@
                                     dateStatusFunc : validate2
                             });
 							//]]>
-                        </script>
+                        </script><span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
                     </td>
                 </tr>
             <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
index 13896e8647..6a66948d94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
@@ -133,7 +133,7 @@ function Dopop(link) {
 										dateStatusFunc : validate2
 									}
 								);
-							</script></li>
+							</script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span></li>
 		<li><label for="fromRO">Check-in date from</label> <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" />
 							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" />
 								<script language="JavaScript" type="text/javascript">
@@ -191,7 +191,7 @@ function Dopop(link) {
 										dateStatusFunc : validate2
 									}
 								);
-							</script></li>
+							</script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span></li>
 				<li><label for="branch">Library: </label>
 <select name="Filter" id="branch"><option value="" > Any Library</option>
     <!--TMPL_LOOP Name="branchloop"-->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
index 11d8dcea26..3c0d86305e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
@@ -212,6 +212,7 @@ button         : "buttonfrom1",
 align          : "Tl"                  
 });
 </script>
+<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
 </td>
 </tr>
 <tr>
@@ -227,6 +228,7 @@ button         : "buttonfrom2",
 align          : "Tl"                  
 });
 </script>
+<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
 </td>
 </tr>
 </table></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
index 731b8664c6..f5a94fbd73 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
@@ -255,6 +255,7 @@ canned reports and writing custom SQL reports.</p>
             align          : "Tl" 
             });     
             </script>          
+		<span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
         </td>
         </tr>
         <!-- TMPL_ELSE -->
@@ -288,6 +289,7 @@ canned reports and writing custom SQL reports.</p>
                 align          : "Tl" 
                 });     
             </script>        
+			<span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
             </td>
         </tr>
             <!-- TMPL_ELSE -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
index 2e19641f62..6655e59822 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
@@ -134,7 +134,7 @@
 										dateStatusFunc : validate2
 									}
 								);
-							</script>
+							</script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
 				</td>
 			</tr>
 			<tr class="hilighted"> 
@@ -210,7 +210,7 @@
 										dateStatusFunc : validate2
 									}
 								);
-							</script>
+							</script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
 				</td>
 			</tr>
 			<tr> 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
index 11933b28b1..6eefeac53c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
@@ -134,7 +134,7 @@
                              dateStatusFunc : validate2
                      });
 					//]]>
-					</script>
+					</script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
                     </td>
                 </tr>
                 <tr class="highlight"> 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
index aa2e73de0a..f87aef1863 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
@@ -63,7 +63,8 @@
                      ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                  }
                 );
-            </script> <span class="required">Required</span></li>
+            </script> <span class="required">Required</span>
+			<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div></li>
 			</ol>
         
 </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
index 054a35e1cb..16511acb1e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
@@ -229,7 +229,7 @@
 		    ifFormat        : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->"
 		});
 		//]]>
-	    </script>
+	    </script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
 	    <input type="button" value="OK" onclick="filterByDate();" />
         </li>
 	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
index a42a71a41e..d633abf24f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
@@ -317,10 +317,12 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
 			<label for="from">Date: from </label>
 			<input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="filter_date_approved_from" -->" />
 			<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" alt="Show Calendar" style="cursor: pointer;" id="openCalendarFrom" />
-			<br />
+			<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
+
 			<label for="to">...to </label>
 			<input type="text" size="10" id="to"   name="to"   value="<!-- TMPL_VAR NAME="filter_date_approved_to" -->" />
 			<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" alt="Show Calendar" style="cursor: pointer;" id="openCalendarTo" />
+			<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
 	    </li>
   </ol>
  <fieldset class="action"><input type="submit" value="Apply Filter(s)" /></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
index 995cedc412..7e7b98bbf0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
@@ -9,7 +9,6 @@
 	 });
 //]]>
 </script>
-<!-- TMPL_INCLUDE NAME="calendar.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
index 497a128b42..34cb7eba7d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
@@ -9,7 +9,6 @@
 	 });
 //]]>
 </script>
-<!-- TMPL_INCLUDE NAME="calendar.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tmpl
index 9ee2a98599..2a0135ffb6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tmpl
@@ -9,7 +9,6 @@
 	 });
 //]]>
 </script>
-<!-- TMPL_INCLUDE NAME="calendar.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
index 91eadb56e2..3259497912 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
@@ -67,7 +67,7 @@
                      ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                  }
                 );
-            </script></p>
+            </script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span></p>
         
         <p><input id="checkissue" type="checkbox" name="checkbox" value="issue" checked="checked" />
         <label for="checkissue">Anonymize check-out history older than</label>
@@ -79,7 +79,7 @@
                      ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                  }
                 );
-            </script></p>
+            </script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span></p>
 
             
             <!-- hidden here -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index 6c864fd885..7bef6775ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -58,6 +58,7 @@ $(document).ready(function(){
             }
             );
             </script>
+			<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
             </li>
           </ol>
         </fieldset>
@@ -135,6 +136,7 @@ $(document).ready(function(){
             }
             );
             </script>
+			<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
         </li>
         <li><label for="ignoreissued">Skip copies on loan: </label>
             <!-- TMPL_IF NAME="ignoreissued" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
index 09dca9966b..b7b674893e 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
@@ -77,6 +77,7 @@ Edit News Item<!-- TMPL_ELSE -->Add News Item<!-- /TMPL_IF --><!-- TMPL_ELSE -->
                     }
                     );
                 </script>
+				<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
             </li>
             <li>
                 <label for="expirationdate">Expiration date</label>
@@ -91,6 +92,7 @@ Edit News Item<!-- TMPL_ELSE -->Add News Item<!-- /TMPL_IF --><!-- TMPL_ELSE -->
                     }
                     );
                 </script>
+				<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
             </li>
             <li>
                 <label for="number">Appear in position </label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl
index e4b0bfab40..181c547e3b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl
@@ -42,7 +42,7 @@
 				});
 //]]>
 </script>
-
+<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
 </li>
 <li><label for="report">Report:</label>
 <select name="report" id="report">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
index 1d14e06e36..3b45f65363 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
@@ -65,7 +65,7 @@
 								</select>
 							</li>
 							<li>
-								<label for="object">Object</label>
+								<label for="object">Object: </label>
 								<input type="text" id="object" name="object" value="<!-- TMPL_VAR NAME="object"-->" />
 							</li>
 							<li>
@@ -73,48 +73,37 @@
 								<input type="text" id="info" name="info" value="<!-- TMPL_VAR NAME="info"-->" />
 							</li>
 							<li>
-								<label for="from"> Display from</label> <input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="datefrom"-->" />
+								<label for="from"> Display from: </label> <input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="datefrom"-->" />
 								<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" alt="Show Calendar" id="openCalendarFrom" style="cursor: pointer;" />
-								<label for="to">to</label> <input size="10" id="to" name="to" type="text" value="<!-- TMPL_VAR NAME="dateto"-->" />
+				<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
+							</li>
+							<li>
+								<label for="to">Display to: </label> <input size="10" id="to" name="to" type="text" value="<!-- TMPL_VAR NAME="dateto"-->" />
 								<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarTo" alt="Show Calendar" style="cursor: pointer;" border="0" />
 									<script type="text/javascript">
 									//<![CDATA[
-									// function submit_check (from_id,to_id) {
-									//	var dateFrom = Date_from_syspref(document.getElementById(from_id).value);
-									//	var dateTo   = Date_from_syspref(document.getElementById(  to_id).value);
-									//	var today = new Date();
-									// 	if (dateFrom < dateTo) { 
-									//		alert("The starting date cannot be after the ending date.");
-									//		document.getElementById(to_id).select();
-									//		return false;
-									//	}
-									// 	if (dateFrom > today) { 
-									//		alert("The starting date cannot be in the future.");
-									//		document.getElementById(from_id).select();
-									//		return false;
-									//	}
-									// }
-									
+
 									// return true if the date is blocked.
 									function disable_from(date) {var limit = get_Calendar_limit(date,'to'  ); return (limit && limit < date);}
 									function disable_to  (date) {var limit = get_Calendar_limit(date,'from'); return (limit && limit > date);}
-									
+
 									Calendar.setup({
-									inputField : "from",
-									ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
-									button : "openCalendarFrom",
-									disableFunc : disable_from,
-									dateStatusFunc : disable_from
+										inputField : "from",
+										ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+										button : "openCalendarFrom",
+										disableFunc : disable_from,
+										dateStatusFunc : disable_from
 									});
 									Calendar.setup({
-									inputField : "to",
-									ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
-									button : "openCalendarTo",
-									disableFunc : disable_to,
-									dateStatusFunc : disable_to
+										inputField : "to",
+										ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+										button : "openCalendarTo",
+										disableFunc : disable_to,
+										dateStatusFunc : disable_to
 									});
 									//]]>
 									</script>
+				<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
 							</li>
 						</ol>
 					</fieldset>
-- 
2.39.5