From e1b1c43425f0bfa1d1cb101418e2a0e3c8dc9e0d Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Tue, 25 Jan 2011 06:24:32 +1300 Subject: [PATCH] Revert "Fix for Bug 3659, Add place hold option from patron checkout tab" This reverts commit da2040634ed4f589c5f6b188ab3a3fac83d99a9b. Wrong patch was applied --- catalogue/ISBDdetail.pl | 11 --- catalogue/MARCdetail.pl | 11 --- catalogue/detail.pl | 12 +-- catalogue/labeledMARCdetail.pl | 11 --- catalogue/moredetail.pl | 11 --- catalogue/search.pl | 11 --- .../prog/en/css/staff-global.css | 11 +-- .../prog/en/includes/cat-toolbar.inc | 26 ----- .../prog/en/includes/circ-toolbar.inc | 30 +++--- .../prog/en/includes/doc-head-close.inc | 1 - .../prog/en/includes/members-toolbar.inc | 24 ++--- .../lib/jquery/plugins/jquery.cookie.min.js | 1 - .../prog/en/modules/catalogue/results.tmpl | 94 ++++++------------- .../prog/en/modules/circ/circulation.tmpl | 1 - 14 files changed, 50 insertions(+), 205 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.cookie.min.js diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl index c59945f8d6..7ebe8e0c01 100755 --- a/catalogue/ISBDdetail.pl +++ b/catalogue/ISBDdetail.pl @@ -43,7 +43,6 @@ use CGI; use C4::Koha; use C4::Biblio; use C4::Items; -use C4::Members; # to use GetMember use C4::Branch; # GetBranchDetail use C4::Serials; # CountSubscriptionFromBiblionumber use C4::Search; # enabled_staff_search_views @@ -67,16 +66,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); -if($query->cookie("holdfor")){ - my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor")); - $template->param( - holdfor => $query->cookie("holdfor"), - holdfor_surname => $holdfor_patron->{'surname'}, - holdfor_firstname => $holdfor_patron->{'firstname'}, - holdfor_cardnumber => $holdfor_patron->{'cardnumber'}, - ); -} - # my @blocs = split /\@/,$ISBD; # my @fields = $record->fields(); my $res = GetISBDView($biblionumber, "intranet"); diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl index a2749cd76a..2dc7b1d5e7 100755 --- a/catalogue/MARCdetail.pl +++ b/catalogue/MARCdetail.pl @@ -54,7 +54,6 @@ use MARC::Record; use C4::Biblio; use C4::Items; use C4::Acquisition; -use C4::Members; # to use GetMember use C4::Serials; #uses getsubscriptionsfrombiblionumber GetSubscriptionsFromBiblionumber use C4::Search; # enabled_staff_search_views @@ -85,16 +84,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); -if($query->cookie("holdfor")){ - my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor")); - $template->param( - holdfor => $query->cookie("holdfor"), - holdfor_surname => $holdfor_patron->{'surname'}, - holdfor_firstname => $holdfor_patron->{'firstname'}, - holdfor_cardnumber => $holdfor_patron->{'cardnumber'}, - ); -} - #count of item linked my $itemcount = GetItemsCount($biblionumber); $template->param( count => $itemcount, diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 17184e9c10..6ee79e62ed 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -30,7 +30,7 @@ use C4::Items; use C4::Circulation; use C4::Branch; use C4::Reserves; -use C4::Members; # to use GetMember +use C4::Members; use C4::Serials; use C4::XISBN qw(get_xisbns get_biblionumber_from_isbn); use C4::External::Amazon; @@ -51,16 +51,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( } ); -if($query->cookie("holdfor")){ - my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor")); - $template->param( - holdfor => $query->cookie("holdfor"), - holdfor_surname => $holdfor_patron->{'surname'}, - holdfor_firstname => $holdfor_patron->{'firstname'}, - holdfor_cardnumber => $holdfor_patron->{'cardnumber'}, - ); -} - my $biblionumber = $query->param('biblionumber'); my $fw = GetFrameworkCode($biblionumber); diff --git a/catalogue/labeledMARCdetail.pl b/catalogue/labeledMARCdetail.pl index 68cf622e14..e72a6d115d 100755 --- a/catalogue/labeledMARCdetail.pl +++ b/catalogue/labeledMARCdetail.pl @@ -26,7 +26,6 @@ use C4::Context; use C4::Output; use C4::Biblio; use C4::Items; -use C4::Members; # to use GetMember use C4::Search; # enabled_staff_search_views my $query = new CGI; @@ -53,16 +52,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); -if($query->cookie("holdfor")){ - my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor")); - $template->param( - holdfor => $query->cookie("holdfor"), - holdfor_surname => $holdfor_patron->{'surname'}, - holdfor_firstname => $holdfor_patron->{'firstname'}, - holdfor_cardnumber => $holdfor_patron->{'cardnumber'}, - ); -} - #count of item linked my $itemcount = GetItemsCount($biblionumber); $template->param( count => $itemcount, diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl index a262d49bfb..d790c41987 100755 --- a/catalogue/moredetail.pl +++ b/catalogue/moredetail.pl @@ -31,7 +31,6 @@ use C4::Auth; use C4::Serials; use C4::Dates qw/format_date/; use C4::Circulation; # to use itemissues -use C4::Members; # to use GetMember use C4::Search; # enabled_staff_search_views my $query=new CGI; @@ -49,16 +48,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({ flagsrequired => {catalogue => 1}, }); -if($query->cookie("holdfor")){ - my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor")); - $template->param( - holdfor => $query->cookie("holdfor"), - holdfor_surname => $holdfor_patron->{'surname'}, - holdfor_firstname => $holdfor_patron->{'firstname'}, - holdfor_cardnumber => $holdfor_patron->{'cardnumber'}, - ); -} - # get variables my $biblionumber=$query->param('biblionumber'); diff --git a/catalogue/search.pl b/catalogue/search.pl index 32e3bf46a3..8cb737d323 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -145,7 +145,6 @@ use C4::Auth qw(:DEFAULT get_session); use C4::Search; use C4::Languages qw(getAllLanguages); use C4::Koha; -use C4::Members qw(GetMember); use C4::VirtualShelves qw(GetRecentShelves); use POSIX qw(ceil floor); use C4::Branch; # GetBranches @@ -182,16 +181,6 @@ if (C4::Context->preference("marcflavour") eq "UNIMARC" ) { $template->param('UNIMARC' => 1); } -if($cgi->cookie("holdfor")){ - my $holdfor_patron = GetMember('borrowernumber' => $cgi->cookie("holdfor")); - $template->param( - holdfor => $cgi->cookie("holdfor"), - holdfor_surname => $holdfor_patron->{'surname'}, - holdfor_firstname => $holdfor_patron->{'firstname'}, - holdfor_cardnumber => $holdfor_patron->{'cardnumber'}, - ); -} - ## URI Re-Writing # Deprecated, but preserved because it's interesting :-) # The same thing can be accomplished with mod_rewrite in 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 5a09fb6cca..b6d439d1dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -439,7 +439,6 @@ ul.toolbar { ul.toolbar button { padding-bottom : 2px; - font-family: arial, verdana, helvetica, sans-serif; } .yui-menu-button { @@ -928,16 +927,13 @@ fieldset.rows .inputnote { } #placehold a, -#placehold button, -#holdfor .first-child { +#placehold button { padding-left : 34px; background-image: url("../../img/toolbar-hold.gif"); background-position : center left; background-repeat : no-repeat; } -#holdfor .first-child { padding-left : 17px; } - #editmenuc .first-child, #deleteshelf .first-child,#newmenuc .first-child, #addbiblio .first-child, #z3950search .first-child, #printmenuc .first-child, #newsupplier .first-child, #savemenuc .first-child, #budgets_menuc .first-child, #periods_menuc .first-child { padding-left : 15px; } @@ -1417,11 +1413,6 @@ li.email { padding : .1em 0 .1em 1em; } -/* Hack just for Firefox */ -html>/**/body #searchheader button, x:-moz-any-link, x:default { - padding-bottom : 3px; -} - #searchheader h3 { } 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 17016ecc88..8d4e02e024 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -148,31 +148,7 @@ function confirm_items_deletion() { container: this, onclick: {fn: printBiblio } }); - - - // Create an array of YAHOO.widget.MenuItem configuration properties - var onButtonClick = function () { - location.href="/cgi-bin/koha/reserve/request.pl?biblionumber="; - } - var HoldForButtonMenu = [ - { text: "Place hold", url: "/cgi-bin/koha/reserve/request.pl?biblionumber=" }, - { text: "Place hold for ()", url: "/cgi-bin/koha/reserve/request.pl?biblionumber=&findborrower=" } - ]; - // Instantiate a Split Button using the array of YAHOO.widget.MenuItem - // configuration properties as the value for the "menu" - // configuration attribute. - - var HoldForButton = new YAHOO.widget.Button({ - id: "holdfor", - type: "split", - label: "Place hold", - name: "holdfor", - menu: HoldForButtonMenu, - container: this, - onclick: { fn: onButtonClick } - }); - new YAHOO.widget.Button({ id: "placehold", type: "link", @@ -180,8 +156,6 @@ function confirm_items_deletion() { container: this, href: "/cgi-bin/koha/reserve/request.pl?biblionumber=" }); - - new YAHOO.widget.Button({ id: "z3950search", diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc index e14590d9c4..976de151d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc @@ -36,8 +36,11 @@ function update_child() { // prepare DOM for YUI Toolbar $(document).ready(function() { - $("#printslip,#patronflags,#deletepatron").parent().remove(); - $("#moremenuc,#printmenuc,#searchtoholdc").empty(); + $("#printslip").parent().remove(); + $("#patronflags").parent().remove(); + $("#deletepatron").parent().remove(); + $("#moremenuc").empty(); + $("#printmenuc").empty(); yuiToolbar(); }); @@ -46,12 +49,7 @@ function update_child() { window.open("/cgi-bin/koha/members/moremember.pl?borrowernumber=&print=" + print_type, "printwindow"); return false; } - function searchToHold(){ - var date = new Date(); - date.setTime(date.getTime() + (10 * 60 * 1000)); - $.cookie("holdfor", "", { path: "/", expires: date }); - location.href="/cgi-bin/koha/catalogue/search.pl"; - } + function yuiToolbar() { var printmenu = [ @@ -78,14 +76,8 @@ function update_child() { name: "printmenubutton", menu: printmenu, container: "printmenuc" - }); - new YAHOO.widget.Button({ - id: "searchtohold", - type: "button", - label: _("Search to hold"), - container: "searchtoholdc", - onclick: {fn: searchToHold } - }); + }); + new YAHOO.widget.Button({ type: "menu", label: _("More"), @@ -93,7 +85,7 @@ function update_child() { menu: moremenu, container: "moremenuc" }); - + new YAHOO.widget.Button("addchild"); new YAHOO.widget.Button("editpatron"); new YAHOO.widget.Button("addnote"); @@ -101,7 +93,7 @@ function update_child() { new YAHOO.widget.Button("changepassword"); new YAHOO.widget.Button("printslip"); new YAHOO.widget.Button("printpage"); - new YAHOO.widget.Button("renewpatron"); + new YAHOO.widget.Button("renewpatron"); @@ -135,12 +127,12 @@ function update_child() {
  • &category_type=C">Add child
    • +">Add Note -->
  • ">Change Password
  • ">Change Password
  • &print=page">Print Page
  • &print=slip">Print Slip
    • -
  • Search to hold
  • ">Renew Account
    • 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 39be3215bc..42f9df2d7c 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 @@ -30,7 +30,6 @@ - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index 18a7a699a0..6f22d4649e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -34,8 +34,11 @@ function update_child() { // prepare DOM for YUI Toolbar $(document).ready(function() { - $("#printslip,#patronflags,#deletepatron").parent().remove(); - $("#moremenuc,#printmenuc,#searchtoholdc").empty(); + $("#printslip").parent().remove(); + $("#patronflags").parent().remove(); + $("#deletepatron").parent().remove(); + $("#moremenuc").empty(); + $("#printmenuc").empty(); yuiToolbar(); }); @@ -44,12 +47,7 @@ function update_child() { window.open("/cgi-bin/koha/members/moremember.pl?borrowernumber=&print=" + print_type, "printwindow"); return false; } - function searchToHold(){ - var date = new Date(); - date.setTime(date.getTime() + (10 * 60 * 1000)); - $.cookie("holdfor", "", { path: "/", expires: date }); - location.href="/cgi-bin/koha/catalogue/search.pl"; - } + function yuiToolbar() { var printmenu = [ { text: _("Print Page"), onclick: {fn: function(){printx_window("page")}} }, @@ -72,14 +70,6 @@ function update_child() { container: "printmenuc" }); - new YAHOO.widget.Button({ - id: "searchtohold", - type: "button", - label: _("Search to hold"), - container: "searchtoholdc", - onclick: {fn: searchToHold } - }); - new YAHOO.widget.Button({ type: "menu", label: _("More"), @@ -118,9 +108,9 @@ function update_child() {
  • &category_type=C">Add child
    • +">Add Note -->
  • ">Change Password
  • &print=page">Print Page
  • &print=slip">Print Slip
    • -
  • Search to hold
  • ">Renew Account
  • ">Set Permissions
  • Delete
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.cookie.min.js b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.cookie.min.js deleted file mode 100644 index eb129db969..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.cookie.min.js +++ /dev/null @@ -1 +0,0 @@ -jQuery.cookie=function(b,j,m){if(typeof j!="undefined"){m=m||{};if(j===null){j="";m.expires=-1}var e="";if(m.expires&&(typeof m.expires=="number"||m.expires.toUTCString)){var f;if(typeof m.expires=="number"){f=new Date();f.setTime(f.getTime()+(m.expires*24*60*60*1000))}else{f=m.expires}e="; expires="+f.toUTCString()}var l=m.path?"; path="+(m.path):"";var g=m.domain?"; domain="+(m.domain):"";var a=m.secure?"; secure":"";document.cookie=[b,"=",encodeURIComponent(j),e,l,g,a].join("")}else{var d=null;if(document.cookie&&document.cookie!=""){var k=document.cookie.split(";");for(var h=0;h // // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html function verify_images() { @@ -22,6 +21,7 @@ function verify_images() { } }); } +var q_array = new Array(); // will hold search terms, if present $(window).load(function() { verify_images(); @@ -30,33 +30,13 @@ $(window).load(function() { function Dopop(link) { newin=window.open(link,'popup','width=500,height=500,toolbar=false,scrollbars=yes,resizeable=yes'); } -function cartList(){ - if($("#addto").find("option:selected").attr("value") == "addtolist"){ - var shelfnumber = $("#addto").find("option:selected").attr("id").replace("s",""); - if (vShelfAdd()) { - Dopop('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?shelfnumber='+shelfnumber+'&confirm=1&' + vShelfAdd()); - } - return false; - } else if($("#addto").find("option:selected").attr("value") == "newlist"){ - if (vShelfAdd()) { - Dopop('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?newshelf=1&' + vShelfAdd()); - } - return false; - } - if($("#addto").find("option:selected").attr("value") == "addtocart"){ - addMultiple(); - return false; - } -} -$(window).load(function() { - new YAHOO.widget.Button("cartsubmit", { onclick: { fn: cartList }}); -}); $(document).ready(function() { -$("#placeholdc").empty(); $('#sortbyform').find("input:submit").hide(); $('#sort_by').change(function() { $('#sortbyform').submit(); }); + + $(".addtocart").show(); var param1 = "