Attachment 48977 Details for Bug 16045 – [SIGNED-OFF] Bug 16045 - Use Font Awesome icons in OAI sets administration

[patch] [SIGNED-OFF] Bug 16045 - Use Font Awesome icons in OAI sets administration

SIGNED-OFF-Bug-16045---Use-Font-Awesome-icons-in-O.patch (text/plain), 5.80 KB, created by Aleisha Amohia on 2016-03-10 21:23:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2016-03-10 21:23:02 UTC

Size: 5.80 KB

patch

obsolete

>From 2d8417b5689b46b4f899f02fd2750c9a2fff5b41 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 10 Mar 2016 10:56:35 -0500
>Subject: [PATCH] [SIGNED-OFF] Bug 16045 - Use Font Awesome icons in OAI sets
> administration
>
>There are links on the OAI sets administration page which can use Font
>Awesome icons instead of being styled with background images. This patch
>makes that change.
>
>Another minor change: Added the "fa-fw" class to items in the "Actions"
>menu which didn't have it. This helps the items line up correctly:
>http://fortawesome.github.io/Font-Awesome/examples/#fixed-width
>
>To test, apply the patches for Bugs 16014 and 15991 if necessary. Apply
>this patch and:
>
>- Go to Administration ->  OAI sets configuration.
>- Click the "New set" button and verify that the "Add description" link
>  uses a Font Awesome icon.
>- Confirm that the "Add description" link works correctly.
>- After adding a description, verify that the "Remove" link looks
>  correct and works correctly.
>- From the list of OAI sets choose "Define mappings" from the "Actions"
>  menu.
>- Confirm that the "Delete" button is styled correctly and works
>  correctly.
>
>Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
>---
> .../prog/en/modules/admin/oai_set_mappings.tt              |    4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt  |   12 ++++++------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>index 277c145..b887077 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>@@ -95,7 +95,7 @@ function hideDialogBox() {
>                       OR
>                     [% END %]
>                   </td>
>-                  <td><a class="clear-field" href="#">Delete</a></td>
>+                  <td><button class="btn btn-mini clear-field" type="button"><i class="fa fa-trash"></i> Delete</button></td>
>                 </tr>
>               [% END %]
>             [% ELSE %]
>@@ -108,7 +108,7 @@ function hideDialogBox() {
>                     </select></td>
>                 <td><input type="text" name="marcvalue" /></td>
>                 <td><input type="button" id="ORbutton" value="OR" /></td>
>-                <td><a class="clear-field" href="#">Delete</a></td>
>+                <td><button class="btn btn-mini clear-field" type="button"><i class="fa fa-trash"></i> Delete</button></td>
>               </tr>
>             [% END %]
>           </tbody>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
>index 35405ec..983b588 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
>@@ -7,7 +7,7 @@ function newDescField() {
>     $("#adddescription").before(
>         '<li><label>setDescription: </label>' +
>         '<textarea style="vertical-align:middle" rows="2" cols="30" name="description"></textarea>' +
>-        '<a onclick="delDescField(this); return false;" class="clear-field" href="#">Remove</a>' +
>+        '<a onclick="delDescField(this); return false;" href="#"><i class="fa fa-fw fa-trash"></i> Remove</a>' +
>         '</li>'
>     );
> }
>@@ -67,10 +67,10 @@ $(document).ready(function() {
>                             <li>
>                                 <label>setDescription: </label>
>                                 <textarea style="vertical-align:middle" rows="2" cols="30" name="description">[% desc.description %]</textarea>
>-                                <a onclick="delDescField(this); return false;" class="clear-field" href="#">Remove</a>
>+                                <a onclick="delDescField(this); return false;" href="#"><i class="fa fa-fw fa-trash"></i> Remove</a>
>                             </li>
>                         [% END %]
>-                        <li id="adddescription"><span class="label">&nbsp;</span><a class="clone-field" href="#" onclick='newDescField(); return false;'>Add description</a></li>
>+                        <li id="adddescription"><span class="label">&nbsp;</span><a href="#" onclick='newDescField(); return false;'><i class="fa fa-fw fa-plus"></i> Add description</a></li>
> 
>                     </ol>
>                 </fieldset>
>@@ -116,9 +116,9 @@ $(document).ready(function() {
>                                 <a class="btn btn-mini dropdown-toggle" id="oaisetsactions[% set.id %]" role="button" data-toggle="dropdown" href="#">
>                                   Actions <b class="caret"></b></a>
>                                 <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="oaisetsactions[% set.id %]">
>-                                  <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&amp;id=[% set.id %]"><i class="fa fa-pencil"></i> Modify</a></li>
>-                                  <li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&amp;id=[% set.id %]"><i class="fa fa-trash"></i> Delete</a></li>
>-                                  <li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id %]"><i class="fa fa-info"></i> Define mappings</a></li>
>+                                  <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&amp;id=[% set.id %]"><i class="fa fa-fw fa-pencil"></i> Modify</a></li>
>+                                  <li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&amp;id=[% set.id %]"><i class="fa fa-fw fa-trash"></i> Delete</a></li>
>+                                  <li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id %]"><i class="fa fa-fw fa-info"></i> Define mappings</a></li>
>                                 </ul>
>                               </div>
>                             </td>
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 16045: 48969 | 48977 | 48999