From c2cfb45d3d74023a711ce127b71df8c3cc88218a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 18 Jul 2019 14:58:45 +0000 Subject: [PATCH] Bug 23339: Reindent addbooks.tt This patch reindents cataloguing/addbooks.tt to use four spaces, following coding guidelines. 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 you should look into your own heart for the right solution. Go to Cataloging. Test that the initial page and search results view look correct and work correctly. Signed-off-by: Maryse Simard Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize --- .../prog/en/modules/cataloguing/addbooks.tt | 418 +++++++++--------- 1 file changed, 212 insertions(+), 206 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt index 823ad60470..c31fe2ae9b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -7,211 +7,217 @@ -[% INCLUDE 'header.inc' %] -[% INCLUDE 'cataloging-search.inc' %] + [% INCLUDE 'header.inc' %] + [% INCLUDE 'cataloging-search.inc' %] - + -
-
-
+
+
+
-[% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -
- [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %] - Advanced editor - [% END %] -
- - -
- [% IF servers.count > 0 %] -
- - - -
- [% END %] - [% IF ( total ) %] -
- [% END %] -
-[% END %] - [% IF ( noitemsfound ) %] - No results found - [% END %] + [% IF ( noitemsfound ) %] + No results found + [% END %] -[%# display the search results %] + [%# display the search results %] -[% IF ( total ) %] -
- [% total | html %] result(s) found in catalog, - [% breeding_count | html %] result(s) found in reservoir -
-
[% pagination_bar | $raw %]
-
- - - - - - - - [% FOREACH resultsloo IN resultsloop %] - - - - - - - [% END %] -
 TitleLocation 
-

- [% INCLUDE 'biblio-title.inc' biblio=resultsloo %] - [% IF ( resultsloo.summary ) %] -

[% resultsloo.summary | html %]

+ [% IF ( total ) %] +
+ [% total | html %] result(s) found in catalog, + [% breeding_count | html %] result(s) found in reservoir +
+
[% pagination_bar | $raw %]
+
+ + + + + + + + [% FOREACH resultsloo IN resultsloop %] + + + + + + + [% END %] +
 TitleLocation 
+

+ [% INCLUDE 'biblio-title.inc' biblio=resultsloo %] +

+ [% IF ( resultsloo.summary ) %] +

[% resultsloo.summary | html %]

+ [% ELSE %] +

+ [% IF ( resultsloo.author ) %] + [% resultsloo.author | html %] + [% ELSE %] +   + [% END %] + [% IF ( resultsloo.isbn ) %] - [% resultsloo.isbn | html %] [% END %] + [% IF ( resultsloo.publicationyear ) %] - [% resultsloo.publicationyear | html %][% END %] + [% IF ( resultsloo.publishercode ) %]- [% resultsloo.publishercode | html %][% END %] + [% IF ( resultsloo.copyrightdate ) %] - [% resultsloo.copyrightdate | html %][% END %] + [% IF ( resultsloo.edition ) %]Edition: [% resultsloo.edition | html %][% END %] + [% IF ( resultsloo.place ) %] ; [% resultsloo.place | html %][% END %] + [% IF ( resultsloo.pages ) %] - [% resultsloo.pages | html %][% END %] + [% IF ( resultsloo.item('size') ) %] ; [% resultsloo.item('size') | html %][% END %] + [% IF ( resultsloo.timestamp ) %] (modified on [% resultsloo.timestamp | html %])[% END %] +

+ [% END %] + 		+ [% IF ( resultsloo.available_items_loop ) %] + + [% FOREACH items_loo IN resultsloo.available_items_loop %] + [% items_loo.count | html %] [% items_loo.branchname | html %] + [% IF ( items_loo.location ) %][% items_loo.location | html %][% END %] + [% IF ( items_loo.itemcallnumber ) %][% items_loo.itemcallnumber | html %][% END %] + [% IF ( items_loo.classification ) %] + + [% items_loo.classification | html %] + + [% END %] +
+ [% END %] + + [% END %] + + [% IF ( resultsloo.onloancount ) %] Checked out ([% resultsloo.onloancount | html %]),
[% END %] + [% IF ( resultsloo.withdrawncount ) %] Withdrawn ([% resultsloo.withdrawncount | html %]),
[% END %] + [% IF ( resultsloo.itemlostcount ) %] Lost ([% resultsloo.itemlostcount | html %])
[% END %] + [% IF ( resultsloo.orderedcount ) %] On order ([% resultsloo.orderedcount | html %])
[% END %] + [% IF ( resultsloo.notforloancount ) %] Not for loan ([% resultsloo.notforloancount | html %])[% END %] + + 		+
+ + Actions + + +
+
+
[% pagination_bar | $raw %]
+
+
[% ELSE %] -

- [% IF ( resultsloo.author ) %] - [% resultsloo.author | html %] - [% ELSE %] -   - [% END %] - [% IF ( resultsloo.isbn ) %] - [% resultsloo.isbn | html %] [% END %] - [% IF ( resultsloo.publicationyear ) %] - [% resultsloo.publicationyear | html %][% END %] - [% IF ( resultsloo.publishercode ) %]- [% resultsloo.publishercode | html %][% END %] - [% IF ( resultsloo.copyrightdate ) %] - [% resultsloo.copyrightdate | html %][% END %] - [% IF ( resultsloo.edition ) %]Edition: [% resultsloo.edition | html %][% END %] - [% IF ( resultsloo.place ) %] ; [% resultsloo.place | html %][% END %] - [% IF ( resultsloo.pages ) %] - [% resultsloo.pages | html %][% END %] - [% IF ( resultsloo.item('size') ) %] ; [% resultsloo.item('size') | html %][% END %] - [% IF ( resultsloo.timestamp ) %] (modified on [% resultsloo.timestamp | html %])[% END %] -

- [% END %] - 		- [% IF ( resultsloo.available_items_loop ) %] - - [% FOREACH items_loo IN resultsloo.available_items_loop %] - [% items_loo.count | html %] [% items_loo.branchname | html %] - [% IF ( items_loo.location ) %][% items_loo.location | html %][% END %] - [% IF ( items_loo.itemcallnumber ) %][% items_loo.itemcallnumber | html %][% END %] - [% IF ( items_loo.classification ) %] - - [% items_loo.classification | html %] - + [% IF ( query ) %] + [% IF ( error ) %]
[% END %]No results found + [% IF ( error ) %] + Error: [% error | html %]
[% END %] -
- [% END %] - [% END %] - - [% IF ( resultsloo.onloancount ) %] Checked out ([% resultsloo.onloancount | html %]),
[% END %] - [% IF ( resultsloo.withdrawncount ) %] Withdrawn ([% resultsloo.withdrawncount | html %]),
[% END %] - [% IF ( resultsloo.itemlostcount ) %] Lost ([% resultsloo.itemlostcount | html %])
[% END %] - [% IF ( resultsloo.orderedcount ) %] On order ([% resultsloo.orderedcount | html %])
[% END %] - [% IF ( resultsloo.notforloancount ) %] Not for loan ([% resultsloo.notforloancount | html %])[% END %] - - 		-
- - Actions - - -
-
-
[% pagination_bar | $raw %]
-
-
-[% ELSE %] - [% IF ( query ) %] - [% IF ( error ) %]
[% END %]No results found - [% IF ( error ) %] - Error: [% error | html %]
- [% END %] - [% END %] -[% END %] - -[% IF ( query ) %] -
-

Biblios in reservoir

- [% IF ( breeding_loop ) %] - - - - - - - - - - [% FOREACH breeding_loo IN breeding_loop %] - - - - - - - - - [% END %] -
TitleISBNDateEditionComing from 
[% breeding_loo.title | html %] - [% breeding_loo.author | html %][% breeding_loo.isbn | html %][% breeding_loo.copyrightdate | html %][% breeding_loo.edition | html %][% breeding_loo.file | html %] -
- - Actions - - -
-
- [% ELSE %] -

None

- [% END %] -
-[% END %] + [% END %] - + [% IF ( query ) %] +
+

Biblios in reservoir

+ [% IF ( breeding_loop ) %] + + + + + + + + + + [% FOREACH breeding_loo IN breeding_loop %] + + + + + + + + + [% END %] +
TitleISBNDateEditionComing from 
+ [% breeding_loo.title | html %] + [% breeding_loo.author | html %] + [% breeding_loo.isbn | html %][% breeding_loo.copyrightdate | html %][% breeding_loo.edition | html %][% breeding_loo.file | html %] +
+ + Actions + + +
+
+ [% ELSE %] +

None

+ [% END %] +
+ [% END %] -
-
+ +
+
[% MACRO jsinclude BLOCK %] -- 2.39.5