Attachment #47880 for bug #15681

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

Lines 86-92 Link Here

(-)a/koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.css (-1 / +1 lines)
86	.container:after{clear:both;}	86	.container:after{clear:both;}
87	.container-fluid{padding-right:20px;padding-left:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";line-height:0;}	87	.container-fluid{padding-right:20px;padding-left:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";line-height:0;}
88	.container-fluid:after{clear:both;}	88	.container-fluid:after{clear:both;}
89	.btn{display:inline-block;display:inline;zoom:1;padding:4px 12px;margin-bottom:0;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #bbbbbb;border:0;border-bottom-color:#a2a2a2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;background-color:#d9d9d9;}	89	.btn{display:inline-block;display:inline;zoom:1;padding:4px 12px;margin-bottom:3px;margin-top:3px;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #bbbbbb;border:0;border-bottom-color:#a2a2a2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;background-color:#d9d9d9;}
90	.btn:active,.btn.active{background-color:#cccccc \9;}	90	.btn:active,.btn.active{background-color:#cccccc \9;}
91	.btn:first-child{*margin-left:0;}	91	.btn:first-child{*margin-left:0;}
92	.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}	92	.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}




    [% END %]
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
    <input type="hidden" name="branch" value="[% branch %]" />
    <div class="btn-group">
    [% IF ( RENEW_ISSUE ) %]
    <button type="submit" class="btn btn-medium" accesskey="y"><i class="fa fa-check"></i> Yes, renew (Y)</button>
    [% ELSE %]
    <button type="submit" class="btn btn-medium" accesskey="y"><i class="fa fa-check"></i> Yes, check out (Y)</button>
    [% END %]
    <input type="hidden" name="onsite_checkout" value="[% onsite_checkout %]" />
    </div>
</form>
[% END %]


    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
    <input type="hidden" name="restoreduedatespec" />
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
    <div class="btn-group">
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
        [% IF ( RENEW_ISSUE ) %]
        <button type="submit" class="btn btn-medium" accesskey="n"><i class="fa fa-times"></i> No, don't renew (N)</button>
        [% ELSE %]
        <button type="submit" class="btn btn-medium" accesskey="n"><i class="fa fa-times"></i> No, don't check out (N)</button>
        [% END %]
    [% ELSE %]
        <button type="submit" class="btn btn-medium"><i class="fa fa-check"></i> Continue</button>
    [% END %]
    </div>
</form>

[% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]
    [% UNLESS flagged && noissues %]
        <button type="submit" class="btn btn-medium" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% borrowernumber %]'"><i class="fa fa-times-circle"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>[% END %]
    [% END %]
[% END %]
</div></div>
[% END %] <!-- NEEDSCONFIRMATION -->
- 

Return to bug 15681

Lines 362-373 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-8 / +10 lines)
362	[% END %]	362	[% END %]
363	<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />	363	<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
364	<input type="hidden" name="branch" value="[% branch %]" />	364	<input type="hidden" name="branch" value="[% branch %]" />
		365	<div class="btn-group">
365	[% IF ( RENEW_ISSUE ) %]	366	[% IF ( RENEW_ISSUE ) %]
366	<input type="submit" class="approve" value="Yes, renew (Y)" accesskey="y" />	367	<button type="submit" class="btn btn-medium" accesskey="y"><i class="fa fa-check"></i> Yes, renew (Y)</button>
367	[% ELSE %]	368	[% ELSE %]
368	<input type="submit" class="approve" value="Yes, check out (Y)" accesskey="y" />	369	<button type="submit" class="btn btn-medium" accesskey="y"><i class="fa fa-check"></i> Yes, check out (Y)</button>
369	[% END %]	370	[% END %]
370	<input type="hidden" name="onsite_checkout" value="[% onsite_checkout %]" />	371	<input type="hidden" name="onsite_checkout" value="[% onsite_checkout %]" />
		372	</div>
371	</form>	373	</form>
372	[% END %]	374	[% END %]
373		375
Lines 397-417 $(document).ready(function() { Link Here
397	<input type="hidden" name="duedatespec" value="[% duedatespec %]" />	399	<input type="hidden" name="duedatespec" value="[% duedatespec %]" />
398	<input type="hidden" name="restoreduedatespec" />	400	<input type="hidden" name="restoreduedatespec" />
399	<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />	401	<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
		402	<div class="btn-group">
400	[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]	403	[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
401	[% IF ( RENEW_ISSUE ) %]	404	[% IF ( RENEW_ISSUE ) %]
402	<input type="submit" class="deny" value="No, don't renew (N)" accesskey="n" />	405	<button type="submit" class="btn btn-medium" accesskey="n"><i class="fa fa-times"></i> No, don't renew (N)</button>
403	[% ELSE %]	406	[% ELSE %]
404	<input type="submit" class="deny" value="No, don't check out (N)" accesskey="n" />	407	<button type="submit" class="btn btn-medium" accesskey="n"><i class="fa fa-times"></i> No, don't check out (N)</button>
405	[% END %]	408	[% END %]
406	[% ELSE %]	409	[% ELSE %]
407	<input type="submit" class="deny" value="Continue" />	410	<button type="submit" class="btn btn-medium"><i class="fa fa-check"></i> Continue</button>
408	[% END %]	411	[% END %]
		412	</div>
409	</form>	413	</form>
410		414
411	[% IF ( RESERVED \|\| ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]	415	[% IF ( RESERVED \|\| ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]
412	[% UNLESS flagged && noissues %]	416	[% UNLESS flagged && noissues %]
413	<div class="circ-checkoutplacehold"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% borrowernumber %]">Click here to place a hold for [% INCLUDE 'patron-title.inc' %]</a></div>	417	<button type="submit" class="btn btn-medium" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% borrowernumber %]'"><i class="fa fa-times-circle"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>[% END %]
414	[% END %]
415	[% END %]	418	[% END %]
416	</div></div>	419	</div></div>
417	[% END %] <!-- NEEDSCONFIRMATION -->	420	[% END %] <!-- NEEDSCONFIRMATION -->
418	-