diff options
author | Petr Vobornik <pvoborni@redhat.com> | 2013-10-16 19:55:42 +0200 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2014-01-21 12:04:02 +0100 |
commit | 77a56b7f875100de2c0803b5b23098bdb2715adb (patch) | |
tree | a1fd512585561123c263fd533935065d1c74ad95 /install/ui/src | |
parent | a0d3d5a2954ffe0cfdf1a6057608f2995afba9b7 (diff) | |
download | freeipa-77a56b7f875100de2c0803b5b23098bdb2715adb.tar.gz freeipa-77a56b7f875100de2c0803b5b23098bdb2715adb.tar.xz freeipa-77a56b7f875100de2c0803b5b23098bdb2715adb.zip |
Adapt password expiration notification to new navigation
https://fedorahosted.org/freeipa/ticket/3902
Diffstat (limited to 'install/ui/src')
-rw-r--r-- | install/ui/src/freeipa/Application_controller.js | 5 | ||||
-rw-r--r-- | install/ui/src/freeipa/ipa.js | 11 | ||||
-rw-r--r-- | install/ui/src/freeipa/widgets/App.js | 6 |
3 files changed, 12 insertions, 10 deletions
diff --git a/install/ui/src/freeipa/Application_controller.js b/install/ui/src/freeipa/Application_controller.js index 13c270fca..461f11b95 100644 --- a/install/ui/src/freeipa/Application_controller.js +++ b/install/ui/src/freeipa/Application_controller.js @@ -66,6 +66,7 @@ define([ on(this.app_widget.menu_widget, 'item-select', lang.hitch(this, this.on_menu_click)); on(this.app_widget, 'profile-click', lang.hitch(this, this.on_profile)); on(this.app_widget, 'logout-click', lang.hitch(this, this.on_logout)); + on(this.app_widget, 'password-reset-click', lang.hitch(this, this.on_password_reset)); on(this.menu, 'selected', lang.hitch(this, this.on_menu_select)); on(this.router, 'facet-show', lang.hitch(this, this.on_facet_show)); @@ -179,6 +180,10 @@ define([ this.run_time.resolve(); }, + on_password_reset: function() { + IPA.password_selfservice(); + }, + on_phase_error: function(error) { window.console.error(error); diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js index 51b4e1d24..fc04c56e6 100644 --- a/install/ui/src/freeipa/ipa.js +++ b/install/ui/src/freeipa/ipa.js @@ -589,16 +589,7 @@ IPA.update_password_expiration = function() { if (diff <= notify_days) { message = text.get('@i18n:password.expires_in'); message = message.replace('${days}', diff); - container.append(message + ' '); - $('<a/>', { - href: '#reset-password', - click: function() { - IPA.password_selfservice(); - return false; - }, - text: text.get('@i18n:password.reset_password_sentence'), - title: text.get('@i18n:password.reset_password') - }).appendTo(container); + container.append(message); } } }; diff --git a/install/ui/src/freeipa/widgets/App.js b/install/ui/src/freeipa/widgets/App.js index 42705649f..2678ff9d1 100644 --- a/install/ui/src/freeipa/widgets/App.js +++ b/install/ui/src/freeipa/widgets/App.js @@ -191,6 +191,8 @@ define(['dojo/_base/declare', this.emit('profile-click'); } else if (item.name === 'logout') { this.emit('logout-click'); + } else if (item.name == 'password_reset') { + this.emit('password-reset-click'); } }, @@ -206,6 +208,10 @@ define(['dojo/_base/declare', label: 'Profile' }, { + name: 'password_reset', + label: 'Change password' + }, + { 'class': 'divider' }, { |