adding calendar popup to member entry

fixing some language on circ screens
18 years ago · 4be97556c2
11 changed files with 101 additions and 27 deletions
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl
@ -1,9 +1,9 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Circulation: Transfers<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha &rsaquo; Circulation &rsaquo; Transfers<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->


-<h1>Circulation: Transfers</h1>
+<h1>Circulation &rsaquo; Transfers</h1>

 <!-- TMPL_IF Name="found" -->
 	<h3>Reserve Found</h3>
@ -103,12 +103,12 @@
 	<form method="post" name="mainform" id="mainform" action="/cgi-bin/koha/circ/branchtransfers.pl">
 	<table>
 	<caption>Transfer</caption>
-	<tr><th scope="row">Destination Branch:</th><td><select name="tobranchcd">
+	<tr><th scope="row">Destination branch:</th><td><select name="tobranchcd">
 			<!-- TMPL_LOOP Name="branchoptionloop" -->
 				<option value="<!-- TMPL_VAR Name="code" -->" <!-- TMPL_VAR Name="selected" -->><!-- TMPL_VAR Name="name" --></option>
 			<!-- /TMPL_LOOP -->
 		</select></td></tr>
-<tr><th scope="row">Enter Book Barcode</th><td><input name="barcode" size="15" /></td></tr>
+<tr><th scope="row">Enter barcode</th><td><input name="barcode" size="15" /></td></tr>
 </table>
 	<input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobrancd" -->" />
 	<!-- TMPL_LOOP Name="trsfitemloop" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl
@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Returns<!-- TMPL_IF Name="returned" -->: <!-- TMPL_VAR Name="itemtitle" --><!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha &rsaquo; Circulation &rsaquo; Returns<!-- TMPL_IF Name="returned" -->: <!-- TMPL_VAR Name="itemtitle" --><!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

 <!-- TMPL_INCLUDE NAME="menus.inc" -->
@ -171,11 +171,11 @@
        <!-- /TMPL_IF -->
    
 <!-- TMPL_ELSE -->
-<h1>Circulation: Returns</h1>
+<h1>Circulation &rsaquo; Returns</h1>
    
    <form method="post" action="/cgi-bin/koha/circ/returns.pl"  name="mainform" id="mainform">
            <fieldset>
-            <legend>Enter Item Barcode</legend>
+            <legend>Enter item barcode</legend>
            <p>
                <input name="barcode" id="barcode" size="14" maxlength="14" />
                <input type="submit" value="Submit" />
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl
@ -1,14 +1,14 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Circulation: Select Your Home Branch<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Circulation &rsaquo; Set Branch<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->


-<h1>Circulation: Select Your Home Branch</h1>
+<h1>Circulation &rsaquo; Set Branch</h1>

 <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
 <!-- TMPL_VAR NAME="branch" -->

-<label for="branch">Choose your Branch:</label>
+<label for="branch">Choose branch:</label>
 <!--branchselection-->
 	<select name="branch" id="branch">
 	<!-- TMPL_LOOP Name="branchloop" -->
@ -18,7 +18,7 @@


 <!-- TMPL_IF Name="printerloop" -->
-    <label for="printer">Choose a Network Printer:</label>
+    <label for="printer">Choose a network printer:</label>
    <!--printerselection-->
    <select name="printer" id="printer">
        <!-- TMPL_LOOP Name="printerloop" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
@ -13,9 +13,9 @@
    <a href="/cgi-bin/koha/circ/currenttransfers.pl">to recieve</a>
    </li>
    <li>
-	Overdues <a href="/cgi-bin/koha/circ/overdue.pl">Items</a>
+	<a href="/cgi-bin/koha/circ/overdue.pl">Overdue items</a>
    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Claims</a>
-    Daily <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Reconciliation</a>
+    <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily reconciliation</a>
    </li>
    </ul>
 </div>
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
@ -1,9 +1,9 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Member search result<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha &rsaquo; Borrowers &rsaquo; Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->

-<h1>Borrowers search results</h1>
+<h1>Borrowers &rsaquo; Search Results</h1>

    <form name="f" action="/cgi-bin/koha/members/member.pl" method="post">
        <label for="member">Name or Barcode</label>
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
@ -1,6 +1,14 @@
 <!-- templates to add/modify an <A>dult -->
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Member, Adult management
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js"></script>
+<!-- End of additions -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 	<!-- TMPL_IF NAME="opadd" -->
@ -152,8 +160,18 @@
 			<!-- TMPL_ELSE -->	
 			<label>
 			<!-- /TMPL_IF-->
-			Date of Birth</label>
-			<input type="text" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
+			Date of birth</label>
+			<input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
+            <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="dateofbirth_button" />
+      <script language="JavaScript" type="text/javascript">
+        Calendar.setup(
+          {
+            inputField : "dateofbirth",
+            ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+            button : "dateofbirth_button"
+          }
+        );
+      </script>
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryinitials" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
@ -1,6 +1,14 @@
 <!-- templates to add/modify a <C>hild -->
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Member, Child management
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js"></script>
+<!-- End of additions -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 <script language="javascript" type="text/javascript">
@ -153,8 +161,18 @@
 			<!-- TMPL_ELSE -->	
 			<label>
 			<!-- /TMPL_IF-->
-			Date of Birth</label>
-			<input type="text" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
+			Date of birth</label>
+			<input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
+            <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="dateofbirth_button" />
+            <script language="JavaScript" type="text/javascript">
+            Calendar.setup(
+            {
+            inputField : "dateofbirth",
+            ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+            button : "dateofbirth_button"
+            }
+            );
+            </script>
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryinitials" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
@ -1,6 +1,14 @@
 <!-- templates to add/modify a <I>nstitution -->
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Member, Organisation management
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js"></script>
+<!-- End of additions -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->

@ -377,7 +385,17 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Arrival date</label>
-			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+			<input type="text" id="dateenrolled" name="dateenrolled"  maxlength="10"	  size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+            <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="dateenrolled_button" />
+            <script language="JavaScript" type="text/javascript">
+                Calendar.setup(
+                {
+                    inputField : "dateenrolled",
+                    ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                    button : "datenrolled_button"
+                }
+                );
+            </script>
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorydateexpiry" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
@ -1,6 +1,14 @@
 <!-- templates to add/modify a <P>rofessional -->
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Member, Professional management
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js"></script>
+<!-- End of additions -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->

@ -150,8 +158,18 @@
 			<!-- TMPL_ELSE -->	
 			<label>
 			<!-- /TMPL_IF-->
-			Date of Birth</label>
-			<input type="text" name="dateofbirth" size="20" onBlur="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
+			Date of birth</label>
+			<input type="text" id="dateofbirth" name="dateofbirth" size="20" onBlur="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
+            <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="dateofbirth_button" />
+            <script language="JavaScript" type="text/javascript">
+                Calendar.setup(
+                {
+                    inputField : "dateofbirth",
+                    ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                    button : "dateofbirth_button"
+                }
+                );
+            </script>
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryinitials" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl
@ -1,19 +1,20 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Member Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha &rsaquo; Borrowers &rsaquo; Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->

-<h1>Borrowers search</h1>
+<h1>Borrowers &rsaquo; Search</h1>

    <form name="f" action="/cgi-bin/koha/members/member.pl" method="post">
-        <label for="member">Name or Barcode</label>
+        <label for="member">Name or barcode</label>
        <input id="member" type="text" size="25" name="member" />
        <select name="orderby" id="orderby">
-            <option value="surname,firstname">Order by Last Name</option>
-            <option value="cardnumber">Order by Card Number</option>
+            <option value="surname,firstname">Order by last name</option>
+            <option value="cardnumber">Order by card number</option>
        </select>
        <input type="submit" value="Search" />
    </form>
+<h1>Borrowers &rsaquo; Browse</h1>
    <div>
        <a href="/cgi-bin/koha/members/member.pl?member=a">A</a>
        <a href="/cgi-bin/koha/members/member.pl?member=b">B</a>
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@ -463,6 +463,7 @@ if ($delete){
 	$template->param(
 		BorrowerMandatoryField => C4::Context->preference("BorrowerMandatoryField"),#field to test with javascript
 		category_type	=> $category_type,#to know the category type of the borrower
+        DHTMLcalendar_dateformat => get_date_format_string_for_DHTMLcalendar(),
 		select_city	=> $select_city,
 		"step_$step" 	=> 1,# associate with step to know where u are
 		step		=> $step,