From babef1a6d9a202bb5e989bc267e49d35a871b1c7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 20 Jul 2016 10:51:30 -0400 Subject: [PATCH] Bug 16946 [Revised] Remove the use of "onclick" from several serials templates This patch modifies several serials module templates to remove the use of event attributes. Events will now be defined in JavaScript. Also changed: - In Serials -> Check expiration, custom form validation has been removed in favor of validation with the plugin. - In Serials -> Claims, the "Clear filter" button has been replaced with a link. Error messages are now styled with the standard "alert" class. - In Serials -> New subscription -> Search for record, the "choose" link is now a Bootstrap button. Pagination links are now styled like other similar links. The "Close" button is now styled as in other popup windows. The "no results found" messages is styled as an informational dialog. - In Serials -> Subscription -> Edit routing list, the "add recipients" and "delete all" controls are now links with Font Awesome icons. To test, apply the patch and: - Go to Serials -> Check expiration. - Try to submit the form without filling in a date. The form validation plugin should warn you that the date field is required. - Submit the form using data which will return results. - Click the "Renew" button for any result. The subscription renewal popup should be triggered for the correct title. - Go to Serials -> Claims. - Select a vendor with missing issues. - Confirm that the date filter works correctly, and that the "Clear filter" link works. - Select one or more result and click the "Send notification" button. The notification should be sent. - Go to Serials -> New subscription. - Click the "Search for record" link to trigger the bibliographic search popup. - Perform a search. Confirm that the "Choose" button selects the correct record and populates the fields in the parent window. - Go to Serials -> Subscription -> Edit routing list. - Confirm that the process of adding recipients to the list works correctly. - Confirm that changing the rank of any recipient works correctly. - Save the routing list and click the "Save and preview routing slip" button on the confirmation page. The slip preview should open. - In the slip preview window, test that the print button works correctly. Signed-off-by: Aleisha QA revision: Removed stray '// -->' and corrected clear filter function Signed-off-by: Jonathan Druart --- .../prog/en/modules/serials/checkexpiration.tt | 30 +++++-------- .../prog/en/modules/serials/claims.tt | 38 ++++++++++------- .../prog/en/modules/serials/result.tt | 49 ++++++++++++++-------- .../en/modules/serials/routing-preview-slip.tt | 14 +++++-- .../prog/en/modules/serials/routing-preview.tt | 14 ++++--- .../prog/en/modules/serials/routing.tt | 23 ++++++---- 6 files changed, 99 insertions(+), 69 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt index 5e573ff..c1f5c75 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt @@ -6,21 +6,13 @@ [% USE Branches %] @@ -132,11 +141,11 @@ [% IF error_claim %] [% IF error_claim == 'no_vendor_email' %] -
This vendor has no email defined for late issues.
+
This vendor has no email defined for late issues.
[% ELSIF error_claim == 'no_loggedin_user_email' %] -
No email is configured for your user.
+
No email is configured for your user.
[% ELSE %] -
[% error_claim %]
+
[% error_claim %]
[% END %] [% END %] [% IF info_claim %] @@ -170,7 +179,7 @@ [% IF ( missingissues ) %]

Missing issues

-
+
Filters : @@ -181,18 +190,15 @@ [% INCLUDE 'date-format.inc' %] - + + Clear filter - -
  • - -
  • -
    + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt index 11ecd18..6566893 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt @@ -3,13 +3,19 @@ [% INCLUDE 'doc-head-close.inc' %] @@ -46,22 +52,31 @@ function GetIt(bibno,title) - - + [% END %]
    [% resultsloo.issn |html %] ChooseChoose
    [% ELSE %] -

    No results found for [% query %]

    -[% END %] -[% IF ( displayprev ) %] -<< -[% END %] -[% IF ( displaynext ) %] ->> + +
    +

    No results found for [% query %]

    +
    + [% END %] + +
    + [% IF ( displayprev ) %] + << Previous + [% END %] + [% IF ( displaynext ) %] + Next >> + [% END %] +
    +

    Search for another record

    -
    Close
    + + + [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt index 5a23158..b5bbf24 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt @@ -1,7 +1,15 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Serials › Routing slip preview [% INCLUDE 'doc-head-close.inc' %] - + @@ -38,9 +46,7 @@

    [% routingnotes %]

    - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt index 6892e1c..7478b11 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt @@ -2,14 +2,17 @@ Koha › Serials › Preview routing list [% INCLUDE 'doc-head-close.inc' %] @@ -27,7 +30,8 @@ function print_slip(subscriptionid,issue){

    Preview routing list for [% title |html %]

    - + +
    1. Issue:[% issue %]
    2. @@ -42,7 +46,7 @@ function print_slip(subscriptionid,issue){
    - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt index 6fccab8..026682a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt @@ -2,8 +2,17 @@ Koha › Serials › [% title |html %] › [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -68,7 +75,7 @@ function reorder_item(sid,rid,rank){ [% FOREACH member IN m_loop %] [% member.name %] - [% rankings = [1 .. m_loop.size] %] [% FOREACH r IN rankings %] [% IF r == member.ranking %] @@ -79,16 +86,16 @@ function reorder_item(sid,rid,rank){ [% END %] - Delete + Delete [% END %] [% END %]

    - + Add recipients [% IF memberloop %] - Delete all + Delete all [% END %]

    -- 2.8.1