From 755cd6a828174ad583c204357d1efb0c75f07f44 Mon Sep 17 00:00:00 2001
From: kados <kados>
Date: Mon, 12 Mar 2007 01:23:03 +0000
Subject: [PATCH] reinstating members.js minor improvements to error tmpl minor
 improvements to authorities blind search

---
 .../intranet-tmpl/prog/en/errors/500.tmpl     | 19 +++++-----
 .../prog/en/members/memberentryA.tmpl         |  1 +
 .../prog/en/members/memberentryC.tmpl         |  1 +
 .../prog/en/members/memberentryI.tmpl         |  1 +
 .../prog/en/members/memberentryP.tmpl         |  1 +
 .../prog/en/members/moremember.tmpl           | 36 +++++++------------
 6 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/500.tmpl b/koha-tmpl/intranet-tmpl/prog/en/errors/500.tmpl
index eab3a20ef9..7c0c517e41 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/errors/500.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/errors/500.tmpl
@@ -1,18 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Error</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 
 <div id="mainbloc">
-<h1>An Error has Occurred!</h1>
-<h2>Error 500</h2>
-<div id="main">
-<ul>
-<li>In Koha this typically means that the Koha team is working on new features</li>	
-<li>Wait while system maintenance is being done or <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
-<li>Use top menu bar to navigate to another part of Koha.</li>
-</ul>
-</div>
+    <h1>An Error has Occurred!</h1>
+    <h2>Error 500</h2>
+    <div id="main">
+    <ul>
+        <li>In Koha this typically means that the Koha team is working on new features</li>	
+        <li>Wait while system maintenance is being done or <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
+        <li>Use top menu bar to navigate to another part of Koha.</li>
+    </ul>
+    </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
index 2cfb3c3256..db1d641446 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Adult Borrower Management</title>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/includes/members.js"></script>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
index ec9dc6523d..193984a953 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Child Borrower Management</title>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/includes/members.js"></script>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
index c221893bb6..557de3529a 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Organisation Borrower Management</title>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/includes/members.js"></script>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
index 956f116cbe..7a5433f48b 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Professional Borrower Management</title>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/includes/members.js"></script>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
index 04687bb752..723b813d54 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
@@ -1,19 +1,11 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Borrower's Details</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
-
 <!-- TMPL_IF NAME="unknowuser" -->
-    <p>
-        <b>
-            This borrower doesn't exist anymore.
-        </b>
-        <br /><br />
-        <a href="javascript:back();">Go Back</a>
-    </p>
+    <p>This borrower doesn't exist anymore.<a href="javascript:back();">Go Back</a></p>
 <!-- TMPL_ELSE -->
 
 <h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h1>
@@ -78,7 +70,6 @@
         <!-- /TMPL_IF -->
     </div>
 </div>
-<br />
 <!-- TMPL_IF NAME="flagged" -->
     <ul>
         <!-- TMPL_IF NAME="debarred" -->
@@ -98,11 +89,11 @@
 
 <fieldset>
 <legend>Borrower information</legend>
-    <!-- TMPL_UNLESS NAME="I" --> <p><label>Title:</label><!-- TMPL_VAR NAME="title" -->&nbsp;</p> 
-    <p><label>First name:</label><!-- TMPL_VAR NAME="firstname" --></p><!-- /TMPL_UNLESS -->
-    <p>
-	<!-- TMPL_IF NAME="I" --><label>Organisation name: </label><!-- TMPL_ELSE --><label>Last name: </label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="surname" -->
-    </p>
+    <!-- TMPL_UNLESS NAME="I" -->
+    <p><label>Title:</label><!-- TMPL_VAR NAME="title" -->&nbsp;</p> 
+    <p><label>First name:</label><!-- TMPL_VAR NAME="firstname" --></p>
+    <!-- /TMPL_UNLESS -->
+    <p><!-- TMPL_IF NAME="I" --><label>Organisation name: </label><!-- TMPL_ELSE --><label>Last name: </label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="surname" --></p>
     <!-- TMPL_UNLESS NAME="I" --><p><label>Other names: </label><!-- TMPL_VAR NAME="othernames" --></p>
     <p><label>Initials: </label><!-- TMPL_VAR NAME="initials" --></p><!-- /TMPL_UNLESS -->
     <p>
@@ -118,12 +109,12 @@
         <!-- TMPL_VAR NAME="address2"-->
     </p>
     <p><label>City: </label><!-- TMPL_VAR NAME="city" --></p>
-    <p><label>Zip Code: </label><!-- TMPL_VAR NAME="zipcode" --></p>
+    <p><label>Zip code: </label><!-- TMPL_VAR NAME="zipcode" --></p>
     <!-- TMPL_UNLESS NAME="I"-->
     	<!-- TMPL_UNLESS NAME="C"-->
-	<p><label>alt address: </label><!-- TMPL_VAR NAME="B_address" --></p>
-    	<p><label>alt city: </label><!-- TMPL_VAR NAME="B_city" --></p>
-    	<p><label>alt zipcode: </label><!-- TMPL_VAR NAME="B_zipcode" --></p>
+	<p><label>Alternate address: </label><!-- TMPL_VAR NAME="B_address" --></p>
+    	<p><label>Alternate city: </label><!-- TMPL_VAR NAME="B_city" --></p>
+    	<p><label>Alternate zipcode: </label><!-- TMPL_VAR NAME="B_zipcode" --></p>
 	<!-- /TMPL_UNLESS -->
     <!-- /TMPL_UNLESS -->
     <!-- TMPL_IF NAME="I" -->
@@ -242,7 +233,7 @@
                 <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
                     <!-- TMPL_VAR NAME="title" -->
                 </a>
-                <br /><!-- TMPL_VAR name="author" -->
+                <!-- TMPL_VAR name="author" -->
             </td>
             <td><!-- TMPL_VAR NAME="date_due" --></td>
             <td>
@@ -322,17 +313,14 @@
 						<!-- TMPL_VAR NAME="title" --> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
 
 						<!-- TMPL_IF name="waiting" -->
-						<br/>
 						<i>This document is available</i>
 						<!-- /TMPL_IF -->
 						<!-- TMPL_IF name="transfered" -->
-						<br/>
 						<i>This document has been transfered from library : 
 						<!-- TMPL_VAR NAME="frombranch" --> the : <!-- TMPL_VAR NAME="datesent" --> </i>
 						<!-- /TMPL_IF -->
 
 						<!-- TMPL_IF name="nottransfered" -->
-						<br/>
 						<i>This document hasn't been transfered yet from library : <!-- TMPL_VAR NAME="nottransferedby" --></i>
 						<!-- /TMPL_IF -->
 				
@@ -348,7 +336,7 @@
 	<!-- /TMPL_IF -->
 </div>
 
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 function confirm_deletion() {
     var is_confirmed = window.confirm('Do you confirm deletion ?');
     var borrowernumbervalue=document.form.borrowernumber.value; 
-- 
2.39.5