Attachment #5571 for bug #5898

View | Details | Raw Unified | Return to bug 5898
Collapse All | Expand All

Lines 436-441 div#toolbar { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (+12 lines)
436	margin-bottom : .7em;	436	margin-bottom : .7em;
437	}	437	}
438		438
		439	div#toolbar .yui-menu-button button,
		440	div#toolbar .yui-button-button button {
		441	line-height : 1.7em;
		442	}
		443
439	ul.toolbar {	444	ul.toolbar {
440	padding-left : 0;	445	padding-left : 0;
441	}	446	}
Lines 948-953 fieldset.rows .inputnote { Link Here
948	background-repeat : no-repeat;	953	background-repeat : no-repeat;
949	}	954	}
950		955
		956	#placeholdc #yui-gen13 { border-top : 1px solid #CCCCCC; margin-top : .3em; }
		957
951	#holdfor .first-child { padding-left : 17px; }	958	#holdfor .first-child { padding-left : 17px; }
952		959
953	#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 {	960	#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 {
Lines 1492-1497 html>/**/body #searchheader button, x:-moz-any-link, x:default { Link Here
1492	padding : 5px 25em 0 0;	1499	padding : 5px 25em 0 0;
1493	}	1500	}
1494		1501
		1502	#searchheader .yui-button button,
		1503	#searchheader .yui-button a {
		1504	line-height : 1.5em;
		1505	}
		1506
1495	#search-facets ul {	1507	#search-facets ul {
1496	margin : 0;	1508	margin : 0;
1497	padding : .3em;	1509	padding : .3em;

Lines 65-73 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (-2 / +2 lines)
65	[% loggedinusername %]	65	[% loggedinusername %]
66	</span>	66	</span>
67	[% IF ( intranetbookbag ) %]	67	[% IF ( intranetbookbag ) %]
68	(<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="delBasket(true);">Log Out</a>) \|	68	(<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket(true);">Log Out</a>) \|
69	[% ELSE %]	69	[% ELSE %]
70	(<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>) \|	70	(<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor();">Log Out</a>) \|
71	[% END %]	71	[% END %]
72	[% ELSE %]	72	[% ELSE %]
73	You are not logged in \|	73	You are not logged in \|

Lines 89-91 function checkEnter(e){ //e is event object passed from function invocation Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js (+4 lines)
89	return true;	89	return true;
90	}	90	}
91	}	91	}
		92
		93	function clearHoldFor(){
		94	$.cookie("holdfor",null, { path: "/", expires: 0 });
		95	}




    $("#hold_form").submit();
    return false;
}

function forgetPatron(){
    $.cookie("holdfor",null, { path: "/", expires: 0 });
    $(".holdforlink").remove();
    $("#placeholdc").empty();
    new YAHOO.widget.Button({
    id: "placehold",
    type: "button",
    label: _("Place hold"),
    container: "placeholdc",
    onclick: { fn: placeHold }
 });
}

function addToList () {
    var checkedItems = $(".selection:checked");
    if ($(checkedItems).size() == 0) {

        }
        var HoldForButtonMenu = [
            { text: "Place hold", onclick: { fn: holdFor }},
            { text: "Place hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", onclick: { fn: holdForPatron }},
            { text: "Forget [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", onclick: { fn: forgetPatron }}];

        var HoldForButton = new YAHOO.widget.Button({
                type: "split",

        [% ELSE %]
        new YAHOO.widget.Button({
            id: "placehold",
            type: "button",
            label: _("Place hold"),
            container: "placeholdc",
            onclick: { fn: placeHold }

                                  <span class="noholdstext">No holds allowed</span>
                              [% ELSE %]
                                  <a id="reserve_[% SEARCH_RESULT.biblionumber %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Holds</a>
                                  [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]&amp;findborrower=[% holdfor_cardnumber %]">Hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])</a></span>[% END %]
                              [% END %]
                          [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
                          | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Edit record</a>

Lines 9-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +1 lines)
9	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>	9	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
10	<script type="text/javascript">	10	<script type="text/javascript">
11	//<![CDATA[	11	//<![CDATA[
12	[% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% END %]	12	[% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %]
13	[% IF ( UseTablesortForCirc ) %]$.tablesorter.addParser({	13	[% IF ( UseTablesortForCirc ) %]$.tablesorter.addParser({
14	id: 'articles',	14	id: 'articles',
15	is: function(s) {return false; },	15	is: function(s) {return false; },
16	-

Return to bug 5898

Lines 136-141 function placeHold () { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-4 / +18 lines)
136	$("#hold_form").submit();	136	$("#hold_form").submit();
137	return false;	137	return false;
138	}	138	}
		139
		140	function forgetPatron(){
		141	$.cookie("holdfor",null, { path: "/", expires: 0 });
		142	$(".holdforlink").remove();
		143	$("#placeholdc").empty();
		144	new YAHOO.widget.Button({
		145	id: "placehold",
		146	type: "button",
		147	label: _("Place hold"),
		148	container: "placeholdc",
		149	onclick: { fn: placeHold }
		150	});
		151	}
		152
139	function addToList () {	153	function addToList () {
140	var checkedItems = $(".selection:checked");	154	var checkedItems = $(".selection:checked");
141	if ($(checkedItems).size() == 0) {	155	if ($(checkedItems).size() == 0) {
Lines 181-188 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
181	}	195	}
182	var HoldForButtonMenu = [	196	var HoldForButtonMenu = [
183	{ text: "Place hold", onclick: { fn: holdFor }},	197	{ text: "Place hold", onclick: { fn: holdFor }},
184	{ text: "Place hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", onclick: { fn: holdForPatron }}	198	{ text: "Place hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", onclick: { fn: holdForPatron }},
185	];	199	{ text: "Forget [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", onclick: { fn: forgetPatron }}];
186		200
187	var HoldForButton = new YAHOO.widget.Button({	201	var HoldForButton = new YAHOO.widget.Button({
188	type: "split",	202	type: "split",
Lines 195-201 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
195	[% ELSE %]	209	[% ELSE %]
196	new YAHOO.widget.Button({	210	new YAHOO.widget.Button({
197	id: "placehold",	211	id: "placehold",
198	type: "link",	212	type: "button",
199	label: _("Place hold"),	213	label: _("Place hold"),
200	container: "placeholdc",	214	container: "placeholdc",
201	onclick: { fn: placeHold }	215	onclick: { fn: placeHold }
Lines 499-505 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
499	<span class="noholdstext">No holds allowed</span>	513	<span class="noholdstext">No holds allowed</span>
500	[% ELSE %]	514	[% ELSE %]
501	<a id="reserve_[% SEARCH_RESULT.biblionumber %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Holds</a>	515	<a id="reserve_[% SEARCH_RESULT.biblionumber %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Holds</a>
502	[% IF ( holdfor ) %] \| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]&findborrower=[% holdfor_cardnumber %]">Hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])</a>[% END %]	516	[% IF ( holdfor ) %] <span class="holdforlink">\| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]&findborrower=[% holdfor_cardnumber %]">Hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])</a></span>[% END %]
503	[% END %]	517	[% END %]
504	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]	518	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
505	\| <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Edit record</a>	519	\| <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Edit record</a>