Bugzilla – Attachment 138235 Details for
Bug 30389
Switch to Bootstrap tabs on the page for adding orders from MARC file
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30389: Switch to Bootstrap tabs on the page for adding orders from MARC file
Bug-30389-Switch-to-Bootstrap-tabs-on-the-page-for.patch (text/plain), 77.35 KB, created by
Katrin Fischer
on 2022-07-28 21:46:13 UTC
(
hide
)
Description:
Bug 30389: Switch to Bootstrap tabs on the page for adding orders from MARC file
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2022-07-28 21:46:13 UTC
Size:
77.35 KB
patch
obsolete
>From 5b6870396fcdfbbfd430979d8f9eda8208cc2e09 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 28 Mar 2022 19:21:55 +0000 >Subject: [PATCH] Bug 30389: Switch to Bootstrap tabs on the page for adding > orders from MARC file >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >This patch updates addorderiso2709.tt so that it uses Bootstrap tabs >intead of jQuery. > >The patch contains indentation changes, so diff accordingly. > >To test apply the patch and go to Acquisitions -> Vendor -> Basket -> >Add to basket -> From a staged file. > >- Click "Add orders" next to the staged file you want to use. >- On the "Add orders" page, test that the tabs work correctly. > >Signed-off-by: Séverine Queune <severine.queune@bulac.fr> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../prog/en/modules/acqui/addorderiso2709.tt | 713 +++++++++--------- > .../intranet-tmpl/prog/js/addorderiso2709.js | 1 - > 2 files changed, 357 insertions(+), 357 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index 9b2f5f9043..3cb1ee24ea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -63,402 +63,403 @@ > </h1> > <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform"> > <div id="tabs" class="toptabs"> >- <ul> >- <li><a href="#records_to_import">Select to import</a></li> >- <li><a href="#items_info" class="items_info">Item information</a></li> >- <li><a href="#accounting_details">Default accounting details</a></li> >+ <ul class="nav nav-tabs" role="tablist"> >+ <li role="presentation" class="active"><a href="#records_to_import" aria-controls="records_to_import" role="tab" data-toggle="tab">Select to import</a></li> >+ <li role="presentation"><a href="#items_info" class="items_info" aria-controls="items_info" role="tab" data-toggle="tab">Item information</a></li> >+ <li role="presentation"><a href="#accounting_details" aria-controls="accounting_details" role="tab" data-toggle="tab">Default accounting details</a></li> > </ul> > >- <div id="records_to_import"> >- <div id="searchheader" class="searchheader"> >- <div> >- <span class="checkall"><a id="checkAll" href="#">Select all</a></span> >- | >- <span class="uncheckall"><a id="unCheckAll" href="#">Clear all</a></span> >- | >- <span> >- <label for="matcher_id">Matching:</label> >- <select name="matcher_id" id="matcher_id"> >- <option value="_TITLE_AUTHOR_">Title and author</option> >- <option value="">Do not look for matching records</option> >- [% FOREACH available_matcher IN available_matchers %] >- [% IF ( available_matcher.code == current_matcher_code ) %] >- <option value="[% available_matcher.matcher_id | html %]" selected="selected"> >- [% available_matcher.code | html %] ([% available_matcher.description | html %]) >- </option> >- [% ELSE %] >- <option value="[% available_matcher.matcher_id | html %]"> >- [% available_matcher.code | html %] ([% available_matcher.description | html %]) >- </option> >+ <div class="tab-content"> >+ <div id="records_to_import" role="tabpanel" class="tab-pane active" > >+ <div id="searchheader" class="searchheader"> >+ <div> >+ <span class="checkall"><a id="checkAll" href="#">Select all</a></span> >+ | >+ <span class="uncheckall"><a id="unCheckAll" href="#">Clear all</a></span> >+ | >+ <span> >+ <label for="matcher_id">Matching:</label> >+ <select name="matcher_id" id="matcher_id"> >+ <option value="_TITLE_AUTHOR_">Title and author</option> >+ <option value="">Do not look for matching records</option> >+ [% FOREACH available_matcher IN available_matchers %] >+ [% IF ( available_matcher.code == current_matcher_code ) %] >+ <option value="[% available_matcher.matcher_id | html %]" selected="selected"> >+ [% available_matcher.code | html %] ([% available_matcher.description | html %]) >+ </option> >+ [% ELSE %] >+ <option value="[% available_matcher.matcher_id | html %]"> >+ [% available_matcher.code | html %] ([% available_matcher.description | html %]) >+ </option> >+ [% END %] > [% END %] >- [% END %] >- </select> >- </span> >- | >- <span> >- <label for="showallbudgets" style="float:none;width:auto;"> Show inactive funds:</label> >- <input type="checkbox" id="showallbudgets" /> >- </span> >- </div> >- </div> <!-- /#searchheader --> >+ </select> >+ </span> >+ | >+ <span> >+ <label for="showallbudgets" style="float:none;width:auto;"> Show inactive funds:</label> >+ <input type="checkbox" id="showallbudgets" /> >+ </span> >+ </div> >+ </div> <!-- /#searchheader --> > >- <input type="hidden" name="op" value="import_records"/> >- <input type="hidden" name="basketno" value="[% basketno | html %]" /> >- <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >- <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" /> >- <input type="hidden" name="ordernumber" value="[% ordernumber | html %]" /> >+ <input type="hidden" name="op" value="import_records"/> >+ <input type="hidden" name="basketno" value="[% basketno | html %]" /> >+ <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >+ <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" /> >+ <input type="hidden" name="ordernumber" value="[% ordernumber | html %]" /> > >- [% FOREACH biblio IN biblio_list %] >- <fieldset class="biblio unselected rows" style="float:none;"> >- <legend> >- <label for="record_[% biblio.import_record_id | html %]" style="width:auto;"> >- <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id | html %]" value="[% biblio.import_record_id | html %]" /> >- <span class="citation">[% biblio.citation | html %]</span> >- </label> >- <span class="links" style="font-weight: normal;"> >- ( <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | uri %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% biblio.import_record_id | html %]" class="previewData">Card</a> | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]&breedingid=[% biblio.import_record_id | html %]&import_batch_id=[% biblio.import_batch_id | html %]&biblionumber=[% biblio.match_biblionumber | html %]">Add order</a> ) >- </span> >- </legend> >- <div style="float:left"> >- <ol> >- <li class="status"> >- <span class="match"> >- [% IF ( biblio_lis.overlay_status == 'no_match' ) %] >+ [% FOREACH biblio IN biblio_list %] >+ <fieldset class="biblio unselected rows" style="float:none;"> >+ <legend> >+ <label for="record_[% biblio.import_record_id | html %]" style="width:auto;"> >+ <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id | html %]" value="[% biblio.import_record_id | html %]" /> >+ <span class="citation">[% biblio.citation | html %]</span> >+ </label> >+ <span class="links" style="font-weight: normal;"> >+ ( <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | uri %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% biblio.import_record_id | html %]" class="previewData">Card</a> | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]&breedingid=[% biblio.import_record_id | html %]&import_batch_id=[% biblio.import_batch_id | html %]&biblionumber=[% biblio.match_biblionumber | html %]">Add order</a> ) >+ </span> >+ </legend> >+ <div style="float:left"> >+ <ol> >+ <li class="status"> >+ <span class="match"> >+ [% IF ( biblio_lis.overlay_status == 'no_match' ) %] > <span>No match</span> >- [% ELSIF ( biblio_lis.overlay_status == 'match_applied' ) %] >+ [% ELSIF ( biblio_lis.overlay_status == 'match_applied' ) %] > <span>Match applied</span> >- [% ELSIF ( biblio_lis.overlay_status == 'auto_match' ) %] >+ [% ELSIF ( biblio_lis.overlay_status == 'auto_match' ) %] > <span>Match found</span> >- [% ELSE %] >- [% biblio_lis.overlay_status | html %] >- [% END %] >- [% IF ( biblio.match_biblionumber ) %] >+ [% ELSE %] >+ [% biblio_lis.overlay_status | html %] >+ [% END %] >+ [% IF ( biblio.match_biblionumber ) %] > <span>Matches biblio [% biblio.match_biblionumber | uri %]</span> (score = [% biblio.match_score | html %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber | uri %]">[% biblio.match_citation | html %]</a> >- [% END %] >- </span> >- </li> >- <li class="quantity"> >- <label for="quantity_record_[% biblio.import_record_id | html %]" class="required">Quantity: </label> >- <input id="quantity_record_[% biblio.import_record_id | html %]" type="text" pattern="[0-9]+" value="[% biblio.quantity.length ? biblio.quantity : 1 | html %]" name="quantity" /> >- <span class="required">Required</span> >- </li> >- <li class="price"> >- <label for="price_record_[% biblio.import_record_id | html %]">Price: </label> >- <input id="price_record_[% biblio.import_record_id | html %]" type="text" value="[% biblio.price | html %]" name="price" /> >- </li> >- <li class="replacementprice"> >- <label for="replacementprice_record_[% biblio.import_record_id | html %]">Replacement price: </label> >- <input id="replacementprice_record_[% biblio.import_record_id | html %]" type="text" value="[% biblio.replacementprice | html %]" name="replacementprice" /> >- </li> >- <li class="discount"> >- <label for="discount_record_[% biblio.import_record_id | html %]">Discount: </label> >- <input id="discount_record_[% biblio.import_record_id | html %]" type="text" value="[% biblio.discount | html %]" name="discount" size="6" /> % >- <div class="hint">If empty, discount rate from vendor will be used</div> >- </li> >- <li class="fund"> >- [% IF ( close ) %] >- <label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label> >- <input type="hidden" size="20" name="budget_id" value="[% budget_id | html %]" />[% Budget_name | html %] >- [% ELSE %] >- <label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label> >- <select id="fund_record_[% biblio.import_record_id | html %]" name="budget_id"> >- <option value="">Select a fund (will use default if set)</option> >- [% FOREACH budget IN budget_loop %] >- [% IF ( budget.b_id == biblio.budget_id ) %] >- [% IF budget.b_active %] >- <option value="[% budget.b_id | html %]" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]" selected="selected">[% budget.b_txt | html %]</option> >- [% ELSE %] >+ [% END %] >+ </span> >+ </li> >+ <li class="quantity"> >+ <label for="quantity_record_[% biblio.import_record_id | html %]" class="required">Quantity: </label> >+ <input id="quantity_record_[% biblio.import_record_id | html %]" type="text" pattern="[0-9]+" value="[% biblio.quantity.length ? biblio.quantity : 1 | html %]" name="quantity" /> >+ <span class="required">Required</span> >+ </li> >+ <li class="price"> >+ <label for="price_record_[% biblio.import_record_id | html %]">Price: </label> >+ <input id="price_record_[% biblio.import_record_id | html %]" type="text" value="[% biblio.price | html %]" name="price" /> >+ </li> >+ <li class="replacementprice"> >+ <label for="replacementprice_record_[% biblio.import_record_id | html %]">Replacement price: </label> >+ <input id="replacementprice_record_[% biblio.import_record_id | html %]" type="text" value="[% biblio.replacementprice | html %]" name="replacementprice" /> >+ </li> >+ <li class="discount"> >+ <label for="discount_record_[% biblio.import_record_id | html %]">Discount: </label> >+ <input id="discount_record_[% biblio.import_record_id | html %]" type="text" value="[% biblio.discount | html %]" name="discount" size="6" /> % >+ <div class="hint">If empty, discount rate from vendor will be used</div> >+ </li> >+ <li class="fund"> >+ [% IF ( close ) %] >+ <label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label> >+ <input type="hidden" size="20" name="budget_id" value="[% budget_id | html %]" />[% Budget_name | html %] >+ [% ELSE %] >+ <label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label> >+ <select id="fund_record_[% biblio.import_record_id | html %]" name="budget_id"> >+ <option value="">Select a fund (will use default if set)</option> >+ [% FOREACH budget IN budget_loop %] >+ [% IF ( budget.b_id == biblio.budget_id ) %] >+ [% IF budget.b_active %] >+ <option value="[% budget.b_id | html %]" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]" selected="selected">[% budget.b_txt | html %]</option> >+ [% ELSE %] > <option value="[% budget.b_id | html %]" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]" selected="selected">[% budget.b_txt | html %] (inactive)</option> > [% END %] > [% ELSE %] > [% IF budget.b_active %]<option value="[% budget.b_id | html %]" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]">[% budget.b_txt | html %]</option> > [% ELSE %]<option value="[% budget.b_id | html %]" class="b_inactive" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]">[% budget.b_txt | html %] (inactive)</option> > [% END %] >- [% END %] >- [% END %] >- </select> >- <span class="required" style="display:none">Required</span> >- [% END %] >- </li> >- <li class="sort1"> >- <label for="sort1_record_[% biblio.import_record_id | html %]">Statistic 1: </label> >- <input id="sort1_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort1" value="[% biblio.sort1 | html %]" /> >- </li> >- <li class="sort2"> >- <label for="sort2_record_[% biblio.import_record_id | html %]">Statistic 2: </label> >- <input id="sort2_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort2" value="[% biblio.sort2 | html %]" /> >- </li> >- </ol> >- </div> >- <div style="float:right"> >- [% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %] >- [% FOREACH item IN biblio.iteminfos %] >- <fieldset> >- <legend>Item record [% item.item_id | html %]</legend> >- <ol> >- <li> >- <label for="homebranch_item_[% item.item_id | html %]">homebranch</label> >- <select id="homebranch_item_[% item.item_id | html %]" name="homebranch_[% item.biblio_count | html %]"> >- [% FOREACH l IN libraries %] >- [% IF l.branchcode == item.homebranch %] >- <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option> >- [% ELSE %] >- <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option> > [% END %] > [% END %] > </select> >- </li> >+ <span class="required" style="display:none">Required</span> >+ [% END %] >+ </li> >+ <li class="sort1"> >+ <label for="sort1_record_[% biblio.import_record_id | html %]">Statistic 1: </label> >+ <input id="sort1_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort1" value="[% biblio.sort1 | html %]" /> >+ </li> >+ <li class="sort2"> >+ <label for="sort2_record_[% biblio.import_record_id | html %]">Statistic 2: </label> >+ <input id="sort2_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort2" value="[% biblio.sort2 | html %]" /> >+ </li> >+ </ol> >+ </div> >+ <div style="float:right"> >+ [% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %] >+ [% FOREACH item IN biblio.iteminfos %] >+ <fieldset> >+ <legend>Item record [% item.item_id | html %]</legend> >+ <ol> >+ <li> >+ <label for="homebranch_item_[% item.item_id | html %]">homebranch</label> >+ <select id="homebranch_item_[% item.item_id | html %]" name="homebranch_[% item.biblio_count | html %]"> >+ [% FOREACH l IN libraries %] >+ [% IF l.branchcode == item.homebranch %] >+ <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option> >+ [% ELSE %] >+ <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ </li> > >- <li> >- <label for="holdingbranch_item_[% item.item_id | html %]">holdingbranch</label> >- <select id="holdingbranch_item_[% item.item_id | html %]" name="holdingbranch_[% item.biblio_count | html %]"> >- [% FOREACH l IN libraries %] >- [% IF l.branchcode == item.holdingbranch %] >- <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option> >- [% ELSE %] >- <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option> >+ <li> >+ <label for="holdingbranch_item_[% item.item_id | html %]">holdingbranch</label> >+ <select id="holdingbranch_item_[% item.item_id | html %]" name="holdingbranch_[% item.biblio_count | html %]"> >+ [% FOREACH l IN libraries %] >+ [% IF l.branchcode == item.holdingbranch %] >+ <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option> >+ [% ELSE %] >+ <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option> >+ [% END %] > [% END %] >- [% END %] >- </select> >- </li> >- <li> >- <label for="itype_item_[% item.item_id | html %]">itype</label> >- <select id="itype_item_[% item.item_id | html %]" name="itype_[% item.biblio_count | html %]"> >- [% FOREACH itemtype IN itemtypes %] >- [% IF itemtype.itemtype == item.itype %] >- <option value="[% itemtype.itemtype | html %]" selected="selected">[% itemtype.description | html %]</option> >- [% ELSE %] >- <option value="[% itemtype.itemtype | html %]">[% itemtype.description | html %]</option> >+ </select> >+ </li> >+ <li> >+ <label for="itype_item_[% item.item_id | html %]">itype</label> >+ <select id="itype_item_[% item.item_id | html %]" name="itype_[% item.biblio_count | html %]"> >+ [% FOREACH itemtype IN itemtypes %] >+ [% IF itemtype.itemtype == item.itype %] >+ <option value="[% itemtype.itemtype | html %]" selected="selected">[% itemtype.description | html %]</option> >+ [% ELSE %] >+ <option value="[% itemtype.itemtype | html %]">[% itemtype.description | html %]</option> >+ [% END %] > [% END %] >- [% END %] >- </select> >- </li> >+ </select> >+ </li> > >- <li> >- <label for="nonpublic_note_item_[% item.item_id | html %]">nonpublic_note</label> >- <input type="text" id="nonpublic_note_item_[% item.item_id | html %]" name="nonpublic_note_[% item.biblio_count | html %]" value="[% item.nonpublic_note | html %]"> >- </li> >- <li> >- <label for="public_note_item_[% item.item_id | html %]">public_note</label> >- <input type="text" id="public_note_item_[% item.item_id | html %]" name="public_note_[% item.biblio_count | html %]" value="[% item.public_note | html %]"> >- </li> >- <li> >- <label for="loc_item_[% item.item_id | html %]">loc</label> >- <select id="loc_item_[% item.item_id | html %]" name="loc_[% item.biblio_count | html %]"> >- <option value=""> </option> >- [% FOREACH locationloo IN locationloop %] >- [% IF ( locationloo.code ) == (item.loc) %] >- <option value="[% locationloo.code | html %]" selected="selected">[% locationloo.description | html %]</option> >- [% ELSE %] >- <option value="[% locationloo.code | html %]">[% locationloo.description | html %]</option> >+ <li> >+ <label for="nonpublic_note_item_[% item.item_id | html %]">nonpublic_note</label> >+ <input type="text" id="nonpublic_note_item_[% item.item_id | html %]" name="nonpublic_note_[% item.biblio_count | html %]" value="[% item.nonpublic_note | html %]"> >+ </li> >+ <li> >+ <label for="public_note_item_[% item.item_id | html %]">public_note</label> >+ <input type="text" id="public_note_item_[% item.item_id | html %]" name="public_note_[% item.biblio_count | html %]" value="[% item.public_note | html %]"> >+ </li> >+ <li> >+ <label for="loc_item_[% item.item_id | html %]">loc</label> >+ <select id="loc_item_[% item.item_id | html %]" name="loc_[% item.biblio_count | html %]"> >+ <option value=""> </option> >+ [% FOREACH locationloo IN locationloop %] >+ [% IF ( locationloo.code ) == (item.loc) %] >+ <option value="[% locationloo.code | html %]" selected="selected">[% locationloo.description | html %]</option> >+ [% ELSE %] >+ <option value="[% locationloo.code | html %]">[% locationloo.description | html %]</option> >+ [% END %] > [% END %] >- [% END %] >- </select> >- </li> >+ </select> >+ </li> > >- <li> >- <label for="ccode_item_[% item.item_id | html %]">ccode</label> >- <select id="ccode_item_[% item.item_id | html %]" name="ccode_[% item.biblio_count | html %]"> >- <option value=""> </option> >- [% FOREACH ccodeloo IN ccodeloop %] >- [% IF ( ccodeloo.code ) == (item.ccode) %] >- <option value="[% ccodeloo.code | html %]" selected="selected">[% ccodeloo.description | html %]</option> >- [% ELSE %] >- <option value="[% ccodeloo.code | html %]">[% ccodeloo.description | html %]</option> >+ <li> >+ <label for="ccode_item_[% item.item_id | html %]">ccode</label> >+ <select id="ccode_item_[% item.item_id | html %]" name="ccode_[% item.biblio_count | html %]"> >+ <option value=""> </option> >+ [% FOREACH ccodeloo IN ccodeloop %] >+ [% IF ( ccodeloo.code ) == (item.ccode) %] >+ <option value="[% ccodeloo.code | html %]" selected="selected">[% ccodeloo.description | html %]</option> >+ [% ELSE %] >+ <option value="[% ccodeloo.code | html %]">[% ccodeloo.description | html %]</option> >+ [% END %] > [% END %] >- [% END %] >- </select> >- </li> >+ </select> >+ </li> > >- <li> >- <label for="notforloan_item_[% item.item_id | html %]">notforloan</label> >- <select id="notforloan_item_[% item.item_id | html %]" name="notforloan_[% item.biblio_count | html %]"> >- <option value=""> </option> >- [% FOREACH n IN notforloanloop %] >- [% IF n.code == item.notforloan %] >- <option value="[% n.code | html %]" selected="selected">[% n.description | html %]</option> >- [% ELSE %] >- <option value="[% n.code | html %]">[% n.description | html %]</option> >+ <li> >+ <label for="notforloan_item_[% item.item_id | html %]">notforloan</label> >+ <select id="notforloan_item_[% item.item_id | html %]" name="notforloan_[% item.biblio_count | html %]"> >+ <option value=""> </option> >+ [% FOREACH n IN notforloanloop %] >+ [% IF n.code == item.notforloan %] >+ <option value="[% n.code | html %]" selected="selected">[% n.description | html %]</option> >+ [% ELSE %] >+ <option value="[% n.code | html %]">[% n.description | html %]</option> >+ [% END %] > [% END %] >- [% END %] >- </select> >- </li> >- <li> >- <label for="uri_item_[% item.item_id | html %]">uri</label> >- <input type="text" id="uri_item_[% item.item_id | html %]" name="uri_[% item.biblio_count | html %]" value="[% item.uri | html %]"> >- </li> >- <li> >- <label for="copyno_item_[% item.item_id | html %]">copyno</label> >- <input type="text" id="copyno_item_[% item.item_id | html %]" name="copyno_[% item.biblio_count | html %]" value="[% item.copyno | html %]"> >- </li> >- <li> >- <label for="budget_code_item_[% item.item_id | html %]">budget_code</label> >- <select class="budget_code_item" id="budget_code_item_[% item.item_id | html %]" name="budget_code_[% item.biblio_count | html %]"> >- <option value="">Select a fund (will use default if set)</option> >- [% FOREACH budget_loo IN budget_loop %] >- [% IF ( budget_loo.b_id ) == ( item.budget_id ) %]<option value="[% budget_loo.b_id | html %]" selected="selected">[% budget_loo.b_txt | html %]</option> >- [% ELSE %]<option value="[% budget_loo.b_id | html %]">[% budget_loo.b_txt | html %]</option> >+ </select> >+ </li> >+ <li> >+ <label for="uri_item_[% item.item_id | html %]">uri</label> >+ <input type="text" id="uri_item_[% item.item_id | html %]" name="uri_[% item.biblio_count | html %]" value="[% item.uri | html %]"> >+ </li> >+ <li> >+ <label for="copyno_item_[% item.item_id | html %]">copyno</label> >+ <input type="text" id="copyno_item_[% item.item_id | html %]" name="copyno_[% item.biblio_count | html %]" value="[% item.copyno | html %]"> >+ </li> >+ <li> >+ <label for="budget_code_item_[% item.item_id | html %]">budget_code</label> >+ <select class="budget_code_item" id="budget_code_item_[% item.item_id | html %]" name="budget_code_[% item.biblio_count | html %]"> >+ <option value="">Select a fund (will use default if set)</option> >+ [% FOREACH budget_loo IN budget_loop %] >+ [% IF ( budget_loo.b_id ) == ( item.budget_id ) %]<option value="[% budget_loo.b_id | html %]" selected="selected">[% budget_loo.b_txt | html %]</option> >+ [% ELSE %]<option value="[% budget_loo.b_id | html %]">[% budget_loo.b_txt | html %]</option> >+ [% END %] > [% END %] >- [% END %] >- </select> >- <span class="item_fund required">Required</span> >- </li> >- <li> >- <label for="price_item_[% item.item_id | html %]">price</label> >- <input type="text" id="price_item_[% item.item_id | html %]" name="itemprice_[% item.biblio_count | html %]" value="[% item.itemprice | html %]"> >- </li> >- <li> >- <label for="replacementprice_item_[% item.item_id | html %]">replacement price</label> >- <input type="text" id="replacementprice_item_[% item.item_id | html %]" name="replacementprice_[% item.biblio_count | html %]" value="[% item.replacementprice | html %]"> >- </li> >- <li> >- <label for="callnumber_item_[% item.item_id | html %]">callnumber</label> >- <input type="text" id="callnumber_item_[% item.item_id | html %]" name="itemcallnumber_[% item.biblio_count | html %]" value="[% item.itemcallnumber | html %]"> >- </li> >- </ol> >- </fieldset> >- [% END # /FOREACH item %] >- </div> >- </fieldset> <!-- .biblio.unselected.rows --> >- >- [% END # /FOREACH biblio %] >- <div class="modal" id="dataPreview" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel"> >- <div class="modal-dialog modal-lg" role="document"> >- <div class="modal-content"> >- <div class="modal-header"> >- <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span >- aria-hidden="true">×</span></button> >- <h4 id="dataPreviewLabel">MARC preview</h4> >- </div> >- <div class="modal-body"> >- <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div> >- </div> >- <div class="modal-footer"> >- <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ </select> >+ <span class="item_fund required">Required</span> >+ </li> >+ <li> >+ <label for="price_item_[% item.item_id | html %]">price</label> >+ <input type="text" id="price_item_[% item.item_id | html %]" name="itemprice_[% item.biblio_count | html %]" value="[% item.itemprice | html %]"> >+ </li> >+ <li> >+ <label for="replacementprice_item_[% item.item_id | html %]">replacement price</label> >+ <input type="text" id="replacementprice_item_[% item.item_id | html %]" name="replacementprice_[% item.biblio_count | html %]" value="[% item.replacementprice | html %]"> >+ </li> >+ <li> >+ <label for="callnumber_item_[% item.item_id | html %]">callnumber</label> >+ <input type="text" id="callnumber_item_[% item.item_id | html %]" name="itemcallnumber_[% item.biblio_count | html %]" value="[% item.itemcallnumber | html %]"> >+ </li> >+ </ol> >+ </fieldset> >+ [% END # /FOREACH item %] > </div> >- </div> <!-- /.modal-content --> >- </div> <!-- /.modal-dialog --> >- </div> <!-- /#dataPreview --> >- </div> <!-- /#records_to_import --> >+ </fieldset> <!-- .biblio.unselected.rows --> > >- <div id="items_info"> >- <h2>Item information</h2> >- <p>Import all the checked items in the basket with the following parameters:</p> >+ [% END # /FOREACH biblio %] >+ <div class="modal" id="dataPreview" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel"> >+ <div class="modal-dialog modal-lg" role="document"> >+ <div class="modal-content"> >+ <div class="modal-header"> >+ <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span >+ aria-hidden="true">×</span></button> >+ <h4 id="dataPreviewLabel">MARC preview</h4> >+ </div> >+ <div class="modal-body"> >+ <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div> >+ </div> >+ <div class="modal-footer"> >+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+ </div> <!-- /.modal-content --> >+ </div> <!-- /.modal-dialog --> >+ </div> <!-- /#dataPreview --> >+ </div> <!-- /#records_to_import --> > >- [% IF ( items ) %] >- <fieldset class="rows" style="float:none;"> >- <legend>Item</legend> >- [% IF ( NoACQframework ) %] >- <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div> >- [% END %] >- [% FOREACH item IN items %] >- <div id="outeritemblock"> >- <div id="itemblock"> >- <ol> >- [% FOREACH iteminformatio IN item.iteminformation %] >- <li style="[% iteminformatio.hidden | html %];"> >- <div class="subfield_line" id="subfield[% iteminformatio.serialid | html %][% iteminformatio.countitems | html %][% iteminformatio.subfield | html %][% iteminformatio.random | html %]"> >- [% IF (iteminformatio.mandatory) %] >- <label class="required">[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | $raw %]</label> >- [% ELSE %] >- <label>[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | $raw %]</label> >- [% END %] >+ <div id="items_info" role="tabpanel" class="tab-pane"> >+ <h2>Item information</h2> >+ <p>Import all the checked items in the basket with the following parameters:</p> >+ >+ [% IF ( items ) %] >+ <fieldset class="rows" style="float:none;"> >+ <legend>Item</legend> >+ [% IF ( NoACQframework ) %] >+ <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div> >+ [% END %] >+ [% FOREACH item IN items %] >+ <div id="outeritemblock"> >+ <div id="itemblock"> >+ <ol> >+ [% FOREACH iteminformatio IN item.iteminformation %] >+ <li style="[% iteminformatio.hidden | html %];"> >+ <div class="subfield_line" id="subfield[% iteminformatio.serialid | html %][% iteminformatio.countitems | html %][% iteminformatio.subfield | html %][% iteminformatio.random | html %]"> >+ [% IF (iteminformatio.mandatory) %] >+ <label class="required">[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | $raw %]</label> >+ [% ELSE %] >+ <label>[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | $raw %]</label> >+ [% END %] > >- [% IF ( iteminformatio.marc_value.type == 'select' ) %] >- <select name="field_value" class="input_marceditor"> >- [% FOREACH value IN iteminformatio.marc_value.values %] >- [% IF ( value == iteminformatio.marc_value.default ) %] >- <option value="[% value | html %]" selected="selected">[% iteminformatio.marc_value.labels.$value | html %]</option> >- [% ELSE %] >- <option value="[% value | html %]">[% iteminformatio.marc_value.labels.$value | html %]</option> >+ [% IF ( iteminformatio.marc_value.type == 'select' ) %] >+ <select name="field_value" class="input_marceditor"> >+ [% FOREACH value IN iteminformatio.marc_value.values %] >+ [% IF ( value == iteminformatio.marc_value.default ) %] >+ <option value="[% value | html %]" selected="selected">[% iteminformatio.marc_value.labels.$value | html %]</option> >+ [% ELSE %] >+ <option value="[% value | html %]">[% iteminformatio.marc_value.labels.$value | html %]</option> >+ [% END %] > [% END %] >- [% END %] >- </select> >- [% ELSE %] >- [% iteminformatio.marc_value | $raw %] >- [% END %] >- <input type="hidden" name="itemid" value="1" /> >- <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield | html %]" /> >- <input type="hidden" name="tag" value="[% iteminformatio.tag | html %]" /> >- <input type="hidden" name="subfield" value="[% iteminformatio.subfield | html %]" /> >- <input type="hidden" name="mandatory" value="[% iteminformatio.mandatory | html %]" /> >- [% IF ( iteminformatio.mandatory ) %] >- <span class="required">Required</span> >- [% END %] >- </div> >- </li> >- [% END %] >- </ol> >- </div><!-- /#itemblock --> >- </div> <!-- /#outeritemblock --> >- [% END #/FOREACH item %] >- </fieldset> >- [% END # /IF items %] >- </div> <!-- /#items_info --> >+ </select> >+ [% ELSE %] >+ [% iteminformatio.marc_value | $raw %] >+ [% END %] >+ <input type="hidden" name="itemid" value="1" /> >+ <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield | html %]" /> >+ <input type="hidden" name="tag" value="[% iteminformatio.tag | html %]" /> >+ <input type="hidden" name="subfield" value="[% iteminformatio.subfield | html %]" /> >+ <input type="hidden" name="mandatory" value="[% iteminformatio.mandatory | html %]" /> >+ [% IF ( iteminformatio.mandatory ) %] >+ <span class="required">Required</span> >+ [% END %] >+ </div> >+ </li> >+ [% END %] >+ </ol> >+ </div><!-- /#itemblock --> >+ </div> <!-- /#outeritemblock --> >+ [% END #/FOREACH item %] >+ </fieldset> >+ [% END # /IF items %] >+ </div> <!-- /#items_info --> > >- <div id="accounting_details"> >- <p>Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):</p> >- <fieldset class="rows" style="float:none;"> >- <legend>Accounting details</legend> >- <ol> >- <li> >- <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order --> >- <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" /> >- </li> >- [% IF ( close ) %] >+ <div id="accounting_details" role="tabpanel" class="tab-pane"> >+ <p>Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):</p> >+ <fieldset class="rows" style="float:none;"> >+ <legend>Accounting details</legend> >+ <ol> > <li> >- <span class="label">Fund: </span> >- <input type="hidden" size="20" name="budget_id" id="budget_id" value="[% budget_id | html %]" />[% Budget_name | html %] >+ <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order --> >+ <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" /> > </li> >- [% ELSE %] >- <li> >- <label for="all_currency">Currency:</label> >- <select name="all_currency" id="all_currency"> >- [% FOREACH currency IN currencies %] >- [% IF currency.currency == bookseller.listprice %] >- <option value="[% currency.currency | html %]" selected="selected">[% currency.currency | html %]</option> >- [% ELSIF not currency.archived %] >- <option value="[% currency.currency | html %]">[% currency.currency | html %]</option> >+ [% IF ( close ) %] >+ <li> >+ <span class="label">Fund: </span> >+ <input type="hidden" size="20" name="budget_id" id="budget_id" value="[% budget_id | html %]" />[% Budget_name | html %] >+ </li> >+ [% ELSE %] >+ <li> >+ <label for="all_currency">Currency:</label> >+ <select name="all_currency" id="all_currency"> >+ [% FOREACH currency IN currencies %] >+ [% IF currency.currency == bookseller.listprice %] >+ <option value="[% currency.currency | html %]" selected="selected">[% currency.currency | html %]</option> >+ [% ELSIF not currency.archived %] >+ <option value="[% currency.currency | html %]">[% currency.currency | html %]</option> >+ [% END %] > [% END %] >- [% END %] >- </select> >+ </select> >+ </li> >+ <li> >+ <label for="all_budget_id">Fund: </label> >+ <select id="all_budget_id" name="all_budget_id"> >+ <option value="">Select a fund (will populate orders/items if set)</option> >+ [% FOREACH budget_loo IN budget_loop %] >+ [% IF ( budget_loo.b_active ) %] >+ <option value="[% budget_loo.b_id | html %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">[% budget_loo.b_txt | html %]</option> >+ [% ELSE %] >+ <option value="[% budget_loo.b_id | html %]" class="b_inactive" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">[% budget_loo.b_txt | html %] (inactive)</option> >+ [% END %] >+ [% END %] >+ </select> >+ <label for="all_showallbudgets" style="float:none;width:auto;"> Show inactive:</label> >+ <input type="checkbox" id="all_showallbudgets" /> >+ </li> >+ [% END #/IF close %] >+ <li> >+ <label for="all_order_internalnote">Internal note: </label> >+ <textarea id="all_order_internalnote" cols="30" rows="3" name="all_order_internalnote"></textarea> > </li> > <li> >- <label for="all_budget_id">Fund: </label> >- <select id="all_budget_id" name="all_budget_id"> >- <option value="">Select a fund (will populate orders/items if set)</option> >- [% FOREACH budget_loo IN budget_loop %] >- [% IF ( budget_loo.b_active ) %] >- <option value="[% budget_loo.b_id | html %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">[% budget_loo.b_txt | html %]</option> >- [% ELSE %] >- <option value="[% budget_loo.b_id | html %]" class="b_inactive" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">[% budget_loo.b_txt | html %] (inactive)</option> >- [% END %] >- [% END %] >- </select> >- <label for="all_showallbudgets" style="float:none;width:auto;"> Show inactive:</label> >- <input type="checkbox" id="all_showallbudgets" /> >+ <label for="all_order_vendornote">Vendor note: </label> >+ <textarea id="all_order_vendornote" cols="30" rows="3" name="all_order_vendornote"></textarea> >+ </li> >+ <li> >+ <div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div> >+ <label for="all_sort1">Statistic 1: </label> >+ <input type="text" id="all_sort1" size="20" name="all_sort1" value="" /> >+ </li> >+ <li> >+ <label for="all_sort2">Statistic 2: </label> >+ <input type="text" id="all_sort2" size="20" name="all_sort2" value="" /> > </li> >- [% END #/IF close %] >- <li> >- <label for="all_order_internalnote">Internal note: </label> >- <textarea id="all_order_internalnote" cols="30" rows="3" name="all_order_internalnote"></textarea> >- </li> >- <li> >- <label for="all_order_vendornote">Vendor note: </label> >- <textarea id="all_order_vendornote" cols="30" rows="3" name="all_order_vendornote"></textarea> >- </li> >- <li> >- <div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div> >- <label for="all_sort1">Statistic 1: </label> >- <input type="text" id="all_sort1" size="20" name="all_sort1" value="" /> >- </li> >- <li> >- <label for="all_sort2">Statistic 2: </label> >- <input type="text" id="all_sort2" size="20" name="all_sort2" value="" /> >- </li> >- </ol> >- </fieldset> <!-- /.rows --> >- </div> <!-- /#accounting_details --> >+ </ol> >+ </fieldset> <!-- /.rows --> >+ </div> <!-- /#accounting_details --> > </div> <!-- /#tabs --> > > <fieldset class="action"> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js b/koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js >index a499d79ba3..34785cda2c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js >@@ -84,7 +84,6 @@ $(document).ready(function() { > $(this.form).submit(); > }); > >- $('#tabs').tabs(); > $(".previewData").on("click", function(e){ > e.preventDefault(); > var ltitle = $(this).text(); >-- >2.30.2
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 30389
:
132359
|
132821
|
138133
| 138235