From cb6d604e916517d3f3c20bb106b957afa3175aec Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 30 Jan 2013 12:25:21 -0500 Subject: [PATCH] Bug 9617 - Replace YUI menu on catalog pages with Bootstrap This patch converts the toolbar include file used by catalog detail pages (detail.pl, MARCdetail.pl, etc.) replacing YUI button and menu code with Bootstrap. Minor change to staff client CSS fixes issue with language footer. Minor change to doc-head-close.inc corrects error in logic for handling cart and lists js discovered in testing. To test, view any page which uses cat-toolbar.inc. Buttons and menus should look correct and work correctly. Functions to test include: New record New item New subscription New child record Edit record Edit items Edit items in a batch Delete items in a batch Attach item Edit as new (duplicate) Replace record via Z39.50 Delete record Delete all items Save (various formats) Add to cart Add to list Print Place hold (including with search-to-hold active). Testing should be done by users with varying permissions including with and without: CAN_user_serials_create_subscription CAN_user_editcatalogue_edit_catalogue CAN_user_editcatalogue_edit_items CAN_user_tools_items_batchmod CAN_user_tools_items_batchdel Signed-off-by: Bernardo Gonzalez Kriegel Comment: All buttons tested. Works as described. No Errors. Looks good. Signed-off-by: Jonathan Druart Signed-off-by: Jared Camins-Esakov --- .../prog/en/css/staff-global.css | 2 +- .../prog/en/includes/cat-toolbar.inc | 284 ++++++++---------- .../prog/en/includes/doc-head-close.inc | 9 +- 3 files changed, 129 insertions(+), 166 deletions(-) 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 8e19eeab25..18a4ef2bec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -48,7 +48,7 @@ a.popup { body { text-align : left; - padding:0 0 2.5em 0; + padding:0 0 4em 0; font-family: arial, verdana, helvetica, sans-serif; } 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 6936532c3a..2dde5ad894 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -1,5 +1,3 @@ -
- + +
- YAHOO.util.Event.onContentReady("cattoolbar", function () { - // Menu for new record, new item, new subscription - var newmenu = [ - [% IF CAN_user_editcatalogue_edit_catalogue %] - {text: _("New record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl" }, +
+ +[% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || +CAN_user_serials_create_subscription ) %] +
+ +
    + [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] +
  • New record
    • [% END %] - [% IF ( CAN_user_editcatalogue_edit_items ) %] - {text: _("New item"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]#additema" }, + + [% IF ( CAN_user_editcatalogue_edit_items ) %] +
  • New item
    • [% END %] [% IF ( CAN_user_serials_create_subscription ) %] - {text: _("New subscription"), url: "/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber %]"}, +
  • New subscription
    • [% END %] + [% IF ( EasyAnalyticalRecords && CAN_user_editcatalogue_edit_catalogue ) %] - {text: _("Analyze items"), url: "/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]&analyze=1" }, +
  • Analyze items
    • [% END %] [% IF CAN_user_editcatalogue_edit_catalogue %] - {text: _("New child record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber %]" }, +
  • New child record
    • [% END %] - ]; - if(newmenu.length){ - new YAHOO.widget.Button({ - type: "menu", - label: _("New"), - id: "newmenuc", - name: "newmenubutton", - menu: newmenu, - container: this - }); - } - var editmenu = [ - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Edit record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&frameworkcode=&op=" },[% END %] - [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Edit items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]" },[% END %] - [% IF ( CAN_user_tools_items_batchmod ) %]{ text: _("Edit items in batch"), url: "/cgi-bin/koha/tools/batchMod.pl?op=show&biblionumber=[% biblionumber %]&src=CATALOGUING" },[% END %] - [% IF ( CAN_user_tools_items_batchdel ) %]{ text: _("Delete items in batch"), url: "/cgi-bin/koha/tools/batchMod.pl?del=1&op=show&biblionumber=[% biblionumber %]&src=CATALOGUING" },[% END %] - [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Attach item"), url: "/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber %]" },[% END %] - [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Link to host item"), url: "/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber %]" },[% END %][% END %] - [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]{ text: _("Upload image"), url: "/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber %]&filetype=image" },[% END %][% END %] - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Edit as new (duplicate)"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&frameworkcode=&op=duplicate" },[% END %] - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Replace record via Z39.50"), onclick: {fn: PopupZ3950 } },[% END %] - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Delete record"), onclick: {fn: confirm_deletion }[% IF ( count || holdcount ) %],id:'disabled'[% END %] },[% END %] - [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Delete all items"), onclick: {fn: confirm_items_deletion }[% IF ( count < 1 || holdcount ) %],id:'disabled2'[% END %] },[% END %] - ]; - if(editmenu.length){ - new YAHOO.widget.Button({ - type: "menu", - label: _("Edit"), - id: "editmenuc", - name: "editmenubutton", - menu: editmenu, - container: this - }); - } - var savemenu = [ - { text: _("MODS (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=[% biblionumber %]" }, - { text: _("Dublin Core (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=dc&op=export&bib=[% biblionumber %]" }, - { text: _("MARCXML"), url: "/cgi-bin/koha/catalogue/export.pl?format=marcxml&op=export&bib=[% biblionumber %]" }, - { text: _("MARC (non-Unicode/MARC-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=marc8&op=export&bib=[% biblionumber %]" }, - { text: _("MARC (Unicode/UTF-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=utf8&op=export&bib=[% biblionumber %]" }, - { text: _("MARC (Unicode/UTF-8, Standard)"), url: "/cgi-bin/koha/catalogue/export.pl?format=marcstd&op=export&bib=[% biblionumber %]" } - ]; - - new YAHOO.widget.Button({ - type: "menu", - label: _("Save"), - id: "savemenuc", - name: "savemenubutton", - menu: savemenu, - container: this - }); +
+
+[% END %] - var addtomenu = [ - { text: _("Cart"), onclick: { fn: addToCart } }, - { text: _("List"), onclick: { fn: addToShelf } } - ]; +
+ +
    + [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] +
  • Edit record
    • + [% END %] - new YAHOO.widget.Button({ - type: "menu", - label: _("Add to"), - name: "addtomenubutton", - menu: addtomenu, - container: this - }); + [% IF ( CAN_user_editcatalogue_edit_items ) %] +
  • Edit items
    • + [% END %] - new YAHOO.widget.Button({ - id: "printbiblio", - type: "button", - label: _("Print"), - container: this, - onclick: {fn: printBiblio } - }); - [% IF ( CAN_user_reserveforothers ) %][% UNLESS ( norequests ) %] - [% IF ( holdfor ) %] - // Create an array of YAHOO.widget.MenuItem configuration properties - var onButtonClick = function () { - location.href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]"; - } - var HoldForButtonMenu = [ - { text: _("Place hold"), url: "/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]" }, - { text: _("Place hold for")+ " [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", url: "/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]&findborrower=[% holdfor_cardnumber %]" } - ]; + [% IF ( CAN_user_tools_items_batchmod ) %]
  • Edit items in batch
    • [% END %] - // Instantiate a Split Button using the array of YAHOO.widget.MenuItem - // configuration properties as the value for the "menu" - // configuration attribute. + [% IF ( CAN_user_tools_items_batchdel ) %]
  • Delete items in a batch
    • [% END %] - var HoldForButton = new YAHOO.widget.Button({ - id: "holdfor", - type: "split", - label: _("Place hold"), - name: "holdfor", - menu: HoldForButtonMenu, - container: this, - onclick: { fn: onButtonClick } - }); - [% ELSE %] - new YAHOO.widget.Button({ - id: "placehold", - type: "link", - label: _("Place hold"), - container: this, - href: "/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]" - }); - [% END %] - [% END %][% END %] + [% IF ( CAN_user_editcatalogue_edit_items ) %]
  • Attach item
    • [% END %] - }); - //]]> - - - + [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]
  • Link to host item[% END %][% END %] + [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]
  • Upload image[% END %][% END %] -
      + [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] +
    • Edit as new (duplicate)
      • +
    • Replace record via Z39.50
      • - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -
    • New record
      • - [% END %] - [% IF ( CAN_user_editcatalogue_edit_items ) %] -
    • New item
      • - [% END %] - [% IF ( CAN_user_serials_create_subscription ) %] -
    • New subscription
      • - [% END %] + [% IF ( count ) %]
    • [% ELSE %]
    • [% END %] + Delete record
      • + [% END %] - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -
    • Edit record
      • - [% END %] - [% IF ( CAN_user_editcatalogue_edit_items ) %] -
    • Edit items
      • - [% END %] - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -
    • Duplicate record
      • - [% END %] - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -
    • Delete
      • - [% END %] + [% IF ( CAN_user_editcatalogue_edit_items ) %] + [% UNLESS ( count ) %]
    • [% ELSE %]
    • [% END %]
    • + Delete all items
      • + [% END %] -
    • Add to shelf
      • -
      • - [% IF ( CAN_user_reserveforothers ) %] - [% UNLESS ( norequests ) %]
    • Place hold
      • [% END %] - [% END %] - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
      • [% END %]
    +
+ +
+ + +
+ +[% IF ( virtualshelves && intranetbookbag ) %] +
+ + +
+[% ELSIF ( virtualshelves ) %] +
Add to list
+[% ELSIF ( intranetbookbag ) %] +
Add to cart
+[% END %] + +
Print
+ +[% IF ( CAN_user_reserveforothers ) %] + [% UNLESS ( norequests ) %] + [% IF ( holdfor ) %] +
+ + + +
+ [% ELSE %] +
Place hold
+ [% END %] + [% END %] +[% END %] +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index 6fcba7240f..a883deff5f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -43,9 +43,10 @@ //]]> [% END %] +[% IF ( virtualshelves || intranetbookbag ) %] - [% IF ( virtualshelves || intranetbookbag ) %] - - [% END %] + +[% END %] [% IF LocalCoverImages %]