Bugzilla – Attachment 755 Details for
Bug 2600
HTML tags in titles not escaped in many places
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Some fixes
0001-Fixes-for-Bug-2600-HTML-tags-in-titles-not-escaped-i.patch (text/plain), 32.75 KB, created by
Chris Cormack
on 2010-02-03 18:49:00 UTC
(
hide
)
Description:
Some fixes
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2010-02-03 18:49:00 UTC
Size:
32.75 KB
patch
obsolete
>From 086c081ac3273b22052bd89d6b019a4e597b2a66 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 3 Feb 2010 13:46:31 -0500 >Subject: [PATCH] Fixes for Bug 2600, HTML tags in titles not escaped in many places > >--- > .../prog/en/modules/catalogue/MARCdetail.tmpl | 30 ++++++------ > .../prog/en/modules/catalogue/results.tmpl | 42 ++++++++-------- > .../prog/en/modules/reserve/request.tmpl | 50 ++++++++++---------- > .../prog/en/modules/opac-addbybiblionumber.tmpl | 4 +- > .../prog/en/modules/opac-readingrecord.tmpl | 2 +- > .../opac-tmpl/prog/en/modules/opac-results.tmpl | 32 ++++++------ > .../prog/en/modules/opac-search-history.tmpl | 4 +- > 7 files changed, 82 insertions(+), 82 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl >index 9e6f733..8fa7d1b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl >@@ -21,23 +21,23 @@ function Changefwk(FwkList) { > <!-- TMPL_INCLUDE NAME="header.inc" --> > <!-- TMPL_INCLUDE NAME="cat-search.inc" --> > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › MARC Details for <i><!-- TMPL_VAR NAME="bibliotitle" --></i></div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › MARC Details for <i><!-- TMPL_VAR NAME="bibliotitle" ESCAPE="html" --></i></div> > > <div id="doc3" class="yui-t2"> >- >+ > <div id="bd"> > <div id="yui-main"> > <div class="yui-b"> > <!-- TMPL_INCLUDE NAME="cat-toolbar.inc" --> > > <!-- TMPL_UNLESS name="popup" --> >- <h1>MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --> ( <!-- TMPL_VAR NAME="bibliotitle" --> )</h1> >- >+ <h1>MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --> ( <!-- TMPL_VAR NAME="bibliotitle" ESCAPE="html" --> )</h1> >+ > > <!-- /TMPL_UNLESS --> > > <p><b>With Framework :<!--TMPL_VAR Name="framework" --></b></p> >- >+ > <div id="bibliotabs" class="toptabs numbered"> > <ul> > <!-- TMPL_IF name="0XX" --> >@@ -103,7 +103,7 @@ function Changefwk(FwkList) { > </div> <!-- class='tag' --> > <!-- /TMPL_LOOP --> > </div> >- >+ > <div id="tab1XX"> > <!-- TMPL_LOOP NAME="1XX" --> > <!-- TMPL_IF name="tag" --> >@@ -133,7 +133,7 @@ function Changefwk(FwkList) { > </div> > <!-- /TMPL_LOOP --> > </div> >- >+ > <div id="tab2XX"> > <!-- TMPL_LOOP NAME="2XX" --> > <!-- TMPL_IF name="tag" --> >@@ -163,7 +163,7 @@ function Changefwk(FwkList) { > </div> > <!-- /TMPL_LOOP --> > </div> >- >+ > <div id="tab3XX"> > <!-- TMPL_LOOP NAME="3XX" --> > <!-- TMPL_IF name="tag" --> >@@ -193,7 +193,7 @@ function Changefwk(FwkList) { > </div> > <!-- /TMPL_LOOP --> > </div> >- >+ > <div id="tab4XX"> > <!-- TMPL_LOOP NAME="4XX" --> > <!-- TMPL_IF name="tag" --> >@@ -223,7 +223,7 @@ function Changefwk(FwkList) { > </div> > <!-- /TMPL_LOOP --> > </div> >- >+ > <div id="tab5XX"> > <!-- TMPL_LOOP NAME="5XX" --> > <!-- TMPL_IF name="tag" --> >@@ -253,7 +253,7 @@ function Changefwk(FwkList) { > </div> > <!-- /TMPL_LOOP --> > </div> >- >+ > <div id="tab6XX"> > <!-- TMPL_LOOP NAME="6XX" --> > <!-- TMPL_IF name="tag" --> >@@ -283,7 +283,7 @@ function Changefwk(FwkList) { > </div> > <!-- /TMPL_LOOP --> > </div> >- >+ > <div id="tab7XX"> > <!-- TMPL_LOOP NAME="7XX" --> > <!-- TMPL_IF name="tag" --> >@@ -313,7 +313,7 @@ function Changefwk(FwkList) { > </div> > <!-- /TMPL_LOOP --> > </div> >- >+ > <div id="tab8XX"> > <!-- TMPL_LOOP NAME="8XX" --> > <!-- TMPL_IF name="tag" --> >@@ -343,7 +343,7 @@ function Changefwk(FwkList) { > </div> > <!-- /TMPL_LOOP --> > </div> >- >+ > <div id="tab9XX"> > <!-- TMPL_LOOP NAME="9XX" --> > <!-- TMPL_IF name="tag" --> >@@ -373,7 +373,7 @@ function Changefwk(FwkList) { > </div> > <!-- /TMPL_LOOP --> > </div> >- >+ > <!-- TMPL_IF name="10XX" --> > <div id="tab10XX"> > <table> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl >index d62fcd3..09d6339 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl >@@ -27,9 +27,9 @@ $(window).load(function() { > verify_images(); > }); > <!-- /TMPL_IF --> >-function Dopop(link) { >+function Dopop(link) { > newin=window.open(link,'popup','width=500,height=500,toolbar=false,scrollbars=yes,resizeable=yes'); >-} >+} > $(document).ready(function() { > $('#sortbyform').find("input:submit").hide(); > $('#sort_by').change(function() { >@@ -62,19 +62,19 @@ $(".addtocart").show(); > }); > > $("#tagsel_span").html("<input id=\"tagsel_tag\" class=\"submit\" type=\"submit\" value=\"Tag\"/>"); >- >+ > function cartList(){ > if($("#addto").find("option:selected").attr("value") == "addtolist"){ > var shelfnumber = $("#addto").find("option:selected").attr("id").replace("s",""); > if (vShelfAdd()) { > Dopop('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?shelfnumber='+shelfnumber+'&confirm=1&' + vShelfAdd()); > } >- return false; >+ return false; > } else if($("#addto").find("option:selected").attr("value") == "newlist"){ > if (vShelfAdd()) { > Dopop('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?newshelf=1&' + vShelfAdd()); > } >- return false; >+ return false; > } > if($("#addto").find("option:selected").attr("value") == "addtocart"){ > addMultiple(); >@@ -191,7 +191,7 @@ function GetZ3950Terms(){ > <!-- /TMPL_IF --> > > <!-- TMPL_IF NAME="koha_spsuggest" --> >- <div style="font-size: 12px;">Did you mean: >+ <div style="font-size: 12px;">Did you mean: > <ul style="list-style: none;"> > <!-- TMPL_LOOP NAME="SPELL_SUGGEST" --> > <li> >@@ -255,15 +255,15 @@ function GetZ3950Terms(){ > <!-- /TMPL_IF --> > </div> > <!-- /TMPL_IF --> >- >+ > <!-- TMPL_IF NAME="query_error" --> > <br /><br /> >- Error: >+ Error: > <span class="problem"> > <!-- TMPL_VAR NAME="query_error" --> > </span> > <!-- /TMPL_IF --> >- >+ > <!-- Search Results Table --> > <!-- TMPL_IF NAME="total" --> > <!-- TMPL_IF NAME="scan" --> >@@ -298,7 +298,7 @@ function GetZ3950Terms(){ > </tr> > </table> > </form> >- >+ > <form action="/cgi-bin/koha/catalogue/search.pl" method="get"> > <table> > <tr> >@@ -308,7 +308,7 @@ function GetZ3950Terms(){ > <!-- TMPL_LOOP NAME="SEARCH_RESULTS" --> > <!-- TMPL_IF NAME="__odd__" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF --> > <td> >- <a href="/cgi-bin/koha/catalogue/search.pl?idx=<!-- TMPL_VAR name="scan_index_to_use" -->&q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->"<!-- TMPL_VAR NAME="title" -->""><!-- TMPL_VAR NAME="title" --></a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?idx=<!-- TMPL_VAR name="scan_index_to_use" -->&q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->"<!-- TMPL_VAR NAME="title" -->""><!-- TMPL_VAR NAME="title" ESCAPE="html" --></a> > </td> > <td> > <!-- TMPL_VAR NAME="author" --> >@@ -369,7 +369,7 @@ function GetZ3950Terms(){ > <input type="hidden" name="<!-- TMPL_VAR NAME="input_name" -->" value="<!-- TMPL_VAR NAME="input_value" -->"/> > <!-- /TMPL_LOOP --> > <!-- /TMPL_IF --> >- >+ > <!-- TABLE RESULTS START --> > > <table> >@@ -386,7 +386,7 @@ function GetZ3950Terms(){ > <a class="p1" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"> > <!-- TMPL_IF NAME="AmazonCoverImages" --> > <img src="<!-- TMPL_IF NAME="normalized_isbn" -->http://images.amazon.com/images/P/<!-- TMPL_VAR name="normalized_isbn" -->.01.TZZZZZZZ.jpg<!-- TMPL_ELSE -->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!-- /TMPL_IF -->" alt="image" class="thumbnail" /> <!-- /TMPL_IF --> >- </a></td> >+ </a></td> > <!-- /TMPL_IF --> > <td> > <input type="checkbox" class="selection" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" style="display:none" /> >@@ -402,8 +402,8 @@ function GetZ3950Terms(){ > <!-- TMPL_ELSE --> > <a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"> > <!-- /TMPL_IF --> >- <b><!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --></b> >- </a> >+ <b><!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" ESCAPE="html" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --></b> >+ </a> > <!-- TMPL_LOOP NAME="subtitle" --> , <!-- TMPL_VAR NAME="subfield" --> <!-- /TMPL_LOOP --> > <!-- TMPL_IF name="volume" -->,<!-- TMPL_VAR name="volume" --><!-- /TMPL_IF --> <!-- TMPL_IF name="volumeddesc" -->, <!-- TMPL_VAR name="volumeddesc" --><!-- /TMPL_IF --> > </p> >@@ -433,10 +433,10 @@ function GetZ3950Terms(){ > <!-- TMPL_ELSE --> > > <!-- /TMPL_IF --> >- >+ > <!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="edition" -->Edition: <!-- TMPL_VAR NAME="edition" --><!-- /TMPL_IF --> >- Description: >+ Description: > <!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF --> > <!-- TMPL_IF name="publicationyear" -->, <!-- TMPL_VAR name="publicationyear" --> > <!-- TMPL_ELSIF name="copyrightdate"-->, <!-- TMPL_VAR name="copyrightdate" --><!-- /TMPL_IF --> >@@ -455,7 +455,7 @@ function GetZ3950Terms(){ > <!-- /TMPL_LOOP --> > </p> > <!-- /TMPL_IF --> >- >+ > <!-- /TMPL_IF --> > <!-- TMPL_IF NAME="norequests" --> > No holds allowed >@@ -472,7 +472,7 @@ function GetZ3950Terms(){ > <!-- TMPL_IF NAME="availablecount" --><!-- TMPL_VAR NAME="availablecount" --><!-- /TMPL_IF --> available: > <ul> > <!-- TMPL_LOOP NAME="available_items_loop" --> >- >+ > <!-- TMPL_IF NAME="noItemTypeImages" --><li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="item-level_itypes" --><!-- TMPL_IF name="imageurl" --><li style="list-style: none; list-style-type: none;"><img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" /><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="location" --><!-- TMPL_VAR NAME="location" --><!-- /TMPL_IF --> >@@ -489,7 +489,7 @@ function GetZ3950Terms(){ > <!-- TMPL_IF name="imageurl" --> > <li style="list-style: none; list-style-type: none;"><img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" /> > <!-- TMPL_ELSE --><li><!-- /TMPL_IF --> >- <!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- /TMPL_IF --> >+ <!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- /TMPL_IF --> > > <!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="location" --><!-- TMPL_VAR NAME="location" --><!-- /TMPL_IF --> >@@ -542,7 +542,7 @@ function GetZ3950Terms(){ > <!-- TMPL_IF NAME="inner_sup_results_loop" --> > <!-- TMPL_VAR NAME="servername" --> > <!-- TMPL_LOOP NAME="inner_sup_results_loop" --> >- <div><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_VAR NAME="sort_by" --><!-- TMPL_VAR NAME="link" -->"><!-- TMPL_VAR NAME="title" --></a></div> >+ <div><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_VAR NAME="sort_by" --><!-- TMPL_VAR NAME="link" -->"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></a></div> > <!-- /TMPL_LOOP --> > <!-- /TMPL_IF --> > <!-- </div> --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl >index 9fd20c4..b52c484 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl >@@ -70,23 +70,23 @@ function checkMultiHold() { > alert(MSG_NO_ITEMS_AVAILABLE); > return false; > } >- >+ > var biblionumbers = ""; > $(spans).each(function() { > var bibnum = $(this).attr("title"); >- biblionumbers += bibnum + "/"; >+ biblionumbers += bibnum + "/"; > }); > > var badSpans = $(".not_holdable"); > var badBibs = ""; > $(badSpans).each(function() { > var bibnum = $(this).attr("title"); >- badBibs += bibnum + "/"; >+ badBibs += bibnum + "/"; > }); > > $("#multi_hold_bibs").val(biblionumbers); > $("#bad_bibs").val(badBibs); >- >+ > return true; > } > >@@ -148,7 +148,7 @@ function checkMultiHold() { > <div id="yui-main"> > <div class="yui-b"> > <!-- TMPL_IF NAME="noitems" --> >-<div class="dialog alert"> >+<div class="dialog alert"> > <strong>Cannot place hold:</strong> this record has no items attached. > </div> > <!-- TMPL_ELSE --> >@@ -162,7 +162,7 @@ function checkMultiHold() { > </form> > </div> > <!-- /TMPL_IF --> >- >+ > <!-- TMPL_UNLESS NAME="multi_hold" --> > <h1>Place a hold on <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a></h1> > <!-- TMPL_ELSE --> >@@ -170,15 +170,15 @@ function checkMultiHold() { > <!-- /TMPL_UNLESS --> > > <!-- TMPL_UNLESS NAME="cardnumber"--> >- <!-- TMPL_IF NAME="messageborrower" --> >- <div class="dialog alert"><h3>Patron Not Found</h3><p>No patron with this name, Please, try another</p> </div> >+ <!-- TMPL_IF NAME="messageborrower" --> >+ <div class="dialog alert"><h3>Patron Not Found</h3><p>No patron with this name, Please, try another</p> </div> > <!-- /TMPL_IF --> > <form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" method="post"> > <!-- TMPL_UNLESS name="CGIselectborrower" --> > <fieldset class="brief"> > <label for="patron">Patron: </label> > <div class="hint">Enter patron card number or partial name:</div> >- <input type="text" size="20" id="patron" class="focus" name="findborrower" /> >+ <input type="text" size="20" id="patron" class="focus" name="findborrower" /> > <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber"-->" /> > <input type="submit" value="Search" /> > </fieldset> >@@ -216,7 +216,7 @@ function checkMultiHold() { > <!-- /TMPL_UNLESS --> > > </div> >-<!-- /TMPL_IF --> >+<!-- /TMPL_IF --> > > <!-- TMPL_IF NAME="messages" --> > <div class="dialog message"><ul> >@@ -234,7 +234,7 @@ function checkMultiHold() { > <!-- TMPL_IF NAME="messageborrower" --> > <div class="dialog alert"><h3>Patron not found:</h3> <p>Name or barcode not found. Please try an other </p></div> > <!-- /TMPL_IF --> >- >+ > <fieldset class="rows left"> > <legend>Hold details</legend> > <!-- TMPL_UNLESS NAME="multi_hold" --> >@@ -242,7 +242,7 @@ function checkMultiHold() { > <!-- TMPL_ELSE --> > <form action="placerequest.pl" method="post" onsubmit="return checkMultiHold();" name="form"> > <!-- /TMPL_UNLESS --> >- >+ > <input type="hidden" size="10" name="member" value="<!-- TMPL_VAR NAME="cardnumber" -->" /> > <input type="hidden" name="type" value="str8" /> > >@@ -252,12 +252,12 @@ function checkMultiHold() { > <input type="hidden" name="bad_bibs" id="bad_bibs" value=""/> > <input type="hidden" name="request" value="any"/> > <!-- TMPL_LOOP NAME="biblioloop" --> >- <input type="hidden" name="title_<!-- TMPL_VAR NAME="biblionumber">" value="<!-- TMPL_VAR NAME="title">"/> >+ <input type="hidden" name="title_<!-- TMPL_VAR NAME="biblionumber">" value="<!-- TMPL_VAR NAME="title" ESCAPE="html">"/> > <input type="hidden" name="rank_<!-- TMPL_VAR NAME="biblionumber">" value="<!-- TMPL_VAR NAME="rank">"/> > <!-- /TMPL_LOOP --> > <!-- TMPL_ELSE --> > <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> >- <input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->" /> >+ <input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="html" -->" /> > <input type="hidden" name="rank-request" value="<!-- TMPL_VAR NAME="fixedRank" -->" /> > <!-- /TMPL_IF --> > >@@ -343,7 +343,7 @@ function checkMultiHold() { > > <!-- TMPL_IF NAME="publicationyear" --><li><span class="label">Publication year:</span> <!-- TMPL_VAR NAME="publicationyear" --></li><!-- /TMPL_IF --> > </ol> >- >+ > <table id="requestspecific"> > <caption>Place a hold on a specific copy</caption> > <tr> >@@ -367,7 +367,7 @@ function checkMultiHold() { > <input type="radio" name="checkitem" class="needsoverride" value="<!-- TMPL_VAR NAME="itemnumber" -->" /> > <img src="/intranet-tmpl/<!-- TMPL_VAR NAME="theme" -->/img/famfamfam/silk/error.png" alt="Requires override of hold policy" /> > <!-- TMPL_ELSE --> >- <input disabled="disabled" type="radio" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" /> >+ <input disabled="disabled" type="radio" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" /> > <img src="/intranet-tmpl/<!-- TMPL_VAR NAME="theme" -->/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" /> > <!-- /TMPL_IF --> > </td> >@@ -378,7 +378,7 @@ function checkMultiHold() { > <!-- /TMPL_IF --> > > <td> >- <!-- TMPL_VAR NAME="barcode" --> >+ <!-- TMPL_VAR NAME="barcode" --> > </td> > <td> > <!-- TMPL_VAR NAME="homebranchname" --> >@@ -399,11 +399,11 @@ function checkMultiHold() { > to <!-- TMPL_VAR NAME="transfertto" -->, since <!-- TMPL_VAR NAME="transfertwhen" --> > <!-- /TMPL_IF --> > <!-- /TMPL_IF --> >- >+ > <!-- TMPL_IF Name="message" --> > Unavailable (lost or missing) > <!-- /TMPL_IF --> >- >+ > <!-- TMPL_IF Name="notforloan" --> > Not for loan (<!-- TMPL_VAR NAME="notforloanvalue" -->) > <!-- /TMPL_IF --> >@@ -425,7 +425,7 @@ function checkMultiHold() { > </tr> > <!-- /TMPL_LOOP --> <!-- itemloop --> > </table> >- >+ > <!-- /TMPL_LOOP --> <!-- bibitemloop --> > > <!-- TMPL_ELSE --><!-- UNLESS multi_hold --> >@@ -494,7 +494,7 @@ function checkMultiHold() { > </table> > > <!-- /TMPL_UNLESS --><!-- /multi_hold --> >- >+ > <fieldset class="action"> > <!-- TMPL_IF NAME="cardnumber"--> > <!-- TMPL_IF NAME="override_required" --> >@@ -545,9 +545,9 @@ function checkMultiHold() { > <!-- TMPL_IF Name="wait" --> > <option value="W" selected="selected">Waiting</option> > <!-- /TMPL_IF --> >- <!-- TMPL_LOOP Name="optionloop" --> >- <!-- TMPL_IF Name="selected" --><option value="<!-- TMPL_VAR NAME="num" -->" selected="selected"><!-- TMPL_VAR NAME="num" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="num" -->"><!-- TMPL_VAR NAME="num" --></option><!-- /TMPL_IF --> >- <!-- /TMPL_LOOP --> >+ <!-- TMPL_LOOP Name="optionloop" --> >+ <!-- TMPL_IF Name="selected" --><option value="<!-- TMPL_VAR NAME="num" -->" selected="selected"><!-- TMPL_VAR NAME="num" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="num" -->"><!-- TMPL_VAR NAME="num" --></option><!-- /TMPL_IF --> >+ <!-- /TMPL_LOOP --> > <option value="del">del</option> > </select> > </td> >@@ -600,7 +600,7 @@ function checkMultiHold() { > <!-- TMPL_ELSE --> > <!-- TMPL_IF Name="constrainttypea" --> > <!-- TMPL_IF Name="item_level_hold" --> >- <i>Only item >+ <i>Only item > <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME='biblionumber' -->"> > <!-- TMPL_IF NAME="barcodenumber" --> > <!-- TMPL_VAR NAME="barcodenumber" --> >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 adbcf92..f85d914 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl >@@ -2,7 +2,7 @@ > <!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › Add to Your List > <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> > <style type="text/css"> >- #custom-doc { width:34.62em;*width:33.78em;min-width:450px; margin:auto; margin-top: .4em;text-align:left; } >+ #custom-doc { width:34.62em;*width:33.78em;min-width:450px; margin:auto; margin-top: .4em;text-align:left; } > </style> > </head> > <body id="addtolist"> >@@ -17,7 +17,7 @@ > <!-- /TMPL_IF --> > <ul> > <!-- TMPL_LOOP NAME="biblios"--> >- <li> <span class="title"><!-- TMPL_VAR NAME="title"--></span> >+ <li> <span class="title"><!-- TMPL_VAR NAME="title" ESCAPE="html"--></span> > <!-- TMPL_IF NAME="author"--><span class="author"> <!-- TMPL_VAR NAME="author"--> </span><!-- /TMPL_IF --> > </li> > <!-- /TMPL_LOOP --> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl >index ec566a9..5216d11 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl >@@ -57,7 +57,7 @@ TMPL_ELSE -->Title<!-- /TMPL_UNLESS --></th> > > <!-- TMPL_IF NAME="SyndeticsCoverImages" --><img src="http://www.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="normalized_isbn" -->/SC.GIF&client=<!-- TMPL_VAR NAME="SyndeticsClientCode" --><!-- TMPL_IF NAME="normalized_upc" -->&upc=<!-- TMPL_VAR NAME="normalized_upc" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="normalized_oclc" -->&oclc=<!-- TMPL_VAR NAME="normalized_oclc" --><!-- /TMPL_IF -->&type=xw10" alt=""/><!-- /TMPL_IF --> > </td> >-<td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> >+<td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></a> > <span class="item-details"> > <!-- TMPL_VAR NAME="author" --> > </span></td> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl >index 2b015cb..7455ff3 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl >@@ -1,7 +1,7 @@ > <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --> >-<!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › >+<!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › > <!-- TMPL_IF NAME="searchdesc" --> >- Results of 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 --> >+ Results of 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 --> > <!-- TMPL_ELSE --> > You did not specify any search criteria. > <!-- /TMPL_IF --> >@@ -29,7 +29,7 @@ function holdMultiple() { > if (checkedCount > 0) { > holdBiblioNums(checkedBiblioNums); > } else { >- alert(MSG_NO_RECORD_SELECTED); >+ alert(MSG_NO_RECORD_SELECTED); > } > } > >@@ -151,19 +151,19 @@ $(document).ready(function(){ > <!-- /TMPL_IF --> > <!-- /TMPL_IF --> > $("#tagsel_span").html("<input id=\"tagsel_tag\" class=\"submit\" type=\"submit\" value=\"Tag\"/>"); >- >+ > function cartList(){ > if($("#addto").find("option:selected").attr("value") == "addtolist"){ > var shelfnumber = $("#addto").find("option:selected").attr("id").replace("s",""); > if (vShelfAdd()) { > Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?selectedshelf='+shelfnumber+'&' + vShelfAdd()); > } >- return false; >+ return false; > } else if($("#addto").find("option:selected").attr("value") == "newlist"){ > <!-- TMPL_IF NAME="loggedinusername" -->if (vShelfAdd()) { > Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?newshelf=1&' + vShelfAdd()); > }<!-- TMPL_ELSE --> alert('You must be logged in to create or add to Lists'); <!-- /TMPL_IF --> >- return false; >+ return false; > } > if($("#addto").find("option:selected").attr("value") == "addtocart" || $("#addto").attr("class") == "addtocart"){ > addMultiple(); >@@ -250,8 +250,8 @@ $(document).ready(function(){ > <h4>Error:</h4> > <!-- TMPL_VAR NAME="query_error" --> > </div> >-<!-- /TMPL_IF --> >- >+<!-- /TMPL_IF --> >+ > <!-- Search Results Table --> > <!-- TMPL_IF NAME="total" --> > <!-- TMPL_IF NAME="scan" --> >@@ -286,7 +286,7 @@ $(document).ready(function(){ > </tr> > </table> > </form> >- >+ > <form action="/cgi-bin/koha/opac-search.pl" method="get"> > <table> > <tr> >@@ -300,7 +300,7 @@ $(document).ready(function(){ > <tr> > <!-- /TMPL_IF --> > <td> >- <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->"<!-- TMPL_VAR NAME="title" ESCAPE="URL" -->""><!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --></a> >+ <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->"<!-- TMPL_VAR NAME="title" ESCAPE="URL" -->""><!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" ESCAPE="html" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --></a> > </td> > <td> > <!-- TMPL_VAR NAME="author" --> >@@ -400,7 +400,7 @@ $(document).ready(function(){ > <!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"> > <!-- /TMPL_IF --> > <!-- /TMPL_IF --> >- <!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --> <!-- TMPL_LOOP NAME="subtitle" --><!--TMPL_VAR Name="subfield"--><!--/TMPL_LOOP--></a> >+ <!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" ESCAPE="html" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --> <!-- TMPL_LOOP NAME="subtitle" --><!--TMPL_VAR Name="subfield"--><!--/TMPL_LOOP--></a> > <!-- TMPL_IF NAME="author" -->by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->" title="Search for works by this author" class="author"><!-- TMPL_VAR NAME="author" --></a> > <!-- TMPL_ELSE --> > <!-- /TMPL_IF --> >@@ -452,7 +452,7 @@ $(document).ready(function(){ > </span> > > <!-- /TMPL_IF --> >- <!-- TMPL_IF NAME="LibraryThingForLibrariesID" --><div class="ltfl_reviews"></div><!-- /TMPL_IF --> >+ <!-- TMPL_IF NAME="LibraryThingForLibrariesID" --><div class="ltfl_reviews"></div><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="TagsEnabled" --> > <!-- TMPL_IF NAME="TagsShowOnList" --> > <!-- TMPL_IF NAME="TagLoop" --> >@@ -528,7 +528,7 @@ $(document).ready(function(){ > <!-- TMPL_IF name="suggestion" --> > <!-- TMPL_IF NAME="AnonSuggestions" --><div class="suggestion">Not finding what you're looking for?<br /> Make a <a href="/cgi-bin/koha/opac-suggestions.pl?op=add">purchase suggestion</a></div><!-- TMPL_ELSE --><!-- TMPL_IF NAME="loggedinusername" --><div class="suggestion">Not finding what you're looking for?<br /> Make a <a href="/cgi-bin/koha/opac-suggestions.pl?op=add">purchase suggestion</a></div><!-- /TMPL_IF --><!-- /TMPL_IF --> > <!-- /TMPL_IF --> >-</div> >+</div> > </div> > </div> > <!-- TMPL_IF NAME="opacfacets" --> >@@ -540,7 +540,7 @@ $(document).ready(function(){ > <!-- /TMPL_IF --> > </div> > >-<!-- TMPL_IF NAME="LibraryThingForLibrariesID" --> >-<script src="http://ltfl.librarything.com/forlibraries/widget.js?id=<!--TMPL_VAR NAME="LibraryThingForLibrariesID" -->&systype=koha" type="text/javascript"></script> >-<!-- /TMPL_IF --> >+<!-- TMPL_IF NAME="LibraryThingForLibrariesID" --> >+<script src="http://ltfl.librarything.com/forlibraries/widget.js?id=<!--TMPL_VAR NAME="LibraryThingForLibrariesID" -->&systype=koha" type="text/javascript"></script> >+<!-- /TMPL_IF --> > <!-- TMPL_INCLUDE NAME="opac-bottom.inc" --> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl >index 20e8c93..657ad14 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl >@@ -7,7 +7,7 @@ > $(document).ready(function() { > // We show table ordered by descending dates by default > // (so that the more recent query is shown first) >- $.tablesorter.defaults.sortList = [[0,1]]; >+ $.tablesorter.defaults.sortList = [[0,1]]; > $(".historyt").tablesorter({ > widgets : ['zebra'],<!-- TMPL_IF EXPR="dateformat eq 'metric'" --> > dateFormat: 'uk'<!-- /TMPL_IF --> >@@ -46,7 +46,7 @@ > <!-- TMPL_LOOP NAME="recentSearches" --> > <tr> > <td><!-- TMPL_VAR NAME="time" --></td> >- <td><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" -->"><!-- TMPL_VAR NAME="query_desc" --></a></td> >+ <td><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" -->"><!-- TMPL_VAR NAME="query_desc" ESCAPE="html" --></a></td> > <td><!-- TMPL_VAR NAME="total" --></td> > </tr> > <!-- /TMPL_LOOP --> >-- >1.6.3.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 2600
:
754
| 755 |
756