Bugzilla – Attachment 133467 Details for
Bug 30466
Convert serials pages tabs to Bootstrap
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30466: Convert serials pages tabs to Bootstrap
Bug-30466-Convert-serials-pages-tabs-to-Bootstrap.patch (text/plain), 47.29 KB, created by
Owen Leonard
on 2022-04-20 12:56:09 UTC
(
hide
)
Description:
Bug 30466: Convert serials pages tabs to Bootstrap
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2022-04-20 12:56:09 UTC
Size:
47.29 KB
patch
obsolete
>From ffdd28513db17c59f3203635e3cf8b0662d010af Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 20 Apr 2022 12:53:27 +0000 >Subject: [PATCH] Bug 30466: Convert serials pages tabs to Bootstrap > >This patch modifies three serials templates in order to replace jQueryUI >tabs with Bootstrap tabs. > >To test, apply the patch and rebuild the staff interface CSS >(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). > >- Go to Serials. >- Perform a serials search which will return one or more results. >- On the search results page you should see an Open and Closed tab. >- The tabs should look correct and work correctly. >- Confirm that "Select all" and "Clear all" controls work correctly in > each tab. > >- Click one of the search results to view the details for that > subscription. >- You should see tabs for Information, Planning, Issues, and Summary. > You may also see an Acquisition details tab depending on your data. > >- In the sidebar menu click "Serial collection." >- On this page you should see tabs corresponding to each year the serial > has been received. >- Under each tab the "Select all" and "Clear all" controls should work > correctly in the context of that tab. Other controls should apply to > all tabs. >--- > .../prog/css/src/staff-global.scss | 1 + > .../en/modules/serials/serials-collection.tt | 17 +- > .../prog/en/modules/serials/serials-search.tt | 61 +-- > .../en/modules/serials/subscription-detail.tt | 477 +++++++++--------- > 4 files changed, 285 insertions(+), 271 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >index 327fe0632a..27fd40e234 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -3044,6 +3044,7 @@ td { > } > > .toptabs { >+ margin-top: 5px; > .ui-tabs-panel { > background: #FFF none; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index 7e6520749c..22dac4b769 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -137,20 +137,20 @@ > > [% IF ( years ) %]<form name="edition" action="/cgi-bin/koha/serials/serials-edit.pl" method="post"> > <div id="subscription_years" class="toptabs numbered"> >-<ul> >- [% FOREACH year IN years %] >+<ul class="nav nav-tabs" role="tablist"> >+ [% FOREACH year IN years %] > [% IF ( year.year ) %] > [% IF year.year == 'manage' %] >- <li><a href="#subscription-year-manage">Manage</a></li> >+ <li role="presentation"><a href="#subscription-year-manage" aria-controls="subscription-year-manage" role="tab" data-toggle="tab">Manage</a></li> > [% ELSE %] >- <li><a href="#subscription-year-[% year.year | uri %]">[% year.year | html %]</a></li> >+ <li role="presentation"><a href="#subscription-year-[% year.year | uri %]" aria-controls="subscription-year-[% year.year | uri %]" role="tab" data-toggle="tab">[% year.year | html %]</a></li> > [% END %] > [% END %] > [% END %] > </ul> >- >+<div class="tab-content"> > [% FOREACH year IN years %] >-<div id="subscription-year-[% year.year | html %]"> >+<div id="subscription-year-[% year.year | html %]" role="tabpanel" class="tab-pane"> > [% IF ( CAN_user_serials_receive_serials ) %] > <p> > <div class="btn-group"><input type="submit" value="Edit serials" class="btn btn-default btn-sm" /></div> >@@ -297,6 +297,7 @@ > </table> > </div> > [% END %] >+ </div> > <input type="hidden" name="subscriptionid" value="[% subscriptionidlist | html %]" /> > > </div> >@@ -342,7 +343,9 @@ > } > > $(document).ready(function() { >- $('#subscription_years').tabs(); >+ if( $("#subscription_years .tab-pane.active").length < 1 ){ >+ $("#subscription_years a:first").tab("show"); >+ } > $(".subscription-year-table").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ > { "aTargets": [ 0,-1 ], "bSortable": false, "bSearchable": false } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >index 70adfbfa9b..5e0154cbf7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >@@ -307,39 +307,41 @@ > > [% IF ( done_searched ) %] > [% IF ( total ) %] >- <div id="serialstabs" class="toptabs" style="clear:both;"> >- <ul class="ui-tabs-nav"> >+ <div id="serialstabs" class="toptabs"> >+ <ul class="nav nav-tabs" role="tablist"> > [% IF mana %] >- <li><a href="#mana">Mana ([% total || 0 | html %])</a></li> >+ <li role="presentation" class="active"><a href="#mana" aria-controls="mana" role="tab" data-toggle="tab">Mana ([% total || 0 | html %])</a></li> > [% ELSE %] >- <li><a href="#opened">Open ([% openedsubscriptions.size || 0 | html %])</a></li> >- <li><a href="#closed">Closed ([% closedsubscriptions.size || 0 | html %])</a></li> >+ <li role="presentation" class="active"><a href="#opened" aria-controls="opened" role="tab" data-toggle="tab">Open ([% openedsubscriptions.size || 0 | html %])</a></li> >+ <li role="presentation"><a href="#closed" aria-controls="closed" role="tab" data-toggle="tab">Closed ([% closedsubscriptions.size || 0 | html %])</a></li> > [% END %] > </ul> >- [% IF mana %] >- <div id="mana"> >- [% INCLUDE 'mana/mana-subscription-search-result.inc' %] >- </div> >- [% ELSE %] >- <div id="opened"> >- [% IF openedsubscriptions %] >- [% INCLUDE subscriptions_table subscriptions = openedsubscriptions %] >- [% ELSE %] >- <div class="dialog message"> >- <p>Your search returned no open subscriptions.</p> >- </div> >- [% END %] >- </div> >- <div id="closed"> >- [% IF closedsubscriptions %] >- [% INCLUDE subscriptions_table subscriptions = closedsubscriptions closed = 1 %] >- [% ELSE %] >- <div class="dialog message"> >- <p>Your search returned no closed subscriptions.</p> >- </div> >- [% END %] >- </div> >- [% END # /IF mana %] >+ <div class="tab-content"> >+ [% IF mana %] >+ <div id="mana" role="tabpanel" class="tab-pane active" > >+ [% INCLUDE 'mana/mana-subscription-search-result.inc' %] >+ </div> >+ [% ELSE %] >+ <div id="opened" role="tabpanel" class="tab-pane active" > >+ [% IF openedsubscriptions %] >+ [% INCLUDE subscriptions_table subscriptions = openedsubscriptions %] >+ [% ELSE %] >+ <div class="dialog message"> >+ <p>Your search returned no open subscriptions.</p> >+ </div> >+ [% END %] >+ </div> >+ <div id="closed" role="tabpanel" class="tab-pane" > >+ [% IF closedsubscriptions %] >+ [% INCLUDE subscriptions_table subscriptions = closedsubscriptions closed = 1 %] >+ [% ELSE %] >+ <div class="dialog message"> >+ <p>Your search returned no closed subscriptions.</p> >+ </div> >+ [% END %] >+ </div> >+ [% END # /IF mana %] >+ </div> <!-- /.tab-content --> > </div> <!-- /#serialstabs --> > [% ELSE %] > <div class="dialog message"> >@@ -505,7 +507,6 @@ > csrlt.fnAddFilters("dt-filter", 750); > manarlt.fnAddFilters("dt-filter", 750); > >- $('#serialstabs').tabs(); > $("#reopensub").click(function(){ > return confirm(_("Are you sure you want to reopen this subscription?")); > }); >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 7d9d9bdbd1..790d82cc84 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >@@ -91,184 +91,192 @@ > [% END %] > > <div id="subscription_description" class="toptabs"> >- <ul class="ui-tabs-nav"> >- <li><a href="#subscription_info">Information</a></li> >- <li><a href="#subscription_planning">Planning</a></li> >- <li><a href="#subscription_issues">Issues</a></li> >- <li><a href="#subscription_summary">Summary</a></li> >+ <ul class="nav nav-tabs" role="tablist"> >+ <li role="presentation" class="active"> >+ <a href="#subscription_info" aria-controls="subscription_info" role="tab" data-toggle="tab">Information</a> >+ </li> >+ <li role="presentation"> >+ <a href="#subscription_planning" aria-controls="subscription_planning" role="tab" data-toggle="tab">Planning</a> >+ </li> >+ <li role="presentation"> >+ <a href="#subscription_issues" aria-controls="subscription_issues" role="tab" data-toggle="tab">Issues</a> >+ </li> >+ <li role="presentation"> >+ <a href="#subscription_summary" aria-controls="subscription_summary" role="tab" data-toggle="tab">Summary</a> >+ </li> > [% IF orders_grouped.size %] >- <li> >- <a href="#acquisition_details">Acquisition details</a> >+ <li role="presentation"> >+ <a href="#acquisition_details" aria-controls=" aria-controls="profile" role="tab" data-toggle="tab"" role="tab" data-toggle="tab">Acquisition details</a> > </li> > [% END %] > </ul> >- >- <div id="subscription_info"> >- <div class="row"> >- <div class="col-sm-6"> >- <div class="rows"> >- <ol> >- <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li> >- <li><span class="label">Librarian identity:</span> [% librarian | html %]</li> >- <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li> >- <li><span class="label">Biblio:</span> <a href="[% PROCESS biblio_a_href biblionumber => bibnum %]">[% bibliotitle | html %]</a> <em>([% bibnum | html %])</em></li> >- [% IF ( OPACBaseURL ) %] >- <li> >- <span class="label">OPAC view:</span> >- <a id="view-subscription-in-opac" target="_blank" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]">Open in new window.</a> >- </li> >- [% END %] >- [% IF ( branchcode ) %] >- <li><span class="label">Library:</span> [% Branches.GetName( branchcode ) | html %]</li> >- [% END %] >- [% IF ( serialsadditems ) %] >- <li><span class="label">Items:</span> Serial receipt creates an item record.</li> >- [% ELSE %] >- <li><span class="label">Items:</span> Serial receipt does not create an item record.</li> >- [% END %] >- <li> >- <span class="label">Serial number:</span> >- [% IF skip_serialseq %] >- Serial number is skipped when an irregularity is found. >+ <div class="tab-content"> >+ <div id="subscription_info" role="tabpanel" class="tab-pane active"> >+ <div class="row"> >+ <div class="col-sm-6"> >+ <div class="rows"> >+ <ol> >+ <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li> >+ <li><span class="label">Librarian identity:</span> [% librarian | html %]</li> >+ <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li> >+ <li><span class="label">Biblio:</span> <a href="[% PROCESS biblio_a_href biblionumber => bibnum %]">[% bibliotitle | html %]</a> <em>([% bibnum | html %])</em></li> >+ [% IF ( OPACBaseURL ) %] >+ <li> >+ <span class="label">OPAC view:</span> >+ <a id="view-subscription-in-opac" target="_blank" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]">Open in new window.</a> >+ </li> >+ [% END %] >+ [% IF ( branchcode ) %] >+ <li><span class="label">Library:</span> [% Branches.GetName( branchcode ) | html %]</li> >+ [% END %] >+ [% IF ( serialsadditems ) %] >+ <li><span class="label">Items:</span> Serial receipt creates an item record.</li> > [% ELSE %] >- Serial number is kept when an irregularity is found. >+ <li><span class="label">Items:</span> Serial receipt does not create an item record.</li> > [% END %] >- </li> >- <li><span class="label">Grace period:</span> [% graceperiod | html %]</li> >- </ol> >- </div> <!-- /.rows --> >- </div> <!-- /.col-sm-6 --> >- <div class="col-sm-6"> >- <div class="rows"> >- <ol> >- [% IF ( location ) %]<li><span class="label">Location:</span> [% location | html %]</li>[% END %] >- [% IF ( callnumber ) %]<li><span class="label">Call number:</span> [% callnumber | html %]</li>[% END %] >- [% IF ( staffdisplaycount ) %]<li><span class="label">Number of issues to display to staff:</span>[% staffdisplaycount | html %]</li>[% END %] >- [% IF ( opacdisplaycount ) %]<li><span class="label">Number of issues to display in OPAC:</span>[% opacdisplaycount | html %]</li>[% END %] >- [% IF ( letter ) %] > <li> >- <span class="label">Patron notification:</span> [% letter | html %] >- (<a href="/cgi-bin/koha/serials/viewalerts.pl?subscriptionid=[% subscriptionid | uri %]">subscribers</a>) >+ <span class="label">Serial number:</span> >+ [% IF skip_serialseq %] >+ Serial number is skipped when an irregularity is found. >+ [% ELSE %] >+ Serial number is kept when an irregularity is found. >+ [% END %] > </li> >- [% END %] >- [% IF ( hasRouting ) %]<li><span class="label">Routing:</span> yes</li>[% END %] >- </ol> >- </div> <!-- /.rows --> >- </div> <!-- /.col-sm-6 --> >- </div> <!-- /.row --> >- >- [% IF available_additional_fields.count %] >- <hr> >- <div class="row"> >+ <li><span class="label">Grace period:</span> [% graceperiod | html %]</li> >+ </ol> >+ </div> <!-- /.rows --> >+ </div> <!-- /.col-sm-6 --> > <div class="col-sm-6"> >- <h3>Additional fields:</h3> > <div class="rows"> > <ol> >- [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] >+ [% IF ( location ) %]<li><span class="label">Location:</span> [% location | html %]</li>[% END %] >+ [% IF ( callnumber ) %]<li><span class="label">Call number:</span> [% callnumber | html %]</li>[% END %] >+ [% IF ( staffdisplaycount ) %]<li><span class="label">Number of issues to display to staff:</span>[% staffdisplaycount | html %]</li>[% END %] >+ [% IF ( opacdisplaycount ) %]<li><span class="label">Number of issues to display in OPAC:</span>[% opacdisplaycount | html %]</li>[% END %] >+ [% IF ( letter ) %] >+ <li> >+ <span class="label">Patron notification:</span> [% letter | html %] >+ (<a href="/cgi-bin/koha/serials/viewalerts.pl?subscriptionid=[% subscriptionid | uri %]">subscribers</a>) >+ </li> >+ [% END %] >+ [% IF ( hasRouting ) %]<li><span class="label">Routing:</span> yes</li>[% END %] > </ol> > </div> <!-- /.rows --> > </div> <!-- /.col-sm-6 --> > </div> <!-- /.row --> >- [% END %] >- </div> <!-- /#subscription_info --> > >- <div id="subscription_planning"> >- <div class="row"> >- <div class="col-sm-12"> >- <div class="rows"> >- <ol> >- <li> >- <span class="label">Beginning date:</span> >- [% startdate | html %] >- </li> >- <li> >- <span class="label">Frequency:</span> >- [% frequency.description | html %] >- </li> >- <li> >- <span class="label">Manual history: </span> >- [% IF ( manualhistory ) %] >- Enabled <a href="/cgi-bin/koha/serials/subscription-history.pl?subscriptionid=[% subscriptionid | uri %]">Edit history</a> >- [% ELSE %] >- Disabled >+ [% IF available_additional_fields.count %] >+ <hr> >+ <div class="row"> >+ <div class="col-sm-6"> >+ <h3>Additional fields:</h3> >+ <div class="rows"> >+ <ol> >+ [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] >+ </ol> >+ </div> <!-- /.rows --> >+ </div> <!-- /.col-sm-6 --> >+ </div> <!-- /.row --> >+ [% END %] >+ </div> <!-- /#subscription_info --> >+ >+ <div id="subscription_planning" role="tabpanel" class="tab-pane"> >+ <div class="row"> >+ <div class="col-sm-12"> >+ <div class="rows"> >+ <ol> >+ <li> >+ <span class="label">Beginning date:</span> >+ [% startdate | html %] >+ </li> >+ <li> >+ <span class="label">Frequency:</span> >+ [% frequency.description | html %] >+ </li> >+ <li> >+ <span class="label">Manual history: </span> >+ [% IF ( manualhistory ) %] >+ Enabled <a href="/cgi-bin/koha/serials/subscription-history.pl?subscriptionid=[% subscriptionid | uri %]">Edit history</a> >+ [% ELSE %] >+ Disabled >+ [% END %] >+ </li> >+ <li> >+ <span class="label">Number pattern:</span> >+ [% numberpattern.label | html %] >+ </li> >+ <li> >+ <table> >+ <tr> >+ <td>Starting with:</td> >+ [% IF (has_X) %] >+ <td>[% lastvalue1 | html %]</td> >+ [% END %] >+ [% IF (has_Y) %] >+ <td>[% lastvalue2 | html %]</td> >+ [% END %] >+ [% IF (has_Z) %] >+ <td>[% lastvalue3 | html %]</td> >+ [% END %] >+ </tr> >+ <tr> >+ <td>Rollover:</td> >+ [% IF (has_X) %] >+ <td>[% numberpattern.whenmorethan1 | html %]</td> >+ [% END %] >+ [% IF (has_Y) %] >+ <td>[% numberpattern.whenmorethan2 | html %]</td> >+ [% END %] >+ [% IF (has_Z) %] >+ <td>[% numberpattern.whenmorethan3 | html %]</td> >+ [% END %] >+ </tr> >+ </table> >+ </li> >+ [% IF ( irregular_issues ) %] >+ <li> >+ <span class="label">Irregularity:</span> >+ [% irregular_issues | html %] issues >+ </li> > [% END %] >- </li> >- <li> >- <span class="label">Number pattern:</span> >- [% numberpattern.label | html %] >- </li> >- <li> >- <table> >- <tr> >- <td>Starting with:</td> >- [% IF (has_X) %] >- <td>[% lastvalue1 | html %]</td> >- [% END %] >- [% IF (has_Y) %] >- <td>[% lastvalue2 | html %]</td> >- [% END %] >- [% IF (has_Z) %] >- <td>[% lastvalue3 | html %]</td> >- [% END %] >- </tr> >- <tr> >- <td>Rollover:</td> >- [% IF (has_X) %] >- <td>[% numberpattern.whenmorethan1 | html %]</td> >- [% END %] >- [% IF (has_Y) %] >- <td>[% numberpattern.whenmorethan2 | html %]</td> >- [% END %] >- [% IF (has_Z) %] >- <td>[% numberpattern.whenmorethan3 | html %]</td> >- [% END %] >- </tr> >- </table> >- </li> >- [% IF ( irregular_issues ) %] > <li> >- <span class="label">Irregularity:</span> >- [% irregular_issues | html %] issues >+ <span class="label">First arrival:</span> >+ [% firstacquidate | html %] > </li> >- [% END %] >- <li> >- <span class="label">First arrival:</span> >- [% firstacquidate | html %] >- </li> >- [% IF ( numberlength ) %]<li> >- <span class="label">Number of issues:</span> >- [% numberlength | html %]</li> >- [% END %] >- [% IF ( weeklength ) %]<li> >- <span class="label">Number of weeks:</span> >- [% weeklength | html %]</li> >- [% END %] >- [% IF ( monthlength ) %]<li> >- <span class="label">Number of months:</span> >- [% monthlength | html %]</li> >- [% END %] >- </ol> >- </div> <!-- /.rows --> >- </div> <!-- /.col-sd-12 --> >- </div> <!-- /.row --> >- </div> <!-- /#subscription_planning --> >+ [% IF ( numberlength ) %]<li> >+ <span class="label">Number of issues:</span> >+ [% numberlength | html %]</li> >+ [% END %] >+ [% IF ( weeklength ) %]<li> >+ <span class="label">Number of weeks:</span> >+ [% weeklength | html %]</li> >+ [% END %] >+ [% IF ( monthlength ) %]<li> >+ <span class="label">Number of months:</span> >+ [% monthlength | html %]</li> >+ [% END %] >+ </ol> >+ </div> <!-- /.rows --> >+ </div> <!-- /.col-sd-12 --> >+ </div> <!-- /.row --> >+ </div> <!-- /#subscription_planning --> > >- <div id="subscription_numbering" style="display:none;"> >- <h3>Numbering calculation</h3> >- <p><label>Numbering formula:</label> [% numberingmethod | html %]</p> >- <table> >- <tr> >- <th> </th> >- <th>X</th> >- <th>Y</th> >- <th>Z</th> >- </tr> >- <tr> >- <td>Add</td> >- <td> >- [% add1 | html %] >- </td> >- <td> >+ <div id="subscription_numbering" role="tabpanel" class="tab-pane" style="display:none"> >+ <h3>Numbering calculation</h3> >+ <p><label>Numbering formula:</label> [% numberingmethod | html %]</p> >+ <table> >+ <tr> >+ <th> </th> >+ <th>X</th> >+ <th>Y</th> >+ <th>Z</th> >+ </tr> >+ <tr> >+ <td>Add</td> >+ <td> >+ [% add1 | html %] >+ </td> >+ <td> > [% add2 | html %] > </td> > <td> >@@ -315,24 +323,24 @@ > </table> > </div> <!-- /#subscription_numbering --> > >- <div id="subscription_issues"> >- <table> >- <tr> >- <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 %] >+ <div id="subscription_issues" role="tabpanel" class="tab-pane"> >+ <table> > <tr> >- <td> >- [% serialslis.serialseq | html %] >- </td> >- <td> >- [% IF serialslis.planneddate %] >- [% serialslis.planneddate | html %] >- [% ELSE %] >+ <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 %] >+ <tr> >+ <td> >+ [% serialslis.serialseq | html %] >+ </td> >+ <td> >+ [% IF serialslis.planneddate %] >+ [% serialslis.planneddate | html %] >+ [% ELSE %] > <span>Unknown</span> > [% END %] > </td> >@@ -370,65 +378,65 @@ > </table> > </div> <!-- /#subscription_issues --> > >- <div id="subscription_summary"> >- <div class="row"> >- <div class="col-sm-12"> >- <div class="rows"> >- <ol> >- <li><span class="label">Start date:</span> [% startdate | html %] </li> >- <li><span class="label">End date:</span> [% enddate | html %]</li> >- <li><span class="label">History start date:</span> [% histstartdate | html %] </li> >- <li><span class="label">History end date:</span> [% histenddate | html %]</li> >- <li><span class="label">Received issues:</span>[% recievedlist | html | html_line_break %]</li> >- <li><span class="label">Missing issues:</span>[% missinglist | html | html_line_break %]</li> >- <li><span class="label">Nonpublic note:</span>[% internalnotes | html | html_line_break %]</li> >- <li><span class="label">Public note:</span>[% notes | html | html_line_break %]</li> >- <li><span class="label">History staff note:</span>[% librariannote | html | html_line_break %]</li> >- <li><span class="label">History OPAC note:</span>[% opacnote | html | html_line_break %]</li> >- </ol> >- </div> <!-- /.rows --> >- </div> <!-- /.col-sm-12 --> >- </div> <!-- /.row --> >- </div> <!-- /#subscription_summary --> >+ <div id="subscription_summary" role="tabpanel" class="tab-pane"> >+ <div class="row"> >+ <div class="col-sm-12"> >+ <div class="rows"> >+ <ol> >+ <li><span class="label">Start date:</span> [% startdate | html %] </li> >+ <li><span class="label">End date:</span> [% enddate | html %]</li> >+ <li><span class="label">History start date:</span> [% histstartdate | html %] </li> >+ <li><span class="label">History end date:</span> [% histenddate | html %]</li> >+ <li><span class="label">Received issues:</span>[% recievedlist | html | html_line_break %]</li> >+ <li><span class="label">Missing issues:</span>[% missinglist | html | html_line_break %]</li> >+ <li><span class="label">Nonpublic note:</span>[% internalnotes | html | html_line_break %]</li> >+ <li><span class="label">Public note:</span>[% notes | html | html_line_break %]</li> >+ <li><span class="label">History staff note:</span>[% librariannote | html | html_line_break %]</li> >+ <li><span class="label">History OPAC note:</span>[% opacnote | html | html_line_break %]</li> >+ </ol> >+ </div> <!-- /.rows --> >+ </div> <!-- /.col-sm-12 --> >+ </div> <!-- /.row --> >+ </div> <!-- /#subscription_summary --> > >- [% IF orders_grouped.size %] >- <div id="acquisition_details"> >- <h2>Acquisition details</h2> >- <table id="orders"> >- <caption> >- <span class="actions"> >- <a href="#" id="hide_received_orders">Hide already received orders</a> >- | <a href="#" id="show_all_orders">Show all orders</a> >- | <a href="#" id="expand_all">Expand all</a> >- | <a href="#" id="collapse_all">Collapse all</a> >- </span> >- </caption> >- <thead> >- <tr> >- <th>Invoice</th> >- <th>Basket</th> >- <th>Order number</th> >- <th>Creation date</th> >- <th>Receive date</th> >- <th>Status</th> >- <th>Internal note</th> >- <th>Vendor note</th> >- <th>Fund</th> >- <th>Quantity</th> >- <th title="ecost tax exc. / ecost tax inc.">Ordered</th> >- <th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th> >- </tr> >- </thead> >- <tbody> >- [% FOR ordernumber IN orders_grouped.keys %] >- [% SET parent_tree_id = loop.count %] >- [% SET parent_order = orders_grouped.$ordernumber %] >- <tr data-tt-id="[% parent_tree_id | html %]" class="highlighted-row"> >- <td></td> [%# invoice %] >- <td> >- [% IF CAN_user_acquisition_order_manage %] >- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% parent_order.basket.basketno | uri %]">[% parent_order.basket.basketname | html %] ([% parent_order.basket.basketno | html %])</a> >- [% ELSE %] >+ [% IF orders_grouped.size %] >+ <div id="acquisition_details" role="tabpanel" class="tab-pane"> >+ <h2>Acquisition details</h2> >+ <table id="orders"> >+ <caption> >+ <span class="actions"> >+ <a href="#" id="hide_received_orders">Hide already received orders</a> >+ | <a href="#" id="show_all_orders">Show all orders</a> >+ | <a href="#" id="expand_all">Expand all</a> >+ | <a href="#" id="collapse_all">Collapse all</a> >+ </span> >+ </caption> >+ <thead> >+ <tr> >+ <th>Invoice</th> >+ <th>Basket</th> >+ <th>Order number</th> >+ <th>Creation date</th> >+ <th>Receive date</th> >+ <th>Status</th> >+ <th>Internal note</th> >+ <th>Vendor note</th> >+ <th>Fund</th> >+ <th>Quantity</th> >+ <th title="ecost tax exc. / ecost tax inc.">Ordered</th> >+ <th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOR ordernumber IN orders_grouped.keys %] >+ [% SET parent_tree_id = loop.count %] >+ [% SET parent_order = orders_grouped.$ordernumber %] >+ <tr data-tt-id="[% parent_tree_id | html %]" class="highlighted-row"> >+ <td></td> [%# invoice %] >+ <td> >+ [% IF CAN_user_acquisition_order_manage %] >+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% parent_order.basket.basketno | uri %]">[% parent_order.basket.basketname | html %] ([% parent_order.basket.basketno | html %])</a> >+ [% ELSE %] > [% parent_order.basket.basketname | html %] ([% parent_order.basket.basketno | html %]) > [% END %] > </td> >@@ -497,6 +505,7 @@ > </table> <!-- /#orders --> > </div> <!-- /#acquisition_details --> > [% END # IF orders_grouped.size %] >+ </div> <!-- /.tab-content --> > </div> <!-- /#subscription_description --> > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >@@ -522,7 +531,7 @@ > var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_("Starting with:"),_("Rollover at:"),_("Choose hemisphere:"),_("Northern"),_("Southern", > "Autumn"),_("Winter"),_("Spring"),_("Summer"),_("Fall"),_("Season"),_("Year")); > $(document).ready(function() { >- $("#subscription_description").tabs(); >+ > $("#renewsub").click(function(){ > popup([% subscriptionid | html %]); > return false; >-- >2.20.1
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 30466
:
132987
|
133209
|
133467
|
133478
|
133481
|
134530