General work on menus and toolbars, as well as some minor terminology changes on...

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

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc
index 6195e31..3f8c62a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc
@@ -1,30 +1,13 @@
-    <div id="action">
-            
-            <div class="edit">
-<ul>
+<div id="toolbar"><ul class="toolbar">
        <li>                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Edit biblio</a></li>
        <li>                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate">Duplicate</a></li>
        <li>                <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit item</a></li>
        <li>                <a href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="count" -->)">Delete</a></li>
-</ul>
-            </div>
-            
-            <div class="view">
-<ul>
-       <li>                <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Complete</a></li>
-       <li>                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Normal</a></li>
-       <li>                <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li>
-</ul>
-            </div>
-            
-            <div class="others">
-<ul>
+
        <li>                <a href="#" onclick="window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">Add to shelf</a></li>
        <li>                <a href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a></li>
-                       <!-- TMPL_IF name="subscriptionsnumber" --><li><a href="/cgi-bin/koha/serials/serials-home.pl?searched=1&amp;title_filter=<!-- TMPL_VAR NAME="subscriptiontitle" -->">Subscription(s)</a></li><!-- /TMPL_IF -->
+                       
                        <!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Request</a></li><!-- /TMPL_IF -->
-       <li>                <a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;title=<!-- TMPL_VAR NAME="title"-->&amp;author=<!-- TMPL_VAR NAME="author"-->" >Circulation history</a></li>
-                         <!-- TMPL_IF NAME="CAN_user_parameters"--><li><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;module=CATALOGUING&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="biblionumber"-->">Modification log</a> </li><!-- /TMPL_IF -->
+       
 </ul>
-            </div>
-    </div>
+    <br clear="all" /></div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
new file mode 100644 (file)
index 0000000..5e81651
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
@@ -0,0 +1,9 @@
+<ul>
+<li>                <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Complete</a></li>
+       <li>                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Normal</a></li>
+       <li>                <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li><!-- TMPL_IF name="subscriptionsnumber" --><li><a href="/cgi-bin/koha/serials/serials-home.pl?searched=1&amp;title_filter=<!-- TMPL_VAR NAME="subscriptiontitle" -->">Subscription(s)</a></li><!-- /TMPL_IF -->
+</ul>
+<ul>
+<li>                <a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;title=<!-- TMPL_VAR NAME="title"-->&amp;author=<!-- TMPL_VAR NAME="author"-->" >Circulation history</a></li>
+                         <!-- TMPL_IF NAME="CAN_user_parameters"--><li><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;module=CATALOGUING&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="biblionumber"-->">Modification log</a> </li><!-- /TMPL_IF -->
+</ul>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
index 9419ea2..7933c1c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
@@ -1,11 +1,3 @@
-<!-- TMPL_IF NAME="biblionumber" -->
-       <div class="biblioinfo">
-       <h5><!-- TMPL_VAR NAME="title" --></h5> 
-       <!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
-       </div>
-<!-- /TMPL_IF -->
-
 <ul>
-       <li><a href="/cgi-bin/koha/catalogue/search.pl">Advanced Search</a></li>
        <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>
 </ul>
\ 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 42e4441..e25b1a9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -17,4 +17,4 @@
 </ul>
 </div>
        
-<div id="login"><!-- 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'); return false;">[ ? ]</a></div></div>
+<div id="login"> <!-- TMPL_IF NAME="AutoLocation" --><strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong><!-- TMPL_ELSE --><strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong> (<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set</a>) | <!-- /TMPL_IF --> <!-- TMPL_IF NAME="loggedinusername" --><span class="loggedinusername"><!-- TMPL_VAR NAME="loggedinusername" --></span> (<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'); return false;">[ ? ]</a></div></div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
index d3192e7..1aeca8c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
@@ -1,6 +1,23 @@
+<!-- TMPL_IF NAME="subscriptionid" -->
+<ul>
+<li><a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Serial Collection</a></li>
+       <!-- TMPL_IF NAME="routing" --><li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Edit Routing List</a></li><!-- TMPL_ELSE -->
+       <li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=new">Create Routing List</a></li><!-- /TMPL_IF -->
+</ul>
+<!-- TMPL_ELSE -->
+       <!-- TMPL_IF NAME="subscriptions" -->
+       <ul>
+       <li>Manage Subscriptions
+               <!-- TMPL_LOOP NAME="subscriptions" -->
+                       <li>#<!-- TMPL_VAR name="subscriptionid" --> <a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Serial Collection</a></li>
+                       <!-- TMPL_IF NAME="routing" --><li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">#<!-- TMPL_VAR name="subscriptionid" --> Edit Routing List</a></li><!-- TMPL_ELSE -->
+       <li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=new">#<!-- TMPL_VAR name="subscriptionid" --> Create Routing List</a></li><!-- /TMPL_IF -->
+               <!-- /TMPL_LOOP -->
+       </li></ul>
+       <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
 <ul>
-       <li>        <a href="/cgi-bin/koha/serials/serials-home.pl">Serials Home</a></li>
        <li>        <a href="/cgi-bin/koha/serials/claims.pl">Claims</a></li>
-       <li>        <a href="/cgi-bin/koha/serials/subscription-add.pl">Add Subscription</a></li>
        <li>        <a href="/cgi-bin/koha/serials/checkexpiration.pl">Check Expiration</a></li>
 </ul>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
new file mode 100644 (file)
index 0000000..8fa89ed
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
@@ -0,0 +1,10 @@
+<div id="toolbar">
+<ul class="toolbar">
+       <li><a href="/cgi-bin/koha/serials/subscription-add.pl">New</a></li>
+       <li><a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a></li>
+       <li><a href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a></li>
+       <li><a href="#" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew </a></li>
+       <li><a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Receive</a></li>
+       <li><a href="javascript:confirm_deletion()">Delete</a></li>
+</ul>
+<br clear="all" />    </div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index 3b3a4e9..d69a39d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -67,11 +67,11 @@ function Addbiblio(op) {
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
+<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
 
 <!-- TMPL_UNLESS name="popup" -->
     <h1>MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --></h1>
     
-<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
 
 <!-- /TMPL_UNLESS -->
 
@@ -441,6 +441,7 @@ function Addbiblio(op) {
 </div>
 </div>
 <div class="yui-b">
+<!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-menu.inc" -->
 </div>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index a88c09c..a0ad264 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -47,10 +47,8 @@ function confirm_deletion(count) {
 <!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
     
     <div id="catalogue_detail_biblio">
-        <h2>Biblio detail</h2>
+        <h2><!-- TMPL_VAR NAME="title" --></h2>
         <p>
-            <label><b>Title</b></label>
-            <!-- TMPL_VAR NAME="title" -->
             [
             <!-- TMPL_IF name="description" -->
                 <!-- TMPL_VAR name="description" -->
@@ -234,6 +232,7 @@ function confirm_deletion(count) {
 </div>
 </div>
 <div class="yui-b">
+<!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-menu.inc" -->
 </div>
 </div>

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 203911c..2656fd5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -141,7 +141,7 @@ if (alreadyreserved > "0"){
 
     <!-- TMPL_IF NAME="alreadyreserved" -->                    
     <p class="problem">
-      <strong>Operation Failed</strong>
+      <strong>Warning:</strong>
       This patron already has a hold on this item
     </p>
     <!-- /TMPL_IF -->
@@ -268,6 +268,7 @@ if (alreadyreserved > "0"){
     </form>
 
 <!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="cardnumber" -->
 <!-- TMPL_IF name="reserveloop" -->
 <form name="T<!-- TMPL_VAR NAME="time" -->" action="modrequest.pl" method="post">
 <fieldset class="rows left">
@@ -354,6 +355,7 @@ if (alreadyreserved > "0"){
 </fieldset>
 </form>
 <!-- /TMPL_IF -->
+<!-- /TMPL_UNLESS -->
 
 </div>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
index 9fe8599..02cceb5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
@@ -75,6 +75,7 @@ $(document).ready(function() {
 
 
 <!-- TMPL_UNLESS name="popup" -->
+       <!-- TMPL_INCLUDE NAME="serials-toolbar.inc" -->
 
        <h1>Serial Collection information for  <i><!-- TMPL_VAR name="bibliotitle" --></i></h1>
 <!-- /TMPL_UNLESS -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
index 69b6a5d..5491a80 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
@@ -104,29 +104,11 @@ function popup(subscriptionid) {
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-
+       <!-- TMPL_INCLUDE NAME="serials-toolbar.inc" -->
 
     <h1>Subscription #<!--TMPL_VAR name="subscriptionid"--></h1>
     <!--TMPL_IF Name="abouttoexpire"--><div class="problem">Subscription is by its end. It should be renewed now.</div><!--/TMPL_IF-->
-    <div id="action">
-        <div class="edit">
-<ul>
-       <li>            <a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a></li>
-       <li>            <a href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a></li>
-       <li>            <a href="#" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew </a></li>
-       <li>            <a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Receive</a></li>
-       <li>            <a href="javascript:confirm_deletion()">Delete</a></li>
-</ul>
-        </div>
-        <div class="view">
-<ul>
-       <li>            <a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Serial Collection</a></li>
-                   <!-- TMPL_IF NAME="routing" --><li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Edit Routing List</a></li><!-- TMPL_ELSE -->
-       <li>            <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=new">Create Routing List</a></li>
-            <!-- /TMPL_IF -->
-</ul>
-        </div>
-    </div>
+    
     <div id="subscription_info">
         <h2>Subscription information</h2>
         <p><label>Librarian identity:</label> <!-- TMPL_VAR name="librarian" --></p>