From cccba73b1888f29a113aacbad61aca837c591b28 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 30 Oct 2014 12:42:07 -0400
Subject: [PATCH] Bug 8836 [Template follow-up] Resurrect Rotating Collections

This follow-up makes drastic changes to the templates in order to bring
them into compliance with established patterns and markup guidelines.
Only minor changes are made to perl scripts.

Changes:

- Add a toolbar include for displaying new, edit, transfer, and delete
  buttons.
- Improve title and breadcrumbs with collection titles and better
  specificity.
- Correct page structure which was inconsistent with the markup of
  similarly-structured pages.
- Correct styling of error and informational messages.
- Added detailed error messages for a couple of conditions which were
  not defined in the template.
- Add link to the detail page of titles which are in a collection using
  the view defined in the IntranetBiblioDefaultView preference.
- Add a link to remove an item from a collection directly without having
  to scan the barcode.
- Add client-side validation to collection creation form.
- In RotatingCollections.pm, add biblionumber to the list of columns
  returned by GetItemsInCollection.
- In rotating_collections/*.pl, remove obsolete declaration of system
  preference variables.

To test, perform all the operations associated with Rotating
Collections:

- Add a new collection
- Edit an existing collection
- Add items to a collection
- Remove items from a collection (via barcode and link)
- Test the behavior of all new toolbar buttons
- Verify that titles and breadcrumbs look correct and links work
  correctly.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
---
 C4/RotatingCollections.pm                          |    1 +
 .../intranet-tmpl/prog/en/css/staff-global.css     |    1 +
 .../en/includes/rotating-collections-toolbar.inc   |   17 +++
 .../en/modules/rotating_collections/addItems.tt    |  147 ++++++++++----------
 .../rotating_collections/editCollections.tt        |  138 ++++++++++---------
 .../rotating_collections/rotatingCollections.tt    |   34 ++---
 .../rotating_collections/transferCollection.tt     |   68 +++++----
 .../prog/en/modules/tools/tools-home.tt            |    2 +-
 rotating_collections/addItems.pl                   |    5 -
 rotating_collections/editCollections.pl            |    7 -
 rotating_collections/rotatingCollections.pl        |    5 -
 rotating_collections/transferCollection.pl         |    5 -
 12 files changed, 222 insertions(+), 208 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc

diff --git a/C4/RotatingCollections.pm b/C4/RotatingCollections.pm
index 12d835d..b6152a8 100644
--- a/C4/RotatingCollections.pm
+++ b/C4/RotatingCollections.pm
@@ -247,6 +247,7 @@ sub GetItemsInCollection {
     my $sth = $dbh->prepare(
         "SELECT
                              biblio.title,
+                             biblio.biblionumber,
                              items.itemcallnumber,
                              items.barcode
                            FROM collections, collections_tracking, items, biblio
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 0f67416..defc5f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -732,6 +732,7 @@ fieldset.rows fieldset.action {
 	padding : 1em;
 }
 
+fieldset.brief label.inline,
 fieldset.rows label.inline {
 	display : inline;
 	float : none;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc
new file mode 100644
index 0000000..321d179
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc
@@ -0,0 +1,17 @@
+            <div id="toolbar" class="btn-toolbar">
+                <div class="btn-group">
+                    <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="icon-plus"></i> New collection</a>
+                </div>
+
+                [% IF ( colId ) %]
+                    <div class="btn-group">
+                        <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId %]">Transfer</a>
+                    </div>
+                    <div class="btn-group">
+                        <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% colId %]"><i class="icon-pencil"></i> Edit</a>
+                    </div>
+                    <div class="btn-group">
+                        <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% colId %]"><i class="icon-remove"></i> Delete</a>
+                    </div>
+                [% END %]
+            </div>
\ No newline at end of file
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 fef190c..6e9e725 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
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Tools &rsaquo; Rotating collections &rsaquo; Add/Remove items</title>
+<title>Koha &rsaquo; Tools &rsaquo; Rotating collections &rsaquo; Collection [% colTitle %] &rsquo; Add or remove items</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
     //<![CDATA[
@@ -13,109 +13,110 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo; Add/Remove items</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId %]">Collection <i>[% colTitle %]</i></a> &rsaquo; Add or remove items</div>
 
 <div id="doc3" class="yui-t2">
     <div id="bd">
-        <div class="yui-b">
-            [% INCLUDE 'tools-menu.inc' %]
-        </div>
+        <div id="yui-main">
+            <div class="yui-b">
 
-        <div class="yui-main">
-            <div class="yui-db">
+              [% INCLUDE 'rotating-collections-toolbar.inc' %]
 
-              <h1>Rotating collections: Add/Remove items</h1>
-
-              <div>
-                  <br />
-                  [% IF ( previousActionAdd ) %]
-                    [% IF ( addSuccess ) %]
-                      <div class="alert">Item with barcode '[% barcode %]' added successfully!</div>
-                    [% ELSE %]
-                      <div class="alert">
-                        <p>Failed to add item with barcode <i>[% barcode %]</i>:
-                        <p>
-                            [% IF failureMessage == "NO_ITEM" %]
-                                No item with matching barcode found!
-                            [% ELSIF failureMessage == "IN_COLLECTION_OTHER" %]
-                                Item is already in a different rotating collection!
-                            [% ELSE %]
-                                [% failureMessage %]
-                            [% END %]
-                        </p>
-                    </div>
-                    [% END %]
-                  [% END %]
+              <h1>Collection <i>[% colTitle %]</i></h1>
 
-                  [% IF ( previousActionRemove ) %]
-                    [% IF ( removeSuccess ) %]
-                      <div class="alert">Item with barcode <i>[% barcode %]</i> removed successfully!</div>
-                    [% ELSE %]
-                      <div class="alert">
-                        Failed to remove item with barcode <i>[% barcode %]</i>:
-                        <p>
-                            [% IF failureMessage == "NO_ITEM" %]
-                                No item with matching barcode found!
-                            [% ELSE %]
-                                [% failureMessage %]
-                            [% END %]
-                        </p>
-                    </div>
-                    [% END %]
-                  [% END %]
+              [% IF ( previousActionAdd ) %]
+                [% IF ( addSuccess ) %]
+                  <div class="dialog message">Item with barcode '[% barcode %]' added successfully</div>
+                [% ELSE %]
+                  <div class="dialog alert">
+                    <p>Failed to add item with barcode <i>[% barcode %]</i>:
+                    <p>
+                        [% IF failureMessage == "NO_ITEM" %]
+                            No item with matching barcode found
+                        [% ELSIF failureMessage == "IN_COLLECTION_OTHER" %]
+                            Item is already in a different rotating collection
+                        [% ELSIF failureMessage == "IN_COLLECTION" %]
+                            Item is already in this collection
+                        [% ELSE %]
+                            [% failureMessage %]
+                        [% END %]
+                    </p>
+                </div>
+                [% END %]
+              [% END %]
 
-                  <h3>Add item to <i>[% colTitle %]</i></h3>
-              </div>
+              [% IF ( previousActionRemove ) %]
+                [% IF ( removeSuccess ) %]
+                  <div class="dialog message">Item with barcode <i>[% barcode %]</i> removed successfully</div>
+                [% ELSE %]
+                  <div class="dialog alert">
+                    Failed to remove item with barcode <i>[% barcode %]</i>:
+                    <p>
+                        [% IF failureMessage == "NO_ITEM" %]
+                            No item with matching barcode found
+                        [% ELSIF failureMessage == "NOT_IN_COLLECTION" %]
+                            Item is not in this collection
+                        [% ELSE %]
+                            [% failureMessage %]
+                        [% END %]
+                    </p>
+                </div>
+                [% END %]
+              [% END %]
 
               <div>
                 <form action="addItems.pl" method="post">
-                <table>
-                  <tr>
-                    <th><label for="barcode">Barcode: </label></td>
-                    <td><input type="text" id="barcode" name="barcode" /></td>
-                    <td>
-                      [% IF ( removeChecked ) %]<input type="checkbox" name="removeItem" checked="checked" />
-                      [% ELSE %]<input type="checkbox" name="removeItem" />[% END %]
-                      <label for="removeItem">Remove item from collection</label>
-                    </td>
-                  </tr>
+                    <fieldset class="brief">
+                        <legend>Add or remove items</legend>
+                        <ol>
+                            <li>
+                                <label for="barcode">Barcode: </label>
+                                <input type="text" id="barcode" name="barcode" />
+                                [% IF ( removeChecked ) %]
+                                    <label class="inline"><input type="checkbox" name="removeItem" checked="checked" /> Remove item from collection</label>
+                                [% ELSE %]
+                                    <label class="inline"><input type="checkbox" name="removeItem" /> Remove item from collection</label>
+                                [% END %]
+                            </li>
+                        </ol>
+                        <p>
+                            <input type="hidden" id="colId" name="colId" value="[% colId %]" />
+                            <input type="hidden" name="action" value="addItem" />
+                            <input type="submit" value="Submit" />
+                        </p>
+                    </fieldset>
 
-                  <input type="hidden" id="colId" name="colId" value="[% colId %]" />
-                  <input type="hidden" name="action" value="addItem" />
-                  <tr><td align="right" colspan="99"><input class="btn" type="submit" value="Submit" /></td></tr>
-                </table>
                 </form>
               </div>
 
               <div>
-                <h2>Items in this collection</h2>
+                <h2>Items in <i>[% colTitle %]</i></h2>
                 [% IF ( collectionItemsLoop ) %]
                   <table>
                     <tr>
                       <th>Title</th>
                       <th>Call number</th>
                       <th>Barcode</th>
+                      <th>&nbsp;</th>
                     </tr>
                     [% FOREACH collectionItemsLoo IN collectionItemsLoop %]
                       <tr>
-                        <td>[% collectionItemsLoo.title |html %]</td>
+                        <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = collectionItemsLoo.biblionumber %][% collectionItemsLoo.title |html %]</a></td>
                         <td>[% collectionItemsLoo.itemcallnumber %]</td>
                         <td>[% collectionItemsLoo.barcode %]</td>
+                        <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId %]&amp;barcode=[% collectionItemsLoo.barcode %]&amp;removeItem=1&amp;action=addItem">Remove</a></td>
                       </tr>
                     [% END %]
                   </table>
                 [% ELSE %]
-                  There are no items in this collection.
+                  <div class="dialog message">There are no items in this collection.</div>
                 [% END %]
               </div>
 
-              <div>
-                <br/>
-                <input type="button" value="Return to rotating collections home" onclick="window.location.href='rotatingCollections.pl'">
-              </div>
-
-            </div>
+            </div> <!-- /.yui-b -->
+        </div> <!-- /#yui-main -->
+        <div class="yui-b">
+            [% INCLUDE 'tools-menu.inc' %]
         </div>
-    </div>
-
-[% INCLUDE 'intranet-bottom.inc' %]
+    </div> <!-- /#bd -->
+[% INCLUDE 'intranet-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
index fa1099a..994b6e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
@@ -1,28 +1,39 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Tools &rsaquo; Rotating collections &rsaquo; Edit collections</title>
+<title>Koha &rsaquo; Tools &rsaquo; Rotating collections &rsaquo;
+    [%- IF ( action == "new" ) %]
+        Add a new collection
+    [% ELSE %]
+        Edit collection [% editColTitle %]
+    [% END -%]
+</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="rcoll_editCollections" class="tools rcoll">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo; Edit collections</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo;
+    [%- IF ( action == "new" ) %]
+        Add a new collection
+    [% ELSE %]
+        <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% editColId %]">Collection <i>[% editColTitle %]</i></a> &rsaquo; Edit
+    [% END -%]
+</div>
 
 <div id="doc3" class="yui-t2">
     <div id="bd">
-        <div class="yui-b">
-           [% INCLUDE 'tools-menu.inc' %]
-        </div>
-
-        <div class="yui-main">
-            <div class="yui-bd">
+        <div id="yui-main">
+            <div class="yui-b">
 
               [% IF ( previousActionCreate ) %]
                 [% IF ( createSuccess ) %]
-                  <div class="alert">Collection <i>[% createdTitle %]</i> created successfully!</div>
+                    <div class="dialog message">
+                        <p>Collection <i>[% createdTitle %]</i> added successfully</p>
+                        <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p>
+                    </div>
                 [% ELSE %]
-                  <div class="alert">
-                    <p>Collection <i>[% createdTitle %]</i> failed to be created!</p>
+                  <div class="dialog alert">
+                    <p>Collection <i>[% createdTitle %]</i> failed to be added</p>
                     <p>
                         [% IF failureMessage == "NO_TITLE" %]
                             No title entered.
@@ -38,18 +49,24 @@
 
               [% IF ( previousActionDelete ) %]
                 [% IF ( deleteSuccess ) %]
-                  <div class="alert">Collection deleted successfully!</div>
+                  <div class="dialog message">
+                    <p>Collection deleted successfully</p>
+                    <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p>
+                  </div>
                 [% ELSE %]
-                  <div class="alert">Collection failed to be deleted!</div>
+                  <div class="dialog alert">Collection failed to be deleted</div>
                 [% END %]
               [% END %]
 
               [% IF ( previousActionUpdate ) %]
                 [% IF ( updateSuccess ) %]
-                  <div class="alert">Collection <i>[% updatedTitle %]</i> updated successfully!</div>
+                  <div class="dialog message">
+                      <p>Collection <i>[% updatedTitle %]</i> updated successfully</p>
+                      <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p>
+                  </div>
                 [% ELSE %]
-                  <div class="alert">
-                    <p>Collection <i>[% updatedTitle %]</i> failed to be updated!</p>
+                  <div class="dialog alert">
+                    <p>Collection <i>[% updatedTitle %]</i> failed to be updated</p>
                     <p>
                         [% IF failureMessage == "NO_ID" %]
                             No collection id given.
@@ -62,64 +79,57 @@
               [% END %]
 
               <div>
-                <br />
 
                 [% IF action == "new" || action == "edit" %]
                     [% IF ( previousActionEdit ) %]
                       <h1>Edit collection <i>[% editColTitle %]</i></h1>
                     [% ELSE %]
-                      <h1>Create new collection</h1>
+                      <h1>Add new collection</h1>
                     [% END %]
 
-                    <form action="editCollections.pl" method="post">
-                      [% IF ( previousActionEdit ) %]
-                        <input type="hidden" name="action" value="update" />
-                        <input type="hidden" name="colId" value="[% editColId %]" />
-                      [% ELSE %]
-                        <input type="hidden" name="action" value="create" />
-                      [% END %]
-
-                      <table>
-                        <tr>
-                          <td>
-                            <label class="required" for="title">Title: </label>
-                          </td>
-                          <td>
-                            [% IF ( editColTitle ) %]<input type="text" name="title" value="[% editColTitle %]" />
-                            [% ELSE %]<input type="text" name="title" />[% END %]
-                          </td>
-                        </tr>
-
-                        <tr>
-                          <td>
-                            <label class="required" for="description">Description: </label>
-                          </td>
-                          <td>
-                            [% IF (editColDescription ) %]<input type="text" size="50" name="description" value="[% editColDescription %]" />
-                            [% ELSE %]<input type="text" size="50" name="description" />[% END %]
-                          </td>
-                        </tr>
+                    <form action="editCollections.pl" method="post" class="validated">
+                        [% IF ( previousActionEdit ) %]
+                            <input type="hidden" name="action" value="update" />
+                            <input type="hidden" name="colId" value="[% editColId %]" />
+                        [% ELSE %]
+                            <input type="hidden" name="action" value="create" />
+                        [% END %]
 
-                        <tr>
-                          <td colspan="2">
-                            [% IF ( previousActionEdit ) %]
-                              <input class="btn" type="submit" value="Update" />
-                            [% ELSE %]
-                              <input class="btn" type="submit" value="Create" />
-                            [% END %]
-                          </td>
-                        </tr>
-                      </table>
+                        <fieldset class="rows">
+                            <ol>
+                                <li>
+                                    <label class="required" for="title">Title: </label>
+                                    [% IF ( editColTitle ) %]
+                                        <input type="text" name="title" value="[% editColTitle %]" required="required" />
+                                        <span class="required">Required</span>
+                                    [% ELSE %]
+                                        <input type="text" name="title" required="required" />
+                                        <span class="required">Required</span>
+                                    [% END %]
+                                </li>
+                                <li>
+                                    <label class="required" for="description">Description: </label>
+                                    [% IF (editColDescription ) %]
+                                        <input type="text" size="50" name="description" value="[% editColDescription %]" required="required" />
+                                        <span class="required">Required</span>
+                                    [% ELSE %]
+                                        <input type="text" size="50" name="description" required="required" />
+                                        <span class="required">Required</span>
+                                    [% END %]
+                                </li>
+                            </ol>
+                        </fieldset>
+                        <fieldset class="action">
+                            <p><input type="submit" value="Submit" /> <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl" class="cancel">Cancel</a></p>
+                        </fieldset>
                     </form>
                 [% END %]
               </div>
 
-              <p>
-                <a class="btn" href="rotatingCollections.pl">Return to rotating collections home</a>
-              </p>
-
-            </div>
+            </div> <!-- /.yui-b -->
+        </div> <!-- /#yui-main -->
+        <div class="yui-b">
+            [% INCLUDE 'tools-menu.inc' %]
         </div>
-    </div>
-[% INCLUDE 'intranet-bottom.inc' %]
-
+    </div> <!-- /#bd -->
+[% INCLUDE 'intranet-bottom.inc' %]
\ No newline at end of file
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 0a893ab..7124575 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
@@ -11,20 +11,18 @@
 
 <div id="doc3" class="yui-t2">
     <div id="bd">
-        <div class="yui-b">
-            [% INCLUDE 'tools-menu.inc' %]
-        </div>
+        <div id="yui-main">
+            <div class="yui-b">
 
-        <div class="yui-main">
-            <div class="yui-bd">
+                [% INCLUDE 'rotating-collections-toolbar.inc' %]
 
                 <h1>Rotating collections</h1>
                 <div>
                     [% IF ( collectionsLoop ) %]
                         <table>
                             <tr>
-                                <th><strong>Title</strong></th>
-                                <th>Description</strong></th>
+                                <th>Title</th>
+                                <th>Description</th>
                                 <th>Current location</th>
                                 <th>&nbsp;</th>
                                 <th>&nbsp;</th>
@@ -34,25 +32,25 @@
 
                             [% FOREACH collectionsLoo IN collectionsLoop %]
                                 <tr>
-                                    <td>[% collectionsLoo.colTitle %]</td>
+                                    <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId %]">[% collectionsLoo.colTitle %]</a></td>
                                     <td>[% collectionsLoo.colDesc %]</td>
                                     <td>[% Branches.GetName( collectionsLoo.colBranchcode ) %]</td>
-                                    <td><a href="addItems.pl?colId=[% collectionsLoo.colId %]">Add/remove items</a></td>
-                                    <td><a href="transferCollection.pl?colId=[% collectionsLoo.colId %]">Transfer</a></td>
-                                    <td><a href="editCollections.pl?action=edit&colId=[% collectionsLoo.colId %]">Edit</a></td>
-                                    <td><a href="editCollections.pl?action=delete&colId=[% collectionsLoo.colId %]">Delete</a></td>
+                                    <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId %]">Add or remove items</a></td>
+                                    <td><a href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% collectionsLoo.colId %]">Transfer</a></td>
+                                    <td><a href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% collectionsLoo.colId %]">Edit</a></td>
+                                    <td><a href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% collectionsLoo.colId %]">Delete</a></td>
                                 </tr>
                             [% END %]
                         </table>
                     [% ELSE %]
-                        There are no collections currently defined.
+                        <div class="dialog message">There are no collections currently defined.</div>
                     [% END %]
                 </div>
 
-                <p>
-                    <a class="btn" href="editCollections.pl?action=new">Create collection</a>
-                </p>
-            </div>
+            </div> <!-- /.yui-b -->
+        </div> <!-- /#yui-main -->
+        <div class="yui-b">
+            [% INCLUDE 'tools-menu.inc' %]
         </div>
-    </div>
+    </div> <!-- /#bd -->
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
index fe582f6..1228827 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
@@ -6,51 +6,59 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo; Transfer collection</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId %]">Collection <i>[% colTitle %]</i></a> &rsaquo; Transfer collection</div>
 
 <div id="doc3" class="yui-t2">
     <div id="bd">
-        <div class="yui-b">
-            [% INCLUDE 'tools-menu.inc' %]
-        </div>
+        <div id="yui-main">
+            <div class="yui-b">
 
-        <div class="yui-main">
-            <div class="yui-bd">
-                <h1>Rotating collections: Transfer collection</h1>
+                <h1>Transfer collection <i>[% colTitle %]</i></h1>
 
                 [% IF ( transferSuccess ) %]
-                    <div class="alert">Collection transferred successfully</div>
+                    <div class="dialog message">
+                        <p>Collection transferred successfully</p>
+                        <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p>
+                    </div>
                 [% ELSIF ( transferFailure ) %]
-                    <div class="alert">Failed to transfer collection!</div>
+                    <div class="dialog alert">
+                        <p>Failed to transfer collection</p>
+                        <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p>
+                    </div>
                 [% END %]
 
                 [% IF ( transferSuccess ) %]
                 [% ELSE %]
                     <div>
                         <form action="transferCollection.pl" method="post">
-                            <input type="hidden" name="colId" value="[% colId %]">
-
-                            <label for="toBranch">Choose your library:</label>
-                            <select name="toBranch">
-                                [% FOREACH branchoptionloo IN branchoptionloop %]
-                                    [% IF ( branchoptionloo.selected ) %]
-                                        <option value="[% branchoptionloo.code %]" selected="selected">[% branchoptionloo.name %]</option>
-                                    [% ELSE %]
-                                        <option value="[% branchoptionloo.code %]">[% branchoptionloo.name %]</option>
-                                    [% END %]
-                                [% END %]
-                            </select>
-
-                            <input class="btn" type="submit" value="Transfer collection">
+                            <input type="hidden" name="colId" value="[% colId %]" />
+                            <fieldset class="rows">
+                                <ol>
+                                    <li>
+                                        <label for="toBranch">Choose your library:</label>
+                                        <select id="toBranch" name="toBranch">
+                                            [% FOREACH branchoptionloo IN branchoptionloop %]
+                                                [% IF ( branchoptionloo.selected ) %]
+                                                    <option value="[% branchoptionloo.code %]" selected="selected">[% branchoptionloo.name %]</option>
+                                                [% ELSE %]
+                                                    <option value="[% branchoptionloo.code %]">[% branchoptionloo.name %]</option>
+                                                [% END %]
+                                            [% END %]
+                                        </select>
+                                    </li>
+                                </ol>
+                            </fieldset>
+                            <fieldset class="action">
+                                <input type="submit" value="Transfer collection"> <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl" class="cancel">Cancel</a>
+                            </fieldset>
                         </form>
                     </div>
                 [% END %]
 
-                <p>
-                    <a class="btn" href="rotatingCollections.pl">Return to rotating collections home</a>
-                </p>
-
-            </div>
+            </div> <!-- /.yui-b -->
+        </div> <!-- /#yui-main -->
+        <div class="yui-b">
+            [% INCLUDE 'tools-menu.inc' %]
         </div>
-    </div>
-[% INCLUDE 'intranet-bottom.inc' %]
+    </div> <!-- /#bd -->
+[% INCLUDE 'intranet-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
index 590cb47..723dcba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
@@ -144,7 +144,7 @@
 
     [% IF ( CAN_user_tools_rotating_collections ) %]
     <dt><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></dt>
-    <dd>Manage Rotating Collections</dd>
+    <dd>Manage rotating collections</dd>
     [% END %]
 
     [% IF ( CAN_user_tools_marc_modification_templates ) %]
diff --git a/rotating_collections/addItems.pl b/rotating_collections/addItems.pl
index df87908..6286a40 100755
--- a/rotating_collections/addItems.pl
+++ b/rotating_collections/addItems.pl
@@ -95,11 +95,6 @@ if ($collectionItems) {
 }
 
 $template->param(
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-
     colId          => $colId,
     colTitle       => $colTitle,
     colDescription => $colDescription,
diff --git a/rotating_collections/editCollections.pl b/rotating_collections/editCollections.pl
index 4372074..6d99ddb 100755
--- a/rotating_collections/editCollections.pl
+++ b/rotating_collections/editCollections.pl
@@ -114,11 +114,4 @@ elsif ( $action eq 'update' ) {
     }
 }
 
-$template->param(
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-);
-
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/rotating_collections/rotatingCollections.pl b/rotating_collections/rotatingCollections.pl
index a27ce74..d86dab0 100755
--- a/rotating_collections/rotatingCollections.pl
+++ b/rotating_collections/rotatingCollections.pl
@@ -43,11 +43,6 @@ my $branchcode = $query->cookie('branch');
 my $collections = GetCollections();
 
 $template->param(
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-
     collectionsLoop => $collections,
 );
 
diff --git a/rotating_collections/transferCollection.pl b/rotating_collections/transferCollection.pl
index 6f92356..855c45a 100755
--- a/rotating_collections/transferCollection.pl
+++ b/rotating_collections/transferCollection.pl
@@ -73,11 +73,6 @@ foreach my $br ( keys %$branches ) {
 ## Get data about collection
 my ( $colId, $colTitle, $colDesc, $colBranchcode ) = GetCollection($colId);
 $template->param(
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-
     colId            => $colId,
     colTitle         => $colTitle,
     colDesc          => $colDesc,
-- 
1.7.2.5