Bug 13321: Rename variables

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / serials / subscription-detail.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index 3c224de..8c95459 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% USE Branches %]
 [% USE AuthorisedValues %]
 [% INCLUDE 'doc-head-open.inc' %]
@@ -50,7 +51,7 @@ $(document).ready(function() {
     [% END %]
     [% IF ( NEEDSCONFIRMATION ) %]
     <div id="circ_needsconfirmation" class="dialog alert">
-                       <h3>Please Confirm Subscription deletion</h3>
+        <h3>Please confirm subscription deletion</h3>
 
                        <ul>
                        [% IF ( NOTEXPIRED ) %] <li>The subscription has not expired yet</li> [% END %] 
@@ -61,11 +62,11 @@ $(document).ready(function() {
                        <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
                        <input type="hidden" name="issueconfirmed" value="1" />
                        <input type="hidden" name="op" value="del" />
-            <input type="submit" class="approve" value="Yes, delete (Y)" accesskey="y" />
+            <button type="submit" class="approve" accesskey="y"><i class="fa fa-fw fa-check"></i> Yes, delete (Y)</button>
                        </form>
                        <form method="get" action="/cgi-bin/koha/serials/subscription-detail.pl">
                        <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
-            <input type="submit" class="deny" value="No, don't delete (N)" accesskey="n" />
+            <button type="submit" class="deny" accesskey="n"><i class="fa fa-fw fa-remove"></i> No, don't delete (N)</button>
                        </form>
 
        </div>
@@ -88,6 +89,12 @@ $(document).ready(function() {
         <li><span class="label">Librarian identity:</span> [% librarian %]</li>
         <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid %]">[% aqbooksellername %]</a></li>
         <li><span class="label">Biblio:</span>  <a href="/cgi-bin/koha/catalogue/[% default_bib_view %].pl?biblionumber=[% bibnum %]">[% bibliotitle %]</a> <i>([% bibnum %])</i></li>
+        [% IF ( OPACBaseURL ) %]
+            <li>
+                <span class="label">OPAC view:</span>
+                <a id="view-subscription-in-opac" target="_blank" href="[% Koha.Preference('OPACBaseURL') %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Open in new window.</a>
+            </li>
+        [% END %]
 [% IF ( branchcode ) %]<li><span class="label">Library:</span> [% Branches.GetName( branchcode ) %]</li>[% END %]
         [% IF ( serialsadditems ) %]
             <li><span class="label">Items:</span> Serial receipt creates an item record.</li>
@@ -274,6 +281,7 @@ $(document).ready(function() {
             <th>Issue number</th>
             <th>Planned date</th>
             <th>Published date</th>
+            <th>Published date (text)</th>
             <th>Status</th>
         </tr>
         [% FOREACH serialslis IN serialslist %]
@@ -295,6 +303,9 @@ $(document).ready(function() {
                       Unknown
                     [% END %]
                 </td>
+                <td>
+                    [% serialslis.publisheddatetext %]
+                </td>
                 <td>
                     [% IF ( serialslis.status1 ) %]Expected[% END %]
                     [% IF ( serialslis.status2 ) %]Arrived[% END %]
@@ -348,8 +359,8 @@ $(document).ready(function() {
                 <tbody>
                     <tr>
                         <td>Ordered amount</td>
-                        <td>[% valuegste_ordered %]</td>
-                        <td>[% valuegsti_ordered %]</td>
+                        <td>[% value_tax_excluded_ordered %]</td>
+                        <td>[% value_tax_included_ordered %]</td>
                         <td>[% budget_name_ordered %]</td>
                         <td>
                             [% IF ( ordered_exists ) %]
@@ -359,8 +370,8 @@ $(document).ready(function() {
                     </tr>
                     <tr>
                         <td>Spent amount</td>
-                        <td>[% valuegste_spent %]</td>
-                        <td>[% valuegsti_spent %]</td>
+                        <td>[% value_tax_excluded_spent %]</td>
+                        <td>[% value_tax_included_spent %]</td>
                         <td>[% budget_name_spent %]</td>
                         <td>
                             [% IF ( spent_exists ) %]