Bugzilla – Attachment 78970 Details for
Bug 15184
Ability to duplicate existing order lines to a given basket
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15184: Improve styling
Bug-15184-Improve-styling.patch (text/plain), 7.95 KB, created by
ByWater Sandboxes
on 2018-09-16 17:50:02 UTC
(
hide
)
Description:
Bug 15184: Improve styling
Filename:
MIME Type:
Creator:
ByWater Sandboxes
Created:
2018-09-16 17:50:02 UTC
Size:
7.95 KB
patch
obsolete
>From e488ff7e4066020ec4b1ef0542ffa62a7c887eee Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Sun, 16 Sep 2018 09:25:16 -0700 >Subject: [PATCH] Bug 15184: Improve styling >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >- Move "Show inactive" checkbox closer to the "Show inactive" text. >- Put more space between the "Show inactive" checkbox and the "The >original..." text >- Add "Check boxes to duplicate the original values" at the top of the >fieldset > >Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> > >Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> >--- > .../prog/en/modules/acqui/duplicate_orders.tt | 62 +++++++++++----------- > 1 file changed, 30 insertions(+), 32 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >index ba4713145c..8614f2264e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >@@ -13,6 +13,7 @@ Basket [% basket.basketno | html %] › Duplicate existing orders > [% Asset.css("css/datatables.css") | $raw %] > <style type="text/css"> > .picked_to_duplicate > td { background-color: #bcdb89 !important; } >+ span.hint { margin-left: 1em; } > </style> > </head> > >@@ -179,41 +180,36 @@ Basket [% basket.basketno | html %] › Duplicate existing orders > <p>Duplicate all the orders with the following accounting details:</p> > <fieldset class="rows" style="float:none;"> > <legend>Accounting details</legend> >+ <div class="hint" style="margin: 1em 1em 0">Check boxes to duplicate the original values</div> > <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" /> >+ <label for="all_currency">Currency:</label> >+ <input type="checkbox" name="copy_existing_value" value="currency" title="Copy existing value" /> >+ <select name="all_currency" id="all_currency"> >+ [% FOREACH currency IN currencies %] >+ [% IF currency.currency == vendor.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 %] >+ </select> >+ <span class="hint" id="hint_currency">The original currency value will be copied</span> > </li> > <li> >- <li> >- <label for="all_currency">Currency:</label> >- <input type="checkbox" name="copy_existing_value" value="currency" title="Copy existing value" /> >- <select name="all_currency" id="all_currency"> >- [% FOREACH currency IN currencies %] >- [% IF currency.currency == vendor.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 %] >- </select> >- <span class="hint" id="hint_currency">The original currency value will be copied</span> >- </li> >- <li> >- <label for="all_budget_id">Fund: </label> >- <input type="checkbox" name="copy_existing_value" value="budget_id" title="Copy existing value" /> >- <select id="all_budget_id" size="1" name="all_budget_id"> >- <option value="">Select a fund</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" /> >- <span class="hint" id="hint_budget_id">The original fund will be used</span> >- </li> >+ <label for="all_budget_id">Fund: </label> >+ <input type="checkbox" name="copy_existing_value" value="budget_id" title="Copy existing value" /> >+ <select id="all_budget_id" size="1" name="all_budget_id"> >+ <option value="">Select a fund</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;margin-right:0;"> Show inactive:</label> >+ <input type="checkbox" id="all_showallbudgets" /> >+ <span class="hint" id="hint_budget_id">The original fund will be used</span> > </li> > <li> > <label for="all_order_internalnote">Internal note: </label> >@@ -251,6 +247,8 @@ Basket [% basket.basketno | html %] › Duplicate existing orders > [% END %] > <input type="hidden" name="op" value="do_duplicate" /> > <input type="hidden" name="basketno" value="[% basket.basketno | 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" /> > <button type="submit" class="btn btn-default">Duplicate orders</button> > <a class="cancel" href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno %]">Cancel</a> > </fieldset> >@@ -321,7 +319,7 @@ Basket [% basket.basketno | html %] › Duplicate existing orders > var MSG_NO_ITEM_SELECTED = _("Nothing is selected."); > var MSG_NO_FUND_SELECTED = _("No fund selected."); > $(document).ready(function() { >- $('.hint').hide(); >+ $('span.hint').hide(); > var columns_settings;// = [% ColumnsSettings.GetColumns( 'acqui', 'histsearch', 'histsearcht', 'json' ) | $raw %]; > KohaTable("table_orders", { > "aoColumnDefs": [ >-- >2.11.0
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 15184
:
77314
|
77315
|
77316
|
77317
|
77318
|
77513
|
77514
|
77515
|
77516
|
77517
|
77966
|
77967
|
77968
|
77969
|
77970
|
78074
|
78075
|
78076
|
78077
|
78078
|
78277
|
78278
|
78279
|
78280
|
78281
|
78282
|
78283
|
78284
|
78285
|
78340
|
78535
|
78536
|
78537
|
78538
|
78539
|
78697
|
78698
|
78699
|
78700
|
78701
|
78702
|
78703
|
78704
|
78705
|
78706
|
78898
|
78911
|
78927
|
78958
|
78959
|
78960
|
78961
|
78962
|
78963
|
78964
|
78965
|
78966
|
78967
|
78968
|
78969
|
78970
|
80485
|
80486
|
80487
|
80488
|
80489
|
80490
|
80491
|
80492
|
80493
|
80494
|
80495
|
80638
|
81435
|
81436
|
81437
|
81438
|
81439
|
81440
|
81441
|
81442
|
81443
|
81444
|
81445
|
81446
|
81447
|
81448
|
82079