Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 15785 - Use Font Awesome icons in confirmation dialogs

Browse source 
We can simplify the staff client's CSS and reduce some image file usage
if we modify confirmation dialogs to use Font Awesome icons. This patch
makes this change for Administration templates.

This patch includes some whitespace changes, so please consider that
when looking at diffs.

To test, apply the patch and test deletion in the following cases. Test
both confirmation and cancel actions.

Administration -> Budgets -> Delete budget
Administration -> Funds -> Delete fund
Administration -> Authority types -> Delete authority type
Administration -> Authority types -> MARC Structure -> Delete tag
Administration -> Authority types -> MARC Structure -> Subfields -> Delete
Administration -> MARC bibliographic framework -> Delete framework
Administration -> MARC bibliographic framework -> MARC structure -> Delete
Administration -> Cities and Towns -> Delete city
Administration -> Classification sources -> Delete classification source
Administration -> Classification sources -> Delete classification filing rule
Administration -> Item types -> Delete
Administration -> Record matching rules -> Delete
Administration -> Patron attribute types -> Delete

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. Icons changed

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
This commit is contained in:
Owen Leonard 2016-02-11 09:36:25 -05:00 committed by Brendan Gallagher
parent c00169e536
commit 5939c4b233
13 changed files with 149 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
View file

@ -1184,6 +1184,31 @@ div.alert strong {
list-style-position:inside;
}
.dialog button {
background-color : #FFF;
border: 1px outset #999999;
border-top-color: #666;
border-left-color: #666;
margin : .4em;
padding : .4em;
}
.dialog button:hover {
background-color : #ffc;
}
.dialog button:active {
border : 1px inset #999999;
}
.approve i.fa {
color: green;
}
.deny i.fa {
color: #cc0000;
}
a.clear-field {
background : transparent url("../../img/clear-field.png") center left no-repeat;
padding-left : 16px;

5
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
View file

@ -411,11 +411,10 @@
<form action="[% script_name %]" method="post">
<input type="hidden" name="op" value="delete_confirmed" />
<input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
<input type="submit" class="approve" value="Delete" />
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
</form>
<form action="[% script_name %]" method="post">
<input type="submit" class="deny" value="Cancel" />
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
</form>
</div>

38
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
View file

@ -619,26 +619,26 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
[% END %] <!-- add_form -->
[% IF op == 'delete_confirm' %]
<div class="dialog alert"> <h3>Delete fund [% budget_name %]?</h3>
If you delete this fund, all orders linked to this fund will be deleted!
<table>
<tr>
<th scope="row">Fund amount:</th>
<td>[% budget_amount | $Price %]</td>
</tr>
</table>
<div class="dialog alert">
<h3>Delete fund [% budget_name %]?</h3>
If you delete this fund, all orders linked to this fund will be deleted!
<table>
<tr>
<th scope="row">Fund amount:</th>
<td>[% budget_amount | $Price %]</td>
</tr>
</table>
<form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post">
<input type="hidden" name="op" value="delete_confirmed" />
<input type="hidden" name="budget_id" value="[% budget_id %]" />
<input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
<input type="submit" value="Delete" class="approve" />
</form>
<form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get">
<input type="submit" class="deny" value="Cancel" />
</form>
</div>
<form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post">
<input type="hidden" name="op" value="delete_confirmed" />
<input type="hidden" name="budget_id" value="[% budget_id %]" />
<input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this fund</button>
</form>
<form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get">
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
</form>
</div>
[% END %]
</div>

34
koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
View file

@ -217,22 +217,28 @@ function displayMoreConstraint(numlayer){
[% IF ( delete_confirm ) %]
<div class="dialog alert"><h3>Delete subfield <span class="ex">'[% tagsubfield %]'?</span></h3>
<form action="[% delete_link %]" method="post"><input type="hidden" name="op" value="delete_confirmed" />
<table><tr><th scope="row">Subfield:</th> <td>[% tagsubfield %]</td></tr>
<tr><th scope="row">Description:</th> <td>[% liblibrarian %]</td></tr></table>
<input type="hidden" name="searchfield" value="[% searchfield %]" />
<input type="hidden" name="tagfield" value="[% tagfield | html%]" />
<input type="hidden" name="tagsubfield" value="[% tagsubfield %]" />
<input type="hidden" name="authtypecode" value="[% authtypecode | html%]" />
<input type="submit" class="approve" value="Yes, delete this subfield" />
<div class="dialog alert">
<h3>Delete subfield <span class="ex">'[% tagsubfield %]'?</span></h3>
<form action="[% delete_link %]" method="post">
<input type="hidden" name="op" value="delete_confirmed" />
<table>
<tr><th scope="row">Subfield:</th> <td>[% tagsubfield %]</td></tr>
<tr><th scope="row">Description:</th> <td>[% liblibrarian %]</td></tr>
</table>
<input type="hidden" name="searchfield" value="[% searchfield %]" />
<input type="hidden" name="tagfield" value="[% tagfield%]" />
<input type="hidden" name="tagsubfield" value="[% tagsubfield | html %]" />
<input type="hidden" name="authtypecode" value="[% authtypecode | html %]" />
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this subfield</button>
</form>
<form action="[% delete_link %]" method="get">
<input type="hidden" name="searchfield" value="[% searchfield %]" />
<input type="hidden" name="tagfield" value="[% tagfield | html %]" />
<input type="hidden" name="tagsubfield" value="[% tagsubfield %]" />
<input type="hidden" name="authtypecode" value="[% authtypecode |html%]" />
<input type="submit" class="deny" value="No, do not delete" />
<input type="hidden" name="searchfield" value="[% searchfield %]" />
<input type="hidden" name="tagfield" value="[% tagfield | html %]" />
<input type="hidden" name="tagsubfield" value="[% tagsubfield %]" />
<input type="hidden" name="authtypecode" value="[% authtypecode |html %]" />
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
</form>
</form></div>
[% END %]

23
koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
View file

@ -135,18 +135,21 @@
[% IF ( delete_confirm ) %]
<div class="dialog alert">
<div class="dialog alert">
<h3>Confirm deletion</h3>
<form action="[% script_name %]" method="post">
<table>
<tr><th scope="row">Tag: </th><td>[% searchfield %] [% liblibrarian %]</td></tr>
</table>
<input type="hidden" name="op" value="delete_confirmed" />
<input type="hidden" name="authtypecode" value="[% authtypecode %]" />
<input type="hidden" name="searchfield" value="[% searchfield %]" />
<input type="submit" value="Yes, delete" class="approve"></form>
<form action="[% script_name %]" method="get"><input type="submit" class="deny" value="No, do not delete" /></form>
</div>
<table>
<tr><th scope="row">Tag: </th><td>[% searchfield %] [% liblibrarian %]</td></tr>
</table>
<input type="hidden" name="op" value="delete_confirmed" />
<input type="hidden" name="authtypecode" value="[% authtypecode %]" />
<input type="hidden" name="searchfield" value="[% searchfield %]" />
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
</form>
<form action="[% script_name %]" method="get">
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
</form>
</div>
[% END %]
[% IF ( delete_confirmed ) %]

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
View file

@ -127,10 +127,10 @@
<form action="/cgi-bin/koha/admin/authtypes.pl" method="post">
<input type="hidden" name="op" value="delete_confirmed" />
<input type="hidden" name="authtypecode" value="[% authority_type.authtypecode %]" />
<fieldset class="action"><input type="submit" class="approve" value="Yes, delete" /></fieldset>
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
</form>
<form action="/cgi-bin/koha/admin/authtypes.pl" method="get">
<input type="submit" class="deny" value="No, do not delete" />
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
</form>
[% END %]
</div>

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
View file

@ -182,10 +182,10 @@
<form class="inline" action="/cgi-bin/koha/admin/biblio_framework.pl" method="post">
<input type="hidden" name="op" value="delete_confirmed" />
<input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
<input type="submit" class="approve" value="Yes, delete this framework!" />
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this framework</button>
</form>
<form class="inline" action="/cgi-bin/koha/admin/biblio_framework.pl" method="get">
<input type="submit" class="deny" value="No, do not delete!" />
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
</form>
</div>
[% END %]

6
koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
View file

@ -106,7 +106,7 @@
[% IF op == 'delete_confirm' %]
<div class="dialog alert">
<h3>Delete City "[% city.city_name %]?"</h3>
<h3>Delete city "[% city.city_name %]?"</h3>
<table>
<tr><th>City id</th>
<td>[% city.cityid %]</td>
@ -127,10 +127,10 @@
<form action="/cgi-bin/koha/admin/cities.pl" method="post">
<input type="hidden" name="op" value="delete_confirmed" />
<input type="hidden" name="cityid" value="[% city.cityid %]" />
<input type="submit" class="approve" value="Yes, delete" />
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
</form>
<form action="/cgi-bin/koha/admin/cities.pl" method="get">
<input type="submit" class="deny" value="No, do not Delete" />
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
</form>
</div>
[% END %]

42
koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
View file

@ -188,29 +188,31 @@ function CheckRuleForm(f) {
[% END %]
[% IF ( delete_class_source_form ) %]
<div class="dialog alert"><h3>Confirm deletion of classification source <span class="ex">'[% class_source %]'</span>?</h3>
<form action="[% script_name %]" name="Aform" method="post">
<input type="hidden" name="op" value="[% confirm_op %]" />
<input type="hidden" name="class_source" value="[% class_source %]" />
<input type="submit" value="Delete classification source" class="approve" />
</form>
<form action="[% script_name %]" method="get">
<input type="submit" value="No, do not delete" class="deny" />
</form>
</div>
<div class="dialog alert">
<h3>Confirm deletion of classification source <span class="ex">'[% class_source %]'</span>?</h3>
<form action="[% script_name %]" name="Aform" method="post">
<input type="hidden" name="op" value="[% confirm_op %]" />
<input type="hidden" name="class_source" value="[% class_source %]" />
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete classification source</button>
</form>
<form action="[% script_name %]" method="get">
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
</form>
</div>
[% END %]
[% IF ( delete_sort_rule_form ) %]
<div class="dialog alert"><h3>Confirm deletion of filing rule <span class="ex">'[% sort_rule %]'</span>?</h3>
<form action="[% script_name %]" name="Aform" method="post">
<input type="hidden" name="op" value="[% confirm_op %]" />
<input type="hidden" name="sort_rule" value="[% sort_rule %]" />
<input type="submit" value="Delete filing rule" class="approve" />
</form>
<form action="[% script_name %]" method="get">
<input type="submit" value="No, do not delete" class="deny" />
</form>
</div>
<div class="dialog alert">
<h3>Confirm deletion of filing rule <span class="ex">'[% sort_rule %]'</span>?</h3>
<form action="[% script_name %]" name="Aform" method="post">
<input type="hidden" name="op" value="[% confirm_op %]" />
<input type="hidden" name="sort_rule" value="[% sort_rule %]" />
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete filing rule</button>
</form>
<form action="[% script_name %]" method="get">
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
</form>
</div>
[% END %]
[% IF ( delete_sort_rule_impossible ) %]

8
koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
View file

@ -302,7 +302,7 @@ Item types administration
[% END %]
[% IF op == 'delete_confirm' %]
<div class="dialog message">
<div class="dialog alert">
<h3>Delete item type '[% itemtype.itemtype %]'?</h3>
<table>
<tr>
@ -322,9 +322,11 @@ Item types administration
</table>
<form action="/cgi-bin/koha/admin/itemtypes.pl" method="post">
<input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="itemtype" value="[% itemtype.itemtype %]" />
<input type="submit" class="approve" value="Delete this Item Type" />
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this item type</button>
</form>
<form action="/cgi-bin/koha/admin/itemtypes.pl" method="post">
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
</form>
<form action="/cgi-bin/koha/admin/itemtypes.pl" method="post"><input type="submit" class="deny" value="Do Not Delete" /></form>
</div>
[% END %]

24
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
View file

@ -114,16 +114,20 @@ $(document).ready(function() {
[% IF ( delete_confirm ) %]
<div class="dialog alert"><h3>Confirm deletion of tag <span class="ex">'[% searchfield %]'</span>?</h3>
<p>Tag: [% searchfield %]</p>
<p>Description: [% liblibrarian %]</p>
<form action="[% script_name %]" method="post">
<input type="hidden" name="op" value="delete_confirmed" />
<input type="hidden" name="searchfield" value="[% searchfield %]" /><input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
<input type="submit" class="approve" value="Yes, delete this tag" /></form>
<form action="[% script_name %]" method="get"><input type="hidden" name="frameworkcode" value="[% frameworkcode %]" /><input type="submit" value="No, do not delete" class="deny" /></form></div>
<div class="dialog alert">
<h3>Confirm deletion of tag <span class="ex">'[% searchfield %]'</span>?</h3>
<p>Tag: [% searchfield %]</p>
<p>Description: [% liblibrarian %]</p>
<form action="[% script_name %]" method="post">
<input type="hidden" name="op" value="delete_confirmed" />
<input type="hidden" name="searchfield" value="[% searchfield %]" />
<input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this tag</button>
</form>
<form action="[% script_name %]" method="get"><input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
</form>
</div>
[% END %]
[% IF ( delete_confirmed ) %]

19
koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
View file

@ -532,14 +532,17 @@ function CheckRuleForm(f) {
[% END %]
[% IF ( delete_matching_rule_form ) %]
<div class="dialog alert"><h3>Confirm deletion of record matching rule <span class="ex">'[% code %]' ([% description %])</span>?</h3>
<form action="[% script_name %]" name="Aform" method="post">
<input type="hidden" name="op" value="[% confirm_op %]" />
<input type="hidden" name="matcher_id" value="[% matcher_id %]" />
<input type="submit" value="Delete record matching rule" class="approve" /></form>
<form action="[% script_name %]" method="get">
<input type="submit" value="No, do not delete" class="deny" />
</form></div>
<div class="dialog alert">
<h3>Confirm deletion of record matching rule <span class="ex">'[% code %]' ([% description %])</span>?</h3>
<form action="[% script_name %]" name="Aform" method="post">
<input type="hidden" name="op" value="[% confirm_op %]" />
<input type="hidden" name="matcher_id" value="[% matcher_id %]" />
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete record matching rule</button>
</form>
<form action="[% script_name %]" method="get">
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
</form>
</div>
[% END %]
[% IF ( display_list ) %]

19
koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
View file

@ -249,14 +249,17 @@ function CheckAttributeTypeForm(f) {
[% END %]
[% IF ( delete_attribute_type_form ) %]
<div class="dialog alert"><h3>Confirm deletion of patron attribute type <span class="ex">'[% code |html %]' ([% description %])</span>?</h3>
<form action="[% script_name %]" name="Aform" method="post">
<input type="hidden" name="op" value="[% confirm_op %]" />
<input type="hidden" name="code" value="[% code |html %]" />
<input type="submit" value="Delete patron attribute type" class="approve" /></form>
<form action="[% script_name %]" method="get">
<input type="submit" value="No, do not delete" class="deny" />
</form></div>
<div class="dialog alert">
<h3>Confirm deletion of patron attribute type <span class="ex">'[% code |html %]' ([% description %])</span>?</h3>
<form action="[% script_name %]" name="Aform" method="post">
<input type="hidden" name="op" value="[% confirm_op %]" />
<input type="hidden" name="code" value="[% code |html %]" />
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete patron attribute type</button>
</form>
<form action="[% script_name %]" method="get">
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
</form>
</div>
[% END %]
[% IF ( display_list ) %]