From ef0a3ac164755b6f92e2b4578d109628d59c7e6a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 17 May 2016 11:18:14 -0400 Subject: [PATCH] Bug 16538 - Improve the style of progress bars Content-Type: text/plain; charset="utf-8" This patch updates the style of progress bars to make them a little nicer. Progress bars in the staff client are not built in a consisten way. Some have been updated to use the element and some have not. This patch improves some styling common to both kinds. Other changes: - Redundant in-page CSS has been removed from many pages. - An invalid "min" attribute has been removed from several instances of . - Corrected capitalization. - Fixed incorrectly quoted attributes. - Added missing form "action" attributes. To test, clear your browser cache if necessary. Apply the patch and test uploads on the following pages: - Circulation -> Offline circulation file upload - Tools -> Batch item modification - Tools -> Batch record modification - Tools -> Stage MARC records for import - Tools -> Manage staged MARC records - Tools -> Upload local cover image - Tools -> Upload In all cases, progress bars should look improved and work correctly. Test Tools -> Batch item deletion. Unused background job handling markup has been removed. Deletion processing should work correctly. --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 24 +++++++++++++++++++++- .../prog/en/modules/offline_circ/process_koc.tt | 6 +----- .../prog/en/modules/tools/batchMod-del.tt | 13 ++++-------- .../prog/en/modules/tools/batchMod-edit.tt | 2 +- .../en/modules/tools/batch_record_modification.tt | 2 +- .../prog/en/modules/tools/manage-marc-import.tt | 6 ++---- .../prog/en/modules/tools/stage-marc-import.tt | 10 ++++----- .../prog/en/modules/tools/upload-images.tt | 16 +++++---------- .../intranet-tmpl/prog/en/modules/tools/upload.tt | 2 +- 9 files changed, 42 insertions(+), 39 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index 35fa6f8..7b21daf 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -2461,11 +2461,33 @@ fieldset.rows table.mceListBox { #jobpanel,#jobstatus,#jobfailed { display : none; } #jobstatus { margin:.4em; } -#jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('../img/progress.png') -300px 0px no-repeat; } + +#jobprogress{ + display: inline-block; + width:200px; + height:10px; + border:1px solid #666; + background:url('../img/progress.png') -300px 0px no-repeat; + } + +.progress_panel { + clear: both; + font-size: 120%; + margin: 1em 0; + padding: 1em; + border: 2px solid #EEE; + border-radius: 5px; +} + +progress { + width: 50%; +} + #selections { width : 100%; white-space : normal; } #selections span { margin:3px;padding:3px;background-color:#EBF3FF;-moz-border-radius:5px;border-radius:5px;white-space:nowrap;line-height:240%;font-size:75%; } #selections span.selected { background-color : #CCE0FC; } #selections input { vertical-align:middle;margin:0 2px; } + #changepasswordf input[type="text"], #changepasswordf input[type="password"] { font-size: 140%; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt index 6fdf5ce..d9cd330 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt @@ -55,10 +55,6 @@ function CheckForm(f) { //]]> - [% INCLUDE 'header.inc' %] @@ -96,7 +92,7 @@ function CheckForm(f) {

- + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt index c813469..61992e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt @@ -1,7 +1,6 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › Batch item deletion [% INCLUDE 'doc-head-close.inc' %] - [% INCLUDE 'datatables.inc' %] @@ -37,8 +36,8 @@ for( x=0; xBatch item deletion[% ELSE %]

Batch item deletion results

[% END %] [% IF ( barcode_not_unique ) %]

Error saving item: Barcode must be unique.

[% END %] [% IF ( no_next_barcode ) %]

Error saving items: Unable to automatically determine values for barcodes. No item has been inserted.

[% END %] - [% IF ( book_on_loan ) %]

Cannot Delete: item is checked out.

[% END %] - [% IF ( book_reserved ) %]

Cannot Delete: item has a waiting hold.

[% END %] + [% IF ( book_on_loan ) %]

Cannot delete: item is checked out.

[% END %] + [% IF ( book_reserved ) %]

Cannot delete: item has a waiting hold.

[% END %] [% UNLESS ( action ) %] @@ -131,15 +130,11 @@ for( x=0; xThis will delete [% IF ( too_many_items ) %]all the[% ELSE %]the selected[% END %] items.

Job progress:

Delete records if no items remain. [% IF too_many_items %] - + [% ELSE %] - + [% END %] Cancel diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt index 8d46d53..bfc8c0d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt @@ -232,7 +232,7 @@ $(document).ready(function(){

Job progress:

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt index a724c36..2d7d534 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt @@ -252,7 +252,7 @@ $(document).ready(function() { Cancel

Job progress:

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt index 3a786e9..40d1ddf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt @@ -151,9 +151,7 @@ $(document).ready(function(){ //]]> @@ -355,7 +353,7 @@ $(document).ready(function(){ [% END %] -

Job progress:

[% END %] [% IF ( can_revert ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt index af24281..c68aa27 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt @@ -7,8 +7,6 @@