Synching with latest changes to default template

diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl
index 1c6b8be..09944dc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl
@@ -27,7 +27,7 @@
                <!-- TMPL_LOOP name="subscriptions" -->
                        <tr>
                                <td>
-                                       <!-- TMPL_VAR name="title" -->
+                                       <!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
                                </td>
                                <td>
                                        <!-- TMPL_VAR name="ISSN" -->

diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl
index 762570c..2748a03 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl
@@ -39,7 +39,7 @@
                                                <!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
                                        </p>
                                </td>
-                               <td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
+                               <td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" ESCAPE="url" -->'); return false;" /></form></td>
                        </tr>
                        <!-- /TMPL_LOOP -->
                </table>

diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
index 20dce61..7c99836 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
@@ -1,11 +1,11 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
 <h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
-<form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form>
+<form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form><!-- TMPL_UNLESS name="totalissues" --><form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="hidden" name="op" value="del" /><input type="submit" class="cancel" value="Delete subscription" /></form><!-- /TMPL_UNLESS -->
 
 <div class="data">
 <table>