From a95855222aa75396f4826a721cb4bccf4ceec805 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 2 Oct 2007 15:01:43 -0500
Subject: [PATCH] Several changes: - add check in link to circulation checkouts
 listing

Signed-off-by: Chris Cormack <crc@liblime.com>
---
 .../prog/en/includes/circ-toolbar.inc         |  4 +-
 .../intranet-tmpl/prog/en/includes/header.inc | 16 ++--
 .../prog/en/modules/circ/circulation.tmpl     |  5 +-
 .../prog/en/modules/intranet-main.tmpl        | 76 +++++++++++++++++--
 .../prog/en/modules/members/moremember.tmpl   | 12 +--
 5 files changed, 88 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index 0ce057e4ee..87ede6875b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -1,5 +1,5 @@
 <div id="toolbar"><ul class="toolbar">
-	<li><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="borrowernumber" -->">Check Out</a></li>
+	<li><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->">Check Out</a></li>
 	<!-- TMPL_IF name="adultborrower" --><li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=C">Add child</a></li><!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="category_type" -->
             <!--TMPL_IF NAME="guarantor"-->
@@ -16,6 +16,6 @@
         <!-- /TMPL_IF -->
 	<li><a href="Someone please write this">Add Note</a></li>
 	<li><a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Change Password</a></li>
-	<li><a href="">Print</a><ul><li><a href="">Page</a></li><li><a href="">Slip</a></li></ul></li><li><a href="javascript:confirm_reregistration();">Renew Account</a></li><li><a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Set Permissions</a></li><li><a href="javascript:confirm_deletion();">Delete</a></li>
+	<li><a href="">Print</a><ul><li><a href="">Page</a></li><li><a href="">Slip</a></li></ul></li><li><a href="javascript:confirm_reregistration();">Renew Account</a></li><!-- TMPL_IF NAME="CAN_user_permission" --><li><a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Set Permissions</a></li><!-- /TMPL_IF --><li><a href="javascript:confirm_deletion();">Delete</a></li>
 </ul>
 <br clear="all" /></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index e25b1a92e6..ddd0bc2d19 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -2,17 +2,17 @@
 	
 <div id="toplevelnav">
 <ul id="toplevelmenu">
-	<li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></li>
-	<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>
-	<li><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></li>
+	<!-- TMPL_IF NAME="CAN_user_circulate" --><li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></li><!-- /TMPL_IF -->
+	 <!-- TMPL_IF NAME="CAN_user_borrowers" --><li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="CAN_user_catalogue" --><li><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></li><!-- /TMPL_IF -->
 	<li class="more"><a href="/cgi-bin/koha/mainpage.pl">More</a><ul>
-	<li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></li>
+	<!-- TMPL_IF NAME="CAN_user_editcatalogue" --><li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></li>
 	<li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
 	<li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
-	<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
-	<li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
-	<li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li>
-	<li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a></li>
+	<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="CAN_user_reports" --><li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="CAN_user_tools" --><li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="CAN_user_parameters" --><li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a></li><!-- /TMPL_IF -->
 	<li><a href="/cgi-bin/koha/about.pl">About Koha</a></li></ul></li>
 </ul>
 </div>
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 20fb6761c4..363a183798 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -644,6 +644,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <th>Call no</th>
         <th>Barcode</th>
         <th>Renew?</th>
+		<th>Check In?</th>
     </tr>
 <!-- TMPL_IF NAME="todayissues" -->
 
@@ -675,12 +676,13 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <!-- /TMPL_IF -->
         <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
         </td>
+		<td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Check In</a></td>
     </tr>
     <!-- /TMPL_LOOP --> <!-- todayissues -->
     <!-- /TMPL_IF --> <!-- todayissues -->
 <!-- TMPL_IF NAME="previssues" -->
     <tr>
-        <th colspan="6"><a name="previous" id="previous">Previous checkouts</a></th>
+        <th colspan="7"><a name="previous" id="previous">Previous checkouts</a></th>
     </tr>
     <!-- TMPL_LOOP NAME="previssues" -->
     <!-- TMPL_IF NAME="togglecolor" -->
@@ -711,6 +713,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <!-- /TMPL_IF -->
         <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
         </td>
+		<td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Check In</a></td>
     </tr>
     <!-- /TMPL_LOOP --> <!-- previssues -->
 <!-- /TMPL_IF --> <!-- previssues -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
index 2d8d584601..02933d0dad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
@@ -8,9 +8,8 @@
 <div id="bd">
 	<div class="yui-gb">
 	<div class="yui-u first">
-	First Column
         <!-- TMPL_IF name="koha_news_count" -->
-		<div>
+		<div id="koha-news">
             News
 			<!-- TMPL_VAR name="koha_news_count" --> recent news item(s)
             <!-- TMPL_LOOP name="koha_news" -->
@@ -18,21 +17,82 @@
 					 on <!-- TMPL_VAR name="newdate" -->
                     <!-- TMPL_VAR name="new" -->
             <!-- /TMPL_LOOP -->
-		</div>
+		</div><!-- /koha-news -->
         <!-- /TMPL_IF -->
 		<div>
 		<!-- TMPL_VAR NAME="IntranetmainUserblock" -->
 		</div>
 	</div>
+	
 	<div class="yui-u">
-	Third Column
+
+    <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
+    <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
+	<ul>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
+    </ul>
+    <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3>
+    <!-- /TMPL_IF --><!-- TMPL_IF NAME="CAN_user_reports" -->
+          <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></h3>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_parameters" -->
+   <h3> <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
+   			<ul>
+            <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></li>
+        </ul>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_tools" -->
+    <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3>
+    <!-- /TMPL_IF -->
+    <h3><a href="/cgi-bin/koha/about.pl">About Koha</a></h3>
 	</div>
+	
+	
 	<div class="yui-u">
-	Second Column
+	<!-- TMPL_IF NAME="CAN_user_circulate" -->
+	<h3><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></h3>
+	<ul><li>
+       <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+        <label for="navfindborrower">Check out to:</label>
+            <input id="navfindborrower" name="findborrower" type="text" size="10" />
+            <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
+            <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
+            <input type="submit" class="submit" value="OK" />
+       </form>
+       </li>
+       <li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
+        <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul>
+		<!-- /TMPL_IF -->
+		  <!-- TMPL_IF NAME="CAN_user_borrowers" -->
+		<h3><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></h3>
+		<ul>
+        <li><form action="/cgi-bin/koha/members/member.pl" method="post">
+           <label for="navmember">Search:&nbsp;</label>
+           <input id="navmember" type="text" size="10" name="member" />
+           <input type="submit" value="OK" class="submit" />
+            </form>
+        </li>
+    </ul>
+	<!-- /TMPL_IF -->
+		  <!-- TMPL_IF NAME="CAN_user_catalogue" -->
+                <h3><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></h3>
+				<ul>
+                    <li>
+                        <form name="searchform" method="get" action="/cgi-bin/koha/catalogue/search.pl" id="searchform">
+                        <input type="hidden" name="idx" value="" />
+                        <label for="navkeyword">
+                            Search:&nbsp;
+                        </label><input type="text" id="navkeyword" name="q" size="10" accesskey="s" />
+                        <input type="submit" value=" OK " class="submit" />
+                        </form>
+                     </li>
+                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>
+                </ul>
+   <!-- /TMPL_IF -->
 	</div>
-</div>
-<div id="ft">
-footer
+	
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
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 889d687627..28588b93aa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -230,7 +230,7 @@ function confirm_reregistration() {
             <td><!-- TMPL_VAR NAME="replacementprice" --></td>
             <td>
             <!-- TMPL_IF name="norenew" -->
-                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Reserved</a>
+                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">On Hold</a>
             <!-- TMPL_ELSE -->
             <!-- TMPL_IF NAME="red" -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
@@ -240,7 +240,7 @@ function confirm_reregistration() {
             <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
             <!-- /TMPL_IF -->
             </td>
-            <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Return</a></td>
+            <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Check In</a></td>
         </tr>
         <!-- /tmpl_loop -->
         <tr>
@@ -257,11 +257,11 @@ function confirm_reregistration() {
 	</div>
 	
 <div id="patrons-items-reserved" class="yui-g">
-	<h2>Patron current reserves</h2>
+	<h2>Patron current holds</h2>
 <!-- TMPL_IF NAME="reservloop" -->
 	<table>
 		<tr>
-			<th>Reserve date</th>
+			<th>Hold date</th>
 			<th>Barcode</th>
 			<th>Title</th>
 			<th>Author</th>
@@ -301,13 +301,13 @@ function confirm_reregistration() {
 					<td><!-- TMPL_VAR NAME="author" --></td>
 					<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
 					<td>
-					    <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">view reserves </a>
+					    <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">view holds </a>
 					</td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
 	<!-- TMPL_ELSE -->
-	<p>Patron has nothing on reserve.</p>
+	<p>Patron has nothing on hold.</p>
 	<!-- /TMPL_IF -->
 	</div>
 
-- 
2.39.5