From ebf438cccedd6f9c348bfa4f1e97fe2a171490f4 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 26 Oct 2018 16:15:39 +0000 Subject: [PATCH] Bug 21693: Clean up checkout notes template This patch modifies the checkout notes template to help compliance with coding guidelines and interface patterns: - Convert to Bootstrap grid - Improve DataTables configuration - Put buttons into a toolbar and move above selection links Also corrected: Minor markup error in circ-nav.inc To test, apply the patch and enable the AllowCheckoutNotes system preference. Add a few checkout notes via the OPAC. - Go to Circulation -> Checkout notes. - Confirm that the page looks correct at various browser widths. - Confirm that the first and last columns of the table of notes are not sortable. - The table should be sorted by default by title. - Title sorting should ignore articles "a," "an," and "the." - Test with the CircSidebar preference both on and off. - With CircSidebar turn on, the checkout notes menu item in the left hand sidebar should show a count of checkout notes. Signed-off-by: Pierre-Marc Thibault --- .../intranet-tmpl/prog/en/includes/circ-nav.inc | 2 +- .../prog/en/modules/circ/checkout-notes.tt | 67 +++++++++++++--------- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc index 48f28d9..bba7bea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc @@ -21,7 +21,7 @@
  • Fast cataloging
  • [% END %][% END %] [% IF Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes %] -
  • Checkout notes [% IF pending_checkout_notes.count %][% pending_checkout_notes.count | html %][% END %]
  • +
  • Checkout notes [% IF pending_checkout_notes.count %][% pending_checkout_notes.count | html %][% END %]
  • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt index dbad745..f56a807 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt @@ -20,10 +20,17 @@ Checkout notes -[% IF Koha.Preference('CircSidebar') %]
    [% ELSE %]
    [% END %] -
    -
    - [% IF Koha.Preference('CircSidebar') %]
    [% END %] +
    +
    +
    +
    +
    + + [% IF Koha.Preference('CircSidebar') %] +
    + [% ELSE %] +
    + [% END %]

    Checkout notes

    @@ -42,6 +49,11 @@ [% END %] [% IF ( notes.count ) %] +
    + + +
    +
    Select all | Clear all @@ -50,22 +62,16 @@
    - -
    - - -
    - - - + + - + @@ -98,21 +104,24 @@ [% ELSE %] - There are currently no checkout notes. +
    There are currently no checkout notes.
    [% END %] - - - [% IF Koha.Preference('CircSidebar') %] - - -
    - [% INCLUDE 'circ-nav.inc' %] -
    - [% END %] + [% IF Koha.Preference('CircSidebar') %] + +
    + +
    + [% ELSE %] + + [% END %] - - + + + + [% MACRO jsinclude BLOCK %] [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] @@ -121,11 +130,13 @@
     Title Title Note Date Set by StatusActionsActions