Bugzilla – Attachment 44365 Details for
Bug 15112
Make greybox consistent size across label and patron card creator
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
bug 15112 - Make greybox consistent size across label/card creator
bug-15112---Make-greybox-consistent-size-across-la.patch (text/plain), 9.51 KB, created by
Marc Véron
on 2015-11-04 12:39:27 UTC
(
hide
)
Description:
bug 15112 - Make greybox consistent size across label/card creator
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2015-11-04 12:39:27 UTC
Size:
9.51 KB
patch
obsolete
>From a3958e08ef368d6b9908eb1f54f164b9f1f73976 Mon Sep 17 00:00:00 2001 >From: Liz Rea <liz@catalyst.net.nz> >Date: Tue, 3 Nov 2015 12:20:25 +1300 >Subject: [PATCH] bug 15112 - Make greybox consistent size across label/card > creator >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Also fixes minor issue with buttons stacking on patroncards/edit-batch >and labels/label-manage > >To test: > >Export a batch every way you can: > >multiple together from label/label-manage >individual items from labels/label-edit-batch >selected items from labels/label-edit-batch >export full batch from labels/label-edit-batch > >multiple together from patroncards/manage >individual cards from patroncards/manage >individual cards from patroncards/edit-batch >selected cards from patroncards/edit-batch >export full batch from patroncards/edit-batch > >Also notice that before this patch, the delete and export buttons >were stacking on the table rows, and that now they are not doing >that anymore. It may take a force refresh to see the behaviour and >the change. > >Signed-off-by: Marc Véron <veron@veron.ch> >--- > .../intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt | 9 +++++---- > .../intranet-tmpl/prog/en/modules/labels/label-manage.tt | 2 +- > .../intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt | 7 ++++--- > koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt | 4 ++-- > 4 files changed, 12 insertions(+), 10 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >index 6f2bbad..362ea8c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >@@ -90,10 +90,10 @@ > alert(_("Please select at least one label to export.")); > return; // no batch selected > } >- return GB_showCenter('Export labels', "/cgi-bin/koha/labels/label-print.pl?batch_id=[% batch_id %]&" + getstr, 700, 800); >+ return GB_showCenter('Export labels', "/cgi-bin/koha/labels/label-print.pl?batch_id=[% batch_id %]&" + getstr, 400, 800); > } > else if (mode == 'batch') { >- return GB_showCenter('Export labels', "/cgi-bin/koha/labels/label-print.pl?batch_id=[% batch_id %]", 700, 800); >+ return GB_showCenter('Export labels', "/cgi-bin/koha/labels/label-print.pl?batch_id=[% batch_id %]", 400, 800); > } > else { > // some pass-thru error trapping just in case... >@@ -118,9 +118,10 @@ > > $(document).ready(function() { > $("#batcht").dataTable($.extend(true, {}, dataTablesDefaults, { >+ "autoWidth": false, > "aoColumnDefs": [ > { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, >- { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false } >+ { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, > ], > "aaSorting": [[ 0, "asc" ]], > "sPaginationType": "four_button" >@@ -245,7 +246,7 @@ > <tr> > [% FOREACH text_field IN table_loo.text_fields %] > [% IF ( text_field.select_field ) %] >- <td><a class="btn btn-mini" onclick="return confirm(MSG_CONFIRM_DELETE);" href="/cgi-bin/koha/labels/label-edit-batch.pl?op=remove&batch_id=[% batch_id |url %]&label_id=[% text_field.field_value |url %]"><icon class="fa fa-trash"></icon> Delete</a> <a class="btn btn-mini" href="#" onclick="GB_showCenter('Export labels','/cgi-bin/koha/labels/label-print.pl?batch_id=[% batch_id %]&label_id=[% text_field.field_value |url %]')"><icon class="fa fa-share-square-o"></icon> Export</a></td> >+ <td><a class="btn btn-mini" onclick="return confirm(MSG_CONFIRM_DELETE);" href="/cgi-bin/koha/labels/label-edit-batch.pl?op=remove&batch_id=[% batch_id |url %]&label_id=[% text_field.field_value |url %]"><icon class="fa fa-trash"></icon> Delete</a><a class="btn btn-mini" href="#" onclick="GB_showCenter('Export labels','/cgi-bin/koha/labels/label-print.pl?batch_id=[% batch_id %]&label_id=[% text_field.field_value |url %]', 400, 800)"><icon class="fa fa-share-square-o"></icon> Export</a></td> > <td><center><input type="checkbox" name="action" value="[% text_field.field_value %]"></center></td> > [% ELSE %] > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index dfa17de..6a89aaf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >@@ -38,7 +38,7 @@ > alert(_("Please select at least one batch to export.")); > return; // no batch selected > } >- return GB_showCenter('Export Labels', "/cgi-bin/koha/labels/label-print.pl?" + getstr, 700, 800); >+ return GB_showCenter('Export Labels', "/cgi-bin/koha/labels/label-print.pl?" + getstr, 400, 800); > }; > function selected_layout(op) { > var selected = new Array; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >index 32e6924..d53b843 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >@@ -89,10 +89,10 @@ > alert(_("Please select at least one card to export.")); > return; // no batch selected > } >- return GB_showCenter(_("Export patron cards"), "/cgi-bin/koha/patroncards/print.pl?batch_id=[% batch_id %]&" + getstr, 700, 800); >+ return GB_showCenter(_("Export patron cards"), "/cgi-bin/koha/patroncards/print.pl?batch_id=[% batch_id %]&" + getstr, 400, 800); > } > else if (mode == 'batch') { >- return GB_showCenter(_("Export patron cards"), "/cgi-bin/koha/patroncards/print.pl?batch_id=[% batch_id %]", 700, 800); >+ return GB_showCenter(_("Export patron cards"), "/cgi-bin/koha/patroncards/print.pl?batch_id=[% batch_id %]", 400, 800); > } > else { > // some pass-thru error trapping just in case... >@@ -121,7 +121,8 @@ > { "aTargets": [ -2, -1 ], "bSortable": false, "bSearchable": false } > ], > "aaSorting": [[ 0, "asc" ]], >- "sPaginationType": "four_button" >+ "sPaginationType": "four_button", >+ "autoWidth": false > })); > $("#additems").click(function(){ > Add(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >index 58feb0e..f038da1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >@@ -65,7 +65,7 @@ > alert(_("Please select at least one batch to export.")); > return; // no batch selected > } >- return GB_showCenter(_("Export patron cards"), "/cgi-bin/koha/patroncards/print.pl?" + getstr, 700, 800); >+ return GB_showCenter(_("Export patron cards"), "/cgi-bin/koha/patroncards/print.pl?" + getstr, 400, 800); > }; > function selected_layout(op) { > var selected = new Array; >@@ -149,7 +149,7 @@ > [% IF ( text_field.select_field ) %] > <td> > <a class="btn btn-mini" href="/cgi-bin/koha/patroncards/edit-[% card_element %].pl?op=edit&element_id=[% text_field.field_value %]"><icon class="fa fa-edit"></icon> Edit</a> >- [% IF ( print ) %]<a class="btn btn-mini" href="#" onclick="GB_showCenter('Export single batch','/cgi-bin/koha/patroncards/print.pl?batch_id=[% text_field.field_value |url %]')"><icon class="fa fa-share-square-o"></icon> Export</a>[% END %] >+ [% IF ( print ) %]<a class="btn btn-mini" href="#" onclick="GB_showCenter('Export single batch','/cgi-bin/koha/patroncards/print.pl?batch_id=[% text_field.field_value |url %]', 400, 800)"><icon class="fa fa-share-square-o"></icon> Export</a>[% END %] > <a class="btn btn-mini" onclick="return confirm(MSG_CONFIRM_DELETE);" href="/cgi-bin/koha/patroncards/manage.pl?op=delete&card_element=[% card_element %]&element_id=[% text_field.field_value %]"><icon class="fa fa-trash"></icon> Delete</a> > </td> > [% IF ( print ) %]<td align="center"><input type="checkbox" name="action" value="[% text_field.field_value %]" /></td>[% END %] >-- >1.7.10.4
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 15112
:
44304
|
44365
|
44460