From 4a7b64a616ed0f701d0b9d5648c76c7d0ba18e89 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 21 Oct 2022 15:14:56 +0100
Subject: [PATCH] Bug 31911: Improve rotating collections item management

This patch renames 'Add/remove items from collection' to just 'Manage
items' in the button in the rotating collections list table, the page
heading and the breadcrumbs.

We also move the heading below the toolbar to be consistent with
elsewhere, remove a superflous second level heading and wrap the content
table in a page-section too.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/rotating_collections/addItems.tt  | 11 ++++-------
 .../rotating_collections/rotatingCollections.tt       |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
index 653077e9d1..7d44604d1f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
@@ -28,7 +28,7 @@
         </li>
         <li>
             <a href="#" aria-current="page">
-                Add or remove items
+                Manage items
             </a>
         </li>
     </ol>
@@ -39,8 +39,6 @@
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
-                <h1>Add/remove items from collection</h1>
-
               [% IF ( ! colId ) %]
                 <div class="dialog message">
                     <p>Invalid collection id</p>
@@ -48,7 +46,7 @@
                 </div>
               [% ELSE %]
               [% INCLUDE 'rotating-collections-toolbar.inc' %]
-              <h2>Collection <em>[% colTitle | html %]</em></h2>
+              <h1>Manage items for <em>[% colTitle | html %]</em></h1>
 
               [% IF ( previousActionAdd ) %]
                 [% IF ( addSuccess ) %]
@@ -115,10 +113,9 @@
                 </form>
               </div>
 
-              <div>
-                <h2>Items in <em>[% colTitle | html %]</em></h2>
+              <div class="page-section">
                 [% IF ( collectionItemsLoop ) %]
-                  <h3>Total items: [% collectionItemsLoop.size | html%]</h3>
+                  <h2>Total items: [% collectionItemsLoop.size | html%]</h2>
                   <table>
                     <tr>
                       <th>Title</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
index 58d806318a..9bbf4d4a23 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
@@ -61,7 +61,7 @@
                                             <a class="btn btn-default btn-xs dropdown-toggle" id="collectionsactions[% collectionsLoo.colId | html %]" role="button" data-toggle="dropdown" href="#">
                                             Actions <b class="caret"></b></a>
                                             <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="collectionsactions[% collectionsLoo.colId | html %]">
-                                                <li><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-plus"></i> Add or remove items</a></li>
+                                                <li><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-plus"></i> Manage items</a></li>
                                                 <li><a href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-exchange"></i> Transfer</a></li>
                                                 <li><a href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
                                                 <li><a class="confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% collectionsLoo.colId | html %]"><i class="fa fa-trash"></i> Delete</a></li>
-- 
2.39.5