From da7f3f0fb184feaffe6885da184be52e526101bf Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 9 Nov 2022 17:28:13 +0000 Subject: [PATCH] Bug 31827: Add page-section to list to log viewer This patch adds a "page-section" container div around the log viewer output. To test, apply the patch and go to Tools -> Logs. - Perform a log search which will return results. - The table of results should appear in a white box. Signed-off-by: David Nind --- .../prog/en/modules/tools/viewlog.tt | 170 +++++++++--------- 1 file changed, 86 insertions(+), 84 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt index 9bf9f915e1..575336b026 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -323,97 +323,99 @@ Check none - - - - - - - - - - - - - - [% FOREACH loopro IN looprow %] - - - - - - + + + [% END %] + +
DateLibrarianModuleActionObjectInfoInterface
[% loopro.timestamp | $KohaDates with_hours=1 %] - [% IF loopro.librarian %] - [% IF ( loopro.librarian.firstname ) || ( loopro.librarian.surname ) %][% loopro.librarian.firstname | html %] [% loopro.librarian.surname | html %] ([% loopro.librarian.borrowernumber | html %]) [% ELSE %][% loopro.librarian.borrowernumber | html %][% END %] - [% ELSE %] - [% loopro.user | html %] - [% END %] - [% PROCESS translate_log_module module=loopro.module %][% PROCESS translate_log_action action=loopro.action %] - [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %] - [% IF loopro.patron %] - [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %][% loopro.patron.firstname | html %] [% loopro.patron.surname | html %] ([% loopro.object | html %]) [% ELSE %]Member [% loopro.object | html %][% END %][% END %] +
+ + + + + + + + + + + + + + [% FOREACH loopro IN looprow %] + + + + + + + - - - - [% END %] - -
DateLibrarianModuleActionObjectInfoInterface
[% loopro.timestamp | $KohaDates with_hours=1 %] + [% IF loopro.librarian %] + [% IF ( loopro.librarian.firstname ) || ( loopro.librarian.surname ) %][% loopro.librarian.firstname | html %] [% loopro.librarian.surname | html %] ([% loopro.librarian.borrowernumber | html %]) [% ELSE %][% loopro.librarian.borrowernumber | html %][% END %] [% ELSE %] - [% loopro.object | html %] + [% loopro.user | html %] [% END %] - [% ELSIF ( loopro.module == 'CATALOGUING' ) %] - [% IF ( loopro.info.substr(0, 4) == 'item' ) %] - Item [% loopro.object | html %] from - Biblio [% loopro.biblionumber | html %] - [% ELSIF ( loopro.info.substr(0, 6) == 'biblio' ) %] - Biblio [% loopro.object | html %] + [% PROCESS translate_log_module module=loopro.module %][% PROCESS translate_log_action action=loopro.action %] + [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %] + [% IF loopro.patron %] + [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %][% loopro.patron.firstname | html %] [% loopro.patron.surname | html %] ([% loopro.object | html %]) [% ELSE %]Member [% loopro.object | html %][% END %][% END %] + [% ELSE %] + [% loopro.object | html %] + [% END %] + [% ELSIF ( loopro.module == 'CATALOGUING' ) %] + [% IF ( loopro.info.substr(0, 4) == 'item' ) %] + Item [% loopro.object | html %] from + Biblio [% loopro.biblionumber | html %] + [% ELSIF ( loopro.info.substr(0, 6) == 'biblio' ) %] + Biblio [% loopro.object | html %] + [% ELSE %] + [% loopro.object | html %] + [% END %] + [% ELSIF ( loopro.module == 'SERIAL' ) %] + Subscription [% loopro.object | html %] + [% ELSIF ( loopro.module == 'AUTHORITIES' ) %] + Authority [% loopro.object | html %] + [% ELSIF ( loopro.module == 'NOTICES' ) %] + [% IF ( loopro.notice ) %] + Notice [% loopro.notice.title | html %] ([% loopro.notice.code | html %]) + [% ELSE %] + [% loopro.object | html %] + [% END %] + [% ELSIF ( loopro.module == 'RECALLS' ) %] + [% IF loopro.recall.item_level %] + Item-level recall on item + [% ELSE %] + Biblio-level recall on biblio + [% END %] + [% ELSIF ( loopro.module == 'ACQUISITIONS' && loopro.action == 'ACQUISITION ORDER' && loopro.object ) %] + [% IF ( CAN_user_acquisition_order_manage ) %] + Basket [% loopro.object | html %] + [% ELSE %] + Basket [% loopro.object | html %] + [% END %] [% ELSE %] [% loopro.object | html %] [% END %] - [% ELSIF ( loopro.module == 'SERIAL' ) %] - Subscription [% loopro.object | html %] - [% ELSIF ( loopro.module == 'AUTHORITIES' ) %] - Authority [% loopro.object | html %] - [% ELSIF ( loopro.module == 'NOTICES' ) %] - [% IF ( loopro.notice ) %] - Notice [% loopro.notice.title | html %] ([% loopro.notice.code | html %]) - [% ELSE %] - [% loopro.object | html %] - [% END %] - [% ELSIF ( loopro.module == 'RECALLS' ) %] - [% IF loopro.recall.item_level %] - Item-level recall on item - [% ELSE %] - Biblio-level recall on biblio - [% END %] - [% ELSIF ( loopro.module == 'ACQUISITIONS' && loopro.action == 'ACQUISITION ORDER' && loopro.object ) %] - [% IF ( CAN_user_acquisition_order_manage ) %] - Basket [% loopro.object | html %] + + [% IF ( loopro.module == 'CIRCULATION' && loopro.object_found ) %] + Item [% loopro.barcode | html %] + [% ELSIF loopro.module == "SYSTEMPREFERENCE" || loopro.module == "REPORTS" || loopro.module == "NEWS" %] +
[% loopro.info | trim | html %]
+
+ +
+ [% ELSIF loopro.module == "NOTICES" %] +
[% loopro.info | trim | html %]
+
+ +
[% ELSE %] - Basket [% loopro.object | html %] +
+ [% loopro.info | html %] +
[% END %] - [% ELSE %] - [% loopro.object | html %] - [% END %] - 		- [% IF ( loopro.module == 'CIRCULATION' && loopro.object_found ) %] - Item [% loopro.barcode | html %] - [% ELSIF loopro.module == "SYSTEMPREFERENCE" || loopro.module == "REPORTS" || loopro.module == "NEWS" %] -
[% loopro.info | trim | html %]
-
- -
- [% ELSIF loopro.module == "NOTICES" %] -
[% loopro.info | trim | html %]
-
- -
- [% ELSE %] -
- [% loopro.info | html %] -
- [% END %] - 		[% PROCESS translate_log_interface log_interface=loopro.interface %]
+
[% PROCESS translate_log_interface log_interface=loopro.interface %]
+ [% ELSE %]
No log found -- 2.30.2