New basic page structure implemented for circ pages: global main menu in the header...

Signed-off-by: Chris Cormack <crc@liblime.com>

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 1218d78..70889f7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1,7 +1,7 @@
 @import url( /intranet-tmpl/prog/en/lib/yui/reset-fonts-grids.css) all;
 
 a, a:link, a:visited, a:active {
-       color : #316494;
+       color : #0000CC;
 }
 
 a:hover {
@@ -227,6 +227,7 @@ legend {
 #breadcrumbs {
        background-color : #F3F3F3;
        border-bottom : 1px solid #E8E8E8;
+       clear : both;
        font-size : 90%;
        padding :.2em .5em .4em .5em;
 }
@@ -240,8 +241,13 @@ div#header_search {
        background-image : url("../../img/koha-logo-medium.gif");
        background-position : .5em .5em;
        background-repeat : no-repeat;
+       float: left;
        padding-left : 14.2em;
-       margin: 1em .5em 1em 0;
+       margin: 1em 0 1.5em 0;
+}
+
+div#header_search input {
+       font-size : 1.3em;
 }
 
 div#header_search ul.link-tabs {
@@ -254,11 +260,9 @@ div#header_search ul.link-tabs li.on a, div#header_search ul.link-tabs li a, div
 }
 
 div#circ_search,div#catalog_search {
-       border-top : 1px solid #EEEEEE;
-       border-left : 1px solid #EEEEEE;
-       border-right : 1px solid #666666;
-       border-bottom : 1px solid #CCCCCC;
-       padding : .5em 2em .5em 1em;
+       border : 0;
+       border-bottom : 1px solid #FF9900;
+       padding : 0 0 .2em 0;
 }
 
 div#circ_search {
@@ -272,7 +276,7 @@ div#catalog_search {
 /* Panel-Switch Tabs */
 ul.link-tabs {
        list-style-type: none;
-       margin: 2px 0 9px 5px;
+       margin: 1px 0 9px 5px;
        padding: 0;
 }
 
@@ -290,16 +294,15 @@ ul.link-tabs li a {
 }
 
 ul.link-tabs li.off a {
-       background-color: #EEEEEB;
-       border-top: 1px solid #DDDDDD;
+       background-color: #FFFFFF;
+       border : 0;
        margin-right : 1px;
+       text-decoration: underline;
 }
 
 ul.link-tabs li.off a:hover {
        background-color: #FFFFEC;
-       border-bottom: 1px solid #333333;
-       border-left : 1px solid #BEBF84;
-       border-right : 2px solid #333333;
+       border : 0;
        margin-right : 0;
        padding: .2em 1.2em .2em 1.2em;
 }

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
new file mode 100644 (file)
index 0000000..5f8ffd8
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -0,0 +1,12 @@
+<div class="yui-b"><ul id="navigation">
+       <li>    <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="holds to retrieve off the shelf">Holds to pull</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="holds waiting for patron pickup">Holds awaiting pickup</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/transferstodo.pl" title="transfers to do from your library">Transfers to do</a></li>
+
+       <li>    <a href="/cgi-bin/koha/circ/transferstoreceive.pl" title="transfers to receive at your library">Transfers to receive</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Fines</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily reconciliation</a></li>
+</ul>
+</div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
new file mode 100644 (file)
index 0000000..1045d4e
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -0,0 +1,24 @@
+<!-- Begin Resident Search Box -->
+<div id="header_search">
+       <div class="tip" id="residenttip">Enter patron card number or partial name:</div>
+       <div id="circ_search">
+       <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="CPL" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+       <input value="Submit" type="submit" />
+       </form>
+       </div>  
+       <div id="catalog_search">
+               <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 class="link-tabs">
+                       <li class="on"><a id="showCircSearch" href="/cgi-bin/koha/circ/circulation.pl">Check Out</a></li>
+                       <li class="off"><a id="showCatSearch" href="/cgi-bin/koha/catalogue/advsearch.pl">Search the Catalog</a></li>
+                       </ul>   
+</div>
+<!-- End Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index aff9540..7322227 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -1,14 +1,12 @@
-<div id="header"><div id="sitetitle">
-    <h1><a href="/cgi-bin/koha/mainpage.pl">Koha Staff Client</a></h1>
-</div>
+<div id="header">
        
 <div id="toplevelnav">
 <ul>
-       <li><a href="/cgi-bin/koha/mainpage.pl">Home</a></li>
        <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/advsearch.pl">Catalogue</a></li>
+       <li><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></li>
+       <li class="more"><a href="/cgi-bin/koha/mainpage.pl">More</a></li>
 </ul>
 </div>
        
-<div id="login"><p><!-- TMPL_IF NAME="loggedinusername" --><span class="loggedinusername"><!-- TMPL_VAR NAME="loggedinusername" --></span></p> <p><!-- TMPL_IF NAME="AutoLocation" --><strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong><!-- TMPL_ELSE --><a href="/cgi-bin/koha/circ/selectbranchprinter.pl"><strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong></a><!-- /TMPL_IF --></p> <p><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a> | <!-- TMPL_ELSE -->You are not logged in | <!-- /TMPL_IF --><a href="/cgi-bin/koha/help.pl" id="helper" onclick="window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[ ? ]</a></p></div></div>
+<div id="login"><p><!-- TMPL_IF NAME="loggedinusername" --><span class="loggedinusername"><!-- TMPL_VAR NAME="loggedinusername" --></span> <!-- TMPL_IF NAME="AutoLocation" --><strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong><!-- TMPL_ELSE --><a href="/cgi-bin/koha/circ/selectbranchprinter.pl"><strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong></a><!-- /TMPL_IF --> | <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a> | <!-- TMPL_ELSE -->You are not logged in | <!-- /TMPL_IF --><a href="/cgi-bin/koha/help.pl" id="helper" onclick="window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[ ? ]</a></div></div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
index 51b5266..c14aa7f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -3,4 +3,26 @@
  $(document).ready(function() {
        $(".focus").focus();
  });
+ 
+ $(document).ready(function() {
+       $('a#showCatSearch').click(function() {
+               $('#catalog_search').show();
+               $('#circ_search').hide();
+               $('#showCircSearch').parents("li").addClass('off').removeClass('on');
+               $('#showCatSearch').parents("li").addClass('on').removeClass('off');
+               $('#search-form').val($('#findborrower').val()).focus();
+               $('#residenttip').html("Enter search keywords:");
+               return false;
+       });
+       
+       $('a#showCircSearch').click(function() {
+               $('#circ_search').show();
+               $('#catalog_search').hide();
+               $('#showCatSearch').parents("li").addClass('off').removeClass('on');
+               $('#showCircSearch').parents("li").addClass('on').removeClass('off');
+               $('#findborrower').val($('#search-form').val()).focus();
+               $('#residenttip').html("Enter patron card number or partial name:");
+               return false;
+       });
+});
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
index 722fb5d..5f236d3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
@@ -1,10 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Circulation Statistics for <!-- TMPL_VAR Name="title" --></title>
+<title>Koha &rsaquo; Circulation &rsaquo; Circulation Statistics for <!-- TMPL_VAR Name="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Circulation Statistics for <!-- TMPL_VAR Name="title" --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -12,6 +14,7 @@
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
+
 <h1>
 <!-- TMPL_VAR Name="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR Name="author" -->)<!-- /TMPL_IF --></a></h1>
 <h2>Barcode <!-- TMPL_VAR Name="barcode" --></h2>
@@ -44,5 +47,5 @@
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
index 56eff71..60409d2 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
@@ -4,7 +4,9 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Library Overdues at <!-- TMPL_VAR NAME="LoginBranchname" --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -12,6 +14,7 @@
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
+
 <h1>Circulation: Library Overdues at <!-- TMPL_VAR NAME="LoginBranchname" --></h1>
 
 <!-- selector of location -->
@@ -179,5 +182,5 @@
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
index ef18799..33ab39d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
@@ -4,7 +4,9 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Transfers</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -12,6 +14,7 @@
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
+
 <h1>Circulation &rsaquo; Transfers</h1>
 
 <!-- TMPL_IF Name="found" -->
@@ -176,5 +179,5 @@
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

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 0c72aa1..3dda525 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -54,10 +54,14 @@
     }
 
 </script>
+
 </head>
 <body>
+
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo;<!-- TMPL_IF NAME="borrowernumber" --> <a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a> &rsaquo; <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- TMPL_ELSE --> <strong>Checkouts</strong><!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -68,7 +72,7 @@
 <!-- TMPL_IF NAME="borrowernumber" -->
     <h1>Checkouts</h1>
 <!-- TMPL_ELSE -->
-    <h1>Circulation &rsaquo; Checkouts</h1>
+<!--     <h1>Circulation &rsaquo; Checkouts</h1> -->
 <!-- /TMPL_IF -->
 
 <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
@@ -166,7 +170,7 @@
 
 <!-- TMPL_UNLESS NAME="CGIselectborrower"-->
 <!-- No card entered yet -->
-<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform" id="mainform">
+<!-- <form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform" id="mainform">
 <fieldset id="circ_circulation_borrower_search">
     <legend>Search for a patron</legend>
 
@@ -179,7 +183,7 @@
     <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
     <input type="submit" value="Submit" />
 </fieldset>
-</form>
+</form> -->
 <!-- /TMPL_UNLESS -->
 <!-- /TMPL_IF --> <!-- borrowernumber -->
 
@@ -884,5 +888,5 @@ No patron matched <!-- TMPL_VAR name="message" -->
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
index c6cd077..5684be4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
@@ -1,10 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --></title>
+<title>Koha &rsaquo; Circulation &rsaquo; Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc"-->
+<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo Circulation Reports &rsaquo Overdues as of <!-- TMPL_VAR NAME="todaysdate" --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -42,5 +44,5 @@
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
index 6ebff46..c5891dc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Circulation &rsaquo; Holds</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Pending Holds</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
@@ -11,10 +11,10 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
 
-
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Pending Holds</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -22,6 +22,7 @@
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
+
 <h1>Pending holds as of <!-- TMPL_VAR NAME="todaysdate" --></h1>
 <div id="filters">
 <br />
@@ -174,5 +175,5 @@ Calendar.setup(
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index 8fad0f1..dfdb3f2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -1,10 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Circulation &rsaquo; Returns <!-- TMPL_VAR Name="title" --></title>
+<title>Koha &rsaquo; Circulation &rsaquo; Check In <!-- TMPL_VAR Name="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+
+<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Check In</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -12,7 +15,8 @@
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
-<h1>Circulation &rsaquo; Returns</h1>
+
+<h1>Check In</h1>
 
 <!-- case of a mistake in transfert loop -->
 <!-- TMPL_IF Name="WrongTransfer" -->
@@ -185,9 +189,8 @@
 <!-- TMPL_ELSE -->
     <form method="post" action="/cgi-bin/koha/circ/returns.pl"  name="mainform" id="mainform">
             <fieldset>
-            <legend>Enter item barcode</legend>
             <p>
-                <input name="barcode" id="barcode" size="14" maxlength="14" class="focus" />
+                <label for="barcode">Enter item barcode: </label><input name="barcode" id="barcode" size="14" maxlength="14" class="focus" />
                 <input type="submit" value="Submit" />
             </p>
             <!-- TMPL_LOOP Name="inputloop" -->
@@ -238,7 +241,7 @@
     </table>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF Name="riloop" -->
-    <h2>Returned items</h2>
+    <h2>Checked-In items</h2>
     <table>
         <tr>
             <th>Title</th>
@@ -282,5 +285,5 @@
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
index f813f09..0939433 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
@@ -1,10 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Circulation &rsaquo; Set Library</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Set Library</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Set Library</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -12,7 +14,8 @@
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
-<h1>Circulation &rsaquo; Set Library</h1>
+
+<h1>Set Library</h1>
 
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
 <!-- TMPL_VAR NAME="branch" -->
@@ -50,5 +53,5 @@
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl
index b930e05..0f95aef 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl
@@ -1,10 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Statistics</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Statistics</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc"-->
+<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>  &rsaquo; Statistics</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -48,5 +50,5 @@
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
index 3ef6ec6..05e3d59 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
@@ -1,14 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Circulation
-<!-- TMPL_IF Name="borrowernumber" -->
-: Checkout to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" -->
-(<!-- TMPL_VAR NAME="cardnumber" -->)
-<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Circulation &rsaquo; Transfers to do</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Transfers to do</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -16,6 +14,7 @@
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
+
     <h1>Transfers to do <!-- TMPL_VAR NAME="show_date" --></h1>
     <!-- TMPL_IF name="branchesloop" -->
     <div id="resultlist">
@@ -76,5 +75,5 @@
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
index 196b2c4..1acd180 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
@@ -1,10 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Circulation</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Transfers to your branch</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>  &rsaquo; Transfers to your branch</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -12,6 +14,7 @@
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
+
        <h1>Transfers made TO your library on : <!-- TMPL_VAR NAME="show_date" --></h1>
        <!-- TMPL_IF name="branchesloop" -->
             <p>Your library is the destination for the following transfer(s)</p>
@@ -79,5 +82,5 @@
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
index 5bf55cd..774e57e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -4,7 +4,9 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Holds</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -12,6 +14,7 @@
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
+
 <h1>Circulation: Library Holds</h1>
 
         <h2>Holds for your library on : <!-- TMPL_VAR NAME="show_date" --></h2>
@@ -93,5 +96,5 @@
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/img/koha-logo-medium.gif b/koha-tmpl/intranet-tmpl/prog/img/koha-logo-medium.gif
new file mode 100644 (file)
index 0000000..80c2de2
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/koha-logo-medium.gif differ

diff --git a/koha-tmpl/intranet-tmpl/prog/img/more-arrow.gif b/koha-tmpl/intranet-tmpl/prog/img/more-arrow.gif
new file mode 100644 (file)
index 0000000..493938a
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/more-arrow.gif differ