diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2013-11-05 19:12:51 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-01-21 12:04:03 +0100 |
| commit | 4bc1942f53bad0168f0a41d5783f038cf704873d (patch) | |
| tree | cf917b061509d51aa388a9be1441d14e735fdc3c | |
| parent | 40ad71726e9c8308b24611afaac90a3d9a33992a (diff) | |
| download | freeipa-4bc1942f53bad0168f0a41d5783f038cf704873d.tar.gz freeipa-4bc1942f53bad0168f0a41d5783f038cf704873d.tar.xz freeipa-4bc1942f53bad0168f0a41d5783f038cf704873d.zip | |
Font Awesome icons in header
https://fedorahosted.org/freeipa/ticket/3904
| -rw-r--r-- | install/ui/less/font-awesome/variables.less | 2 | ||||
| -rw-r--r-- | install/ui/src/freeipa/widget.js | 2 | ||||
| -rw-r--r-- | install/ui/src/freeipa/widgets/App.js | 13 | ||||
| -rw-r--r-- | install/ui/src/freeipa/widgets/DropdownWidget.js | 13 |
4 files changed, 21 insertions, 9 deletions
diff --git a/install/ui/less/font-awesome/variables.less b/install/ui/less/font-awesome/variables.less index f40a555f0..1a65fe2d9 100644 --- a/install/ui/less/font-awesome/variables.less +++ b/install/ui/less/font-awesome/variables.less @@ -1,7 +1,7 @@ // Variables // -------------------------- -@fa-font-path: "../fonts"; +@fa-font-path: "../font"; //@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.0.3/fonts"; // for referencing Bootstrap CDN font files directly @fa-css-prefix: fa; @fa-version: "4.0.3"; diff --git a/install/ui/src/freeipa/widget.js b/install/ui/src/freeipa/widget.js index 6fc8be24a..641b34862 100644 --- a/install/ui/src/freeipa/widget.js +++ b/install/ui/src/freeipa/widget.js @@ -3681,7 +3681,7 @@ IPA.button = function(spec) { if (spec.icon) { $('<span/>', { - 'class': 'icon '+spec.icon + 'class': 'fa '+spec.icon }).appendTo(button); } diff --git a/install/ui/src/freeipa/widgets/App.js b/install/ui/src/freeipa/widgets/App.js index 2678ff9d1..123e7081c 100644 --- a/install/ui/src/freeipa/widgets/App.js +++ b/install/ui/src/freeipa/widgets/App.js @@ -80,7 +80,7 @@ define(['dojo/_base/declare', _fullnameSetter: function(value) { this.fullname = value; if (this.logged_user_node) { - prop.set(this.logged_user_node, 'textContent', value); + prop.set(this.logged_user_node, 'textContent', ' '+ value); } }, @@ -170,7 +170,7 @@ define(['dojo/_base/declare', var nodes = []; nodes.push(construct.create('span', { - 'class': 'icon-user icon-white' + 'class': 'fa fa-user' })); this.logged_user_node = construct.create('span', { @@ -205,18 +205,21 @@ define(['dojo/_base/declare', items: [ { name: 'profile', - label: 'Profile' + label: 'Profile', + icon: 'fa-user' }, { name: 'password_reset', - label: 'Change password' + label: 'Change password', + icon: 'fa-key' }, { 'class': 'divider' }, { name: 'logout', - label: 'Logout' + label: 'Logout', + icon: 'fa-sign-out' } ] }); diff --git a/install/ui/src/freeipa/widgets/DropdownWidget.js b/install/ui/src/freeipa/widgets/DropdownWidget.js index 992bcf378..9f740e614 100644 --- a/install/ui/src/freeipa/widgets/DropdownWidget.js +++ b/install/ui/src/freeipa/widgets/DropdownWidget.js @@ -173,11 +173,20 @@ define(['dojo/_base/declare', var li = construct.create('li', { 'data-name': item.name || '' }); + var a = construct.create('a', { - 'href': '#' + item.name || '', - innerHTML: item.label || '' + 'href': '#' + item.name || '' }, li); + if (item.icon) { + construct.create('i', { + 'class': 'fa ' + item.icon + }, a); + } + + var text = document.createTextNode(' '+item.label || ''); + construct.place(text, a); + if (item['class']) { dom_class.add(li, item['class']); } |