From 377006ebe5a0e87a6f7517f0cb347a958c95a997 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 11 Jul 2019 18:59:21 +0000 Subject: [PATCH] Bug 23304: Reindent cataloguing/z3950_search.tt This patch reindents cataloguing/z3950_search.tt to use four spaces and to eliminate tabs, following coding guidelines. Trailing white space has been removed, and some minor markup errors have been corrected for validity. To test, apply the patch and use your preferred method for checking the differences between files while ignoring whitespace. I use diff with the "-w" flag, but I'm not giving orders, you do you. Go to Cataloging -> New from Z39.50/SRU. Test that the search form and results look correct and work correctly. Signed-off-by: Nadine Pierre Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize --- .../en/modules/cataloguing/z3950_search.tt | 383 ++++++++++-------- 1 file changed, 205 insertions(+), 178 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt index 0a01aee147..85e512e916 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt @@ -6,201 +6,229 @@ Koha › Z39.50/SRU search results [% INCLUDE 'doc-head-close.inc' %] - +
+ [% IF ( opsearch ) %] +

Z39.50/SRU search

+
+
+
+ +
+
    +
  1. + +
    2. +
  2. +
    3. +
  3. +
    4. +
  4. +
    5. +
  5. +
    6. +
  6. +
    7. +
  7. +
    8. +
  8. +
    9. +
  9. +
    10. +
  10. +
    11. +
  11. + Clear search form +
    12. +
+ + +
+
- [% IF ( opsearch ) %] -

Z39.50/SRU search

- -
-
- -
-
    -
    2. -
    3. -
    4. -
    5. -
    6. -
    7. -
    8. -
    9. -
    10. -
    11. -
  11. Clear search form
    12. -
- - -
-
-

Search targets

-
- Select all | Clear all - [% FOREACH serverloo IN serverloop %] -

- [% IF ( serverloo.checked ) %] - - [% ELSE %] - - [% END %] - +

+

Search targets

+
+ + Select all | + Clear all + + [% FOREACH serverloo IN serverloop %] +

+ [% IF ( serverloo.checked ) %] + + [% ELSE %] + + [% END %] + +

+ [% END %] +
+
+
-

- [% END %] -
-
-
- -
+ + + [% ELSE %] -[% ELSE %] -
-
-

Results

-

You searched for: - [% IF ( title ) %]Title: [% title | html %] [% END %] - [% IF ( author ) %]Author: [% author | html %] [% END %] - [% IF ( isbn ) %]ISBN: [% isbn | html %] [% END %] - [% IF ( issn ) %]ISSN: [% issn | html %] [% END %] - [% IF ( lccall ) %]LC call number: [% lccall | html %] [% END %] - [% IF ( subject ) %]Subject heading: [% subject | html %] [% END %] - [% IF ( controlnumber ) %]Control no: [% controlnumber | html %] [% END %] - [% IF ( dewey ) %]Dewey: [% dewey | html %] [%END %] - [% IF ( srchany ) %]Raw (any): [% srchany | html %] [% END %] - [% IF ( stdid ) %]Standard ID: [% stdid | html %] [% END %] -

- [% IF ( errconn ) %] -
-
    - [% FOREACH errcon IN errconn %] - [% IF ( errcon.error == '10000' ) %]
  • Connection failed to [% errcon.server | html %]
    • - [% ELSIF ( errcon.error == '10007' ) %]
  • Connection timeout to [% errcon.server | html %]
    • - [% ELSIF errcon.error.match( '^XSLTH' ) %]
  • [% errcon.server | html %] record [% errcon.seq | html %]: [% PROCESS 'xslt-handler.inc' code=errcon.error %]
    • - [% ELSE %]
  • [% errcon.server | html %] record [% errcon.seq | html %]: [% errcon.error | html %]
    • +
    +
    +

    Results

    +

    + You searched for: + [% IF ( title ) %]Title: [% title | html %] [% END %] + [% IF ( author ) %]Author: [% author | html %] [% END %] + [% IF ( isbn ) %]ISBN: [% isbn | html %] [% END %] + [% IF ( issn ) %]ISSN: [% issn | html %] [% END %] + [% IF ( lccall ) %]LC call number: [% lccall | html %] [% END %] + [% IF ( subject ) %]Subject heading: [% subject | html %] [% END %] + [% IF ( controlnumber ) %]Control no: [% controlnumber | html %] [% END %] + [% IF ( dewey ) %]Dewey: [% dewey | html %] [%END %] + [% IF ( srchany ) %]Raw (any): [% srchany | html %] [% END %] + [% IF ( stdid ) %]Standard ID: [% stdid | html %] [% END %] +

    + [% IF ( errconn ) %] +
    +
      + [% FOREACH errcon IN errconn %] + [% IF ( errcon.error == '10000' ) %]
    • Connection failed to [% errcon.server | html %]
      • + [% ELSIF ( errcon.error == '10007' ) %]
    • Connection timeout to [% errcon.server | html %]
      • + [% ELSIF errcon.error.match( '^XSLTH' ) %]
    • [% errcon.server | html %] record [% errcon.seq | html %]: [% PROCESS 'xslt-handler.inc' code=errcon.error %]
      • + [% ELSE %]
    • [% errcon.server | html %] record [% errcon.seq | html %]: [% errcon.error | html %]
      • + [% END %] + [% END %] +
    +
    [% END %] - [% END %] -
-
- [% END %] - [% IF ( breeding_loop ) %] - - - - - - - - - - [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %] - - [% END %] - - - [% FOREACH breeding_loo IN breeding_loop %] - [% IF ( breeding_loo.breedingid ) %] + [% IF ( breeding_loop ) %] +
ServerTitleAuthorDateEditionISBNLCCNAdditional fieldsActions
+ + + + + + + + + + [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %] + + [% END %] + + + + + [% FOREACH breeding_loo IN breeding_loop %] + [% IF ( breeding_loo.breedingid ) %] + + + + + + + + + [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %] + + [% END %] + + + [% END %] + [% END %] + +
ServerTitleAuthorDateEditionISBNLCCNAdditional fieldsActions
[% breeding_loo.server | html %][% breeding_loo.title | html %][% breeding_loo.author | html %][% breeding_loo.date | html %][% breeding_loo.edition | html %][% breeding_loo.isbn | html %][% breeding_loo.lccn | html %] +
+ [% FOREACH addnumberfield IN breeding_loo.addnumberfields %] + [% FOREACH string IN breeding_loo.$addnumberfield %] +
[% addnumberfield | html %]:
+
[% string | html %]
+ [% END %] + [% END %] +
+ 		+
+ + Actions + + +
+
- - [% breeding_loo.server | html %] - [% breeding_loo.title | html %] - [% breeding_loo.author | html %] - [% breeding_loo.date | html %] - [% breeding_loo.edition | html %] - [% breeding_loo.isbn | html %] - [% breeding_loo.lccn | html %] - [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %] - -
- [% FOREACH addnumberfield IN breeding_loo.addnumberfields %] - [% FOREACH string IN breeding_loo.$addnumberfield %] -
[% addnumberfield | html %]:
-
[% string | html %]
- [% END %] - [% END %] -
- - [% END %] - -
- - Actions - - -
- - - [% END %] - [% END %] - + - +
+ + + + + + + + + + + + + + [% FOREACH server IN servers %] + + [% END %] - - - - - - - - - - - - - - + [% IF ( show_prevbutton ) %] + + [% END %] + Page [% current_page | html %] / [% total_pages | html %] + [% IF ( show_nextbutton ) %] + + [% END %] +
Go to page : +
- [% FOREACH server IN servers %] - - [% END %] + [% ELSE %] +
Nothing found.
+ [% END %] - [% IF ( show_prevbutton ) %] - - [% END %] - Page [% current_page | html %] / [% total_pages | html %] - [% IF ( show_nextbutton ) %] - +
+

+ + + +

+
+
+
[% END %] -
Go to page : - - - [% ELSE %] -
Nothing found.
- [% END %] -

-[% END %] - -
- -[% IF ( numberpending ) %]

Still [% numberpending | html %] servers to search

[% END %] + [% IF ( numberpending ) %] +

Still [% numberpending | html %] servers to search

+ [% END %] [% MACRO jsinclude BLOCK %] [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] @@ -253,7 +281,6 @@ "left" : left, "right" : "unset" }); - } }); }); -- 2.39.5