Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 6739: (follow-up) template changes for the bootstrap theme

Browse source 
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes QA script, t, xt and t/db_dependent/Members*.

Testing notes:
    - Database update
      * Changes to kohastructure match changes done by the updatedatabase
        statement. Feature is activated by default!
      * Ran database update succesfully.
      * Note: Expired patrons are now blocked by default in new
        AND in updated installations.
    - System preference
      * Verified system preference shows up correctly.
    - Category configuration
      * Add new patron category
      * Edit existing patron category
      * Delete patron category
      * Check patron category summary table.
      => Verified all actions work as expected.
      => Verified chosen value for BlockExpiredPatronOpacActions
         is always displayed and saved correctly.
      * Note: The new value is missing from the summary table.
      * Note: The new value is also not shown when deleting a patron
        category.
    - Check functionality
      * Renew and place a hold for an NOT EXPIRED patron with
        a) category: use syspref (default)
           syspref: block  (default)
        b) category: use syspref (default)
           syspref: don't block
        c) category: block
           syspref: don't block
        d) category: block
           syspref: block
        e) category: don't block
           sypref: block
        f) category: don't block
           syspref: don't block
        Holds and renewals were always possible.
      * Also verified that the warning from NotifyBorrowerDeparture
        still shows up correctly.
      * Verified holds and renewals are still blocked, when the
        user has a restriction with a date in the future.
      * Renew and place a hold for an EXPIRED patron with
        a) category: use syspref (default)
           syspref: block  (default)
           Holds and renewals blocked.
        b) category: use syspref (default)
           syspref: don't block
           Holds an renewals possible.
        c) category: block
           syspref: don't block
           Holds and renewals blocked.
        d) category: block
           syspref: block
           Holds and renewals blocked.
        e) category: don't block
           sypref: block
           Holds and renewals possible.
        f) category: don't block
           syspref: don't block
           Holds and renewals possible.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Jonathan Druart 2014-01-15 11:53:56 +01:00 committed by Galen Charlton
parent fd3985eb6c
commit 4db91211aa
2 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
View file

@ -77,6 +77,10 @@
<div id="bad_data" class="alert">ERROR: Internal error: incomplete hold request.</div> <div id="bad_data" class="alert">ERROR: Internal error: incomplete hold request.</div>
[% END %] [% END %]
[% IF ( expired_patron ) %]
<div id="expired_patron" class="alert"><strong>Sorry</strong>, you cannot place holds because your library card has expired.</p><p>Please contact your librarian if you wish to renew your card.</div>
[% END %]
[% ELSE %] [% ELSE %]
[% IF ( none_available ) %] [% IF ( none_available ) %]

35
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
View file

@ -57,7 +57,25 @@
[% IF ( BORROWER_INF.warnexpired ) %] [% IF ( BORROWER_INF.warnexpired ) %]
<div class="alert" id="warnexpired"> <div class="alert" id="warnexpired">
<strong>Please note:</strong><span> Your card has expired. Please contact the library for more information.</span> <strong>Please note: </strong><span>Your account has expired as of [% BORROWER_INF.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account.</span>
</div>
[% END %]
[% IF ( RENEW_ERROR ) %]
<div class="dialog alert">
<strong>Please note:</strong>
<span>
Your account renewal failed because of the following:
[% FOREACH error IN RENEW_ERROR.split('\|') %]
[% IF error == 'card_expired' %]
Your account has expired. Please contact the library for more information.
[% ELSIF error == 'too_many' %]
You have renewed this item the maximum number of times allowed.
[% ELSIF error == 'on_reserve' %]
This item is on hold for another patron.
[% END %]
[% END %]
</span>
</div> </div>
[% END %] [% END %]
@ -115,7 +133,7 @@
<th>Barcode</th> <th>Barcode</th>
[% END %] [% END %]
<th>Call No.</th> <th>Call No.</th>
[% IF ( OpacRenewalAllowed ) %] [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
<th class="nosort">Renew</th> <th class="nosort">Renew</th>
[% END %] [% END %]
[% IF ( OPACFinesTab ) %] [% IF ( OPACFinesTab ) %]
@ -201,7 +219,7 @@
<span class="tdlabel">Call number:</span> <span class="tdlabel">Call number:</span>
[% ISSUE.itemcallnumber %] [% ISSUE.itemcallnumber %]
</td> </td>
[% IF ( OpacRenewalAllowed ) %] [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
<td class="renew"> <td class="renew">
[% IF ( ISSUE.status ) %] [% IF ( ISSUE.status ) %]
[% IF ( canrenew ) %] [% IF ( canrenew ) %]
@ -235,12 +253,12 @@
[% END # /FOREACH ISSUES %] [% END # /FOREACH ISSUES %]
</tbody> </tbody>
</table> </table>
[% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %] [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
<input type="submit" class="btn" value="Renew selected" /> <input type="submit" class="btn" value="Renew selected" />
[% END %] [% END %]
</form> </form>
[% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %] [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
<form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post"> <form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
<input type="hidden" name="from" value="opac_user" /> <input type="hidden" name="from" value="opac_user" />
<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
@ -657,7 +675,7 @@
var MSG_CONFIRM_SUSPEND_HOLDS = _("Are you sure you want to suspend all holds?"); var MSG_CONFIRM_SUSPEND_HOLDS = _("Are you sure you want to suspend all holds?");
var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended holds?"); var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended holds?");
$(function() { $(document).ready(function(){
$('#opac-user-views').tabs(); $('#opac-user-views').tabs();
$(".js-show").show(); $(".js-show").show();
$(".js-hide").hide(); $(".js-hide").hide();
@ -698,8 +716,11 @@
e.preventDefault(); e.preventDefault();
$("#renewall").submit(); $("#renewall").submit();
}); });
$("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>"); [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
$("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");
[% END %]
[% END %] [% END %]
$( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future $( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future
}); });
//]]> //]]>