@@ -, +, @@ alternating row colors history Looks good. Haven't seen any regression. --- koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css | 7 ++----- koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css | 11 +---------- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 +++++- .../intranet-tmpl/prog/en/modules/acqui/lateorders.tt | 3 +-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt | 6 +----- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 4 ---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 5 ----- .../intranet-tmpl/prog/en/modules/acqui/supplier.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/classsources.tt | 4 ---- .../prog/en/modules/authorities/searchresultlist.tt | 4 ---- .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/catalogue/subject.tt | 2 +- .../prog/en/modules/cataloguing/addbooks.tt | 10 +--------- .../intranet-tmpl/prog/en/modules/cataloguing/additem.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/circ/bookcount.tt | 3 +-- .../intranet-tmpl/prog/en/modules/members/boraccount.tt | 2 +- .../prog/en/modules/reports/borrowers_out.tt | 6 +----- .../prog/en/modules/reports/borrowers_stats.tt | 14 ++++++-------- .../prog/en/modules/reports/cat_issues_top.tt | 2 +- .../prog/en/modules/reports/catalogue_out.tt | 3 +-- .../intranet-tmpl/prog/en/modules/reports/dictionary.tt | 6 +----- .../prog/en/modules/reports/issues_stats.tt | 14 +++++--------- .../prog/en/modules/reports/reserves_stats.tt | 16 ++++++---------- .../intranet-tmpl/prog/en/modules/reserve/request.tt | 2 +- .../prog/en/modules/serials/acqui-search-result.tt | 4 ---- .../prog/en/modules/serials/checkexpiration.tt | 4 ---- .../prog/en/modules/serials/serials-collection.tt | 4 ++-- .../prog/en/modules/serials/serials-edit.tt | 4 ---- .../prog/en/modules/suggestion/suggestion.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt | 6 +----- .../prog/en/modules/tools/manage-marc-import.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 4 ---- 34 files changed, 51 insertions(+), 129 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css +++ a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css @@ -140,14 +140,11 @@ a.tagnum { width: 79.2%; } -tr.active td { +tbody tr.active:nth-child(2n+1) td, +tbody tr.active td { background-color: #FFFFCC; } -tr.active.highlight td { - background-color: #FEF4B4; -} - #loading { background-color: #FFF; cursor: wait; --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -264,21 +264,12 @@ table+table { .highlighted-row { background-color: orange !important } -tbody tr:nth-child(odd) td, -tr.highlight td, -tr.highlight th, -tr.odd td, -tr.odd.highlight td { +tbody tr:nth-child(odd) td { background-color : #F3F3F3; border : 1px solid #BCBCBC; border-right : 1px solid #BCBCBC; } -tr.even td, tr.even.highlight td { - background-color: #FFF; - border-right : 1px solid #BCBCBC; -} - .overdue td.od { color : #cc0000; font-weight : bold; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -446,7 +446,11 @@ [% FOREACH books_loo IN books_loop %] - [% IF ( books_loo.order_received ) %][% ELSE %][% IF ( books_loo.toggle ) %][% ELSE %][% END %][% END %] + [% IF ( books_loo.order_received ) %] + + [% ELSE %] + + [% END %] [% books_loo.ordernumber %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -131,8 +131,7 @@ $(document).ready(function() { [% FOREACH lateorder IN lateorders %] - [% UNLESS ( loop.odd ) %] - [% ELSE %][% END %] + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -49,11 +49,7 @@ [% FOREACH order IN ordered %] - [% IF loop.odd %] - - [% ELSE %] - - [% END %] + [% order.title %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -98,11 +98,7 @@ [% FOREACH searchresult IN searchresults %] - [% UNLESS ( loop.odd ) %] - - [% ELSE %] - [% END %] [% searchresult.number %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -52,12 +52,7 @@ [% FOREACH order IN spent %] - [% IF loop.odd %] - - [% ELSE %] - [% END %] - [% order.title %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -369,7 +369,7 @@ function delete_contact(ev) { [% FOREACH contract IN contracts %] - [% IF ( loop.even ) %][% ELSE %][% END %] + [% contract.contractname %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -272,7 +272,7 @@ - + [% FOREACH loo IN frameworks %] [% loo.frameworkcode %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -285,11 +285,7 @@ function CheckRuleForm(f) { Actions [% FOREACH class_sort_rule IN class_sort_rules %] - [% IF ( loop.odd ) %] - [% ELSE %] - - [% END %] [% class_sort_rule.rule %] [% class_sort_rule.description %] [% class_sort_rule.sort_routine %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -74,11 +74,7 @@ function searchauthority() { [% END %] [% FOREACH resul IN result %] - [% UNLESS ( loop.odd ) %] - - [% ELSE %] - [% END %] [% PROCESS authresult summary=resul.summary %] Details [% UNLESS ( resul.isEDITORS ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -440,7 +440,7 @@ var holdForPatron = function () { Count [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] - [% IF ( loop.odd ) %][% ELSE %][% END %] + [% SEARCH_RESULT.title |html %] @@ -474,7 +474,7 @@ var holdForPatron = function () { [% SET MaxSearchResultsItemsPerRecordStatusCheck = Koha.Preference('MaxSearchResultsItemsPerRecordStatusCheck') %] [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] - [% IF ( loop.odd ) %][% ELSE %][% END %] + [% IF ( AmazonCoverImages || LocalCoverImages ) %] [% IF ( LocalCoverImages) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt @@ -26,7 +26,7 @@ Subject headings [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] - [% IF ( SEARCH_RESULT.even ) %][% ELSE %][% END %] + [% SEARCH_RESULT.subject %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -142,11 +142,7 @@ [% IF ( CAN_user_editcatalogue_edit_items ) %] [% END %] [% FOREACH resultsloo IN resultsloop %] - [% IF ( loop.even ) %] - - [% ELSE %] - - [% END %] +

@@ -231,11 +227,7 @@ [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] [% END %] [% FOREACH breeding_loo IN breeding_loop %] - [% IF ( loop.odd ) %] - [% ELSE %] - - [% END %] [% breeding_loo.title |html %] [% breeding_loo.author %] [% breeding_loo.isbn %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -157,9 +157,9 @@ function confirm_deletion() { [% FOREACH item_loo IN item_loop %] [% IF ( item_loo.itemnumber == itemnumber) %] [% IF item_loo.nomod %] - + [% ELSE %] - + [% END %] [% ELSE %] [% IF item_loo.nomod %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt @@ -4,7 +4,6 @@ [% INCLUDE 'doc-head-close.inc' %] @@ -33,7 +32,7 @@ $(document).ready(function(){ [% count %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -75,7 +75,7 @@ $(document).ready(function() { [% FOREACH account IN accounts %] - [% IF ( loop.odd ) %][% ELSE %][% END %] + [% FOREACH loopro IN mainloo.looprow %] - [% UNLESS ( loop.odd ) %] - - [% ELSE %] - - [% END %] + [% FOREACH loopcel IN loopro.loopcell %] [% FOREACH loopro IN mainloo.looprow %] - [% UNLESS ( loop.odd ) %] - [% ELSE %][% END %] + [% FOREACH loopcel IN loopro.loopcell %] @@ -74,7 +73,7 @@ - + @@ -91,7 +90,7 @@ - + - + @@ -168,7 +167,7 @@ [% IF ( SORT1_LOOP ) %] - + @@ -185,8 +184,7 @@ [% END %] [% IF ( SORT2_LOOP ) %] - [% UNLESS ( SORT1_LOOP ) %] - [% ELSE %][% END %] + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt @@ -75,7 +75,7 @@ [% END %] [% FOREACH loopro IN mainloo.looprow %] -[% IF ( loopro.hilighted ) %][% ELSE %][% END %] + [% FOREACH loopcel IN loopro.loopcell %] [% IF ( looptable.looprow ) %] [% FOREACH loopro IN looptable.looprow %] - [% UNLESS ( loop.odd ) %] - [% ELSE %][% END %] + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt @@ -71,11 +71,7 @@ [% FOREACH definition IN definitions %] - [% UNLESS ( loop.odd ) %] - - [% ELSE %] - - [% END %] + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt @@ -44,11 +44,7 @@ [% FOREACH loopro IN mainloo.looprow %] - [% IF ( loop.odd ) %] - [% ELSE %] - - [% END %] [% FOREACH loopcel IN loopro.loopcell %] @@ -88,7 +84,7 @@ [% INCLUDE 'date-format.inc' %] - + - + @@ -166,7 +162,7 @@ - + @@ -190,7 +186,7 @@ - + @@ -210,7 +206,7 @@ [% END %] [% IF ( hassort2 ) %] - + [% FOREACH loopro IN mainloo.looprow %] - [% IF ( loop.odd ) %] - [% ELSE %] - - [% END %] [% FOREACH loopcel IN loopro.loopcell %] - + @@ -220,7 +216,7 @@ - + @@ -244,7 +240,7 @@ - + @@ -268,7 +264,7 @@ - + @@ -292,7 +288,7 @@ - + @@ -312,7 +308,7 @@ [% END %] [% IF ( hassort2 ) %] - + [% END %] [% FOREACH reserveloo IN biblioloo.reserveloop %] - [% UNLESS ( loop.odd ) %][% ELSE %][% END %] + [% FOREACH loop_supplier IN loop_suppliers %] - [% UNLESS ( loop.odd ) %] - - [% ELSE %] - [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt @@ -103,11 +103,7 @@ [% FOREACH subscriptions_loo IN subscriptions_loop %] - [% IF ( subscriptions_loo.toogle ) %] - - [% ELSE %] - [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -116,7 +116,7 @@ $(document).ready(function() { [% FOREACH subscription IN subscriptions %] - [% UNLESS ( loop.odd ) %][% ELSE %][% END %] + @@ -222,7 +222,7 @@ $(document).ready(function() { [% FOREACH serial IN year.serials %] - [% UNLESS ( loop.odd ) %][% ELSE %][% END %] + [% IF ( CAN_user_serials_receive_serials ) %] [% FOREACH serialslis IN serialslist %] - [% UNLESS ( loop.odd ) %] - - [% ELSE %] - [% END %] [% FOREACH suggestions_loo IN suggestion.suggestions_loop %] - [% IF ( suggestions_loo.even ) %][% ELSE %][% END %] + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt @@ -47,11 +47,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% FOREACH title IN titles %] - [% IF ( title.even ) %] - - [% ELSE %] - - [% END %] + + [% ELSIF ( record.record_type == 'auth' ) %] - [% END %] @@ -20,7 +20,7 @@ [% ELSIF ( record.record_type == 'auth') %] + [% END %] [% END %] @@ -423,7 +423,7 @@ Page [% FOREACH batch_lis IN batch_list %] - [% UNLESS ( loop.odd ) %][% ELSE %][% END %] + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -171,7 +171,7 @@ [% FOREACH loopro IN looprow %] - [% UNLESS ( loop.odd ) %][% ELSE %][% END %] + [% FOREACH itemsloo IN itemsloop %] - [% UNLESS ( loop.odd ) %] - - [% ELSE %] - [% END %] [% IF itemsloop %]
Library No. of times checked out
[% account.date |$KohaDates %] [% SWITCH account.accounttype %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt @@ -40,11 +40,7 @@ $(document).ready(function(){ [% END %]
[% loopro.rowtitle %][% IF ( loopcel.value ) %][% loopcel.value %][% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt @@ -40,8 +40,7 @@ TOTAL
[% IF ( loopro.rowtitle_display ) %][% loopro.rowtitle_display %][% ELSE %][% loopro.rowtitle %][% END %]
Patron category
Patron activity  
Library
Sort1
Sort2
[% loopro.rowtitle %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt @@ -66,8 +66,7 @@
[% loop.count %] [% IF ( loopro.itemcallnumber ) %][% loopro.itemcallnumber %][% ELSE %]No call number[% END %] 
[% definition.name %] [% definition.description %] [% definition.areaname %]TOTAL
[% loopro.rowtitle_display or "UNKNOWN VALUE" |html %][% loopcel.value %]
Item type
Collection
Item call number
Patron sort 2
Patron sort 2 TOTAL
[% loopro.rowtitle_display or "UNKNOWN VALUE" |html %] @@ -168,7 +164,7 @@ Cancelled
Hold Date
Item type
Holding library
Collection
Item call number
Patron sort 2
Patron sort 2  
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt @@ -27,11 +27,7 @@ function GetIt(aqbooksellerid,name) Select
[% loop_supplier.name %] Choose
 
[% subscriptions_loo.issn %] Renew
# [% subscription.subscriptionid %] [% subscription.frequency.description %] [% subscription.numberpattern.label %]
[% UNLESS CAN_user_serials_receive_serials %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -116,11 +116,7 @@ $(document).ready(function() { Notes
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -505,7 +505,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
[% INCLUDE 'biblio-default-view.inc' biblionumber = title.biblionumber %][% title.title |html %][% FOREACH subtitl IN title.subtitle %] [% subtitl.subfield %][% END %] [% title.author %]

[% IF ( title.publishercode ) %]- [% title.publishercode|html %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt @@ -10,9 +10,9 @@

[% IF ( record.record_type == 'biblio' ) %] - Matches biblio [% record_lis.match_id %] (score = [% record_lis.match_score %]): [% record_lis.match_citation %]Matches biblio [% record_lis.match_id %] (score = [% record_lis.match_score %]): [% record_lis.match_citation %]Matches authority [% record_lis.match_id %] (score = [% record_lis.match_score %]): [% record_lis.match_citation %] | + Matches authority [% record_lis.match_id %] (score = [% record_lis.match_score %]): [% record_lis.match_citation %] | Merge
- Search for a record to merge in a new windowSearch for a record to merge in a new window
Action
[% batch_lis.import_batch_id %] [% batch_lis.file_name %] [% batch_lis.comments %]
[% loopro.timestamp %] [% IF ( loopro.userfirstname ) || ( loopro.usersurname ) %][% loopro.userfirstname %] [% loopro.usersurname %] ([% loopro.user %]) [% ELSE %][% loopro.user %][% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -435,11 +435,7 @@ function placeHold () {
--