Bugzilla – Attachment 133479 Details for
Bug 30436
Convert article requests tabs to Bootstrap
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30436: Convert article requests tabs to Bootstrap
Bug-30436-Convert-article-requests-tabs-to-Bootstr.patch (text/plain), 56.05 KB, created by
Tomás Cohen Arazi (tcohen)
on 2022-04-20 14:44:22 UTC
(
hide
)
Description:
Bug 30436: Convert article requests tabs to Bootstrap
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2022-04-20 14:44:22 UTC
Size:
56.05 KB
patch
obsolete
>From 6b03f6e5ec456f00fb538dc9f850ad638215fc21 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 1 Apr 2022 15:50:32 +0000 >Subject: [PATCH] Bug 30436: Convert article requests tabs to Bootstrap >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >This patch converts the jQuery tabs on the article requests page to >Bootstrap. > >To test you should have the "ArticleRequests" system preference >enabled. If necessary, create some article requests and mark some >"Pending," some "Processing," and leave some new. > >- Apply the patch and go to Circulation -> Article requests. >- The page should show three tabs: New, Pending, and Processing. >- The tabs should look correct and work correctly. >- The DataTables under each tab should work correctly. > >Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > .../prog/en/modules/circ/article-requests.tt | 659 +++++++++--------- > 1 file changed, 330 insertions(+), 329 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >index efbd50d203b..1c559b5330b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >@@ -170,343 +170,344 @@ > </form> > > <div id="article-request-tabs" class="toptabs"> >- <ul> >- <li> >- <a href="#article-requests-requested"> >+ <ul class="nav nav-tabs" role="tablist"> >+ <li role="presentation" class="active"> >+ <a href="#article-requests-requested" aria-controls="article-requests-requested" role="tab" data-toggle="tab"> > New (<span id="ar_requested_count">[% article_requests_requested.count | html %]</span>) > </a> > </li> > >- <li> >- <a href="#article-requests-pending"> >+ <li role="presentation"> >+ <a href="#article-requests-pending" aria-controls="article-requests-pending" role="tab" data-toggle="tab"> > Pending (<span id="ar_pending_count">[% article_requests_pending.count | html %]</span>) > </a> >- </li> >+ </li role="presentation"> > > <li> >- <a href="#article-requests-processing"> >+ <a href="#article-requests-processing" aria-controls="article-requests-processing" role="tab" data-toggle="tab"> > Processing (<span id="ar_processing_count">[% article_requests_processing.count | html %]</span>) > </a> > </li> > </ul> >- >- <div id="article-requests-requested"> >- <div class="article-requests-requested_table_controls"> >- <a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="ClearAll"><i class="fa fa-remove"></i> Clear all</a> >- [% PROCESS actions menuid='article-menu-requested' id_arg=0 pull_right='' aria_menu='table_controls' %] >+ <div class="tab-content"> >+ <div id="article-requests-requested" role="tabpanel" class="tab-pane active"> >+ <div class="article-requests-requested_table_controls"> >+ <a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="ClearAll"><i class="fa fa-remove"></i> Clear all</a> >+ [% PROCESS actions menuid='article-menu-requested' id_arg=0 pull_right='' aria_menu='table_controls' %] >+ </div> >+ >+ <table id="article-requests-requested-table"> >+ <thead> >+ <tr> >+ <th/> >+ <th class="ar-title">Title</th> >+ <th class="ar-request">Requested article</th> >+ <th class="ar-collection">Collection</th> >+ <th class="ar-itemtype">Item type</th> >+ <th class="ar-callnumber">Call number</th> >+ <th class="ar-status">Status</th> >+ <th class="ar-copynumber">Copy number</th> >+ <th class="ar-enumchron">Enumeration</th> >+ <th class="ar-barcode">Barcode</th> >+ <th class="ar-format">Format</th> >+ <th class="ar-urls">URLs</th> >+ <th class="ar-patron">Patron</th> >+ <th class="ar-date">Date</th> >+ <th class="ar-actions noExport">Actions</th> >+ </tr> >+ </thead> >+ >+ <tbody> >+ [% FOREACH ar IN article_requests_requested %] >+ <tr class="ar-row ar-requested"> >+ <td><input type="checkbox" reqid="[% ar.id | html %]"/></td> >+ <td class="ar-title"> >+ <p> >+ <a class="title" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% ar.biblionumber | uri %]"> >+ [% INCLUDE 'biblio-title.inc' biblio=ar.biblio %] >+ </a> >+ </p> >+ >+ <p> >+ <div class="ar-biblionumber content_hidden">[% ar.biblionumber | html %]</div> >+ <div class="ar-author">[% ar.biblio.author | html %]</div> >+ <div class="ar-pubdata"> >+ [% ar.biblio.biblioitem.publishercode | html %] >+ >+ [% IF ar.biblio.biblioitem.publicationyear %] >+ [% ar.biblio.biblioitem.publicationyear | html %] >+ [% ELSIF ar.biblio.copyrightdate %] >+ [% ar.biblio.copyrightdate | html %] >+ [% END %] >+ >+ [% IF ar.biblio.biblioitem.pages %] >+ : [% ar.biblio.biblioitem.pages | html %] >+ [% END %] >+ >+ [% r.biblio.biblioitem.size | html %] >+ >+ [% IF ar.biblio.biblioitem.isbn %] >+ ISBN: [% ar.biblio.biblioitem.isbn | html %] >+ [% END %] >+ </div> >+ </p> >+ </td> >+ <td class="ar-request"> >+ [% IF ar.toc_request %] <p><strong>Include TOC</strong> </p> [% END %] >+ [% IF ar.title %] <p><strong>Title:</strong> [% ar.title | html %] </p> [% END %] >+ [% IF ar.author %] <p><strong>Author:</strong> [% ar.author | html %] </p> [% END %] >+ [% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume | html %] </p> [% END %] >+ [% IF ar.issue %] <p><strong>Issue:</strong> [% ar.issue | html %] </p> [% END %] >+ [% IF ar.date %] <p><strong>Date:</strong> [% ar.date | html %] </p> [% END %] >+ [% IF ar.pages %] <p><strong>Pages:</strong> [% ar.pages | html %] </p> [% END %] >+ [% IF ar.chapters %] <p><strong>Chapters:</strong> [% ar.chapters | html %] </p> [% END %] >+ [% IF ar.patron_notes %] <p><strong>Patron notes:</strong> [% ar.patron_notes | html %] </p> [% END %] >+ </td> >+ <td class="ar-collection">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => ar.item.ccode ) | html %]</td> >+ <td class="ar-itemtype">[% ItemTypes.GetDescription( ar.item.effective_itemtype ) | html %]</td> >+ <td class="ar-callnumber"> >+ [% IF ar.item.location %] >+ <em>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ar.item.location ) | html %]</em> >+ [% END %] >+ >+ [% ar.item.itemcallnumber | html %] >+ </td> >+ <td class="ar-status">[% PROCESS 'item_status' myitem = ar.item IF ar.item %]</td> >+ <td class="ar-copynumber">[% ar.item.copynumber | html %]</td> >+ <td class="ar-enumchron">[% ar.item.enumchron | html %]</td> >+ <td class="ar-barcode">[% ar.item.barcode | html %]</td> >+ <td class="ar-format">[% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %]</td> >+ <td class="ar-urls">[% IF ar.format == 'SCAN' %]<span id="url_yesno_[% ar.id | html %]">[% IF ar.urls %]Yes[% ELSE %]No[% END%]</span><span id="url_[% ar.id | html %]" style="display:none;">[% ar.urls | url %]</span>[% END %]</td> >+ <td class="ar-patron"> >+ <p> >+ <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]"> >+ [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %]) >+ </a> >+ </p> >+ >+ <p>[% ar.borrower.phone | html %]</p> >+ </td> >+ <td class="ar-date"><span title="[% ar.created_on | html %]">[% ar.created_on | $KohaDates %]</span></td> >+ <td class="ar-actions"> >+ [% PROCESS actions menuid = "row" _ ar.id id_arg=ar.id pull_right='pull-right' aria_menu='ar-actions' %] >+ </td> >+ </tr> >+ [% END %] >+ </tbody> >+ </table> > </div> > >- <table id="article-requests-requested-table"> >- <thead> >- <tr> >- <th/> >- <th class="ar-title">Title</th> >- <th class="ar-request">Requested article</th> >- <th class="ar-collection">Collection</th> >- <th class="ar-itemtype">Item type</th> >- <th class="ar-callnumber">Call number</th> >- <th class="ar-status">Status</th> >- <th class="ar-copynumber">Copy number</th> >- <th class="ar-enumchron">Enumeration</th> >- <th class="ar-barcode">Barcode</th> >- <th class="ar-format">Format</th> >- <th class="ar-urls">URLs</th> >- <th class="ar-patron">Patron</th> >- <th class="ar-date">Date</th> >- <th class="ar-actions noExport">Actions</th> >- </tr> >- </thead> >- >- <tbody> >- [% FOREACH ar IN article_requests_requested %] >- <tr class="ar-row ar-requested"> >- <td><input type="checkbox" reqid="[% ar.id | html %]"/></td> >- <td class="ar-title"> >- <p> >- <a class="title" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% ar.biblionumber | uri %]"> >- [% INCLUDE 'biblio-title.inc' biblio=ar.biblio %] >- </a> >- </p> >- >- <p> >- <div class="ar-biblionumber content_hidden">[% ar.biblionumber | html %]</div> >- <div class="ar-author">[% ar.biblio.author | html %]</div> >- <div class="ar-pubdata"> >- [% ar.biblio.biblioitem.publishercode | html %] >- >- [% IF ar.biblio.biblioitem.publicationyear %] >- [% ar.biblio.biblioitem.publicationyear | html %] >- [% ELSIF ar.biblio.copyrightdate %] >- [% ar.biblio.copyrightdate | html %] >- [% END %] >- >- [% IF ar.biblio.biblioitem.pages %] >- : [% ar.biblio.biblioitem.pages | html %] >- [% END %] >- >- [% r.biblio.biblioitem.size | html %] >- >- [% IF ar.biblio.biblioitem.isbn %] >- ISBN: [% ar.biblio.biblioitem.isbn | html %] >- [% END %] >- </div> >- </p> >- </td> >- <td class="ar-request"> >- [% IF ar.toc_request %] <p><strong>Include TOC</strong> </p> [% END %] >- [% IF ar.title %] <p><strong>Title:</strong> [% ar.title | html %] </p> [% END %] >- [% IF ar.author %] <p><strong>Author:</strong> [% ar.author | html %] </p> [% END %] >- [% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume | html %] </p> [% END %] >- [% IF ar.issue %] <p><strong>Issue:</strong> [% ar.issue | html %] </p> [% END %] >- [% IF ar.date %] <p><strong>Date:</strong> [% ar.date | html %] </p> [% END %] >- [% IF ar.pages %] <p><strong>Pages:</strong> [% ar.pages | html %] </p> [% END %] >- [% IF ar.chapters %] <p><strong>Chapters:</strong> [% ar.chapters | html %] </p> [% END %] >- [% IF ar.patron_notes %] <p><strong>Patron notes:</strong> [% ar.patron_notes | html %] </p> [% END %] >- </td> >- <td class="ar-collection">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => ar.item.ccode ) | html %]</td> >- <td class="ar-itemtype">[% ItemTypes.GetDescription( ar.item.effective_itemtype ) | html %]</td> >- <td class="ar-callnumber"> >- [% IF ar.item.location %] >- <em>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ar.item.location ) | html %]</em> >- [% END %] >- >- [% ar.item.itemcallnumber | html %] >- </td> >- <td class="ar-status">[% PROCESS 'item_status' myitem = ar.item IF ar.item %]</td> >- <td class="ar-copynumber">[% ar.item.copynumber | html %]</td> >- <td class="ar-enumchron">[% ar.item.enumchron | html %]</td> >- <td class="ar-barcode">[% ar.item.barcode | html %]</td> >- <td class="ar-format">[% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %]</td> >- <td class="ar-urls">[% IF ar.format == 'SCAN' %]<span id="url_yesno_[% ar.id | html %]">[% IF ar.urls %]Yes[% ELSE %]No[% END%]</span><span id="url_[% ar.id | html %]" style="display:none;">[% ar.urls | url %]</span>[% END %]</td> >- <td class="ar-patron"> >- <p> >- <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]"> >- [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %]) >- </a> >- </p> >- >- <p>[% ar.borrower.phone | html %]</p> >- </td> >- <td class="ar-date"><span title="[% ar.created_on | html %]">[% ar.created_on | $KohaDates %]</span></td> >- <td class="ar-actions"> >- [% PROCESS actions menuid = "row" _ ar.id id_arg=ar.id pull_right='pull-right' aria_menu='ar-actions' %] >- </td> >+ <div id="article-requests-pending" role="tabpanel" class="tab-pane"> >+ <div class="article-requests-pending_table_controls"> >+ <a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="ClearAll"><i class="fa fa-remove"></i> Clear all</a> >+ [% PROCESS actions menuid='article-menu-pending' id_arg=0 pull_right='' aria_menu='table_controls' %] >+ </div> >+ >+ <table id="article-requests-pending-table"> >+ <thead> >+ <tr> >+ <th/> >+ <th class="ar-title">Title</th> >+ <th class="ar-request">Requested article</th> >+ <th class="ar-collection">Collection</th> >+ <th class="ar-itemtype">Item type</th> >+ <th class="ar-callnumber">Call number</th> >+ <th class="ar-status">Status</th> >+ <th class="ar-copynumber">Copy number</th> >+ <th class="ar-enumchron">Enumeration</th> >+ <th class="ar-barcode">Barcode</th> >+ <th class="ar-format">Format</th> >+ <th class="ar-urls">URLs</th> >+ <th class="ar-patron">Patron</th> >+ <th class="ar-date">Date</th> >+ <th class="ar-actions noExport">Actions</th> > </tr> >- [% END %] >- </tbody> >- </table> >- </div> >- >- <div id="article-requests-pending"> >- <div class="article-requests-pending_table_controls"> >- <a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="ClearAll"><i class="fa fa-remove"></i> Clear all</a> >- [% PROCESS actions menuid='article-menu-pending' id_arg=0 pull_right='' aria_menu='table_controls' %] >+ </thead> >+ >+ <tbody> >+ [% FOREACH ar IN article_requests_pending %] >+ <tr class="ar-row ar-pending"> >+ <td><input type="checkbox" reqid="[% ar.id | html %]"/></td> >+ <td class="ar-title"> >+ <p> >+ <a class="title" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% ar.biblionumber | uri %]"> >+ [% INCLUDE 'biblio-title.inc' biblio=ar.biblio %] >+ </a> >+ </p> >+ >+ <p> >+ <div class="ar-biblionumber content_hidden">[% ar.biblionumber | html %]</div> >+ <div class="ar-author">[% ar.biblio.author | html %]</div> >+ <div class="ar-pubdata"> >+ [% ar.biblio.biblioitem.publishercode | html %] >+ >+ [% IF ar.biblio.biblioitem.publicationyear %] >+ [% ar.biblio.biblioitem.publicationyear | html %] >+ [% ELSIF ar.biblio.copyrightdate %] >+ [% ar.biblio.copyrightdate | html %] >+ [% END %] >+ >+ [% IF ar.biblio.biblioitem.pages %] >+ : [% ar.biblio.biblioitem.pages | html %] >+ [% END %] >+ >+ [% r.biblio.biblioitem.size | html %] >+ >+ [% IF ar.biblio.biblioitem.isbn %] >+ ISBN: [% ar.biblio.biblioitem.isbn | html %] >+ [% END %] >+ </div> >+ </p> >+ </td> >+ <td class="ar-request"> >+ [% IF ar.toc_request %] <p><strong>Include TOC</strong> </p> [% END %] >+ [% IF ar.title %] <p><strong>Title:</strong> [% ar.title | html %] </p> [% END %] >+ [% IF ar.author %] <p><strong>Author:</strong> [% ar.author | html %] </p> [% END %] >+ [% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume | html %] </p> [% END %] >+ [% IF ar.issue %] <p><strong>Issue:</strong> [% ar.issue | html %] </p> [% END %] >+ [% IF ar.date %] <p><strong>Date:</strong> [% ar.date | html %] </p> [% END %] >+ [% IF ar.pages %] <p><strong>Pages:</strong> [% ar.pages | html %] </p> [% END %] >+ [% IF ar.chapters %] <p><strong>Chapters:</strong> [% ar.chapters | html %] </p> [% END %] >+ [% IF ar.patron_notes %] <p><strong>Patron notes:</strong> [% ar.patron_notes | html %] </p> [% END %] >+ </td> >+ <td class="ar-collection">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => ar.item.ccode ) | html %]</td> >+ <td class="ar-itemtype">[% ItemTypes.GetDescription( ar.item.effective_itemtype ) | html %]</td> >+ <td class="ar-callnumber"> >+ [% IF ar.item.location %] >+ <em>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ar.item.location ) | html %]</em> >+ [% END %] >+ >+ [% ar.item.itemcallnumber | html %] >+ </td> >+ <td class="ar-status">[% PROCESS 'item_status' myitem = ar.item IF ar.item %]</td> >+ <td class="ar-copynumber">[% ar.item.copynumber | html %]</td> >+ <td class="ar-enumchron">[% ar.item.enumchron | html %]</td> >+ <td class="ar-barcode">[% ar.item.barcode | html %]</td> >+ <td class="ar-format">[% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %]</td> >+ <td class="ar-urls">[% IF ar.format == 'SCAN' %]<span id="url_yesno_[% ar.id | html %]">[% IF ar.urls %]Yes[% ELSE %]No[% END%]</span><span id="url_[% ar.id | html %]" style="display:none;">[% ar.urls | url %]</span>[% END %]</td> >+ <td class="ar-patron"> >+ <p> >+ <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]"> >+ [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %]) >+ </a> >+ </p> >+ >+ <p>[% ar.borrower.phone | html %]</p> >+ </td> >+ <td class="ar-date" data-order="[% ar.created_on | html %]">[% ar.created_on | $KohaDates %]</td> >+ <td class="ar-actions"> >+ [% PROCESS actions menuid = "row" _ ar.id id_arg=ar.id format=ar.format pull_right='pull-right' aria_menu='ar-actions' %] >+ </td> >+ </tr> >+ [% END %] >+ </tbody> >+ </table> > </div> > >- <table id="article-requests-pending-table"> >- <thead> >- <tr> >- <th/> >- <th class="ar-title">Title</th> >- <th class="ar-request">Requested article</th> >- <th class="ar-collection">Collection</th> >- <th class="ar-itemtype">Item type</th> >- <th class="ar-callnumber">Call number</th> >- <th class="ar-status">Status</th> >- <th class="ar-copynumber">Copy number</th> >- <th class="ar-enumchron">Enumeration</th> >- <th class="ar-barcode">Barcode</th> >- <th class="ar-format">Format</th> >- <th class="ar-urls">URLs</th> >- <th class="ar-patron">Patron</th> >- <th class="ar-date">Date</th> >- <th class="ar-actions noExport">Actions</th> >- </tr> >- </thead> >- >- <tbody> >- [% FOREACH ar IN article_requests_pending %] >- <tr class="ar-row ar-pending"> >- <td><input type="checkbox" reqid="[% ar.id | html %]"/></td> >- <td class="ar-title"> >- <p> >- <a class="title" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% ar.biblionumber | uri %]"> >- [% INCLUDE 'biblio-title.inc' biblio=ar.biblio %] >- </a> >- </p> >- >- <p> >- <div class="ar-biblionumber content_hidden">[% ar.biblionumber | html %]</div> >- <div class="ar-author">[% ar.biblio.author | html %]</div> >- <div class="ar-pubdata"> >- [% ar.biblio.biblioitem.publishercode | html %] >- >- [% IF ar.biblio.biblioitem.publicationyear %] >- [% ar.biblio.biblioitem.publicationyear | html %] >- [% ELSIF ar.biblio.copyrightdate %] >- [% ar.biblio.copyrightdate | html %] >- [% END %] >- >- [% IF ar.biblio.biblioitem.pages %] >- : [% ar.biblio.biblioitem.pages | html %] >- [% END %] >- >- [% r.biblio.biblioitem.size | html %] >- >- [% IF ar.biblio.biblioitem.isbn %] >- ISBN: [% ar.biblio.biblioitem.isbn | html %] >- [% END %] >- </div> >- </p> >- </td> >- <td class="ar-request"> >- [% IF ar.toc_request %] <p><strong>Include TOC</strong> </p> [% END %] >- [% IF ar.title %] <p><strong>Title:</strong> [% ar.title | html %] </p> [% END %] >- [% IF ar.author %] <p><strong>Author:</strong> [% ar.author | html %] </p> [% END %] >- [% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume | html %] </p> [% END %] >- [% IF ar.issue %] <p><strong>Issue:</strong> [% ar.issue | html %] </p> [% END %] >- [% IF ar.date %] <p><strong>Date:</strong> [% ar.date | html %] </p> [% END %] >- [% IF ar.pages %] <p><strong>Pages:</strong> [% ar.pages | html %] </p> [% END %] >- [% IF ar.chapters %] <p><strong>Chapters:</strong> [% ar.chapters | html %] </p> [% END %] >- [% IF ar.patron_notes %] <p><strong>Patron notes:</strong> [% ar.patron_notes | html %] </p> [% END %] >- </td> >- <td class="ar-collection">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => ar.item.ccode ) | html %]</td> >- <td class="ar-itemtype">[% ItemTypes.GetDescription( ar.item.effective_itemtype ) | html %]</td> >- <td class="ar-callnumber"> >- [% IF ar.item.location %] >- <em>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ar.item.location ) | html %]</em> >- [% END %] >- >- [% ar.item.itemcallnumber | html %] >- </td> >- <td class="ar-status">[% PROCESS 'item_status' myitem = ar.item IF ar.item %]</td> >- <td class="ar-copynumber">[% ar.item.copynumber | html %]</td> >- <td class="ar-enumchron">[% ar.item.enumchron | html %]</td> >- <td class="ar-barcode">[% ar.item.barcode | html %]</td> >- <td class="ar-format">[% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %]</td> >- <td class="ar-urls">[% IF ar.format == 'SCAN' %]<span id="url_yesno_[% ar.id | html %]">[% IF ar.urls %]Yes[% ELSE %]No[% END%]</span><span id="url_[% ar.id | html %]" style="display:none;">[% ar.urls | url %]</span>[% END %]</td> >- <td class="ar-patron"> >- <p> >- <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]"> >- [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %]) >- </a> >- </p> >- >- <p>[% ar.borrower.phone | html %]</p> >- </td> >- <td class="ar-date" data-order="[% ar.created_on | html %]">[% ar.created_on | $KohaDates %]</td> >- <td class="ar-actions"> >- [% PROCESS actions menuid = "row" _ ar.id id_arg=ar.id format=ar.format pull_right='pull-right' aria_menu='ar-actions' %] >- </td> >+ <div id="article-requests-processing" role="tabpanel" class="tab-pane"> >+ <div class="article-requests-processing_table_controls"> >+ <a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="ClearAll"><i class="fa fa-remove"></i> Clear all</a> >+ [% PROCESS actions menuid='article-menu-processing' id_arg=0 pull_right='' aria_menu='table_controls' %] >+ </div> >+ <table id="article-requests-processing-table"> >+ <thead> >+ <tr> >+ <th/> >+ <th class="ar-title">Title</th> >+ <th class="ar-request">Requested article</th> >+ <th class="ar-collection">Collection</th> >+ <th class="ar-itemtype">Item type</th> >+ <th class="ar-callnumber">Call number</th> >+ <th class="ar-status">Status</th> >+ <th class="ar-copynumber">Copy number</th> >+ <th class="ar-enumchron">Enumeration</th> >+ <th class="ar-barcode">Barcode</th> >+ <th class="ar-format">Format</th> >+ <th class="ar-urls">URLs</th> >+ <th class="ar-patron">Patron</th> >+ <th class="ar-date">Date</th> >+ <th class="ar-actions noExport">Actions</th> > </tr> >- [% END %] >- </tbody> >- </table> >- </div> >- >- <div id="article-requests-processing"> >- <div class="article-requests-processing_table_controls"> >- <a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="ClearAll"><i class="fa fa-remove"></i> Clear all</a> >- [% PROCESS actions menuid='article-menu-processing' id_arg=0 pull_right='' aria_menu='table_controls' %] >+ </thead> >+ >+ <tbody> >+ [% FOREACH ar IN article_requests_processing %] >+ <tr class="ar-row ar-processing"> >+ <td><input type="checkbox" reqid="[% ar.id | html %]"/></td> >+ <td class="ar-title"> >+ <p> >+ [% INCLUDE 'biblio-title.inc' biblio=ar.biblio link = 1%] >+ </p> >+ >+ <p> >+ <div class="ar-biblionumber content_hidden">[% ar.biblionumber | html %]</div> >+ <div class="ar-author">[% ar.biblio.author | html %]</div> >+ <div class="ar-pubdata"> >+ [% ar.biblio.biblioitem.publishercode | html %] >+ >+ [% IF ar.biblio.biblioitem.publicationyear %] >+ [% ar.biblio.biblioitem.publicationyear | html %] >+ [% ELSIF ar.biblio.copyrightdate %] >+ [% ar.biblio.copyrightdate | html %] >+ [% END %] >+ >+ [% IF ar.biblio.biblioitem.pages %] >+ : [% ar.biblio.biblioitem.pages | html %] >+ [% END %] >+ >+ [% r.biblio.biblioitem.size | html %] >+ >+ [% IF ar.biblio.biblioitem.isbn %] >+ ISBN: [% ar.biblio.biblioitem.isbn | html %] >+ [% END %] >+ </div> >+ </p> >+ </td> >+ <td class="ar-request"> >+ [% IF ar.toc_request %] <p><strong>Include TOC</strong> </p> [% END %] >+ [% IF ar.title %] <p><strong>Title:</strong> [% ar.title | html %] </p> [% END %] >+ [% IF ar.author %] <p><strong>Author:</strong> [% ar.author | html %] </p> [% END %] >+ [% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume | html %] </p> [% END %] >+ [% IF ar.issue %] <p><strong>Issue:</strong> [% ar.issue | html %] </p> [% END %] >+ [% IF ar.date %] <p><strong>Date:</strong> [% ar.date | html %] </p> [% END %] >+ [% IF ar.pages %] <p><strong>Pages:</strong> [% ar.pages | html %] </p> [% END %] >+ [% IF ar.chapters %] <p><strong>Chapters:</strong> [% ar.chapters | html %] </p> [% END %] >+ [% IF ar.patron_notes %] <p><strong>Patron notes:</strong> [% ar.patron_notes | html %] </p> [% END %] >+ </td> >+ <td class="ar-collection">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => ar.item.ccode ) | html %]</td> >+ <td class="ar-itemtype">[% ItemTypes.GetDescription( ar.item.effective_itemtype ) | html %]</td> >+ <td class="ar-callnumber"> >+ [% IF ar.item.location %] >+ <em>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ar.item.location ) | html %]</em> >+ [% END %] >+ >+ [% ar.item.itemcallnumber | html %] >+ </td> >+ <td class="ar-status">[% PROCESS 'item_status' myitem = ar.item IF ar.item %]</td> >+ <td class="ar-copynumber">[% ar.item.copynumber | html %]</td> >+ <td class="ar-enumchron">[% ar.item.enumchron | html %]</td> >+ <td class="ar-barcode">[% ar.item.barcode | html %]</td> >+ <td class="ar-format">[% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %]</td> >+ <td class="ar-urls">[% IF ar.format == 'SCAN' %]<span id="url_yesno_[% ar.id | html %]">[% IF ar.urls %]Yes[% ELSE %]No[% END%]</span><span id="url_[% ar.id | html %]" style="display:none;">[% ar.urls | url %]</span>[% END %]</td> >+ <td class="ar-patron"> >+ <p> >+ <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]"> >+ [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %]) >+ </a> >+ </p> >+ >+ <p>[% ar.borrower.phone | html %]</p> >+ </td> >+ <td class="ar-date" data-order="[% ar.created_on | html %]">[% ar.created_on | $KohaDates %]</td> >+ <td class="ar-actions"> >+ [% PROCESS actions menuid="table_" _ ar.id id_arg=ar.id format=ar.format pull_right='pull-right' aria_menu='ar-actions' %] >+ </td> >+ </tr> >+ [% END %] >+ </tbody> >+ </table> > </div> >- <table id="article-requests-processing-table"> >- <thead> >- <tr> >- <th/> >- <th class="ar-title">Title</th> >- <th class="ar-request">Requested article</th> >- <th class="ar-collection">Collection</th> >- <th class="ar-itemtype">Item type</th> >- <th class="ar-callnumber">Call number</th> >- <th class="ar-status">Status</th> >- <th class="ar-copynumber">Copy number</th> >- <th class="ar-enumchron">Enumeration</th> >- <th class="ar-barcode">Barcode</th> >- <th class="ar-format">Format</th> >- <th class="ar-urls">URLs</th> >- <th class="ar-patron">Patron</th> >- <th class="ar-date">Date</th> >- <th class="ar-actions noExport">Actions</th> >- </tr> >- </thead> >- >- <tbody> >- [% FOREACH ar IN article_requests_processing %] >- <tr class="ar-row ar-processing"> >- <td><input type="checkbox" reqid="[% ar.id | html %]"/></td> >- <td class="ar-title"> >- <p> >- [% INCLUDE 'biblio-title.inc' biblio=ar.biblio link = 1%] >- </p> >- >- <p> >- <div class="ar-biblionumber content_hidden">[% ar.biblionumber | html %]</div> >- <div class="ar-author">[% ar.biblio.author | html %]</div> >- <div class="ar-pubdata"> >- [% ar.biblio.biblioitem.publishercode | html %] >- >- [% IF ar.biblio.biblioitem.publicationyear %] >- [% ar.biblio.biblioitem.publicationyear | html %] >- [% ELSIF ar.biblio.copyrightdate %] >- [% ar.biblio.copyrightdate | html %] >- [% END %] >- >- [% IF ar.biblio.biblioitem.pages %] >- : [% ar.biblio.biblioitem.pages | html %] >- [% END %] >- >- [% r.biblio.biblioitem.size | html %] >- >- [% IF ar.biblio.biblioitem.isbn %] >- ISBN: [% ar.biblio.biblioitem.isbn | html %] >- [% END %] >- </div> >- </p> >- </td> >- <td class="ar-request"> >- [% IF ar.toc_request %] <p><strong>Include TOC</strong> </p> [% END %] >- [% IF ar.title %] <p><strong>Title:</strong> [% ar.title | html %] </p> [% END %] >- [% IF ar.author %] <p><strong>Author:</strong> [% ar.author | html %] </p> [% END %] >- [% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume | html %] </p> [% END %] >- [% IF ar.issue %] <p><strong>Issue:</strong> [% ar.issue | html %] </p> [% END %] >- [% IF ar.date %] <p><strong>Date:</strong> [% ar.date | html %] </p> [% END %] >- [% IF ar.pages %] <p><strong>Pages:</strong> [% ar.pages | html %] </p> [% END %] >- [% IF ar.chapters %] <p><strong>Chapters:</strong> [% ar.chapters | html %] </p> [% END %] >- [% IF ar.patron_notes %] <p><strong>Patron notes:</strong> [% ar.patron_notes | html %] </p> [% END %] >- </td> >- <td class="ar-collection">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => ar.item.ccode ) | html %]</td> >- <td class="ar-itemtype">[% ItemTypes.GetDescription( ar.item.effective_itemtype ) | html %]</td> >- <td class="ar-callnumber"> >- [% IF ar.item.location %] >- <em>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ar.item.location ) | html %]</em> >- [% END %] >- >- [% ar.item.itemcallnumber | html %] >- </td> >- <td class="ar-status">[% PROCESS 'item_status' myitem = ar.item IF ar.item %]</td> >- <td class="ar-copynumber">[% ar.item.copynumber | html %]</td> >- <td class="ar-enumchron">[% ar.item.enumchron | html %]</td> >- <td class="ar-barcode">[% ar.item.barcode | html %]</td> >- <td class="ar-format">[% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %]</td> >- <td class="ar-urls">[% IF ar.format == 'SCAN' %]<span id="url_yesno_[% ar.id | html %]">[% IF ar.urls %]Yes[% ELSE %]No[% END%]</span><span id="url_[% ar.id | html %]" style="display:none;">[% ar.urls | url %]</span>[% END %]</td> >- <td class="ar-patron"> >- <p> >- <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]"> >- [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %]) >- </a> >- </p> >- >- <p>[% ar.borrower.phone | html %]</p> >- </td> >- <td class="ar-date" data-order="[% ar.created_on | html %]">[% ar.created_on | $KohaDates %]</td> >- <td class="ar-actions"> >- [% PROCESS actions menuid="table_" _ ar.id id_arg=ar.id format=ar.format pull_right='pull-right' aria_menu='ar-actions' %] >- </td> >- </tr> >- [% END %] >- </tbody> >- </table> >- </div> >+ </div> <!-- /.tab-content --> > <br/> > </div> > </div> >@@ -520,18 +521,18 @@ > var active_tab = "#article-requests-requested"; > var last_cancel_reason, requested_datatable, pending_datatable, processing_datatable, active_datatable; > $(document).ready(function() { >- $('#article-request-tabs').tabs({ >- activate: function( activate_event, activate_ui ) { >- active_tab = activate_ui.newPanel.selector; >- if( active_tab == '#article-requests-requested' ) >- active_datatable = requested_datatable; >- else if( active_tab == '#article-requests-pending' ) >- active_datatable = pending_datatable; >- else active_datatable = processing_datatable; >- activateBatchActions( active_tab ); >- }, >- }); > >+ $("#article-request-tabs a[data-toggle='tab']").on("shown.bs.tab", function (e) { >+ active_tab = e.target.hash; >+ if( active_tab == "#article-requests-requested" ){ >+ active_datatable = requested_datatable; >+ } else if( active_tab == "#article-requests-pending" ){ >+ active_datatable = pending_datatable; >+ } else { >+ active_datatable = processing_datatable; >+ } >+ activateBatchActions( active_tab ); >+ }); > > $( "input:checkbox, #article-request-tabs" ).on("change", function(){ > activateBatchActions( active_tab ); >-- >2.34.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 30436
:
132870
|
132928
|
132933
| 133479