Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

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

Signed-off-by: Chris Cormack <crc@liblime.com>
3.0.x
Owen Leonard 17 years ago
committed by Chris Cormack
parent
4b09332aed
commit
21b08b3b20
11 changed files with 54 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc
  2. 9
      koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
  3. 8
      koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
  4. 2
      koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
  5. 21
      koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
  6. 10
      koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
  7. 3
      koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
  8. 5
      koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
  9. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
  10. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
  11. 22
      koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl

27
koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc
View File

@ -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>

9
koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
View File

@ -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>

8
koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
View File

@ -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>

2
koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
View File

@ -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>

21
koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
View File

@ -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>

10
koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
View File

@ -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>

3
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
View File

@ -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>

5
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
View File

@ -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>

4
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
View File

@ -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>

1
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
View File

@ -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 -->

22
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
View File

@ -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>

Write Preview
Loading…
Cancel
Save