Attachment 145336 Details for Bug 32628 – Bug 32628: Add 'page-section' to various serials pages

[patch] Bug 32628: Add 'page-section' to various serials pages

Bug-32628-Add-page-section-to-various-serials-page.patch (text/plain), 8.27 KB, created by Katrin Fischer on 2023-01-16 19:27:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-01-16 19:27:43 UTC

Size: 8.27 KB

patch

obsolete

>From 588d6f098b0a07792b9a0efec2833adc85a0db92 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 13 Jan 2023 14:07:41 +0000
>Subject: [PATCH] Bug 32628: Add 'page-section' to various serials pages
>
>This patch adds a "page-section" container div around the main section
>of serials pages which lack it.
>
>This patch contains indentation changes, so please ignore whitespace
>when looking at the diff.
>
>To test you must have at least one subscription in your system. Apply
>the patch and view the following pages to confirm that the main content
>is contained in a white box:
>
>- Subscription batch edit:
>  - Go to Serials -> Search subscriptions -> Results
>  - Check the box next to one or more search results and click "Edit
>    selected serials."
>- Subscription frequencies:
>  - Serials -> Manage frequencies
>- View subscription alerts:
>  - Log in to the OPAC and search for a subscription.
>    - On the subscription detail page click the "Subscribe to to email
>      notification on new issues."
>  - In the staff interface, locate that subscription and view its
>    details.
>    - Click the "subscribers" link under "Patron notification."
>
>Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../modules/serials/subscription-batchedit.tt |  2 +-
> .../serials/subscription-frequencies.tt       | 58 ++++++++++---------
> .../prog/en/modules/serials/viewalerts.tt     | 42 +++++++-------
> 3 files changed, 53 insertions(+), 49 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>index ba122bddf2..6b38351a52 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>@@ -37,7 +37,7 @@
> 
>                     <h1>Subscription batch edit</h1>
> 
>-                    <div>
>+                    <div class="page-section">
>                         <p>You are about to edit the following subscriptions:</p>
>                         <table>
>                             <thead>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
>index 0272ef373e..5cfe13bde1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
>@@ -136,35 +136,37 @@
>         [% END %]
> 
>         [% IF (frequencies_loop.size) %]
>-          <table id="frequenciest">
>-            <thead>
>-              <tr>
>-                <th>Description</th>
>-                <th>Unit</th>
>-                <th>Issues per unit</th>
>-                <th>Units per issue</th>
>-                <th>Display order</th>
>-                <th class="noExport">Actions</th>
>-              </tr>
>-            </thead>
>-            <tbody>
>-              [% FOREACH frequency IN frequencies_loop %]
>-                <tr>
>-                  <td>[% frequency.description | html %]</td>
>-                  <td>[% PROCESS translate_frequnit frequnit=frequency.unit %]</td>
>-                  <td>[% frequency.issuesperunit | html %]</td>
>-                  <td>[% frequency.unitsperissue | html %]</td>
>-                  <td>[% frequency.displayorder | html %]</td>
>-                  <td class="actions">
>-                    <a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=modify&frequencyid=[% frequency.id | html %]"><i class="fa fa-pencil"></i> Edit</a>
>-                    <a class="delete_frequency btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=del&frequencyid=[% frequency.id | html %]"><i class="fa fa-trash"></i> Delete</a>
>-                  </td>
>-                </tr>
>-              [% END %]
>-            </tbody>
>-          </table>
>+            <div class="page-section">
>+                <table id="frequenciest">
>+                    <thead>
>+                        <tr>
>+                            <th>Description</th>
>+                            <th>Unit</th>
>+                            <th>Issues per unit</th>
>+                            <th>Units per issue</th>
>+                            <th>Display order</th>
>+                            <th class="noExport">Actions</th>
>+                        </tr>
>+                    </thead>
>+                    <tbody>
>+                        [% FOREACH frequency IN frequencies_loop %]
>+                            <tr>
>+                                <td>[% frequency.description | html %]</td>
>+                                <td>[% PROCESS translate_frequnit frequnit=frequency.unit %]</td>
>+                                <td>[% frequency.issuesperunit | html %]</td>
>+                                <td>[% frequency.unitsperissue | html %]</td>
>+                                <td>[% frequency.displayorder | html %]</td>
>+                                <td class="actions">
>+                                    <a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=modify&frequencyid=[% frequency.id | html %]"><i class="fa fa-pencil"></i> Edit</a>
>+                                    <a class="delete_frequency btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=del&frequencyid=[% frequency.id | html %]"><i class="fa fa-trash"></i> Delete</a>
>+                                </td>
>+                            </tr>
>+                        [% END %]
>+                    </tbody>
>+                </table>
>+            </div> 
>         [% ELSE %]
>-          <p>There is no defined frequency.</p>
>+            <p>There is no defined frequency.</p>
>         [% END %]
>       [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
>index ddf38a7c37..e8e8c1f8c5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
>@@ -31,28 +31,30 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
> 
>-<h1>Alert subscribers for <em>[% bibliotitle | html %]</em></h1>
>+                <h1>Alert subscribers for <em>[% bibliotitle | html %]</em></h1>
>+                <p>
>+                    <span class="label">Subscription:</span> <a href="subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]">[% bibliotitle | html %] #[% subscriptionid | html %]</a>
>+                </p>
> 
>-<p>
>-    <span class="label">Subscription:</span> <a href="subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]">[% bibliotitle | html %] #[% subscriptionid | html %]</a>
>-</p>
>+                <div class="page-section">
> 
>-[% IF subscribers.count %]
>-    <table>
>-        <tr>
>-            <th>Patron name</th>
>-        </tr>
>-        [% FOREACH subscriber IN subscribers %]
>-        <tr>
>-            <td>
>-                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% subscriber.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' patron=subscriber %]</a>
>-            </td>
>-        </tr>
>-        [% END %]
>-    </table>
>-[% ELSE %]
>-    <p>There are no patrons subscribed to this subscription serial alert.</p>
>-[% END %]
>+                    [% IF subscribers.count %]
>+                        <table>
>+                            <tr>
>+                                <th>Patron name</th>
>+                            </tr>
>+                            [% FOREACH subscriber IN subscribers %]
>+                            <tr>
>+                                <td>
>+                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% subscriber.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' patron=subscriber %]</a>
>+                                </td>
>+                            </tr>
>+                            [% END %]
>+                        </table>
>+                    [% ELSE %]
>+                        <p>There are no patrons subscribed to this subscription serial alert.</p>
>+                    [% END %]
>+                </div> 
> 
>             </main>
>         </div> 
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 32628: 145276 | 145326 | 145336