From b3c947cab1114a81e64aeff21feb53f49dbffb7f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 14 Jul 2010 09:37:48 -0400 Subject: [PATCH] Begin fix for Bug 3652 - XSS vulnerabilities - Setting default_escape => "HTML" in C4::Output In the OPAC: - Removing redundant "ESCAPE='HTML'" from the templates - Adding "ESCAPE='0'" where necessary: -- Variables like OpacNav which output HTML or JS -- Instances of CGI::scrolling_list variables --- C4/Output.pm | 1 + .../opac-tmpl/prog/en/includes/doc-head-close.inc | 4 +- .../opac-tmpl/prog/en/includes/doc-head-open.inc | 6 ++- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 4 +- .../opac-tmpl/prog/en/includes/navigation.inc | 2 +- .../opac-tmpl/prog/en/includes/opac-bottom.inc | 6 +- koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-account.tmpl | 2 +- .../prog/en/modules/opac-addbybiblionumber.tmpl | 4 +- .../opac-tmpl/prog/en/modules/opac-basket.tmpl | 14 +++--- .../opac-tmpl/prog/en/modules/opac-browser.tmpl | 10 ++-- .../opac-tmpl/prog/en/modules/opac-detail.tmpl | 48 ++++++++-------- koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-mymessages.tmpl | 10 ++-- .../opac-tmpl/prog/en/modules/opac-opensearch.tmpl | 56 ++++++++++---------- .../prog/en/modules/opac-readingrecord.tmpl | 8 ++-- .../opac-tmpl/prog/en/modules/opac-reserve.tmpl | 4 +- .../prog/en/modules/opac-results-grouped.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-results.tmpl | 18 +++--- .../opac-tmpl/prog/en/modules/opac-review.tmpl | 2 +- .../prog/en/modules/opac-search-history.tmpl | 4 +- .../opac-tmpl/prog/en/modules/opac-sendbasket.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 22 ++++---- .../opac-tmpl/prog/en/modules/opac-showmarc.tmpl | 2 +- .../prog/en/modules/opac-showreviews.tmpl | 2 +- .../prog/en/modules/opac-suggestions.tmpl | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl | 6 +- .../prog/en/modules/opac-tags_subject.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-topissues.tmpl | 2 +- 31 files changed, 129 insertions(+), 124 deletions(-) diff --git a/C4/Output.pm b/C4/Output.pm index 9f5ed5e..1c2e8d5 100644 --- a/C4/Output.pm +++ b/C4/Output.pm @@ -98,6 +98,7 @@ sub gettemplate { my $template = HTML::Template::Pro->new( filename => $filename, die_on_bad_params => 1, + default_escape => 'html', global_vars => 1, case_sensitive => 1, loop_context_vars => 1, # enable: __first__, __last__, __inner__, __odd__, __counter__ diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc index fe7e7db..d3e85d3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc @@ -12,7 +12,7 @@ /css/print.css" /> /lib/jquery/plugins/ui.tabs.css" /> - + @@ -57,7 +57,7 @@ $(window).load(function() { verify_images(); }); - + //]]> diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc index 7af0218..c3f4adf 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc @@ -1,5 +1,9 @@ -" xml:lang="" dir="" xmlns="http://www.w3.org/1999/xhtml"> + +" xml:lang="" dir="" xmlns="http://www.w3.org/1999/xhtml"> + +" xml:lang="" xmlns="http://www.w3.org/1999/xhtml"> + diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 878a412..2830905 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -15,7 +15,7 @@ <!-- /TMPL_IF --> </div> <!-- TMPL_IF NAME="opacheader" --> - <!-- TMPL_VAR NAME="opacheader" --> + <!-- TMPL_VAR NAME="opacheader" ESCAPE="0" --> <!-- /TMPL_IF --> <div id="opac-main-search" class="yui-g"> <!-- TMPL_IF NAME="opacsmallimage" --> @@ -78,7 +78,7 @@ <select name="limit" id="masthead_search" class="left" style="max-width:10em;width:10em;"> <option value="">All Libraries</option> <!-- TMPL_LOOP NAME="BranchesLoop" --> - <option <!-- TMPL_IF NAME="selected" -->SELECTED<!-- /TMPL_IF --> value="branch:<!-- TMPL_VAR NAME='value' -->"><!-- TMPL_VAR NAME='branchname' --></option> + <option <!-- TMPL_IF NAME="selected" -->SELECTED<!-- /TMPL_IF --> value="branch:<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option> <!-- /TMPL_LOOP --> </select> <!-- TMPL_ELSE --> diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc index 78841ce..9167e7a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc @@ -1 +1 @@ -<!-- TMPL_VAR NAME="OpacNav" --> \ No newline at end of file +<!-- TMPL_VAR NAME="OpacNav" ESCAPE="0" --> \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc index 94a86e9..db2b02f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc @@ -1,7 +1,7 @@ <!-- TMPL_IF NAME="opaccredits" --> <div class="ft"> - <!-- TMPL_VAR NAME="opaccredits" --> + <!-- TMPL_VAR NAME="opaccredits" ESCAPE="0" --> </div> <!-- /TMPL_IF --> </div> @@ -12,7 +12,7 @@ <!-- TMPL_LOOP NAME="languages_loop" --> <!-- TMPL_IF NAME="group_enabled" --> <!-- TMPL_IF NAME="plural" --> - <a id="show<!-- TMPL_VAR NAME="rfc4646_subtag" -->" class="sublangs more" href="#"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></a> + <a id="show<!-- TMPL_VAR NAME="rfc4646_subtag" -->" class="sublangs more" href="#"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></a> <div id="sub<!-- TMPL_VAR NAME="rfc4646_subtag" -->"> <div class="bd"><ul> <!-- TMPL_LOOP NAME="sublanguages_loop" --> @@ -20,7 +20,7 @@ <!-- TMPL_IF NAME="sublanguage_current" --> <li> <!-- TMPL_VAR NAME="native_description" --> <!-- TMPL_VAR NAME="script_description" --> <!-- TMPL_VAR NAME="region_description" --> <!-- TMPL_VAR NAME="variant_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</li> <!-- TMPL_ELSE --> - <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"> <!-- TMPL_VAR NAME="native_description" --> <!-- TMPL_VAR NAME="script_description" --> <!-- TMPL_VAR NAME="region_description" --> <!-- TMPL_VAR NAME="variant_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a></li> + <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"> <!-- TMPL_VAR NAME="native_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="script_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="region_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="variant_description" ESCAPE="0" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a></li> <!-- /TMPL_IF --> <!-- /TMPL_IF --> <!-- /TMPL_LOOP --> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tmpl index dfe1495..2a78374 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tmpl @@ -1,4 +1,4 @@ -<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" DEFAULT="Koha Online" --> › ILS-DI +<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › ILS-DI <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> </head> <body> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl index 039e2ea..e90b0b2 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl @@ -37,7 +37,7 @@ <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></span> <!-- /TMPL_IF --> <span class="view"><span id="ISBDview">ISBD View</span></span> </div> - <div id="isbdcontents"><!-- TMPL_VAR name="ISBD" --></div> + <div id="isbdcontents"><!-- TMPL_VAR name="ISBD" ESCAPE="0" --></div> </div> </div> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl index 319d0d7..26119ca 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl @@ -148,7 +148,7 @@ </tr> <!-- TMPL_LOOP name="item_loop" --> <tr> - <!-- TMPL_VAR name="item_value" --> + <!-- TMPL_VAR name="item_value" ESCAPE="0" --> </tr> <!-- /TMPL_LOOP --> </table><!-- TMPL_ELSE --> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl index 0b7f220..81888ee 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl @@ -37,7 +37,7 @@ <!-- TMPL_IF NAME="odd" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF --> <td><!-- TMPL_VAR NAME="date" --></td> <td><!-- TMPL_VAR NAME="description" --> - <!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" escape="html" --><!-- /TMPL_IF --></td> + <!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td> <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amount" --></td> <!-- TMPL_IF NAME="amountoutstandingcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amountoutstanding" --></td> </tr> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl index f85d914..d57d9c0 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl @@ -17,7 +17,7 @@ <!-- /TMPL_IF --> <ul> <!-- TMPL_LOOP NAME="biblios"--> - <li> <span class="title"><!-- TMPL_VAR NAME="title" ESCAPE="html"--></span> + <li> <span class="title"><!-- TMPL_VAR NAME="title"--></span> <!-- TMPL_IF NAME="author"--><span class="author"> <!-- TMPL_VAR NAME="author"--> </span><!-- /TMPL_IF --> </li> <!-- /TMPL_LOOP --> @@ -25,7 +25,7 @@ <!-- TMPL_IF NAME="CGIvirtualshelves"--> <form name="f1" action="/cgi-bin/koha/opac-addbybiblionumber.pl" method="post"> <fieldset class="rows"><legend>Select a List</legend> - <ol><li> <label for="shelfnumber">Add to list:</label> <!-- TMPL_VAR NAME="CGIvirtualshelves" --></li></ol> + <ol><li> <label for="shelfnumber">Add to list:</label> <!-- TMPL_VAR NAME="CGIvirtualshelves" ESCAPE="0" --></li></ol> <!-- TMPL_LOOP NAME="biblios" --> <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><!-- /TMPL_LOOP --> <input type="hidden" name="modifyshelfcontents" value="1" /></fieldset> <fieldset class="action"><input type="submit" value="Save" class="submit" /> <a class="close cancel" href="#">Cancel</a></fieldset> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl index e314342..0d46c1e 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl @@ -161,14 +161,14 @@ function tagAdded() { <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --> <h3> <!-- TMPL_IF NAME="print_basket" --> - <!-- TMPL_VAR NAME="title" escape="html" --> - <!-- TMPL_IF name="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" escape="html" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --> - <!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author" escape="html" --><!-- /TMPL_IF --> + <!-- TMPL_VAR NAME="title" --> + <!-- TMPL_IF name="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --> + <!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_ELSE --> <input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked)" /> - <!-- TMPL_VAR NAME="title" escape="html" --> - <!-- TMPL_IF name="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" escape="html" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --> - <!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author" escape="html"--><!-- /TMPL_IF --> + <!-- TMPL_VAR NAME="title" --> + <!-- TMPL_IF name="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --> + <!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF --> <!-- /TMPL_IF --> </h3> <!-- COinS / OpenURL --> @@ -352,7 +352,7 @@ function tagAdded() { </td> <!-- /TMPL_UNLESS --> <td> <a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)"> - <!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" escape="html" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --> + <!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --> </a> <!-- COinS / OpenURL --> <span class="Z3988" title="ctx_ver=Z39.88-2004&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&rft.au=<!-- TMPL_VAR NAME="author" -->&rft.btitle=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->&rft.date=<!-- TMPL_VAR NAME="publicationyear" -->&rft.tpages=<!-- TMPL_VAR NAME="size" -->&rft.isbn=<!-- TMPL_VAR NAME="isbn" ESCAPE="url" -->&rft.aucorp=&rft.place=<!-- TMPL_VAR NAME="place" -->&rft.pub=<!-- TMPL_VAR NAME="publisher" ESCAPE="url" -->&rft.edition=<!-- TMPL_VAR NAME="edition" -->&rft.series=<!-- TMPL_VAR NAME="series" -->&rft.genre="></span> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl index 66f2a66..048f514 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl @@ -1,4 +1,4 @@ -<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › ISBD +<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › Browse by Hierarchy <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> </head> <body id="opac-browser"> @@ -18,7 +18,7 @@ <li style="list-style-type: none;"><ul> <!-- TMPL_LOOP name="HIERARCHY_LOOP" --> <li> - <a href="opac-browser.pl?level=<!-- TMPL_VAR name="level"-->&filter=<!-- TMPL_VAR name="classification" ESCAPE="uri" -->"><!-- TMPL_VAR name="description" ESCAPE="html" --></a> + <a href="opac-browser.pl?level=<!-- TMPL_VAR name="level"-->&filter=<!-- TMPL_VAR name="classification" ESCAPE="uri" -->"><!-- TMPL_VAR name="description" --></a> </li> <li style="list-style-type: none;"><ul> <!-- /TMPL_LOOP --> @@ -27,9 +27,9 @@ <td width="33%"> <p> <!-- TMPL_IF name="endnode" --> - <a href="opac-search.pl?q=Dewey-classification:<!-- TMPL_VAR name="classification" ESCAPE="uri" -->"><!-- TMPL_VAR name="description" ESCAPE="html" --></a> + <a href="opac-search.pl?q=Dewey-classification:<!-- TMPL_VAR name="classification" ESCAPE="uri" -->"><!-- TMPL_VAR name="description" --></a> <!-- TMPL_ELSE --> - <a href="opac-browser.pl?level=<!-- TMPL_VAR name="level"-->&filter=<!-- TMPL_VAR name="classification" ESCAPE="uri" -->"><!-- TMPL_VAR name="description" ESCAPE="html" --></a> + <a href="opac-browser.pl?level=<!-- TMPL_VAR name="level"-->&filter=<!-- TMPL_VAR name="classification" ESCAPE="uri" -->"><!-- TMPL_VAR name="description" --></a> <!-- /TMPL_IF --></p> <p style="font-size:0.75em"><i>(<!-- TMPL_VAR name="number"--> biblios)</i></p> </td> @@ -41,7 +41,7 @@ <!-- /TMPL_LOOP --> </ul></li></ul> <!-- TMPL_ELSE --> - <div class="warning">The browser table is empty. this feature is not fully set-up. See the <a href="http://wiki.koha.org/doku.php?id=opacbrowser">Koha Wiki</a> for more information on what it does and how to configure it.</div> + <div class="dialog message">The browser table is empty. this feature is not fully set-up. See the <a href="http://wiki.koha.org/doku.php?id=opacbrowser">Koha Wiki</a> for more information on what it does and how to configure it.</div> <!-- /TMPL_IF --> </div></div> </div> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl index b1fdf84..118c5c4 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl @@ -1,4 +1,4 @@ -<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › Details for: <!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_LOOP NAME="subtitle" -->, <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --> +<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › Details for: <!-- TMPL_VAR NAME="title" --><!-- TMPL_LOOP NAME="subtitle" -->, <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --> <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script> <script type="text/JavaScript" language="JavaScript"> @@ -80,7 +80,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="GoogleJackets" --><div style="block" title="<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" class="<!-- TMPL_VAR NAME="normalized_isbn" -->" id="gbs-thumbnail-preview"></div><!-- /TMPL_IF --> - <!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="normalized_isbn" --><!-- TMPL_IF NAME="OPACURLOpenInNewWindow" --><a href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->" target="_blank"><img alt="See Baker & Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->" /></a><!-- TMPL_ELSE --><a href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->"><img alt="See Baker & Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->" /></a><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --> + <!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="normalized_isbn" --><!-- TMPL_IF NAME="OPACURLOpenInNewWindow" --><a href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" --><!-- TMPL_VAR NAME="normalized_isbn" -->" target="_blank"><img alt="See Baker & Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" --><!-- TMPL_VAR NAME="normalized_isbn" -->" /></a><!-- TMPL_ELSE --><a href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" --><!-- TMPL_VAR NAME="normalized_isbn" -->"><img alt="See Baker & Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" --><!-- TMPL_VAR NAME="normalized_isbn" -->" /></a><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --> </div> <abbr class="unapi-id" title="koha:biblionumber:<!-- TMPL_VAR NAME="biblionumber" -->"><!-- unAPI --></abbr> @@ -90,10 +90,10 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <!-- /TMPL_IF --> <!-- TMPL_IF NAME="OPACXSLTDetailsDisplay" --> - <!-- TMPL_VAR NAME="XSLTBloc" --> + <!-- TMPL_VAR NAME="XSLTBloc" ESCAPE="0" --> <!-- TMPL_ELSE --> - <h1><!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --> <!-- /TMPL_LOOP --></span><!-- /TMPL_IF --></h1> - <!-- TMPL_IF NAME="author" --><h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" ESCAPE="HTML" --></a></h5><!-- /TMPL_IF --> + <h1><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --> <!-- /TMPL_LOOP --></span><!-- /TMPL_IF --></h1> + <!-- TMPL_IF NAME="author" --><h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a></h5><!-- /TMPL_IF --> <div id="views"><span class="view"><span id="Normalview">Normal View</span></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></span> <!-- TMPL_IF NAME="ISBD" --><span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD View</a></span><!-- /TMPL_IF --> </div> @@ -133,7 +133,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <!-- TMPL_IF name="publishercode" --> <span class="results_summary"><span class="label">Published by :</span> <a href="/cgi-bin/koha/opac-search.pl?q=pb:<!-- TMPL_VAR NAME="publishercode" ESCAPE="URL" --> "> - <!-- TMPL_VAR NAME="publishercode" ESCAPE="HTML" --> + <!-- TMPL_VAR NAME="publishercode" --> </a> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF --> </span> <!-- /TMPL_IF --> @@ -228,7 +228,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <!-- TMPL_IF NAME="GetShelves" --> <span class="results_summary"><span class="label">List(s) this item appears in: </span> <!-- TMPL_LOOP NAME="GetShelves" --> - <a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->&sortfield=title"><!-- TMPL_VAR NAME="shelfname" --></a> + <a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->&sortfield=title"><!-- TMPL_VAR NAME="shelfname" --></a> <!-- TMPL_IF NAME="__LAST__" --><!-- TMPL_ELSE -->|<!-- /TMPL_IF --> <!-- /TMPL_LOOP --> </span> @@ -239,7 +239,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <!-- TMPL_IF NAME="TagLoop" --> <span class="label">Tags from this library:</span> <ul><!-- TMPL_LOOP NAME="TagLoop" --> - <li><a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="term" ESCAPE="HTML" --></a> <span class="weight">(<!-- TMPL_VAR NAME="weight_total" -->)</span></li> + <li><a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="term" --></a> <span class="weight">(<!-- TMPL_VAR NAME="weight_total" -->)</span></li> <!-- /TMPL_LOOP --> </ul><!-- TMPL_ELSE --><span class="label">Tags from this library:</span><div>No tags from this library for this title.</div> <!-- /TMPL_IF --> @@ -302,7 +302,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <!-- TMPL_IF NAME="BakerTaylorContentURL" --> <span class="results_summary"> - <span class="label">Enhanced Content:</span><!-- TMPL_IF NAME="OPACURLOpenInNewWindow" --><a href="<!-- TMPL_VAR NAME="BakerTaylorContentURL" ESCAPE="HTML" -->" target="_blank">Content Cafe</a><!-- TMPL_ELSE --><a href="<!-- TMPL_VAR NAME="BakerTaylorContentURL" ESCAPE="HTML" -->">Content Cafe</a><!-- /TMPL_IF --> + <span class="label">Enhanced Content:</span><!-- TMPL_IF NAME="OPACURLOpenInNewWindow" --><a href="<!-- TMPL_VAR NAME="BakerTaylorContentURL" -->" target="_blank">Content Cafe</a><!-- TMPL_ELSE --><a href="<!-- TMPL_VAR NAME="BakerTaylorContentURL" -->">Content Cafe</a><!-- /TMPL_IF --> </span> <!-- /TMPL_IF --> </div> @@ -433,7 +433,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="browser_normalized_isbn" --><div style="block" title="<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" class="<!-- TMPL_VAR name="browser_normalized_isbn" -->" id="gbs-thumbnail-preview<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="browser_normalized_isbn" --> - <img alt="See Baker & Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="browser_normalized_isbn" -->" /><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --> + <img alt="See Baker & Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" --><!-- TMPL_VAR NAME="browser_normalized_isbn" -->" /><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --> </a></td> <!-- /TMPL_LOOP --> @@ -452,7 +452,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="browser_normalized_isbn" --><div style="block" title="<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" class="<!-- TMPL_VAR name="browser_normalized_isbn" -->" id="gbs-thumbnail-preview<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="browser_normalized_isbn" --> - <img alt="See Baker & Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="browser_normalized_isbn" -->" /><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --> + <img alt="See Baker & Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" --><!-- TMPL_VAR NAME="browser_normalized_isbn" -->" /><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --> </a></td> <!-- /TMPL_LOOP --> @@ -461,11 +461,11 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <tr> <!-- TMPL_LOOP NAME="PREVIOUS_SHELF_BROWSE" --> -<td class="top"><!-- TMPL_VAR NAME="itemcallnumber" --><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser"><!-- TMPL_VAR NAME="title" escape="html" --></a></td> +<td class="top"><!-- TMPL_VAR NAME="itemcallnumber" --><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser"><!-- TMPL_VAR NAME="title" --></a></td> <!-- /TMPL_LOOP --> <!-- TMPL_LOOP NAME="NEXT_SHELF_BROWSE" --> - <td class="top"><!-- TMPL_VAR NAME="itemcallnumber" --><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser"><!-- TMPL_VAR NAME="title" escape="html" --></a></td> + <td class="top"><!-- TMPL_VAR NAME="itemcallnumber" --><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser"><!-- TMPL_VAR NAME="title" --></a></td> <!-- /TMPL_LOOP --> </tr> </table> @@ -483,7 +483,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <!-- TMPL_LOOP NAME="AMAZON_EDITORIAL_REVIEWS" --> <!-- TMPL_IF NAME="Content" --> <h4>From <!-- TMPL_VAR NAME="Source" -->:</h4> - <div><!-- TMPL_VAR NAME="Content" --></div> + <div><!-- TMPL_VAR NAME="Content" ESCAPE="0" --></div> <!-- /TMPL_IF --> <!-- /TMPL_LOOP --> <!-- /TMPL_IF--> @@ -492,7 +492,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <!-- TMPL_IF NAME="SyndeticsSummary" --> <!-- TMPL_IF NAME="SYNDETICS_SUMMARY" --> <h4>Enhanced Descriptions from Syndetics:</h4> - <p><!-- TMPL_VAR NAME="SYNDETICS_SUMMARY" --></p> + <p><!-- TMPL_VAR NAME="SYNDETICS_SUMMARY" ESCAPE="0" --></p> <!-- /TMPL_IF --> <!-- /TMPL_IF --> <!-- /TMPL_IF --> @@ -530,7 +530,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <div id="excerpt"> <div class="content_set"> <h3>Excerpt provided by Syndetics</h3> -<!-- TMPL_VAR NAME="SYNDETICS_EXCERPT" --> +<!-- TMPL_VAR NAME="SYNDETICS_EXCERPT" ESCAPE="0" --> </div> </div> <!-- /TMPL_IF --><!-- /TMPL_IF --> @@ -545,7 +545,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <!-- TMPL_LOOP NAME="reviews" --> <!-- TMPL_IF NAME="content" --> - <!-- TMPL_VAR NAME="content" --> + <!-- TMPL_VAR NAME="content" ESCAPE="0" --> <!-- /TMPL_IF --> <!-- /TMPL_LOOP --> @@ -561,7 +561,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <h3>Author Notes provided by Syndetics</h3> <!-- TMPL_LOOP NAME="SYNDETICS_ANOTES" --> <!-- TMPL_IF NAME="content" --> - <!-- TMPL_VAR NAME="content" --> + <!-- TMPL_VAR NAME="content" ESCAPE="0" --> <!-- /TMPL_IF --> <!-- /TMPL_LOOP --> </div> @@ -716,8 +716,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --> </td> -<td><!-- TMPL_VAR NAME="description" --></td><td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR NAME="author" ESCAPE="HTML" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="copyrightdate" --> ©<!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" --> - <p><!-- TMPL_VAR NAME="publishercode" ESCAPE="HTML" --> +<td><!-- TMPL_VAR NAME="description" --></td><td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="copyrightdate" --> ©<!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" --> + <p><!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="pages" --><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></p><!-- /TMPL_IF --> <!-- /TMPL_IF --></td> @@ -744,7 +744,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <img border="0" src="https://secure.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="browser_normalized_isbn" -->/SC.GIF&client=<!-- TMPL_VAR NAME="SyndeticsClientCode" --><!-- TMPL_IF NAME="browser_normalized_upc" -->&upc=<!-- TMPL_VAR NAME="browser_normalized_upc" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="browser_normalized_oclc" -->&oclc=<!-- TMPL_VAR NAME="browser_normalized_oclc" --><!-- /TMPL_IF -->&type=xw10" alt="" /> <!-- TMPL_ELSE --><img border="0" src="http://www.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="browser_normalized_isbn" -->/SC.GIF&client=<!-- TMPL_VAR NAME="SyndeticsClientCode" --><!-- TMPL_IF NAME="browser_normalized_upc" -->&upc=<!-- TMPL_VAR NAME="browser_normalized_upc" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="browser_normalized_oclc" -->&oclc=<!-- TMPL_VAR NAME="browser_normalized_oclc" --><!-- /TMPL_IF -->&type=xw10" alt="" /><!-- /TMPL_IF --> <!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --> -<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" ESCAPE="HTML" --></a> </td> +<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> </td> <!-- /TMPL_LOOP --> <!-- /TMPL_LOOP --> </tr></table> @@ -760,9 +760,9 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <!-- TMPL_LOOP NAME="AMAZON_CUSTOMER_REVIEWS" --> <div class="content_set"> - <div class="clearfix" style="margin: .5em 0;"><h4 style="float: left;"><!-- TMPL_VAR NAME="Summary" ESCAPE="HTML" --></h4> <span class="starMT" style="float: left;"><span class="starFull" style="float: left; width:<!-- TMPL_VAR EXPR="Rating * 10" -->px"></span></span> </div> <!-- TMPL_VAR NAME="Date" --> + <div class="clearfix" style="margin: .5em 0;"><h4 style="float: left;"><!-- TMPL_VAR NAME="Summary" --></h4> <span class="starMT" style="float: left;"><span class="starFull" style="float: left; width:<!-- TMPL_VAR EXPR="Rating * 10" -->px"></span></span> </div> <!-- TMPL_VAR NAME="Date" --> <!-- TMPL_IF NAME="Content" --> - <p style="margin-left: .2em;"><!-- TMPL_VAR NAME="Content" ESCAPE="HTML" --></p> + <p style="margin-left: .2em;"><!-- TMPL_VAR NAME="Content" ESCAPE="0" --></p> <!-- /TMPL_IF --> </div> <!-- /TMPL_LOOP --> @@ -814,7 +814,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { <h4>Search for this title in:</h4> <ul class="first-of-type"> -<!-- TMPL_VAR NAME="OPACSearchForTitleIn" --> +<!-- TMPL_VAR NAME="OPACSearchForTitleIn" ESCAPE="0" --> </ul> </div> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl index d1c5b3a..5d9eae4 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl @@ -35,7 +35,7 @@ </div> <!-- /TMPL_IF --> - <!-- TMPL_IF NAME="OpacMainUserBlock" --><div id="opacmainuserblock" class="container"><!-- TMPL_VAR NAME="OpacMainUserBlock" --></div><!-- /TMPL_IF --> + <!-- TMPL_IF NAME="OpacMainUserBlock" --><div id="opacmainuserblock" class="container"><!-- TMPL_VAR NAME="OpacMainUserBlock" ESCAPE="0" --></div><!-- /TMPL_IF --> </div> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-mymessages.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-mymessages.tmpl index 78d496d..6e102e9 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-mymessages.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-mymessages.tmpl @@ -13,11 +13,11 @@ <webMaster></webMaster> <!-- TMPL_LOOP NAME="message_list" --> <item> - <title><!-- TMPL_VAR ESCAPE=HTML NAME="subject" --> - - - - + <!-- TMPL_VAR NAME="subject" --> + + + + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tmpl index 05b4221..a416aef 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tmpl @@ -1,10 +1,10 @@ - Search - Search the - koha opac - + Search + Search the + koha opac + /cgi-bin/koha/opac-search.pl?q={searchTerms}&pw={startPage?}&format=rss2"/> @@ -16,10 +16,10 @@ xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:atom="http://www.w3.org/2005/Atom"> - <![CDATA[<!-- TMPL_VAR NAME="LibraryName" ESCAPE="html" --> Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" ESCAPE="html" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" --> with limit(s): '<!-- TMPL_VAR NAME="limit_desc" ESCAPE="html" -->'<!-- /TMPL_IF -->]]> - /cgi-bin/koha/opac-search.pl?&format=rss2 - /cgi-bin/koha/opac-search.pl?&format=rss2" /> - for '' with limit(s): '' at ]]> + <![CDATA[<!-- TMPL_VAR NAME="LibraryName" --> Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" --> with limit(s): '<!-- TMPL_VAR NAME="limit_desc" -->'<!-- /TMPL_IF -->]]> + /cgi-bin/koha/opac-search.pl?&format=rss2 + /cgi-bin/koha/opac-search.pl?&format=rss2" /> + for '' with limit(s): '' at ]]> @@ -28,11 +28,11 @@ 20