From 9def03c85239d9954e24b6d3b7633d2a0d481a40 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 14 Nov 2022 18:10:07 +0000 Subject: [PATCH] Bug 32199: Add page-section to various patron pages This patch adds a .page-section div to various patron-related pages in order to provide a consistent page structure. To test, apply the patch and view the following pages to confirm that the primary page content is wrapped in a container with a white background: - Patrons -> Patron details -> - Files - Holds history - ILL request history - Notices - Purchase suggestions - Routing lists - Statistics - Staff interface home page -> Discharge requests pending Signed-off-by: Katrin Fischer Signed-off-by: David Nind Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi --- .../prog/en/includes/ill-list-table.inc | 2 +- .../prog/en/modules/members/discharges.tt | 2 +- .../prog/en/modules/members/files.tt | 48 +++---- .../prog/en/modules/members/holdshistory.tt | 2 +- .../prog/en/modules/members/notices.tt | 122 ++++++++-------- .../modules/members/purchase-suggestions.tt | 130 +++++++++--------- .../prog/en/modules/members/routing-lists.tt | 2 +- .../prog/en/modules/members/statistics.tt | 90 ++++++------ 8 files changed, 203 insertions(+), 195 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc index 35a8538ec7..7b370937ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc @@ -1,4 +1,4 @@ -
+
[% IF prefilters.length > 0 %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt index d00f3cc43a..cf215eec15 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt @@ -36,7 +36,7 @@ [% IF pending_discharges %]

Pending discharge requests

-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt index 358d8299d7..9e04a619c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt @@ -49,29 +49,31 @@ [% END %] [% IF ( files ) %] -
- - - - - - - [% IF CAN_user_borrowers_edit_borrowers %][% END %] - - - - - [% FOREACH f IN files %] - - - - - - [% IF CAN_user_borrowers_edit_borrowers %][% END %] - - [% END %] - -
NameTypeDescriptionUploaded 
[% f.file_name | html %][% f.file_type | html %][% f.file_description | html %][% f.date_uploaded | $KohaDates %] Delete
+
+ + + + + + + + [% IF CAN_user_borrowers_edit_borrowers %][% END %] + + + + + [% FOREACH f IN files %] + + + + + + [% IF CAN_user_borrowers_edit_borrowers %][% END %] + + [% END %] + +
NameTypeDescriptionUploaded 
[% f.file_name | html %][% f.file_type | html %][% f.file_description | html %][% f.date_uploaded | $KohaDates %] Delete
+
[% ELSE %]

This patron has no files attached.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt index b8f28442c3..ce521036d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt @@ -53,7 +53,7 @@ [% SET show_itemtype_column = Koha.Preference('AllowHoldItemTypeSelection') %] -
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt index d72b20bb85..a68cabeef5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -45,68 +45,70 @@

Sent notices for [% INCLUDE 'patron-title.inc' %]

[% IF ( QUEUED_MESSAGES ) %] -
- - - - - - - - - - - - [% FOREACH QUEUED_MESSAGE IN QUEUED_MESSAGES %] +
+
NoticeTypeStatusUpdated onTime createdDelivery note
+ - - - - - - + + + + + + - [% END %] - -
- [% QUEUED_MESSAGE.subject | html %] - - - [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email - [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'print' ) %]print - [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'feed' ) %]feed - [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]sms - [% ELSE %][% QUEUED_MESSAGE.message_transport_type | html %][% END %] - - [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent - [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending - [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed - [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted - [% ELSE %][% QUEUED_MESSAGE.status | html %][% END %] - [% IF ( QUEUED_MESSAGE.status != 'pending' ) %] -
-
- - - -
-
- [% END %] - 		[% QUEUED_MESSAGE.updated_on | $KohaDates with_hours => 1 %][% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %] - [% IF ( QUEUED_MESSAGE.failure_code ) %] - [% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]Invalid borrowernumber [% borrowernumber | html %] - [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_EMAIL' ) %]Unable to find an email address for this borrower - [% ELSIF (matches = QUEUED_MESSAGE.failure_code.match('INVALID_EMAIL:(\w+)') ) %]Invalid [% matches.0 | html %] email address found [% borrowernumber | html %] - [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_FROM' ) %]Missing from email address - [% ELSIF ( QUEUED_MESSAGE.failure_code == 'MISSING_SMS' ) %]Missing SMS number - [% ELSIF ( QUEUED_MESSAGE.failure_code == 'DUPLICATE_MESSAGE' ) %]Message is duplicate - [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_NOTES' ) %]No notes from SMS driver - [% ELSIF ( QUEUED_MESSAGE.failure_code == 'SENDMAIL' ) %]Unhandled email failure, check the logs for further details - [% ELSIF ( QUEUED_MESSAGE.failure_code == "UNKNOWN_ERROR" ) %]Unknown error - [% ELSE %]Error occurred while sending email. - [% END %] - [% END %] - NoticeTypeStatusUpdated onTime createdDelivery note
+ + + [% FOREACH QUEUED_MESSAGE IN QUEUED_MESSAGES %] + + + [% QUEUED_MESSAGE.subject | html %] + + + + [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email + [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'print' ) %]print + [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'feed' ) %]feed + [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]sms + [% ELSE %][% QUEUED_MESSAGE.message_transport_type | html %][% END %] + + + [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent + [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending + [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed + [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted + [% ELSE %][% QUEUED_MESSAGE.status | html %][% END %] + [% IF ( QUEUED_MESSAGE.status != 'pending' ) %] +
+
+ + + +
+
+ [% END %] + + [% QUEUED_MESSAGE.updated_on | $KohaDates with_hours => 1 %] + [% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %] + + [% IF ( QUEUED_MESSAGE.failure_code ) %] + [% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]Invalid borrowernumber [% borrowernumber | html %] + [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_EMAIL' ) %]Unable to find an email address for this borrower + [% ELSIF (matches = QUEUED_MESSAGE.failure_code.match('INVALID_EMAIL:(\w+)') ) %]Invalid [% matches.0 | html %] email address found [% borrowernumber | html %] + [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_FROM' ) %]Missing from email address + [% ELSIF ( QUEUED_MESSAGE.failure_code == 'MISSING_SMS' ) %]Missing SMS number + [% ELSIF ( QUEUED_MESSAGE.failure_code == 'DUPLICATE_MESSAGE' ) %]Message is duplicate + [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_NOTES' ) %]No notes from SMS driver + [% ELSIF ( QUEUED_MESSAGE.failure_code == 'SENDMAIL' ) %]Unhandled email failure, check the logs for further details + [% ELSIF ( QUEUED_MESSAGE.failure_code == "UNKNOWN_ERROR" ) %]Unknown error + [% ELSE %]Error occurred while sending email. + [% END %] + [% END %] + + + [% END %] + + +
[% ELSE %]
There is no record of any messages that have been sent to this patron.
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt index 7ac37ca60a..240bd5af26 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt @@ -46,72 +46,74 @@
[% IF suggestions.size %] - - - - - - - - - - - +
+
SummaryNoteManaged byManaged onSuggested onStatus
+ + + + + + + + + + - - [% FOREACH s IN suggestions %] - - + [% FOREACH s IN suggestions %] + + + + + + - - - - - - [% END %] - -
SummaryNoteManaged byManaged onSuggested onStatus
-

- - [% IF ( CAN_user_catalogue ) %] - [% s.title | html %] - [% ELSE %] - [% s.title | html %] +

+

+ + [% IF ( CAN_user_catalogue ) %] + [% s.title | html %] + [% ELSE %] + [% s.title | html %] + [% END %] + +

+

+ [% IF ( s.author ) %][% s.author | html %],[% END %] + [% IF ( s.copyrightdate ) %] - [% s.copyrightdate | html %],[% END %] + [% IF ( s.publishercode ) %] - [% s.publishercode | html %][% END %] + [% IF ( s.place ) %]([% s.place | html %])[% END %] + [% IF ( s.collectiontitle ) %] , [% s.collectiontitle | html %][% END %] + [% IF ( s.itemtype ) %] - [% s.itemtype | html %][% END %] +

+ 		[% s.note | html %] + + [% INCLUDE 'patron-title.inc' patron => s.manager %] + + [% s.manageddate | $KohaDates %] + + [% s.suggesteddate | $KohaDates %] + + [% SWITCH s.STATUS %] + [% CASE "ASKED" %]Requested + [% CASE "CHECKED" %]Checked by the library + [% CASE "ACCEPTED" %]Accepted by the library + [% CASE "ORDERED" %]Ordered by the library + [% CASE "REJECTED" %]Suggestion declined + [% CASE "AVAILABLE" %]Available in the library + [% CASE %] + [% SET status_description = AuthorisedValues.GetByCode('SUGGEST_STATUS', s.STATUS) %] + [% IF status_description %] + [% status_description | html %] + [% ELSE %] + Unknown + [% END %] [% END %] - -

-

- [% IF ( s.author ) %][% s.author | html %],[% END %] - [% IF ( s.copyrightdate ) %] - [% s.copyrightdate | html %],[% END %] - [% IF ( s.publishercode ) %] - [% s.publishercode | html %][% END %] - [% IF ( s.place ) %]([% s.place | html %])[% END %] - [% IF ( s.collectiontitle ) %] , [% s.collectiontitle | html %][% END %] - [% IF ( s.itemtype ) %] - [% s.itemtype | html %][% END %] -

- 		[% s.note | html %] - - [% INCLUDE 'patron-title.inc' patron => s.manager %] - - [% s.manageddate | $KohaDates %] - - [% s.suggesteddate | $KohaDates %] - - [% SWITCH s.STATUS %] - [% CASE "ASKED" %]Requested - [% CASE "CHECKED" %]Checked by the library - [% CASE "ACCEPTED" %]Accepted by the library - [% CASE "ORDERED" %]Ordered by the library - [% CASE "REJECTED" %]Suggestion declined - [% CASE "AVAILABLE" %]Available in the library - [% CASE %] - [% SET status_description = AuthorisedValues.GetByCode('SUGGEST_STATUS', s.STATUS) %] - [% IF status_description %] - [% status_description | html %] - [% ELSE %] - Unknown - [% END %] - [% END %] - [% IF s.reason %]([% s.reason | html %])[% END %] -
+ [% IF s.reason %]([% s.reason | html %])[% END %] + + + [% END %] + + +
[% ELSE %]

This patron has not submitted any purchase suggestions

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt index aa5c0c4894..e4f5204eaf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt @@ -57,7 +57,7 @@ [% END %] -
+
[% IF ( routinglists ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt index d5385b2470..14e283adec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt @@ -56,53 +56,55 @@

Statistics for [% INCLUDE 'patron-title.inc' %]

[% IF ( datas.size ) %] -
- - - [% FOREACH cn IN column_names %] - - [% END %] - - - - - - +
+
- [% SWITCH cn %] - [% CASE 'itype' %] - Item type - [% CASE 'ccode' %] - Collection - [% CASE 'location' %] - Shelving location - [% CASE 'homebranch' %] - Home library - [% CASE 'holdingbranch' %] - Holding library - [% CASE %] - [% cn | html %] - [% END %] - Total checkouts as of yesterdayToday's checkoutsToday's checkinsTotal checkouts
+ + + [% FOREACH cn IN column_names %] + + [% END %] + + + + + + - - [% FOREACH r IN datas %] + + [% FOREACH r IN datas %] + + [% FOREACH c IN r %] + + [% END %] + + [% END %] + + - [% FOREACH c IN r %] - - [% END %] + + + + + - [% END %] - - - - - - - - - - -
+ [% SWITCH cn %] + [% CASE 'itype' %] + Item type + [% CASE 'ccode' %] + Collection + [% CASE 'location' %] + Shelving location + [% CASE 'homebranch' %] + Home library + [% CASE 'holdingbranch' %] + Holding library + [% CASE %] + [% cn | html %] + [% END %] + Total checkouts as of yesterdayToday's checkoutsToday's checkinsTotal checkouts
[% c | html %]
[% c | html %]TOTAL[% count_total_precedent_state | html %][% count_total_issues | html %][% count_total_issues_returned | html %][% count_total_actual_state | html %]
TOTAL[% count_total_precedent_state | html %][% count_total_issues | html %][% count_total_issues_returned | html %][% count_total_actual_state | html %]
+ + +
[% ELSE %]
There are no statistics for this patron.
[% END %] -- 2.39.5