From 24ede7cad950c02bc1cca294f0e1ae9487c90381 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 2 Oct 2007 15:01:58 -0500
Subject: [PATCH] Refining holds menu display; restructuring forgotton
 stopwords.tmpl with breadcrumbs, layout, etc; Formatting reports-home.tmpl as
 "dashboard."

Signed-off-by: Chris Cormack <crc@liblime.com>
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |  4 +-
 .../intranet-tmpl/prog/en/includes/hold-menu.inc   |  6 ---
 .../prog/en/includes/stopwords-admin-search.inc    | 34 +++++++++++++++++
 .../prog/en/modules/admin/stopwords.tmpl           | 44 +++++++++++++---------
 .../prog/en/modules/reports/reports-home.tmpl      | 26 +++++++------
 .../prog/en/modules/reserve/request.tmpl           |  8 +++-
 6 files changed, 85 insertions(+), 37 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.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 a89ba5d4ff..3660726f33 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -83,7 +83,7 @@ em {
 .yui-u {
 }
 
-#doc3 {
+#doc, #doc1, #doc2, #doc3 {
 	padding-top : 1em;
 }
 
@@ -262,7 +262,7 @@ div#header_search ul.link-tabs li.off a {
 	padding : 0.1em .5em .2em .5em;
 }
 
-div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div#addbooks_search,div#notices_search,div#printer_search,div#checkin_search,div#suggestions_search,div#roadtype_search {
+div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div#addbooks_search,div#notices_search,div#printer_search,div#checkin_search,div#suggestions_search,div#roadtype_search,div#stopword_search {
 	border : 0;
 	border-bottom : 1px solid #FF9900;
 	padding : 0 0 .2em 0;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc
index da7cbdbc0a..343c060a6e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc
@@ -31,9 +31,3 @@
 	<!-- TMPL_IF NAME="CAN_user_parameters"--><li><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;module=MEMBERS&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="borrowernumber" -->">Modification Log</a></li><!-- /TMPL_IF --></ul>
 </div>
 <!-- /TMPL_IF -->
-
-<ul>
-	<li><a href="/cgi-bin/koha/circ/returns.pl">Check In</a></li>
-	<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
-	<li>    <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>
-</ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
new file mode 100644
index 0000000000..b4c1c2b9dc
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
@@ -0,0 +1,34 @@
+
+	<!-- Begin Members Resident Search Box -->
+<div id="header_search">
+	<div id="stopword_search">
+	<p class="tip">Stop Word Search:</p>
+	    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="text" size="40" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+        <input type="submit" name="ok" value="Search" />
+    </form>
+	</div>
+	<div id="circ_search">
+	<p class="tip">Enter patron card number or partial name:</p>
+	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+			<label for="findborrower"> </label>
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+	<input value="Submit" type="submit" />
+	</form>
+	</div>	
+	<div id="catalog_search">
+	<p class="tip">Enter search keywords:</p>
+		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+		</form>
+	</div>
+			<ul>
+			<li><a href="/cgi-bin/koha/admin/roadtype.pl#stopword_search">Search Stop Words</a></li>
+			<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
+			</ul>	
+</div>
+<!-- End Members Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
index a857efaa06..f0e574308f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
@@ -1,14 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration</title>
+<title>Koha &rsaquo; System Administration &rsaquo; <!-- TMPL_IF NAME="else" -->Stop Words<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_form" --> Stop Words &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify Stop Word<!-- TMPL_ELSE -->Add Stop Word<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --> Stop Words &rsaquo; Data recorded<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> Stop Words &rsaquo; Delete Stop Word '<!-- TMPL_VAR NAME="searchfield" -->' ?<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" --> Stop Words &rsaquo; Data deleted<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-
-<h1>Koha &rsaquo; Stopword</h1>
-
-<div id="mainbloc">
-    <!-- TMPL_IF NAME="add_form" -->
+<!-- TMPL_IF NAME="add_form" -->
         <script language="javascript" type="text/javascript">
             /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             function isNotNull(f,noalert) {
@@ -59,7 +52,22 @@
                 }
             }
         </script>
+	<!-- /TMPL_IF -->
+</head>
+<body>
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="stopwords-admin-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="else" -->Stop Words<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_form" --><a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a> &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify Stop Word<!-- TMPL_ELSE -->Add Stop Word<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --> <a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a> &rsaquo; Data recorded<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> <a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a> &rsaquo; Delete Stop Word '<!-- TMPL_VAR NAME="searchfield" -->' ?<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" --> <a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a> &rsaquo; Data deleted<!-- /TMPL_IF --></div>
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b">
+
+<!-- TMPL_IF NAME="add_form" -->
+        
         <!-- TMPL_IF NAME="searchfield" -->
             <h1>Modify word</h1>
         <!-- TMPL_ELSE -->
@@ -113,12 +121,9 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
-    <h1>Stop words admin</h1>
-    <b>NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
-    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-        <input type="submit" name="ok" value="OK" />
-    </form>
+    <h1>Stop Words</h1>
+    <p class="message">NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.</p>
+
 
     <!-- TMPL_IF NAME="searchfield" -->
                     You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
@@ -147,6 +152,11 @@
             <input type="submit" value="Add Stop word" alt="Add Stop word" />
     </form>
 <!-- /TMPL_IF -->
-</div>
 
-<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
+</div>
+</div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl
index 4ce71e3ce5..b6ebbfc08d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl
@@ -8,46 +8,50 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Reports</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc3" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b">
+	<div class="yui-b"><div class="yui-g"> 
 
 <h1>Reports</h1>
 
-	<h2>Statistics wizards</h2>
+<div class="yui-g first">
+<div class="yui-u first">	<h2>Statistics wizards</h2>
 	<ul>
 		<li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
 		<li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li>
 		<li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></li>
 		<li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
-	</ul>
+	</ul></div>
 
 
-	<h2>Top Lists</h2>
+	<div class="yui-u"><h2>Top Lists</h2>
 	<ul>
 		<li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons checking out the most</a></li>
 		<li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Items checked out the most</a></li>
-	</ul>
-	
-	<h2>Inactive</h2>
+	</ul></div>
+</div>
+
+
+<div class="yui-g">	<div class="yui-u first"><h2>Inactive</h2>
 	<ul>
 		<li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Patrons who haven't checked out</a></li>
 		<li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items not checked out</a></li>
-	</ul>
+	</ul></div>
 
 
-	<h2>Other</h2>
+	<div class="yui-u"><h2>Other</h2>
 	<ul>
 		<li><a href="/cgi-bin/koha/reports/itemslost.pl">Items lost</a></li>
 		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
 		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Checkouts by patron category</a></li>
 		<li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
-	</ul>
+	</ul></div></div>
 
 </div>
 </div>
+</div>
 
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index d0bc2c5ed1..a2300fd24d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -81,8 +81,11 @@ if (alreadyreserved > "0"){
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> &rsaquo; Place a hold on <!-- TMPL_VAR NAME="title" --></div>
 
+<!-- TMPL_IF NAME="cardnumber" -->
 <div id="doc3" class="yui-t2">
-   
+ <!-- TMPL_ELSE -->
+ <div id="doc" class="yui-t7">
+ <!-- /TMPL_IF -->  
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
@@ -366,8 +369,11 @@ if (alreadyreserved > "0"){
 
 </div>
 </div>
+
+<!-- TMPL_IF NAME="cardnumber"-->
 <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="hold-menu.inc" -->
 </div>
+<!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-- 
2.11.0