Bug 15636 - DataTables Warning: Requested unknown parameter from opac-detail.tt

[koha.git] / koha-tmpl / opac-tmpl / bootstrap / en / modules / opac-detail.tt

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index ecc1751..3440af7 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -104,7 +104,7 @@
                     [% END %]
 
                     <div id="views">
-                        <span class="view"><span id="Normalview">Normal view</span></span>
+                        <span class="view current-view"><span id="Normalview">Normal view</span></span>
                         <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber %]">MARC view</a></span>
                         [% IF ( ISBD ) %]<span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber %]">ISBD view</a></span>[% END %]
                     </div>
@@ -363,14 +363,6 @@
                         [% END # / IF MARCURLS %]
                     [% END # / IF OPACXSLTDetailsDisplay %]
 
-                    [% IF ( AuthorisedValueImages && authorised_value_images ) %]
-                        <div class="authorised_value_images">
-                            [% FOREACH authorised_value_image IN authorised_value_images %]
-                                <img src="[% authorised_value_image.imageurl %]" alt="[% authorised_value_image.label %]" title="[% authorised_value_image.label %]" />
-                            [% END %]
-                        </div>
-                    [% END # / AuthorisedValueImages && authorised_value_images %]
-
                     <!-- This puts the LTFL reviews in, and if TabbedView is not set, puts the remaining content above the Tabs instead of in them -->
                     [% IF ( LibraryThingForLibrariesID ) %]
                         [% UNLESS ( LibraryThingForLibrariesTabbedView ) %]
@@ -840,25 +832,18 @@
                                                 <td>[% latestserial.serialseq %]</td>
                                                 <td>[% latestserial.planneddate %]</td>
                                                 <td>
-                                                    [% IF ( latestserial.status1 ) %]
-                                                        Awaited
-                                                    [% ELSE %]
-                                                        [% IF ( latestserial.status2 ) %]
-                                                            Arrived
-                                                        [% ELSE %]
-                                                            [% IF ( latestserial.status3 ) %]
-                                                                Late
-                                                            [% ELSE %]
-                                                                [% IF ( latestserial.status4 ) %]
-                                                                    Missing
-                                                                [% ELSE %]
-                                                                    [% IF ( latestserial.status5 ) %]
-                                                                        Not issued
-                                                                    [% END %]
-                                                                [% END %]
-                                                            [% END %]
-                                                        [% END %]
-                                                    [% END %]
+                                                    [% IF (latestserial.status1 ) %]Expected[% END %]
+                                                    [% IF (latestserial.status2 ) %]Arrived[% END %]
+                                                    [% IF (latestserial.status3 ) %]Late[% END %]
+                                                    [% IF (latestserial.status4 ) %]Missing[% END %]
+                                                        [% IF (latestserial.status41 ) %]Missing (never received)[% END %]
+                                                        [% IF (latestserial.status42 ) %]Missing (sold out)[% END %]
+                                                        [% IF (latestserial.status43 ) %]Missing (damaged)[% END %]
+                                                        [% IF (latestserial.status44 ) %]Missing (lost)[% END %]
+                                                    [% IF (latestserial.status5 ) %]Not issued[% END %]
+                                                    [% IF (latestserial.status6 ) %]Delete[% END %]
+                                                    [% IF (latestserial.status7 ) %]Claimed[% END %]
+                                                    [% IF (latestserial.status8 ) %]Stopped[% END %]
                                                 </td>
                                                 <td>[% latestserial.notes %]</td>
                                             </tr>
@@ -1002,14 +987,14 @@
 
                         [% IF ( HTML5MediaEnabled ) %]
                             <div id="html5media">
-                                    <p>
-                                        <[% HTML5MediaParent %] controls preload=none>
-                                          [% FOREACH HTML5MediaSet IN HTML5MediaSets %]
-                                            <[% HTML5MediaSet.child  %] src="[% HTML5MediaSet.srcblock %]"[% HTML5MediaSet.typeblock %] />
-                                          [% END %]
-                                            [[% HTML5MediaParent %] tag not supported by your browser.]
-                                        </[% HTML5MediaParent %]>
-                                    </p>
+                              [% FOREACH HTML5MediaSet IN HTML5MediaSets %]
+                                <p>
+                                  <[% HTML5MediaParent %] controls preload=none>
+                                    <[% HTML5MediaSet.child  %] src="[% HTML5MediaSet.srcblock %]"[% HTML5MediaSet.typeblock %] />
+                                    [[% HTML5MediaParent %] tag not supported by your browser.]
+                                  </[% HTML5MediaParent %]>
+                                </p>
+                              [% END %]
                             </div>
                         [% END # / IF HTML5MediaEnabled %]
 
@@ -1443,8 +1428,10 @@
         $(".holdingst").dataTable($.extend(true, {}, dataTablesDefaults, {
             "aoColumns": [
                 [% IF ( item_level_itypes ) %]null,[% END %]
-                null,
-                [% IF ( OpacLocationBranchToDisplay == 'both' ) %]null,[% END %]
+                [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' || singleBranchMode ) %]null,[% END %]
+                [% UNLESS ( singleBranchMode ) %]
+                    [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %]null,[% END %]
+                [% END %]
                 [% IF ( itemdata_ccode ) %]null,[% END %]
                 null,
                 [% IF ( itemdata_enumchron ) %]null,[% END %]