Bugzilla – Attachment 142554 Details for
Bug 31834
Inconsistent table formatting for list of MARC imports
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31834: Replace incorrect "table" class from MARC imports table
Bug-31834-Replace-incorrect-table-class-from-MARC-.patch (text/plain), 12.12 KB, created by
Katrin Fischer
on 2022-10-24 19:18:31 UTC
(
hide
)
Description:
Bug 31834: Replace incorrect "table" class from MARC imports table
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2022-10-24 19:18:31 UTC
Size:
12.12 KB
patch
obsolete
>From c74fdfa84c293657db2ed97e86e0711374d6aaee Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 24 Oct 2022 14:08:37 +0000 >Subject: [PATCH] Bug 31834: Replace incorrect "table" class from MARC imports > table > >The table containing staged MARC record batches has a "table" class >added to the <table> tag, which is inconsistent with other tables in the >staff interface. The class pulls in default table styles from Bootstrap >which aren't consistent. > >There are a few other non-DataTable tables have the the class >"dataTable" added in order to make them more consistent. I think this >table should have that class too. The template is also modified to give >the table a <thead> and <tbody>, with indentation corrected accordingly. > >To test, apply the patch and go to Cataloging -> Manage staged records. > >The table of staged records should look correct, with style matching >DataTables elsewhere in Koha, e.g. Administration -> Libraries. > >Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../en/modules/tools/manage-marc-import.tt | 122 +++++++++--------- > 1 file changed, 63 insertions(+), 59 deletions(-) > >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 a2168c7ec4..3b36b551b5 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 >@@ -309,67 +309,71 @@ > [% PROCESS pagination %] > [% END %] > <div class="page-section"> >- <table class="table"> >- <tr> >- <th>#</th> >- <th>File name</th> >- <th>Profile</th> >- <th>Comments</th> >- <th>Type</th> >- <th>Status</th> >- <th>Staged</th> >- <th># Records</th> >- <th># Items</th> >- <th>Action</th> >- </tr> >- [% FOREACH batch_lis IN batch_list %] >+ <table class="dataTable"> >+ <thead> > <tr> >- <td>[% batch_lis.import_batch_id | html %]</td> >- <td><a href="?import_batch_id=[% batch_lis.import_batch_id | uri %]">[% batch_lis.file_name | html %]</a></td> >- <td>[% batch_lis.profile | html %]</td> >- <td>[% batch_lis.comments | html %]</td> >- <td>[% IF ( batch_lis.record_type == 'auth' ) %]Authority[% ELSE %]Bibliographic[% END %]</td> >- <td> >- [% IF ( batch_lis.import_status == 'cleaned' ) %] >- <span>Cleaned</span> >- [% ELSIF ( batch_lis.import_status == 'imported' ) %] >- <span>Imported</span> >- [% ELSIF ( batch_lis.import_status == 'importing' ) %] >- <span>Importing</span> >- [% ELSIF ( batch_lis.import_status == 'reverted' ) %] >- <span>Reverted</span> >- [% ELSIF ( batch_lis.import_status == 'reverting' ) %] >- <span>Reverting</span> >- [% ELSIF ( batch_lis.import_status == 'staged' ) %] >- <span>Staged</span> >- [% ELSE %] >- <span>[% batch_lis.import_status | html %]</span> >- [% END %] >- </td> >- <td>[% batch_lis.upload_timestamp | $KohaDates with_hours=1 %]</td> >- <td>[% batch_lis.num_records | html %]</td> >- <td>[% batch_lis.num_items | html %] >- [% IF ( batch_lis.num_items && batch_lis.import_status == 'imported' ) %] >- (<a href="?import_batch_id=[% batch_lis.import_batch_id | uri %]&op=create_labels">Create label batch</a>) >- [% END %] >- </td> >- <td class="actions"> >- [% IF ( batch_lis.can_clean ) %] >- <form method="post" name="clean_batch_[% batch_lis.import_batch_id | html %]" id="clean_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_clean"> >- <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id | html %]" /> >- <input type="hidden" name="op" value="clean-batch" /> >- <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-eraser"></i> Clean</button> >- </form> >- [% ELSIF ( batch_lis.import_status == 'cleaned' ) %] >- <form method="post" action="/cgi-bin/koha/tools/manage-marc-import.pl" name="delete_batch_[% batch_lis.import_batch_id | html %]" id="delete_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_delete"> >- <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id | html %]" /> >- <input type="hidden" name="op" value="delete-batch" /> >- <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> >- </form> >- [% END %] >- </td> >+ <th>#</th> >+ <th>File name</th> >+ <th>Profile</th> >+ <th>Comments</th> >+ <th>Type</th> >+ <th>Status</th> >+ <th>Staged</th> >+ <th># Records</th> >+ <th># Items</th> >+ <th>Action</th> > </tr> >- [% END # /FOREACH batch_lis %] >+ </thead> >+ <tbody> >+ [% FOREACH batch_lis IN batch_list %] >+ <tr> >+ <td>[% batch_lis.import_batch_id | html %]</td> >+ <td><a href="?import_batch_id=[% batch_lis.import_batch_id | uri %]">[% batch_lis.file_name | html %]</a></td> >+ <td>[% batch_lis.profile | html %]</td> >+ <td>[% batch_lis.comments | html %]</td> >+ <td>[% IF ( batch_lis.record_type == 'auth' ) %]Authority[% ELSE %]Bibliographic[% END %]</td> >+ <td> >+ [% IF ( batch_lis.import_status == 'cleaned' ) %] >+ <span>Cleaned</span> >+ [% ELSIF ( batch_lis.import_status == 'imported' ) %] >+ <span>Imported</span> >+ [% ELSIF ( batch_lis.import_status == 'importing' ) %] >+ <span>Importing</span> >+ [% ELSIF ( batch_lis.import_status == 'reverted' ) %] >+ <span>Reverted</span> >+ [% ELSIF ( batch_lis.import_status == 'reverting' ) %] >+ <span>Reverting</span> >+ [% ELSIF ( batch_lis.import_status == 'staged' ) %] >+ <span>Staged</span> >+ [% ELSE %] >+ <span>[% batch_lis.import_status | html %]</span> >+ [% END %] >+ </td> >+ <td>[% batch_lis.upload_timestamp | $KohaDates with_hours=1 %]</td> >+ <td>[% batch_lis.num_records | html %]</td> >+ <td>[% batch_lis.num_items | html %] >+ [% IF ( batch_lis.num_items && batch_lis.import_status == 'imported' ) %] >+ (<a href="?import_batch_id=[% batch_lis.import_batch_id | uri %]&op=create_labels">Create label batch</a>) >+ [% END %] >+ </td> >+ <td class="actions"> >+ [% IF ( batch_lis.can_clean ) %] >+ <form method="post" name="clean_batch_[% batch_lis.import_batch_id | html %]" id="clean_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_clean"> >+ <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id | html %]" /> >+ <input type="hidden" name="op" value="clean-batch" /> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-eraser"></i> Clean</button> >+ </form> >+ [% ELSIF ( batch_lis.import_status == 'cleaned' ) %] >+ <form method="post" action="/cgi-bin/koha/tools/manage-marc-import.pl" name="delete_batch_[% batch_lis.import_batch_id | html %]" id="delete_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_delete"> >+ <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id | html %]" /> >+ <input type="hidden" name="op" value="delete-batch" /> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> >+ </form> >+ [% END %] >+ </td> >+ </tr> >+ [% END # /FOREACH batch_lis %] >+ </tbody> > </table> > </div> <!-- /.page-section --> > >-- >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 31834
:
142515
|
142550
| 142554