From 5cc3cdeb2983d5425735957a45eb2115067bea13 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 19 Nov 2007 15:08:25 -0600 Subject: [PATCH] Finishing first round of OPAC updates. Lost of unstandardized interface elements and menu placement issues still to be resolved. Also included are a couple of changes to the intranet detail page. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/includes/cat-toolbar.inc | 34 ++--- .../prog/en/modules/catalogue/detail.tmpl | 116 +++++------------ koha-tmpl/opac-tmpl/prog/en/css/opac.css | 102 +++++++++++++++ .../prog/en/includes/doc-head-close.inc | 10 +- .../opac-tmpl/prog/en/includes/masthead.inc | 12 +- .../opac-tmpl/prog/en/includes/navigation.inc | 10 +- .../prog/en/includes/opac-bottom.inc | 19 --- koha-tmpl/opac-tmpl/prog/en/js/basket.js | 2 +- koha-tmpl/opac-tmpl/prog/en/js/main.js | 9 -- koha-tmpl/opac-tmpl/prog/en/js/script.js | 41 ------ .../prog/en/modules/maintenance.tmpl | 7 +- .../prog/en/modules/opac-ISBDdetail.tmpl | 72 +++++++--- .../prog/en/modules/opac-MARCdetail.tmpl | 57 ++++---- .../en/modules/opac-addbybiblionumber.tmpl | 31 +++-- .../prog/en/modules/opac-advsearch.tmpl | 18 ++- .../en/modules/opac-authorities-home.tmpl | 101 +++++++------- .../en/modules/opac-authoritiesdetail.tmpl | 30 +++-- .../opac-authoritiessearchresultlist.tmpl | 22 +++- .../prog/en/modules/opac-basket.tmpl | 68 +++++----- .../prog/en/modules/opac-detail.tmpl | 13 +- .../en/modules/opac-full-serial-issues.tmpl | 19 ++- .../prog/en/modules/opac-results.tmpl | 123 ++++++------------ .../prog/en/modules/opac-sendbasketform.tmpl | 37 +++--- .../prog/en/modules/opac-serial-issues.tmpl | 19 ++- .../prog/en/modules/opac-shelves.tmpl | 21 +-- .../prog/en/modules/opac-tags_subject.tmpl | 19 ++- .../prog/en/modules/opac-topissues.tmpl | 75 ++++++----- koha-tmpl/opac-tmpl/prog/images/checkall.gif | Bin 0 -> 83 bytes opac/opac-topissues.pl | 2 + 29 files changed, 581 insertions(+), 508 deletions(-) delete mode 100644 koha-tmpl/opac-tmpl/prog/en/js/main.js create mode 100644 koha-tmpl/opac-tmpl/prog/images/checkall.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index c6bd2f7f1f..130de3a01e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -33,16 +33,14 @@ function confirm_deletion() { // prepare DOM for YUI Toolbar $(document).ready(function() { - $("#viewmarc").parent().remove(); - $("#viewisbd").parent().remove(); - $("#viewitems").parent().remove(); - $("#viewmenuc").empty(); $("#edititems").parent().remove(); $("#duplicatebiblio").parent().remove(); $("#deletebiblio").parent().remove(); $("#editmenuc").empty(); $("#addtoshelfc").empty(); $("#printbiblioc").empty(); + $("#export").remove(); + $("#addtoshelfc").before("
  • "); yuiToolbar(); }); @@ -55,20 +53,21 @@ function confirm_deletion() { { text: "Edit as New (Duplicate)", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=&frameworkcode=&op=duplicate" }, { text: "Delete Record", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&biblionumber=",disabled: true, onclick: {fn: confirm_deletion }} ]; - - var viewmenu = [ - { text: "Normal Display", url: "/cgi-bin/koha/catalogue/detail.pl?biblionumber=", selected: true }, - { text: "MARC Display", url: "/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=" }, - { text: "ISBD Display", url: "/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=" }, - { text: "Items Display", url: "/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=" } - ]; + + var savemenu = [ + { text: "MODS (XML)", url: "/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=" }, + { text: "Dublin Core (XML)", url: "/cgi-bin/koha/catalogue/export.pl?format=dc&op=export&bib=" }, + { text: "MARCXML", url: "/cgi-bin/koha/catalogue/export.pl?format=marcxml&op=export&bib=" }, + { text: "MARC (non-Unicode/MARC-8)", url: "/cgi-bin/koha/catalogue/export.pl?format=marc8&op=export&bib=" }, + { text: "MARC (Unicode/UTF-8)", url: "/cgi-bin/koha/catalogue/export.pl?format=utf8&op=export&bib=" }, + ]; new YAHOO.widget.Button({ type: "menu", - label: "View", - name: "viewmenubutton", - menu: viewmenu, - container: "viewmenuc" + label: "Save", + name: "savemenubutton", + menu: savemenu, + container: "savemenuc" }); new YAHOO.widget.Button({ @@ -113,11 +112,6 @@ function confirm_deletion() {
  • &frameworkcode=&op=duplicate">Duplicate Record
  • ">Delete
    • -
  • ">Normal View
    • -
  • ">MARC View
    • -
  • ">ISBD View
    • -
  • ">Items View
    • -
  • ">Add to shelf
  • ">Print
    • 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 b1d2a58874..f0e2f88860 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -18,9 +18,9 @@
    -

    - + +

    [ @@ -51,16 +51,13 @@

  • Illustrator:
    • - -
  • Publisher: - "> - - -
    • - - -
  • in:
    • - + +
  • Published by: + "> + + () , +
    • +
  • Description: , @@ -68,14 +65,13 @@
    • - -
    - - /ref=sib_dp_pt/002-7879865-0184864#reader-link">.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Cover image" /> - - -
    -
    +
    + /ref=sib_dp_pt/002-7879865-0184864#reader-link">.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" /> + + + 
    + +
    • ISBN:
      • @@ -134,10 +130,9 @@
    -
    +
    - item(s) @@ -213,75 +208,26 @@ + - - -
    -

    Amazon Reader Reviews:

    -

    - - &store=books">Add your own review

    - - -

    Rating (from Amazon.com):

    -
    px">
    - -
    - -

    - - -

    - -
    - - - -
    -

    Sorry, there are no reviews available for this title.

    -
    - - -
    - - - -

    Similar Items

    - - - - -
  • .gif" title="" /> -"> by ©
    • -.01._THUMBZZZ_PU_PU-5_.jpg" /> - - .gif" title="" /> - barcode: - - - - - - -
    +
    -
    Item type
    - - - /> -
    Save Record
    Select Download Format: -
    + + + + + " /> +
    Save Record
    Select Download Format: +
    -
    diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 123403800f..6e7ccb26bd 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -169,11 +169,17 @@ h6 { input[type=submit], input[type=button], input[type=reset] { background-color : #6BA037; + border:1px outset #666666; color : #FFFFFF; + font-size : 93%; font-weight : bold; padding : 2px; } +input[type=submit]:active, input[type=button], input[type=reset] { + border: 1px inset #666666; +} + p.searchresults { background-color : #EFF1DC; } @@ -183,6 +189,7 @@ table { margin : 1em 0; border-right : 1px solid #dddddd; border-top : 1px solid #dddddd; + width : 100%; } td,th { @@ -623,4 +630,99 @@ h2 span.hint { } a.cancel { padding-left : 1em; +} + +#usermenu { + margin-top : 1em; +} + +#toolbar ul { + margin : 1em 0 0 0; + padding : 0; +} + +#toolbar ul li { + display : inline; + list-style : none; +} + +#toolbar ul li a { + border : 1px solid #afbccf; + padding : .3em; + text-decoration : none; + margin-right : .1em; +} + +.searchresults input, .searchresults label, .searchresults select { + font-size: 90%; +} + +.searchresults label { + float : right; + margin-top : 5px; +} + +.searchresults p { + margin: 0; + padding: 0; + padding-top : .6em; +} + +.searchresults p img { + vertical-align: middle; +} + +.searchresults table td { + vertical-align: top; +} + +p.searchresults { + background-color : #EFF1DC; + margin-top : -5px; + vertical-align : middle; + padding : 3px 3px 5px 5px; +} + +.searchresults td, .searchresults th, .searchresults table { + border: 0; +} + +.searchresults tr { + border-bottom : 1px solid #CCCCCC; +} + +.searchresults table { + border-top : 0px solid #CCCCCC; +} + +p.availability { + color:#666666; +} + +.available { + font-size: 90%; +} + +.searchresults a.reserve, .searchresults a.reserve:visited { + background-position:left top; + background-repeat:no-repeat; + float:right; + padding:2px 3px 2px 26px; +} + +.searchresults a.reserve { + background-color:transparent; + color:#006699; +} + +input.reserve, a.reserve { + background-image:url(/opac-tmpl/prog/images/placereserve.gif); +} + +a.reserve { + background-color:#006699; + color:White; +} +.unavailable { + color: #990033; } \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc index ed1f4f4037..e8a77e0342 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc @@ -24,7 +24,6 @@ - @@ -37,4 +36,11 @@ var MSG_NRECORDS_IN_BASKET = _("already in the bag"); var MSG_NO_RECORD_SELECTED = _("No item was selected"); var MSG_NO_RECORD_ADDED = _("No item was added to your book bag"); - \ No newline at end of file + + + + \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 539a6e7a73..a043e269d5 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -3,7 +3,17 @@
    diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc index c65101ea29..db3a0a4f7b 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc @@ -4,15 +4,7 @@
  • Search Home
  • Advanced Search
    • - -
  • - Book Bag - - -
    • - +
  • Virtual Shelves
    • diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc index 7d7c6f617a..b65560b868 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc @@ -1,23 +1,4 @@
    - -
    - - User Info -

    Logged in as:

    -

    Log Out

    - -
    -

    Login:

    - -

    Pass:

    - -

    - -

    -
    - -
    - diff --git a/koha-tmpl/opac-tmpl/prog/en/js/basket.js b/koha-tmpl/opac-tmpl/prog/en/js/basket.js index f889bdd9b1..5fd91a23b3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/js/basket.js +++ b/koha-tmpl/opac-tmpl/prog/en/js/basket.js @@ -320,7 +320,7 @@ function sendBasket() { var loc = CGIBIN + "opac-sendbasket.pl?" + strCookie; - var optWin="dependant=yes,scrollbars=no,resizable=no,height=300,width=400,top=50,left=100"; + var optWin="dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100"; var win_form = open(loc,"win_form",optWin); } diff --git a/koha-tmpl/opac-tmpl/prog/en/js/main.js b/koha-tmpl/opac-tmpl/prog/en/js/main.js deleted file mode 100644 index 2a8b6c934c..0000000000 --- a/koha-tmpl/opac-tmpl/prog/en/js/main.js +++ /dev/null @@ -1,9 +0,0 @@ -// one window.onload to rule them all - -window.onload=kohajs; - -// check to see if functions exist before loading them -function kohajs() { - if ( typeof window.verify_images == "function" ) verify_images(); -} - diff --git a/koha-tmpl/opac-tmpl/prog/en/js/script.js b/koha-tmpl/opac-tmpl/prog/en/js/script.js index bb4423348e..ce9f97a721 100644 --- a/koha-tmpl/opac-tmpl/prog/en/js/script.js +++ b/koha-tmpl/opac-tmpl/prog/en/js/script.js @@ -1,44 +1,3 @@ -function ValidateCode() -{ - // Validating the patron id by Oscar R. Paredes - // Please do not remove this line and the line above. - var patron_id = document.forms['auth'].userid.value; - var snumber = "Pp 0123456789"; - var len = patron_id.length; - var new_patron_id = ""; - var bOK = true - if (patron_id.length != 0) - { - for (i=0;(i 12) - { alert("Your card number is invalid, please verify it."); - bOK = false; - } - else - { if (pos > 2) - car = patron_id.substring(i,i+1); - else - car = ""; - new_patron_id = new_patron_id + car; - } - } // end for i - while (bOK && (new_patron_id.length < 7)) - new_patron_id = "0" + new_patron_id; - if (new_patron_id.length > 7) - { alert("Your library card number is too long."); - bOK = false; - } - if (bOK) - document.forms['auth'].userid.value = new_patron_id; - else - { - document.forms['auth'].userid.value = ""; - document.forms['auth'].userid.focus(); - } - } -} - function CheckAll() { count = document.mainform.elements.length; diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl index f1c1bc644f..ef8853a9a5 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl @@ -3,11 +3,14 @@ - + -
    +
    +
    + Site under maintenance. Please Come back later. If you still see this page, please contact ">me +
    diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl index 508c401cf9..487cd2e371 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl @@ -1,5 +1,19 @@ - Catalog -- ISBD + Catalog › ISBD View + @@ -9,39 +23,55 @@
    - diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl index 16248f56b7..cbd08d2038 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl @@ -2,37 +2,23 @@ - - + -
    +
    + + \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl index 58578cef30..dc6da4b4cc 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl @@ -1,8 +1,13 @@ - Catalog -- Add to My Virtual Shelf + Catalog › Add to My Virtual Shelf + +
    +

    Add these biblios to a shelf

    @@ -20,31 +25,31 @@ -
    -

    Select an Existing Virtualshelf

    - + +
    Select an Existing List +
    " /> - - +
    +
    Cancel

    ...or...

    -
    - Add to a New Virtualshelf: -

    + +

    Add to a New List: +
    1. -

      - +
      2. +
    2. +
    " /> - +
    Cancel

    diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl index e4ff34c032..90bb8dbb87 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl @@ -3,9 +3,13 @@ Catalog -- Advanced Search - - + + +

    +
    +
    +
    @@ -464,4 +468,12 @@ } - +
    +
    +
    +
    + + +
    +
    + \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl index 6a84e83a02..2aae9242cc 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl @@ -1,75 +1,82 @@ - -- Library Catalog + › Library Catalog › Authority Search - - + -

    Authority search

    +
    +
    +
    +
    -
    - - - - "> -
    -

    Search on - + + " /> +
    +Authority search +
      +
    1. -

    -

    - -

  • + + - "> - - - -

    -

    - - " /> + + + +

    • +
  • + + - "> - - - -

    -

    - - " /> + + + +

    • +
  • + + - "> - - - -

    -

    " /> + + + +

    • +
  • -

    -

    - -

    -
    • + + +
    + +
    -
    - +
    +
    +
    +
    + + +
    +
    + \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl index ef30081c14..9d89759e08 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl @@ -2,14 +2,6 @@ /includes/hierarchy.css"> - - - - - -
    - -/includes/hierarchy.css"> + + + + + +
    +
    +
    +
    + + +
    @@ -71,5 +75,13 @@ function showChildren(mynumber) {
    + +
    +
    +
    +
    - + +
    +
    + \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl index a177624f4a..e87438b256 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl @@ -1,9 +1,13 @@ - -- Library Catalog + › Library Catalog › Authority Search ResultNo results found - - + + +
    +
    +
    +

    Authority search results

    @@ -31,6 +35,7 @@
    +
    @@ -75,4 +80,13 @@

    - + + + + +
    + + +
    + + \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl index 4e90b42ddd..2036e92bda 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl @@ -1,43 +1,31 @@ - - Catalog -- Your Book Bag - - - - - + Catalog › Your Book Bag + + +/includes/favicon.ico" type="image/x-icon" /> + + + -
    +

    Your Book Bag

    -
    - - Brief Display - - More Details - - Send - Print - Empty and Close - Hide Window + -
    -

    -Selected items : - - Remove - | - - - Add to a shelf - - -

    @@ -47,18 +35,14 @@
    - " - name="bib" - id="bib" - onclick="selRecord(value,checked)" /> + " name="bib" id="bib" onclick="selRecord(value,checked)" />
    - + @@ -170,14 +154,24 @@ +
    ISBN
    + -
    Check AllSelected items : + + Remove + | + + + Add to a shelf + +
    + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl index d672e19d17..20981ac2f4 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl @@ -3,8 +3,15 @@ @@ -172,7 +179,7 @@
  • ">ISBD View
    • -
  • "> +
  • "> MARC View
    • diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl index 0877244075..5ba899fb0f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl @@ -2,8 +2,12 @@ - - + + +
    +
    +
    +
    @@ -68,5 +72,12 @@ function showlayer(numlayer) } - - +
    +
    +
    +
    + + +
    +
    + \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl index 66bc6254d4..8039b73e59 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl @@ -111,38 +111,24 @@
    - + " /> - -

    - Re-sort results - -

    - - - - - - + - - - - - - - - - + @@ -150,11 +136,7 @@ - - - - + + - - -
    TitleItem countLocationReservation

    + + + Check All + + +

    - - " title="Click to add to book bag" /> - - + "> http://images.amazon.com/images/P/.01.TZZZZZZZ.jpghttp://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="image" class="thumbnail" /> @@ -166,48 +148,38 @@ -

    - - "> - - - - - "> - - - - "> - - , , - - -

    - -

    - -

    - - "> - -   - - - - - - ; - - - ; - (modified on ) -

    - -     		- - - - + "> "> "> by ">  +

    - + - + ; + - + : + ; + (modified on )

    +

    + +Copies available at: + --> + + (), + + +No copies available: + + + On loan (), + Withdrawn (), + Lost () + On order () +

    +

    ">Place Reserve " title="Click to add to book bag" /> + "> + + +

    +     		@@ -232,17 +204,6 @@ - - Not Reserveable - - "> - Reserves - - -
    diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl index 1e89580b73..96b8ea1fc7 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl @@ -1,14 +1,13 @@ Catalog -- Sending Your Book Bag - -
    -

    Sending your book bag

    - + +

    Message Sent

    The book bag was sent to:

    +

    Close window

    Problem sending the book bag...

    @@ -18,28 +17,22 @@ " method="post"> -

    +

    +Sending your book bag +
    1. - -

      -

      -
      - -

      -

      - + +

      2. +
    2. + + +
      3. +
    3. " /> -

      +
    +
    Cancel
    -

    - -

    - -
    -

    - -
    diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl index ccbe6559c1..374ec16281 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl @@ -2,8 +2,13 @@ - - + + +
    +
    +
    +
    +

    Issues for a subscription

    " class="button">Normal View @@ -88,4 +93,12 @@ - +
    +
    +
    +
    + + +
    +
    + \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl index 883f7538ba..f35e45e9f9 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl @@ -1,15 +1,12 @@ Catalog -- Contents of My Virtual Shelves - - - - - -
    -
    -
    + +
    +
    +
    +

    Virtual Shelves /images/caret.gif" width="16" height="16" alt=">" border="0" /> The Virtual Shelf is empty

    @@ -179,5 +176,9 @@
    - - +
    + + +
    +
    + \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl index 8281ea93d2..3f72e1d938 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl @@ -2,8 +2,12 @@ - - + + +
    +
    +
    +

    Subject cloud

    This "cloud" show you the most used topics in our catalogue. Click on one of them to see the documents related to it

    @@ -18,4 +22,13 @@ " style="font-size:px;"> - + +
    +
    +
    +
    + + +
    +
    + \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl index 866f15e325..6ef8cf728f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl @@ -1,19 +1,23 @@ -- Library Catalog - - - - - -
    - Show + + + + +
    +
    +
    +
    + -

    the @@ -21,9 +25,11 @@ function Dopop(link) { - - most issued documents owned by branch - titles + +

  • + + -

    -

    Limit palmares to - - - acquired in the last

    • +
  • + - +
  • + +
    • +
    - + -

    The most issued + + +
    The most checked-out - documents - available at + titles + at - the library + - since months - (no time limit) - - + in the past months + of all time + @@ -91,4 +100,12 @@ function Dopop(link) {
    Title Itemtype
    - + + + +
    + + +
    + + \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/images/checkall.gif b/koha-tmpl/opac-tmpl/prog/images/checkall.gif new file mode 100644 index 0000000000000000000000000000000000000000..cc8c0a9760d5305cd7a74cf8a088d55521768fb5 GIT binary patch literal 83 zcmZ?wbhEHb6k-r!XkcUjf|+OjEB<5wG8q|kKzxu41Cv&de8cILweuzmXn1R%D=^Dz h2orZxwoFRdv36NRt%B0Z7p3>M?cUvaUz35s8US3V8GZl& literal 0 HcmV?d00001 diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl index b77c0ab0c5..6e995cea92 100755 --- a/opac/opac-topissues.pl +++ b/opac/opac-topissues.pl @@ -84,6 +84,8 @@ while (my $line= $sth->fetchrow_hashref) { push @results, $line; } +if($timeLimit eq 999){ $timeLimit = 0 }; + $template->param(do_it => 1, limit => $limit, branch => $branches->{$branch}->{branchname}, -- 2.39.5