From 3b838ac251a145be2cfa46a076f1e786a86c2f16 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 22 Feb 2016 13:09:00 -0500
Subject: [PATCH] Bug 15880 - Serials new frequency link should be a toolbar
 button
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch converts the "new frequency" link to a Bootstrap-style
toolbar button in order to maintain consistency. Also included in this
patch are some other minor markup corrections:

- A colon and space after labels
- A 'Cancel' link instead of a button.
- "Required" classes for a required field.

To test, apply the patch and go to Serials -> Manage frequencies.

- Test the "New frequency" button
- Confirm that the changes to the entry form look correct.

Followed test plan, displays as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
---
 .../serials/subscription-frequencies.tt       | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

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 09860956a9..8442ed23e1 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
@@ -106,11 +106,11 @@ $(document).ready(function() {
           <fieldset class="rows">
             <ol>
               <li>
-                <label for="description">Description:</label>
-                <input type="text" id="description" name="description" value="[% description %]" />
+                <label class="required" for="description">Description: </label>
+                <input type="text" id="description" name="description" value="[% description %]" class="required" required="required" /> <span class="required">Required</span>
               </li>
               <li>
-                <label for="unit">Unit</label>
+                <label for="unit">Unit: </label>
                 <select id="unit" name="unit">
                   <option value="">None</option>
                   [% FOREACH unit IN units_loop %]
@@ -126,7 +126,7 @@ $(document).ready(function() {
               </li>
               <li><span class="hint">Note: one of the two following fields must be equal to 1</span></li>
               <li>
-                <label for="issuesperunit">Issues per unit</label>
+                <label for="issuesperunit">Issues per unit: </label>
                 [% IF (new) %]
                   <input type="text" id="issuesperunit" name="issuesperunit" value="1" size="3" />
                 [% ELSE %]
@@ -134,7 +134,7 @@ $(document).ready(function() {
                 [% END %]
               </li>
               <li>
-                <label for="unitsperissue">Units per issue</label>
+                <label for="unitsperissue">Units per issue: </label>
                 [% IF (new) %]
                   <input type="text" id="unitsperissue" name="unitsperissue" value="1" size="3" />
                 [% ELSE %]
@@ -142,17 +142,22 @@ $(document).ready(function() {
                 [% END %]
               </li>
               <li>
-                <label for="displayorder">Display order</label>
+                <label for="displayorder">Display order: </label>
                 <input type="text" id="displayorder" name="displayorder" value="[% displayorder %]" size="3" />
               </li>
             </ol>
           </fieldset>
           <fieldset class="action">
             <input type="submit" value="Save" />
-            <input type="button" value="Cancel" onclick="window.location='/cgi-bin/koha/serials/subscription-frequencies.pl'" />
+            <a href="/cgi-bin/koha/serials/subscription-frequencies.pl" class="cancel">Cancel</a>
           </fieldset>
         </form>
       [% ELSE %]
+
+        <div id="toolbar" class="btn-toolbar">
+            <a class="btn btn-small" id="newfrequency" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=new"><i class="fa fa-plus"></i> New frequency</a>
+        </div>
+
         <h1>Frequencies</h1>
         [% IF still_used %]
             <div class="dialog">
@@ -180,7 +185,6 @@ $(document).ready(function() {
                 </form>
             </div>
         [% END %]
-        <a href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=new">New frequency</a>
 
         [% IF (frequencies_loop.size) %]
           <table id="frequenciest">
-- 
2.39.5