From 49787e94d146a49e0a0555fbfeb681f250fdac0d Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Wed, 30 Mar 2011 08:39:38 +1300 Subject: [PATCH] Bug 5917 : Tracking template changes --- .../prog/en/modules/catalogue/results.tt | 12 ++++++------ .../en/modules/reports/guided_reports_start.tt | 4 ++-- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 14 ++++++++++++-- .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 4 +++- .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 14 ++++++++++++-- koha-tt/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 4 +++- 6 files changed, 38 insertions(+), 14 deletions(-) diff --git a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt index 6be6efcdc0..0dbea66193 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -438,7 +438,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {

[% IF ( SEARCH_RESULT.summary ) %] [% IF ( SEARCH_RESULT.author ) %] - [% SEARCH_RESULT.author %] + [% SEARCH_RESULT.author %] [% ELSE %]   [% END %] @@ -458,7 +458,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () { [% END %] [% IF ( SEARCH_RESULT.author ) %] - [% SEARCH_RESULT.author %] + [% SEARCH_RESULT.author %] [% ELSE %]   [% END %] @@ -470,7 +470,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () { [% IF ( SEARCH_RESULT.size ) %] ; [% SEARCH_RESULT.size %][% END %] [% IF ( SEARCH_RESULT.normalized_isbn ) %]ISBN: [% SEARCH_RESULT.normalized_isbn %][% END %] [% SEARCH_RESULT.description %] [% IF ( SEARCH_RESULT.timestamp ) %] (modified on [% SEARCH_RESULT.timestamp %])[% END %] - [% IF ( SEARCH_RESULT.cn_class ) %][[% SEARCH_RESULT.cn_class %]][% END %] + [% IF ( SEARCH_RESULT.cn_class ) %][[% SEARCH_RESULT.cn_class %]][% END %]

[% IF ( SEARCH_RESULT.searchhighlightblob ) %]

[% SEARCH_RESULT.searchhighlightblob %]

[% END %] @@ -509,7 +509,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () { [% IF ( available_items_loo.noItemTypeImages ) %]
  • [% ELSE %][% IF ( available_items_loo.item_level_itypes ) %][% IF ( available_items_loo.imageurl ) %]
  • [% available_items_loo.description %][% ELSE %]
  • [% END %][% ELSE %]
  • [% END %][% END %] [% IF ( available_items_loo.branchname ) %][% available_items_loo.branchname %][% END %] [% IF ( available_items_loo.location ) %][% available_items_loo.location %][% END %] - [% IF ( available_items_loo.itemcallnumber ) %][[% available_items_loo.itemcallnumber %]][% END %] + [% IF ( available_items_loo.itemcallnumber ) %][[% available_items_loo.itemcallnumber %]][% END %] ([% available_items_loo.count %])
    • [% END %] [% END %] @@ -526,7 +526,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () { [% IF ( onloan_items_loo.branchname ) %][% onloan_items_loo.branchname %][% END %] [% IF ( onloan_items_loo.location ) %][% onloan_items_loo.location %][% END %] - [% IF ( onloan_items_loo.itemcallnumber ) %][[% onloan_items_loo.itemcallnumber %]][% END %] + [% IF ( onloan_items_loo.itemcallnumber ) %][[% onloan_items_loo.itemcallnumber %]][% END %] ([% onloan_items_loo.count %][% IF ( onloan_items_loo.longoverdue ) %], [% onloan_items_loo.longoverdue %] long overdue[% END %]) date due: [% onloan_items_loo.due_date %] [% END %] [% END %] @@ -543,7 +543,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () { [% IF ( other_items_loo.branchname ) %][% other_items_loo.branchname %][% END %] [% IF ( other_items_loo.location ) %][% other_items_loo.location %][% END %] - [% IF ( other_items_loo.itemcallnumber ) %][[% other_items_loo.itemcallnumber %]][% END %] + [% IF ( other_items_loo.itemcallnumber ) %][[% other_items_loo.itemcallnumber %]][% END %] [% IF ( other_items_loo.wthdrawn ) %](Withdrawn)[% END %] [% IF ( other_items_loo.itemlost ) %](Lost)[% END %] [% IF ( other_items_loo.damaged ) %](Damaged)[% END %] diff --git a/koha-tt/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tt/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index 478821cfd3..03de8501ea 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -499,8 +499,8 @@ NAME="name" -->">[% order_b.name %]

    [% name %]

    [% IF ( notes ) %]

    [% notes %]

    [% END %] [% IF ( unlimited_total ) %]

    Total number of rows matching the (unlimited) query is [% unlimited_total %].

    [% END %] -[% sql %] -[% DEFAULT pagination_bar="" %] +
    [% sql %]
    +

    [% DEFAULT pagination_bar="" %]

    [% UNLESS ( errors ) %] [% FOREACH header_ro IN header_row %][% END %] diff --git a/koha-tt/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tt/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index c6c045fb61..7f1f7b6bc5 100644 --- a/koha-tt/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tt/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -21,6 +21,7 @@ ,complete-subfield + @@ -421,14 +422,23 @@ /cgi-bin/koha/catalogue/search.pl?q=an: + + /cgi-bin/koha/catalogue/search.pl?q= + abcdfgklmnopqrstvxyz + and + (su:" + ") + + + - /cgi-bin/koha/catalogue/search.pl?q=su: + /cgi-bin/koha/catalogue/search.pl?q=su:"" - abcdtvxyz + abcdfgklmnopqrstvxyz vxyz -- diff --git a/koha-tt/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tt/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl index 0cd4559bf1..05a1d83f19 100644 --- a/koha-tt/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl +++ b/koha-tt/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl @@ -24,13 +24,15 @@ + + - + diff --git a/koha-tt/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tt/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl index fe872e0e29..b47500ac7c 100644 --- a/koha-tt/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tt/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl @@ -25,6 +25,7 @@ ,complete-subfield + @@ -478,14 +479,23 @@ /cgi-bin/koha/opac-search.pl?q=an: + + /cgi-bin/koha/opac-search.pl?q= + abcdfgklmnopqrstvxyz + and + (su:" + ") + + + - /cgi-bin/koha/opac-search.pl?q=su: + /cgi-bin/koha/opac-search.pl?q=su:"" - abcdtvxyz + abcdfgklmnopqrstvxyz vxyz -- diff --git a/koha-tt/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tt/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl index 559de13b1c..4ffc031940 100644 --- a/koha-tt/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl +++ b/koha-tt/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl @@ -24,13 +24,15 @@ + + - + -- 2.39.5
    [% header_ro.cell %]