[PATCH] [Ginger 1/1] Use fontawesome icon instead of external image

7 views
Skip to first unread message

Aline Manera

unread,
Sep 9, 2017, 9:13:11 PM9/9/17
to Ginger Devel
From: Aline Manera <aline....@gmail.com>

edit-alt class is linked to an external image on Wok. There is no need to use
it as fontawesome has the same icon available.

Signed-off-by: Aline Manera <aline....@gmail.com>
---
ui/js/ginger-bootgrid.js | 2 +-
ui/js/host-storage-iscsi.js | 2 +-
ui/js/util.js | 2 +-
ui/pages/host-admin.html.tmpl | 2 +-
ui/pages/host-audit.html.tmpl | 2 +-
ui/pages/host-network.html.tmpl | 4 ++--
ui/pages/host-storage.html.tmpl | 2 +-
ui/pages/host-system-services.html.tmpl | 4 ++--
8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ui/js/ginger-bootgrid.js b/ui/js/ginger-bootgrid.js
index 6cd7073..266c18f 100644
--- a/ui/js/ginger-bootgrid.js
+++ b/ui/js/ginger-bootgrid.js
@@ -226,7 +226,7 @@ ginger.createActionList = function(settings) {
toolbarNode = $('<div class="btn-group"></div>');
toolbarNode.appendTo($("#" + container));
dropHTML = ['<div class="dropdown menu-flat">',
- '<button id="action-dropdown-button-', container, '" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">', (buttonType === 'action') ? '<span class="edit-alt"></span>'+ i18n['GINBG00003M'] : '<i class="fa fa-plus-circle"></i>'+ i18n['GINBG00004M'], '<span class="caret"></span>',
+ '<button id="action-dropdown-button-', container, '" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">', (buttonType === 'action') ? '<i class="fa fa-pencil-square-o" aria-hidden="true"></i>'+ i18n['GINBG00003M'] : '<i class="fa fa-plus-circle"></i>'+ i18n['GINBG00004M'], '<span class="caret"></span>',
'</button>',
'<ul class="dropdown-menu"></ul>',
'</div>'
diff --git a/ui/js/host-storage-iscsi.js b/ui/js/host-storage-iscsi.js
index e764472..74a3d90 100644
--- a/ui/js/host-storage-iscsi.js
+++ b/ui/js/host-storage-iscsi.js
@@ -53,7 +53,7 @@ ginger.initiSCSIGridData = function() {
var settingsButton = '<button id="iSCSI-settings" class="btn btn-primary" style="margin-left:-5px;"><i class="fa fa-cogs"></i> ' + i18n['GINIS00003M'] + '</button>';
var actionButton = ['<div class="btn-group" style="margin-left:-5px;">',
'<div class="dropdown menu-flat iSCSI-action">',
- '<button id="iSCSI-action-btn" class="btn btn-primary dropdown-toggle disabled" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"><span class="edit-alt"></span>' + i18n['GINIS00004M'] + '<span class="caret"></span></button>',
+ '<button id="iSCSI-action-btn" class="btn btn-primary dropdown-toggle disabled" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>' + i18n['GINIS00004M'] + '<span class="caret"></span></button>',
'<ul class="dropdown-menu actionsheet">',
'<li role="presentation"><a id="iSCSI-login-btn" class="iSCSI-login disablelink"><i class="fa fa-sign-in"></i>' + i18n['GINIS00005M'] + '</a></li>',
'<li role="presentation"><a id="iSCSI-logout-btn" class="iSCSI-logout disablelink"><i class="fa fa-sign-out"></i>' + i18n['GINIS00006M'] + '</a></li>',
diff --git a/ui/js/util.js b/ui/js/util.js
index a4e4bd5..7e18a0e 100644
--- a/ui/js/util.js
+++ b/ui/js/util.js
@@ -1290,7 +1290,7 @@ ginger.createActionButtons = function(settings) {
toolbarNode = $('<div class="btn-group"></div>');
toolbarNode.appendTo($("#" + container));
dropHTML = ['<div class="dropdown menu-flat">',
- '<button id="action-dropdown-button-', container, '" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">', (buttonType === 'action') ? '<span class="edit-alt"></span>'+ i18n['GINBG00003M'] : '<i class="fa fa-plus-circle"></i>'+ i18n['GINBG00004M'], '<span class="caret"></span>',
+ '<button id="action-dropdown-button-', container, '" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">', (buttonType === 'action') ? '<i class="fa fa-pencil-square-o" aria-hidden="true"></i>'+ i18n['GINBG00003M'] : '<i class="fa fa-plus-circle"></i>'+ i18n['GINBG00004M'], '<span class="caret"></span>',
'</button>',
'<ul class="dropdown-menu"></ul>',
'</div>'
diff --git a/ui/pages/host-admin.html.tmpl b/ui/pages/host-admin.html.tmpl
index 9d0bc65..98de4e2 100644
--- a/ui/pages/host-admin.html.tmpl
+++ b/ui/pages/host-admin.html.tmpl
@@ -449,7 +449,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
--><span class="column-detach">
<div class="user-actions btn-group pull-right" id="users-pcc-action-area" style="padding-right:40px;"">
<div class="dropdown menu-flat ">
- <button class="btn btn-primary dropdown-toggle users-pcc-button" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"><span class="edit-alt"></span>$_("Actions")<span class="caret"></span></button>
+ <button class="btn btn-primary dropdown-toggle users-pcc-button" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>$_("Actions")<span class="caret"></span></button>
<ul class="dropdown-menu actionsheet">
<li role="presentation">
<a href="#" id="user-passwdchange" data-toggle="modal"><i class="fa fa-file"></i> $_("Change Password")</a>
diff --git a/ui/pages/host-audit.html.tmpl b/ui/pages/host-audit.html.tmpl
index 1292b92..8cba86a 100644
--- a/ui/pages/host-audit.html.tmpl
+++ b/ui/pages/host-audit.html.tmpl
@@ -50,7 +50,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<div class="btn-group">
<div class="btn-group">
<div class="dropdown auditmenu-action">
- <button type="button" class="btn btn-primary dropdown-toggle edit-alt" data-toggle="dropdown">
+ <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-pencil-square-o">$_("Actions")</i> <span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
<li>
diff --git a/ui/pages/host-network.html.tmpl b/ui/pages/host-network.html.tmpl
index 7c7ceb1..c938da7 100644
--- a/ui/pages/host-network.html.tmpl
+++ b/ui/pages/host-network.html.tmpl
@@ -195,7 +195,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<script id="networkConfigButtonsTmpl" type="html/text">
<div class="btn-group">
<div class="dropdown menu-flat nw-configuration-action pull-left">
- <button class="btn btn-primary dropdown-toggle" disabled="disabled" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"><span class="edit-alt"></span>$_("Actions")<span class="caret"></span></button>
+ <button class="btn btn-primary dropdown-toggle" disabled="disabled" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>$_("Actions")<span class="caret"></span></button>
<ul class="dropdown-menu actionsheet dropdown-menu-right">
<li class="disabled"><a href="#" class="nw-up"><i class="fa fa-chevron-circle-up"></i>$_("Up")</a></li>
<li class="disabled"><a href="#" class="nw-down"><i class="fa fa-chevron-circle-down"></i>$_("Down")</a></li>
@@ -224,7 +224,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
--><span class="column-action">
<span class="pull-right">
<div class="dropdown menu-flat">
- <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"><span class="edit-alt"></span>$_("Actions")<span class="caret"></span></button>
+ <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>$_("Actions")<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="#" class="edit-bridge" data-name="{name}" href="#"><i class="fa fa-file"></i>$_("Edit Bridge")</a></li>
<li class="critical"><a href="#" class="remove-bridge" data-name="{name}"><i class="fa fa-minus-circle"></i>$_("Remove Bridge")</a></li>
diff --git a/ui/pages/host-storage.html.tmpl b/ui/pages/host-storage.html.tmpl
index 210a0f6..5093cca 100644
--- a/ui/pages/host-storage.html.tmpl
+++ b/ui/pages/host-storage.html.tmpl
@@ -330,7 +330,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<span class="column-action">
<span class="pull-left">
<div class="dropdown menu-flat storage-action">
- <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"><span class="edit-alt"></span>$_("Actions")<span class="caret"></span></button>
+ <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>$_("Actions")<span class="caret"></span></button>
<ul class="dropdown-menu actionsheet">
<li role="presentation">
<a class="pool-activate partition-delete"><i class="fa fa-minus-circle"></i>$_("Delete Partition")</a>
diff --git a/ui/pages/host-system-services.html.tmpl b/ui/pages/host-system-services.html.tmpl
index f2e37cb..1b9e2e9 100644
--- a/ui/pages/host-system-services.html.tmpl
+++ b/ui/pages/host-system-services.html.tmpl
@@ -72,8 +72,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<span class="pull-right">
<div class="dropdown menu-flat system-service-actions">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
- <span class="edit-alt"></span>$_("Actions")<span class="caret"></span>
- </button>
+ <i class="fa fa-pencil-square-o" aria-hidden="true"></i>$_("Actions")<span class="caret"></span>
+ </button>
<ul class="dropdown-menu" role="menu">
<li><a class='service-start' data-service="{name}" href="#"><i class="fa fa-power-off"></i>$_("Start")</a></li>
<li><a class='service-restart' data-service="{name}" href="#"><i class="fa fa-refresh"></i>$_("Restart")</a></li>
--
2.13.5

Reply all
Reply to author
Forward
0 new messages