Attachment 106541 Details for Bug 22773 – Bug 22773: (follow-up) Recommended changes are made on datatable and butons

[patch] Bug 22773: (follow-up) Recommended changes are made on datatable and butons

Bug-22773-follow-up-Recommended-changes-are-made-o.patch (text/plain), 4.73 KB, created by Katrin Fischer on 2020-07-05 10:46:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-07-05 10:46:48 UTC

Size: 4.73 KB

patch

obsolete

>From 441b332c90d263318336e0c946d0112b50aa66bb Mon Sep 17 00:00:00 2001
>From: Devinim <kohadevinim@devinim.com.tr>
>Date: Fri, 18 Oct 2019 13:51:55 +0000
>Subject: [PATCH] Bug 22773: (follow-up) Recommended changes are made on
> datatable and butons
>
>Signed-off-by: Kelly McElligott <kelly@bywatersolutions.com>
>
>Signed-off-by: Christopher Kellermeyer <ckellermeyer@altadenalibrary.org>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 4 ----
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 7 ++++---
> 2 files changed, 4 insertions(+), 7 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 b55b97eea8..709eb18fd1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -3518,10 +3518,6 @@ span {
> margin: 1em auto;
> }
> 
>-#merge {
>- margin: .5em 0 0;
>-}
>-
> #merge_table {
> tr {
> &.active {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>index ae2d17a564..6b44920f18 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>@@ -103,9 +103,9 @@
> </table>
> <a class="submit merge" id="merge" href="#merge_invoices">Merge selected invoices</a>
> [% IF tab == 'closed' %]
>- <a class="submit" id="open_sel" href="#reopen_selected" data-op="reopen" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"> Reopen selected invoices</a>
>+ <a class="btn btn-default" id="open_sel" href="#reopen_selected" data-op="reopen" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"> Reopen selected invoices</a>
> [% ELSE %]
>- <a class="submit" id="close_sel" href="#close_selected" data-op="close" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"> Close selected invoices</a>
>+ <a class="btn btn-default" id="close_sel" href="#close_selected" data-op="close" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"> Close selected invoices</a>
> [% END %]
> 
> [% END %] 
>@@ -353,7 +353,8 @@
> { "bSortable": false, "aTargets": [1, -1] },
> { "bVisible": false, "aTargets": [0] },
> { "sType": "title-string", "aTargets" : [ "title-string" ] }
>- ]
>+ ],
>+ autoWidth: false
> }));
> 
> $("#show_only_subscription").prop("checked", false);
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 22773: 93357 | 93375 | 93448 | 93660 | 94411 | 95290 | 96906 | 96907 | 96908 | 96909 | 96910 | 98729 | 98730 | 98731 | 98732 | 98733 | 106538 | 106539 | 106540 | 106541 | 106542 | 106543 | 106544 | 115420 | 115421 | 115422 | 115423 | 115424 | 115425 | 115426 | 116010 | 119282 | 119283 | 119284 | 119285 | 119286 | 119287 | 119288 | 119289 | 119290