---
catalogue/issuehistory.pl | 2 -
.../prog/en/includes/biblio-view-menu.inc | 2 +-
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +-
.../prog/en/modules/acqui/supplier.tmpl | 4 +-
.../prog/en/modules/admin/admin-home.tmpl | 8 ++--
.../prog/en/modules/admin/branches.tmpl | 2 +-
.../prog/en/modules/catalogue/MARCdetail.tmpl | 40 ++++++++++----------
.../prog/en/modules/catalogue/detail.tmpl | 10 ++--
.../prog/en/modules/catalogue/moredetail.tmpl | 4 +-
.../prog/en/modules/circ/circulation.tmpl | 4 +-
.../prog/en/modules/circ/selectbranchprinter.tmpl | 3 +-
.../prog/en/modules/members/boraccount.tmpl | 2 +-
.../prog/en/modules/members/member-flags.tmpl | 2 +-
.../prog/en/modules/members/memberentrygen.tmpl | 28 +++++++-------
.../prog/en/modules/members/messaging.tmpl | 4 +-
.../prog/en/modules/members/moremember.tmpl | 2 +-
.../prog/en/modules/reserve/request.tmpl | 6 +-
.../prog/en/modules/tools/viewlog.tmpl | 4 +-
.../prog/en/modules/opac-sendbasketform.tmpl | 2 +-
.../prog/en/modules/opac-suggestions.tmpl | 2 +-
.../prog/en/modules/opac-userdetails.tmpl | 2 +-
21 files changed, 67 insertions(+), 68 deletions(-)
diff --git a/catalogue/issuehistory.pl b/catalogue/issuehistory.pl
index d1b38b6..6e7e107 100755
--- a/catalogue/issuehistory.pl
+++ b/catalogue/issuehistory.pl
@@ -42,8 +42,6 @@ my $params = $query->Vars;
my $biblionumber = $params->{'biblionumber'};
my $itemnumber = $params->{'itemnumber'};
-my $title = $params->{'title'};
-my $author = $params->{'author'};
my ($issues,$biblio,$barcode);
if ($itemnumber){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
index 07d593e..3f021f9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
@@ -16,7 +16,7 @@
</ul>
<ul>
<!-- TMPL_IF NAME="issuehistoryview" --><li class="active"><!-- TMPL_ELSE
--><li><!-- /TMPL_IF -->
-<a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=<!-- TMPL_IF
NAME="object" --><!-- TMPL_VAR NAME="object" --><!-- TMPL_ELSE --><!-- TMPL_IF
NAME="object" --><!-- TMPL_VAR NAME="object" --><!-- TMPL_ELSE --><!-- TMPL_VAR
NAME="biblionumber" --><!-- /TMPL_IF --><!-- /TMPL_IF -->&title=<!--
TMPL_VAR NAME="title"-->&author=<!-- TMPL_VAR NAME="author"-->" >Checkout
history</a></li>
+<a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=<!-- TMPL_IF
NAME="object" --><!-- TMPL_VAR NAME="object" --><!-- TMPL_ELSE --><!-- TMPL_IF
NAME="object" --><!-- TMPL_VAR NAME="object" --><!-- TMPL_ELSE --><!-- TMPL_VAR
NAME="biblionumber" --><!-- /TMPL_IF --><!-- /TMPL_IF -->" >Checkout
history</a></li>
<!-- TMPL_IF NAME="CAN_user_parameters"--><!-- TMPL_IF NAME="logview" --><li
class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a
href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&module=CATALOGUING&action=MODIFY&object=<!--
TMPL_VAR NAME="biblionumber"-->">Modification log</a> </li><!-- /TMPL_IF -->
</ul>
</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index c0e62ea..98247e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -39,7 +39,7 @@ function confirm_deletion() {
$("#addtoshelfc").empty();
$("#printbiblioc").empty();
$("#export").remove();
- $("#addtoshelfc").before("<li id=\"savemenuc\"></li>");
+ $("#addtoshelfc").before("<li id=\"savemenuc\"><\/li>");
yuiToolbar();
});
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index bf0b5ee..b801e1e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -70,7 +70,7 @@ if (f.company.value == "") {
<input type="text" size="20" id="contact_phone_2"
name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->" /></li>
<li><label for="contact_fax">Fax</label>
<input type="text" size="20" id="contact_fax"
name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->" /></li>
- <li><label for="company_email">E-mail</label>
+ <li><label for="company_email">Email</label>
<input type="text" size="40" id="company_email"
name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->" /></li>
<li><label for="contact_notes">Notes</label>
<textarea id="contact_notes" name="contact_notes" cols="40"
rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea></li></ol>
@@ -172,7 +172,7 @@ if (f.company.value == "") {
<!-- TMPL_VAR NAME="contaltphone" --></p>
<p><strong>Fax: </strong>
<!-- TMPL_VAR NAME="contfax" --></p>
- <!-- TMPL_IF NAME="contemail" --><p><strong>E-mail: </strong>
+ <!-- TMPL_IF NAME="contemail" --><p><strong>Email: </strong>
<a href="mailto:<!-- TMPL_VAR NAME="contemail" -->"><!--
TMPL_VAR NAME="contemail" --></a></p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="contnotes" --><p><strong>Notes: </strong>
<!-- TMPL_VAR NAME="contnotes" --></p><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
index 2093c69..a9a1cd1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
@@ -18,7 +18,7 @@
<div class="yui-u first">
<dl>
<dt><a href="/cgi-bin/koha/admin/systempreferences.pl">Global system
preferences</a></dt>
- <dd>Manage global system preferences like MARC flavor, date format,
administrator e-mail, and templates.</dd>
+ <dd>Manage global system preferences like MARC flavor, date format,
administrator email, and templates.</dd>
</dl>
@@ -51,10 +51,10 @@
</dl>
</div>
<div class="yui-u">
-<h3>Catalog</h3>
+<h3>Catalogue</h3>
<dl>
- <dt><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized
values</a></dt>
- <dd>Define categories and authorized values for them.</dd>
+ <dt><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised
values</a></dt>
+ <dd>Define categories and authorised values for them.</dd>
<dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC
Bibliographic framework</a></dt>
<dd>Create and manage Bibliographic frameworks that define the
characteristics of your MARC Records (field and subfield definitions) as well
as templates for the MARC editor.</dd>
<dt><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC
mapping</a></dt>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index dca2c97..3b16826 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -96,7 +96,7 @@
<li><label for="branchaddress3">Address Line 3</label><input
type="text" name="branchaddress3" id="branchaddress3" value="<!-- TMPL_VAR
name="branchaddress3" escape="HTML" -->" /></li>
<li><label for="branchphone">Phone</label><input type="text"
name="branchphone" id="branchphone" value="<!-- TMPL_VAR name="branchphone"
escape="HTML" -->" /></li>
<li><label for="branchfax">Fax</label><input type="text"
name="branchfax" id="branchfax" value="<!-- TMPL_VAR name="branchfax"
escape="HTML" -->" /></li>
- <li><label for="branchemail">E-mail</label><input type="text"
name="branchemail" id="branchemail" value="<!-- TMPL_VAR name="branchemail"
escape="HTML" -->" /></li>
+ <li><label for="branchemail">Email</label><input type="text"
name="branchemail" id="branchemail" value="<!-- TMPL_VAR name="branchemail"
escape="HTML" -->" /></li>
<li><label for="branchip">IP</label><input type="text" name="branchip"
id="branchip" value="<!-- TMPL_VAR name="branchip" escape="HTML" -->" /> <span
class="hint">Can be entered as a single IP, or a subnet such as
192.168.1.*</span></li>
<!--
<li><label for="branchprinter">Library Printer</label>
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 466b1ef..f88478b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -89,10 +89,10 @@ function Changefwk(FwkList) {
<span class="subfield-label">
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR
NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<span title="<!-- TMPL_VAR name="long_desc" -->"><!--
TMPL_VAR NAME="short_desc" --></span></span>
- <!-- TMPL_VAR NAME="marc_value" -->
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
<!-- TMPL_IF name="link" -->
<a
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&idx=<!-- TMPL_VAR
NAME="link" -->,phr&type=intranet&q=<!-- TMPL_VAR NAME="marc_value"
ESCAPE="URL" -->">
- <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search
on <!-- TMPL_VAR name="marc_value" -->" />
+ <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->"
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authority" -->
@@ -119,10 +119,10 @@ function Changefwk(FwkList) {
<span class="subfield-label">
<!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
<span title="<!-- TMPL_VAR name="long_desc" -->"><!--
TMPL_VAR NAME="short_desc" --></span></span>
- <!-- TMPL_VAR NAME="marc_value" -->
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
<!-- TMPL_IF name="link" -->
<a
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&idx=<!-- TMPL_VAR
NAME="link" -->,phr&type=intranet&q=<!-- TMPL_VAR NAME="marc_value"
ESCAPE="URL" -->">
- <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search
on <!-- TMPL_VAR name="marc_value" -->" />
+ <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->"
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authority" -->
@@ -149,10 +149,10 @@ function Changefwk(FwkList) {
<span class="subfield-label">
<!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
<span title="<!-- TMPL_VAR name="long_desc" -->"><!--
TMPL_VAR NAME="short_desc" --></span></span>
- <!-- TMPL_VAR NAME="marc_value" -->
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
<!-- TMPL_IF name="link" -->
<a
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&idx=<!-- TMPL_VAR
NAME="link" -->,phr&type=intranet&q=<!-- TMPL_VAR NAME="marc_value"
ESCAPE="URL" -->">
- <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search
on <!-- TMPL_VAR name="marc_value" -->" />
+ <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->"
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authority" -->
@@ -179,10 +179,10 @@ function Changefwk(FwkList) {
<span class="subfield-label">
<!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
<span title="<!-- TMPL_VAR name="long_desc" -->"><!--
TMPL_VAR NAME="short_desc" --></span></span>
- <!-- TMPL_VAR NAME="marc_value" -->
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
<!-- TMPL_IF name="link" -->
<a
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&idx=<!-- TMPL_VAR
NAME="link" -->,phr&type=intranet&q=<!-- TMPL_VAR NAME="marc_value"
ESCAPE="URL" -->">
- <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search
on <!-- TMPL_VAR name="marc_value" -->" />
+ <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->"
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authority" -->
@@ -209,10 +209,10 @@ function Changefwk(FwkList) {
<span class="subfield-label">
<!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
<span title="<!-- TMPL_VAR name="long_desc" -->"><!--
TMPL_VAR NAME="short_desc" --></span></span>
- <!-- TMPL_VAR NAME="marc_value" -->
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
<!-- TMPL_IF name="link" -->
<a
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&idx=<!-- TMPL_VAR
NAME="link" -->,phr&type=intranet&q=<!-- TMPL_VAR NAME="marc_value"
ESCAPE="URL" -->">
- <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->"> alt="Search
on <!-- TMPL_VAR name="marc_value" -->" />
+ <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html"
-->"> alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authority" -->
@@ -239,10 +239,10 @@ function Changefwk(FwkList) {
<span class="subfield-label">
<!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
<span title="<!-- TMPL_VAR name="long_desc" -->"><!--
TMPL_VAR NAME="short_desc" --></span></span>
- <!-- TMPL_VAR NAME="marc_value" -->
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
<!-- TMPL_IF name="link" -->
<a
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&idx=<!-- TMPL_VAR
NAME="link" -->,phr&type=intranet&q=<!-- TMPL_VAR NAME="marc_value"
ESCAPE="URL" -->">
- <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search
on <!-- TMPL_VAR name="marc_value" -->" />
+ <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->"
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authority" -->
@@ -269,10 +269,10 @@ function Changefwk(FwkList) {
<span class="subfield-label">
<!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
<span title="<!-- TMPL_VAR name="long_desc" -->"><!--
TMPL_VAR NAME="short_desc" --></span></span>
- <!-- TMPL_VAR NAME="marc_value" -->
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
<!-- TMPL_IF name="link" -->
<a
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&idx=<!-- TMPL_VAR
NAME="link" -->,phr&type=intranet&q=<!-- TMPL_VAR NAME="marc_value"
ESCAPE="URL" -->">
- <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search
on <!-- TMPL_VAR name="marc_value" -->" />
+ <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->"
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authority" -->
@@ -299,10 +299,10 @@ function Changefwk(FwkList) {
<span class="subfield-label">
<!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
<span title="<!-- TMPL_VAR name="long_desc" -->"><!--
TMPL_VAR NAME="short_desc" --></span></span>
- <!-- TMPL_VAR NAME="marc_value" -->
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
<!-- TMPL_IF name="link" -->
<a
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&idx=<!-- TMPL_VAR
NAME="link" -->,phr&type=intranet&q=<!-- TMPL_VAR NAME="marc_value"
ESCAPE="URL" -->">
- <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search
on <!-- TMPL_VAR name="marc_value" -->" />
+ <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->"
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authority" -->
@@ -329,10 +329,10 @@ function Changefwk(FwkList) {
<span class="subfield-label">
<!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
<span title="<!-- TMPL_VAR name="long_desc" -->"><!--
TMPL_VAR NAME="short_desc" --></span></span>
- <!-- TMPL_VAR NAME="marc_value" -->
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
<!-- TMPL_IF name="link" -->
<a
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&idx=<!-- TMPL_VAR
NAME="link" -->,phr&type=intranet&q=<!-- TMPL_VAR NAME="marc_value"
ESCAPE="URL" -->">
- <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search
on <!-- TMPL_VAR name="marc_value" -->" />
+ <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->"
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authority" -->
@@ -359,10 +359,10 @@ function Changefwk(FwkList) {
<span class="subfield-label">
<!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
<span title="<!-- TMPL_VAR name="long_desc" -->"><!--
TMPL_VAR NAME="short_desc" --></span></span>
- <!-- TMPL_VAR NAME="marc_value" -->
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
<!-- TMPL_IF name="link" -->
<a
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&idx=<!-- TMPL_VAR
NAME="link" -->,phr&type=intranet&q=<!-- TMPL_VAR NAME="marc_value"
ESCAPE="URL" -->">
- <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search
on <!-- TMPL_VAR name="marc_value" -->" />
+ <img border="0" src="<!-- TMPL_VAR
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png"
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->"
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authority" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 4171273..34b3bef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -61,12 +61,12 @@ function verify_images() {
<!-- TMPL_IF name="volume" --> <!-- TMPL_VAR name="volume" --><!--
/TMPL_IF -->
<!-- TMPL_IF name="volumedesc" -->, <!-- TMPL_VAR
name="volumedesc" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="number" --> <!--
TMPL_VAR NAME="number" --> <!-- /TMPL_IF -->
<!-- TMPL_IF name="unititle" -->, <!-- TMPL_VAR name="unititle"
-->/<!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="author" -->By <a
href="/cgi-bin/koha/catalogue/search.pl?q=au:<!-- TMPL_VAR NAME="author"
-->"><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="author" -->By <a
href="/cgi-bin/koha/catalogue/search.pl?q=au:<!-- TMPL_VAR NAME="author"
ESCAPE="url" -->"><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF -->
<ul>
<!-- TMPL_IF name="MARCAUTHORS" -->
<li><strong>Additional Authors:</strong><ul>
<!-- TMPL_LOOP NAME="MARCAUTHORS" -->
- <li><!-- TMPL_LOOP NAME="MARCAUTHOR_SUBFIELDS_LOOP" --><!--
TMPL_VAR NAME="separator" --><a title="â¡<!-- TMPL_VAR NAME=code --> <!--
TMPL_VAR NAME=value -->" href="/cgi-bin/koha/catalogue/search.pl?q=<!--
TMPL_LOOP NAME=link_loop --><!-- TMPL_VAR NAME=operator --><!-- TMPL_VAR
name='limit' -->:<!-- TMPL_VAR NAME=link --><!-- /TMPL_LOOP -->"><!-- TMPL_VAR
NAME="value" --></a><!-- /TMPL_LOOP --></li>
+ <li><!-- TMPL_LOOP NAME="MARCAUTHOR_SUBFIELDS_LOOP" --><!--
TMPL_VAR NAME="separator" --><a title="â¡<!-- TMPL_VAR NAME="code" --> <!--
TMPL_VAR NAME="value" -->" href="/cgi-bin/koha/catalogue/search.pl?q=<!--
TMPL_LOOP NAME="link_loop" --><!-- TMPL_VAR NAME="operator" --><!-- TMPL_VAR
name="limit" -->:<!-- TMPL_VAR NAME="link" ESCAPE="url" --><!-- /TMPL_LOOP
-->"><!-- TMPL_VAR NAME="value" --></a><!-- /TMPL_LOOP --></li>
<!-- /TMPL_LOOP -->
</ul>
@@ -74,8 +74,8 @@ function verify_images() {
<!-- /TMPL_IF -->
<!-- TMPL_IF name="publishercode" -->
<li><strong>Published by:</strong>
- <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:<!-- TMPL_VAR
NAME="publishercode"-->">
- <!-- TMPL_VAR NAME="publishercode" -->
+ <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:<!-- TMPL_VAR
NAME="publishercode" ESCAPE="url" -->">
+ <!-- TMPL_VAR NAME="publishercode" ESCAPE="html" -->
</a> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR
NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!--
TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF --> <!-- TMPL_IF
NAME="editionstatement" --><!-- TMPL_VAR NAME="editionstatement" --><!--
/TMPL_IF --> <!-- TMPL_IF NAME="editionresponsability" --><!-- TMPL_VAR
NAME="editionresponsability" --><!-- /TMPL_IF -->
</li>
<!-- /TMPL_IF -->
@@ -118,7 +118,7 @@ function verify_images() {
<li><strong>Subjects:</strong>
<ul>
<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
- <li><!-- TMPL_LOOP NAME="MARCSUBJECT_SUBFIELDS_LOOP" --> <!--
TMPL_VAR NAME="separator" --> <a title="â¡<!-- TMPL_VAR NAME="code" --> <!--
TMPL_VAR NAME="value" -->" href="/cgi-bin/koha/catalogue/search.pl?q=<!--
TMPL_LOOP NAME="link_loop" --><!-- TMPL_VAR NAME="operator" --><!-- TMPL_VAR
name="limit" -->:<!-- TMPL_VAR NAME="link" --><!-- /TMPL_LOOP -->"><!--
TMPL_VAR NAME="value" --></a><!-- /TMPL_LOOP --></li>
+ <li><!-- TMPL_LOOP NAME="MARCSUBJECT_SUBFIELDS_LOOP" --> <!--
TMPL_VAR NAME="separator" --> <a title="â¡<!-- TMPL_VAR NAME="code" --> <!--
TMPL_VAR NAME="value" -->" href="/cgi-bin/koha/catalogue/search.pl?q=<!--
TMPL_LOOP NAME="link_loop" --><!-- TMPL_VAR NAME="operator" --><!-- TMPL_VAR
name="limit" -->:<!-- TMPL_VAR NAME="link" escape="url" --><!-- /TMPL_LOOP
-->"><!-- TMPL_VAR NAME="value" ESCAPE="html" --></a><!-- /TMPL_LOOP --></li>
<!-- /TMPL_LOOP -->
</ul>
</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index fa3db03..21b9957 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -19,7 +19,7 @@
<div id="catalogue_detail_biblio">
<!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
- <h2><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="author" -->, by <!--
TMPL_VAR NAME="author" --><!-- /TMPL_IF --></h2>
+ <h2><!-- TMPL_VAR NAME="title" ESCAPE="html" --> <!-- TMPL_IF
NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></h2>
<ol class="bibliodetails">
<li><span class="label">Biblionumber:</span> <!-- TMPL_VAR
NAME="biblionumber" --> </li>
<!-- TMPL_UNLESS NAME="item-level_itypes" -->
@@ -28,7 +28,7 @@
<!-- deprecated? <li><span class="label">Loan length:</span> <!--
TMPL_VAR NAME="loanlength" --> </li> -->
<li><span class="label">Rental charge:</span>$<!-- TMPL_VAR
NAME="rentalcharge" --> </li>
<li><span class="label">ISBN:</span> <!-- TMPL_VAR NAME="isbn"
--> </li>
- <li><span class="label">Publisher:</span><!-- TMPL_VAR NAME="place"
--> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear"
--> </li>
+ <li><span class="label">Publisher:</span><!-- TMPL_VAR NAME="place"
--> <!-- TMPL_VAR NAME="publishercode" ESCAPE="html" --> <!-- TMPL_VAR
NAME="publicationyear" --> </li>
<!-- TMPL_IF NAME="volumeddesc" --><li><span
class="label">Volume:</span> <!-- TMPL_VAR NAME="volumeddesc" --></li><!--
/TMPL_IF -->
<li><span class="label">Physical Details:</span> <!-- TMPL_VAR
NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size"
--> </li>
<!-- TMPL_IF NAME="bnotes" --><li><span class="label">Notes:</span>
<!-- TMPL_VAR NAME="bnotes" --></li><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 1229390..e959144 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -567,8 +567,8 @@ No patron matched <span class="ex"><!-- TMPL_VAR
name="message" --></span>
</div>
</div>
-<!-- TMPL_UNLESS NAME="CGIselectborrower" --><div class="yui-b">
+<!-- TMPL_UNLESS NAME="CGIselectborrower" --><!-- TMPL_IF
NAME="borrowernumber" --><div class="yui-b">
<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
-</div><!-- /TMPL_UNLESS -->
+</div><!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
index a403d5e..c1c5841 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
@@ -34,6 +34,7 @@
<!-- TMPL_IF Name="printerloop" -->
<li><label for="printer">Choose a network printer:</label>
+ <input type="hidden" name="setcookies" value="1" />
<!--printerselection-->
<select name="printer" id="printer">
<!-- TMPL_LOOP Name="printerloop" -->
@@ -44,7 +45,7 @@
<!-- /TMPL_LOOP -->
</select></li>
<!-- /TMPL_IF -->
- <input type="hidden" name="setcookies" value="1" /></ol>
+ </ol>
</fieldset> <fieldset class="action"><input type="submit" value="Submit"
name="changesettings" /></fieldset>
</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index 949f239..138b3c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -39,7 +39,7 @@
<!-- TMPL_IF NAME="toggle" --> <tr><!-- TMPL_ELSE --><tr
class="highlight"><!-- /TMPL_IF -->
<td><!-- TMPL_VAR NAME="date" --></td>
- <td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_IF
NAME="itemnumber" --><a
href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">View
item</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR
NAME="title" --><!-- /TMPL_IF --></td>
+ <td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_IF
NAME="itemnumber" --><a
href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber"
-->">View item</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="printtitle" -->
<!-- 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/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
index 13093e5..da9bdc6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
@@ -1,7 +1,7 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha › Patrons › Set Privileges for <!-- TMPL_VAR
NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<link rel="stylesheet" href="<!-- TMPL_VAR NAME="themelang"
-->/css/treeview/jquery.treeview.css"/>
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang"
-->/css/treeview/jquery.treeview.css"/>
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/lib/jquery/plugins/jquery.treeview.pack.js"></script>
<!-- set up tree -->
<script type="text/javascript">
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index d75a738..b606ad3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -1,6 +1,6 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha › Patrons ›
-<!-- TMPL_IF NAME="opadd" --> Add<!-- TMPL_ELSE --> Modify<!--/TMPL_IF-->
<!--TMPL_IF Name="categoryname"--> <!--TMPL_VAR Name="categoryname"-->
patron<!-- TMPL_ELSE --><!--TMPL_IF Name="I"--> Organization patron<!--/TMPL_IF
--><!--TMPL_IF Name="A"--> Adult patron<!--/TMPL_IF --><!--TMPL_IF Name="C"-->
Child patron<!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professional
patron<!--/TMPL_IF --><!--TMPL_IF Name="S"--> Staff patron<!--/TMPL_IF
--><!--/TMPL_IF --><!--TMPL_UNLESS Name="opadd"--> <!-- TMPL_VAR NAME="surname"
-->, <!-- TMPL_VAR name="firstname" --><!--/TMPL_UNLESS--></title>
+<!-- TMPL_IF NAME="opadd" --> Add<!-- TMPL_ELSE --> Modify<!--/TMPL_IF-->
<!--TMPL_IF Name="categoryname"--> <!--TMPL_VAR Name="categoryname"-->
patron<!-- TMPL_ELSE --><!--TMPL_IF Name="I"--> Organisation patron<!--/TMPL_IF
--><!--TMPL_IF Name="A"--> Adult patron<!--/TMPL_IF --><!--TMPL_IF Name="C"-->
Child patron<!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professional
patron<!--/TMPL_IF --><!--TMPL_IF Name="S"--> Staff patron<!--/TMPL_IF
--><!--/TMPL_IF --><!--TMPL_UNLESS Name="opadd"--> <!-- TMPL_VAR NAME="surname"
-->, <!-- TMPL_VAR name="firstname" --><!--/TMPL_UNLESS--></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang'
-->/js/members.js"></script>
<!-- TMPL_INCLUDE NAME="calendar.inc" -->
@@ -57,10 +57,10 @@
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a
href="/cgi-bin/koha/members/members-home.pl">Patrons</a> ›
<!-- TMPL_IF NAME="opadd" -->
- Add<!--TMPL_IF Name="categoryname"--> <!--TMPL_VAR
Name="categoryname"--> patron<!-- TMPL_ELSE --><!--TMPL_IF Name="I"-->
Organization patron<!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adult
patron<!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child patron<!--/TMPL_IF
--><!--TMPL_IF Name="P"--> Professional patron<!--/TMPL_IF --><!--TMPL_IF
Name="S"--> Staff patron<!--/TMPL_IF --><!--/TMPL_IF -->
+ Add<!--TMPL_IF Name="categoryname"--> <!--TMPL_VAR
Name="categoryname"--> patron<!-- TMPL_ELSE --><!--TMPL_IF Name="I"-->
Organisation patron<!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adult
patron<!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child patron<!--/TMPL_IF
--><!--TMPL_IF Name="P"--> Professional patron<!--/TMPL_IF --><!--TMPL_IF
Name="S"--> Staff patron<!--/TMPL_IF --><!--/TMPL_IF -->
<!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
<!-- TMPL_ELSE -->
-<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR
NAME="borrowernumber" -->"><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR
NAME="surname" --></a> › <strong>Modify<!--TMPL_IF
Name="categoryname"--> <!--TMPL_VAR Name="categoryname"--> patron<!-- TMPL_ELSE
--><!--TMPL_IF Name="I"--> Organization patron<!--/TMPL_IF --><!--TMPL_IF
Name="A"--> Adult patron<!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child
patron<!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professional patron<!--/TMPL_IF
--><!--TMPL_IF Name="S"--> Staff patron<!--/TMPL_IF --><!--/TMPL_IF -->
+<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR
NAME="borrowernumber" -->"><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR
NAME="surname" --></a> › <strong>Modify<!--TMPL_IF
Name="categoryname"--> <!--TMPL_VAR Name="categoryname"--> patron<!-- TMPL_ELSE
--><!--TMPL_IF Name="I"--> Organisation patron<!--/TMPL_IF --><!--TMPL_IF
Name="A"--> Adult patron<!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child
patron<!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professional patron<!--/TMPL_IF
--><!--TMPL_IF Name="S"--> Staff patron<!--/TMPL_IF --><!--/TMPL_IF -->
</strong><!-- /TMPL_IF --></div>
<!-- TMPL_IF NAME="opadd" --><div id="doc" class="yui-t7"><!-- TMPL_ELSE
--><div id="doc3" class="yui-t2"><!-- /TMPL_IF -->
@@ -72,11 +72,11 @@
<!-- TMPL_IF NAME="opadd" -->
<h1>
- Add<!--TMPL_IF Name="categoryname"--> <!--TMPL_VAR
Name="categoryname"--> patron<!-- TMPL_ELSE --><!--TMPL_IF Name="I"-->
Organization patron<!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adult
patron<!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child patron<!--/TMPL_IF
--><!--TMPL_IF Name="P"--> Professional patron<!--/TMPL_IF --><!--TMPL_IF
Name="S"--> Staff patron<!--/TMPL_IF --><!--/TMPL_IF --> <!-- TMPL_VAR
name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
+ Add<!--TMPL_IF Name="categoryname"--> <!--TMPL_VAR
Name="categoryname"--> patron<!-- TMPL_ELSE --><!--TMPL_IF Name="I"-->
Organisation patron<!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adult
patron<!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child patron<!--/TMPL_IF
--><!--TMPL_IF Name="P"--> Professional patron<!--/TMPL_IF --><!--TMPL_IF
Name="S"--> Staff patron<!--/TMPL_IF --><!--/TMPL_IF --> <!-- TMPL_VAR
name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
</h1>
<!-- TMPL_ELSE -->
<h1>
- Modify<!--TMPL_IF Name="categoryname"--> <!--TMPL_VAR
Name="categoryname"--> patron<!-- TMPL_ELSE --><!--TMPL_IF Name="I"-->
Organization patron<!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adult
patron<!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child patron<!--/TMPL_IF
--><!--TMPL_IF Name="P"--> Professional patron<!--/TMPL_IF --><!--TMPL_IF
Name="S"--> Staff patron<!--/TMPL_IF --><!--/TMPL_IF -->
+ Modify<!--TMPL_IF Name="categoryname"--> <!--TMPL_VAR
Name="categoryname"--> patron<!-- TMPL_ELSE --><!--TMPL_IF Name="I"-->
Organisation patron<!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adult
patron<!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child patron<!--/TMPL_IF
--><!--TMPL_IF Name="P"--> Professional patron<!--/TMPL_IF --><!--TMPL_IF
Name="S"--> Staff patron<!--/TMPL_IF --><!--/TMPL_IF -->
<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
</h1>
<!-- /TMPL_IF -->
@@ -84,7 +84,7 @@
<!-- TMPL_IF NAME="check_member" -->
<p>
<form name="form_double"
action="/cgi-bin/koha/members/memberentry.pl" method="post">
- <div class="dialog alert">
+ <div class="dialog error">
<h3>Duplicate suspected</h3>
<a
href="javascript:Dopop('borrowers_details.pl?borrowernumber=<!--TMPL_VAR
NAME="check_member"-->');" >Detail</a>
Duplicate ?
@@ -155,7 +155,7 @@
<!--TMPL_IF Name="step_1"-->
<fieldset class="rows" id="memberentry_identity">
- <legend><!--TMPL_IF Name="I"-->Organization
<!--TMPL_ELSE-->Patron <!--/TMPL_IF-->identity</legend>
+ <legend><!--TMPL_IF Name="I"-->Organisation
<!--TMPL_ELSE-->Patron <!--/TMPL_IF-->identity</legend>
<ol>
<!-- TMPL_UNLESS name="I" -->
<!-- TMPL_IF NAME="title_cgipopup" -->
@@ -277,7 +277,7 @@
<!-- TMPL_ELSE -->
<li id="contact-details" style="display: none">
<!-- /TMPL_IF -->
- <span class="label">Patron #:</span> <!-- TMPL_IF
NAME="guarantorid" --> <a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR
NAME="guarantorid" -->" target="blank"><!-- TMPL_VAR NAME="guarantorid"
--></a><!-- /TMPL_IF -->
+ <span class="label">Patron #:</span> <!-- TMPL_IF
NAME="guarantorid" --> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!--
TMPL_VAR NAME="guarantorid" -->" target="blank"><!-- TMPL_VAR
NAME="guarantorid" --></a><!-- /TMPL_IF -->
</li>
<li>
<label for="contactname">Surname: </label>
@@ -403,7 +403,7 @@
<!--TMPL_ELSE-->
<label for="B_email">
<!-- /TMPL_IF-->
- E-mail (home): </label>
+ Email (home): </label>
<input type="text" id="B_email" name="B_email" size="45" value="<!--
TMPL_VAR NAME="B_email" -->" />
<!-- TMPL_IF NAME="mandatoryB_email" --><span
class="required">Required</span><!-- /TMPL_IF --> </li>
<!--/TMPL_IF-->
@@ -443,7 +443,7 @@
<!--TMPL_ELSE-->
<label for="email">
<!-- /TMPL_IF-->
- E-mail (home): </label>
+ Email (home): </label>
<input type="text" id="email" name="email" size="45" value="<!--
TMPL_VAR NAME="email" -->" />
<!-- TMPL_IF NAME="mandatoryemail" --><span
class="required">Required</span><!-- /TMPL_IF -->
</li>
@@ -453,7 +453,7 @@
<!--TMPL_ELSE-->
<label for="emailpro">
<!-- /TMPL_IF-->
- E-mail (work): </label>
+ Email (work): </label>
<input type="text" id="emailpro" name="emailpro" size="45" value="<!--
TMPL_VAR NAME="emailpro" -->" />
<!-- TMPL_IF NAME="mandatoryemailpro" --><span
class="required">Required</span><!-- /TMPL_IF -->
</li>
@@ -617,14 +617,14 @@
<!-- TMPL_IF NAME="I" -->
<!-- TMPL_IF NAME="memberofinstution" -->
<fieldset class="rows" id="memberentry_organisation">
- <legend>Organizations</legend><ol>
+ <legend>Organisations</legend><ol>
<li>
<!-- TMPL_IF NAME="mandatoryphone" -->
<label for="organisations" class="required">
<!--TMPL_ELSE-->
<label for="organisations">
<!-- /TMPL_IF-->
- Organization(s): </label>
+ Organisation(s): </label>
<!-- TMPL_VAR NAME="CGIorganisations" -->
<!-- TMPL_IF NAME="mandatoryphone" --><span
class="required">Required</span><!-- /TMPL_IF -->
</li>
@@ -664,7 +664,7 @@
<!-- TMPL_IF EXPR="typename eq 'C'" --><optgroup
label="Child"><!-- /TMPL_IF -->
<!-- TMPL_IF EXPR="typename eq 'A'" --><optgroup
label="Adult"><!-- /TMPL_IF -->
<!-- TMPL_IF EXPR="typename eq 'S'" --><optgroup
label="Staff"><!-- /TMPL_IF -->
- <!-- TMPL_IF EXPR="typename eq 'I'" --><optgroup
label="Organization"><!-- /TMPL_IF -->
+ <!-- TMPL_IF EXPR="typename eq 'I'" --><optgroup
label="Organisation"><!-- /TMPL_IF -->
<!-- TMPL_IF EXPR="typename eq 'P'" --><optgroup
label="Professional"><!-- /TMPL_IF -->
<!-- TMPL_IF EXPR="typename eq 'X'" --><optgroup
label="Statistical"><!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="categoryloop" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tmpl
index 42870e4..955ce67 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tmpl
@@ -54,12 +54,12 @@
<h3>Manage patron messaging settings</h3>
<table>
- <tr><th></th><th># days in
advance</th><th>sms</th><th>email</th><th>Digests only?</th><th>rss</th><th>do
not notify</th></tr>
+ <tr><th></th><th>Days in advance</th><th>SMS</th><th>Email</th><th>Digests
only?</th><th>RSS</th><th>Do not notify</th></tr>
<!-- TMPL_LOOP name="messaging_preferences" -->
<tr>
<td><!-- TMPL_VAR NAME="message_name" --></td>
<!-- TMPL_IF NAME="takes_days" -->
- <td><select name="<!-- TMPL_VAR NAME="message_attribute_id" -->-DAYS"
id="<!-- TMPL_VAR NAME="message_name" -->-DAYS" >
+ <td><select name="<!-- TMPL_VAR NAME="message_attribute_id" -->-DAYS">
<!-- TMPL_LOOP name="select_days" -->
<!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR
NAME="day" -->" selected="selected"><!-- TMPL_VAR NAME="day" --></option><!--
TMPL_ELSE -->
<option value="<!-- TMPL_VAR NAME="day" -->"><!-- TMPL_VAR
NAME="day" --></option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index b1c5a2c..9887487 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -220,7 +220,7 @@ if (nodename =="barcodes[]"){
<fieldset class="action">
<input type="submit" value="Upload" class="submit" />
<input name="op" type="hidden" value="Upload" />
- <!-- TMPL_IF NAME="picture" --><a
href="/cgi-bin/koha/tools/picture-upload.pl?op=Delete&cardnumber=<!-- TMPL_VAR
NAME="cardnumber" -->&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"
class="delete">Delete</a><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="picture" --><a
href="/cgi-bin/koha/tools/picture-upload.pl?op=Delete&cardnumber=<!--
TMPL_VAR NAME="cardnumber" -->&borrowernumber=<!-- TMPL_VAR
NAME="borrowernumber" -->" class="delete">Delete</a><!-- /TMPL_IF -->
</fieldset>
</fieldset>
</form>
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 771063c..99aa17a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -154,9 +154,9 @@ if (alreadyreserved > "0"){
<div class="dialog alert"><h3>Patron not found:</h3> <p>Name or barcode not
found. Please try an other </p></div>
<!-- /TMPL_IF -->
+ <form action="placerequest.pl" method="post" onsubmit="return
check();" name="form">
<fieldset class="rows left">
<legend>Hold details</legend>
- <form action="placerequest.pl" method="post" onsubmit="return
check();" name="form">
<input type="hidden" size="10" name="member" value="<!-- TMPL_VAR
NAME="cardnumber" -->" />
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR
NAME="biblionumber" -->" />
@@ -185,10 +185,10 @@ if (alreadyreserved > "0"){
<li> <label for="requestany">Place a hold on the next available copy
</label>
<input type="checkbox" id="requestany" name="request"
checked="checked" value="Any" />
- </li>
-
<input type="hidden" name="biblioitem" value="<!-- TMPL_VAR
NAME="biblioitemnumber" -->" />
<input type="hidden" name="alreadyreserved" value="<!-- TMPL_VAR
NAME="alreadyreserved" -->" />
+ </li>
+
</ol>
<fieldset class="action">
<!-- TMPL_IF NAME="cardnumber"-->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
index d549370..c380f5a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
@@ -154,12 +154,12 @@
<td><!-- TMPL_VAR NAME="action"
--></td>
<td>
<!-- TMPL_IF
NAME="MEMBERS"-->
- <a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR
NAME="object" -->" title="display detail for this member." title="Display
member details.">
+ <a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR
NAME="object" -->" title="Display member details">
member <!--
TMPL_VAR NAME="object" -->
</a>
<!-- TMPL_ELSE -->
<!-- TMPL_IF
NAME="CIRCULATION" -->
- <a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR
NAME="object" -->" title="display detail for this member." title="Display
member details.">
+ <a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR
NAME="object" -->" title="Display member details">
<!-- TMPL_IF
NAME="object"-->member <!-- TMPL_VAR NAME="object" --><!-- /TMPL_IF -->
</a>
<!-- TMPL_ELSE -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
index 80087aa..c162a9d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
@@ -20,7 +20,7 @@
<fieldset class="rows">
<legend>Sending your cart</legend>
<ol> <li>
- <label for="email_add">E-mail Address:</label>
+ <label for="email_add">Email Address:</label>
<input type="text" id="email_add" name="email_add" size="43" />
</li>
<li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
index aa67124..749c735 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
@@ -56,7 +56,7 @@ $.tablesorter.addParser({
<!-- TMPL_IF name="op_add" -->
<h1>Enter a new purchase suggestion</h1>
- <p>Please fill out this form to make a purchase suggestion. You will
receive an email when the library processes your purchase suggestion</p>
+ <p>Please fill out this form to make a purchase suggestion. You will
receive an email when the library processes your purchase suggestion.</p>
<p>No fields are mandatory. Enter whatever information you have. The
"Notes" field can be used to provide any additional information.</p>
<form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
<fieldset class="rows"> <ol>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
index 89b7a7b..273cbfb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
@@ -29,7 +29,7 @@ Card Number:</th><td><!-- TMPL_VAR NAME="cardnumber"
--></td></tr>
<tr><th scope="row">Fax:</th><td><!-- TMPL_IF NAME="fax" --><!-- TMPL_VAR
NAME="fax" --><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td></tr>
-<tr><th scope="row">E-mail:</th><td><!-- TMPL_IF NAME="email" --><a
href="mailto:<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email"
--></a><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td></tr>
+<tr><th scope="row">Email:</th><td><!-- TMPL_IF NAME="email" --><a
href="mailto:<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email"
--></a><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td></tr>
</table>
--
1.5.5.GIT
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
