Thanks Petr. I thought I had grepped all that out. Guess I didn't do it from the top of the tree.
Updated patch attached. On Tue, May 5, 2015 at 5:15 AM, Petr Vobornik <pvobo...@redhat.com> wrote: > On 04/30/2015 07:43 PM, Gabe Alford wrote: > >> Thanks Kyle and Petr. >> >> Update patch attached. >> > > Renaming the buttons also requires to update webui integration tests in > ipatests/test_webui, quick search: > ipatests/test_webui/test_realmdomains.py:42,48 > ipatests/test_webui/ui_driver.py:1221,1246,1464,1483 > > > > >> On Wed, Apr 29, 2015 at 7:59 AM, Kyle Baker <kyba...@redhat.com> wrote: >> >> >>> ----- Original Message ----- >>> >>>> On 04/27/2015 03:03 PM, Gabe Alford wrote: >>>> >>>>> Hello, >>>>> >>>>> Fix for https://fedorahosted.org/freeipa/ticket/4926 >>>>> >>>>> Thanks, >>>>> >>>>> Gabe >>>>> >>>>> >>>> PatternFly has new recommendations for terminology and wording [1]. I'm >>>> not entirely sure if the usage of 'save' here is good. PF defines 'edit' >>>> as the recommended term. The page doesn't say if 'save' is not >>>> recommended, though. Save seems to me as a confirmation of editing. >>>> >>> >>> Yes I think save would be best here based on the message given. >>> >>> Thanks for checking out the Terminology screen! >>> >>> >>>> Kyle, could you advise what is the best term for reflecting user changes >>>> and for confirmation of this action? >>>> >>>> Technical notes: >>>> 1. it would be better to add a new string and then use it in the button >>>> instead of having 'Save' text for '@i18n:buttons.update' definition. >>>> >>>> 2. String changes in internal.py should be also reflected in >>>> install/ui/test/data/ipa_init.json (for static web ui demo). >>>> >>>> 3. optional: in addition to text change, buttons and related actions >>>> could also be renamed (same reasons as in 1). It's more proper but much >>>> more complicated. >>>> >>>> >>>> [1] >>>> >>> https://www.patternfly.org/styles/terminology-and-wording/#action-labels >>> >>>> -- >>>> Petr Vobornik >>>> >>>> >>> >> > > -- > Petr Vobornik >
From 03863c17968a182b5e1857c0cb57ebb956576021 Mon Sep 17 00:00:00 2001 From: Gabe <redhatri...@gmail.com> Date: Tue, 5 May 2015 06:33:27 -0600 Subject: [PATCH] Unsaved changes dialog internally inconsistent https://fedorahosted.org/freeipa/ticket/4926 --- install/ui/src/freeipa/details.js | 30 +++++++++++++++--------------- install/ui/src/freeipa/dns.js | 2 +- install/ui/src/freeipa/ipa.js | 8 ++++---- install/ui/test/data/ipa_init.json | 2 ++ install/ui/util/make-ui.sh | 2 +- ipalib/plugins/internal.py | 2 ++ ipatests/test_webui/test_realmdomains.py | 4 ++-- ipatests/test_webui/ui_driver.py | 8 ++++---- 8 files changed, 31 insertions(+), 27 deletions(-) diff --git a/install/ui/src/freeipa/details.js b/install/ui/src/freeipa/details.js index 7aa4c0ef6541900d6fa5b14b16ec964b50349015..e428dc90875a1ad567a13f379aa5ca079e47b672 100644 --- a/install/ui/src/freeipa/details.js +++ b/install/ui/src/freeipa/details.js @@ -453,8 +453,8 @@ exp.facet_policies = IPA.facet_policies = function(spec) { * - sets name, title, label if not present * - adds default actions and related buttons * - refresh - * - reset - * - update + * - revert + * - save * - adds dirty state evaluator * * @member details @@ -472,21 +472,21 @@ exp.details_facet_pre_op = function(spec, context) { spec.actions = spec.actions || []; spec.actions.unshift( 'refresh', - 'reset', - 'update'); + 'revert', + 'save'); spec.control_buttons = spec.control_buttons || []; if (!spec.no_update) { spec.control_buttons.unshift( { - name: 'reset', - label: '@i18n:buttons.reset', + name: 'revert', + label: '@i18n:buttons.revert', icon: 'fa-undo' }, { - name: 'update', - label: '@i18n:buttons.update', + name: 'save', + label: '@i18n:buttons.save', icon: 'fa-upload' }); } @@ -1404,8 +1404,8 @@ exp.refresh_action = IPA.refresh_action = function(spec) { exp.reset_action = IPA.reset_action = function(spec) { spec = spec || {}; - spec.name = spec.name || 'reset'; - spec.label = spec.label || '@i18n:buttons.reset'; + spec.name = spec.name || 'revert'; + spec.label = spec.label || '@i18n:buttons.revert'; spec.enable_cond = spec.enable_cond || ['dirty']; var that = IPA.action(spec); @@ -1426,8 +1426,8 @@ exp.reset_action = IPA.reset_action = function(spec) { exp.update_action = IPA.update_action = function(spec) { spec = spec || {}; - spec.name = spec.name || 'update'; - spec.label = spec.label || '@i18n:buttons.update'; + spec.name = spec.name || 'save'; + spec.label = spec.label || '@i18n:buttons.save'; spec.needs_confirm = spec.needs_confirm !== undefined ? spec.needs_confirm : false; spec.enable_cond = spec.enable_cond || ['dirty']; @@ -2007,8 +2007,8 @@ exp.register = function() { var f = reg.facet; a.register('refresh', exp.refresh_action); - a.register('reset', exp.reset_action); - a.register('update', exp.update_action); + a.register('revert', exp.reset_action); + a.register('save', exp.update_action); a.register('object', exp.object_action); a.register('enable', exp.enable_action); a.register('disable', exp.disable_action); @@ -2026,4 +2026,4 @@ exp.register = function() { phases.on('registration', exp.register); return exp; -}); \ No newline at end of file +}); diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js index 7b66c8674a761a67025d1c4cfe3f7126b2cf9f68..8dce6a96d875652b225a07a3861bb37e5ed310f3 100644 --- a/install/ui/src/freeipa/dns.js +++ b/install/ui/src/freeipa/dns.js @@ -1961,7 +1961,7 @@ IPA.dns.record_type_table_widget = function(spec) { dialog.create_button({ name: 'modify', - label: '@i18n:buttons.update', + label: '@i18n:buttons.save', click: function() { dialog.modify(); } diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js index a78d1f0638ec5d750b5aee52197c5b04feae3f94..836ad689bd82253632c28f54b9a9386996c80b12 100644 --- a/install/ui/src/freeipa/ipa.js +++ b/install/ui/src/freeipa/ipa.js @@ -754,8 +754,8 @@ IPA.dirty_dialog = function(spec) { }; that.create_button({ - name: 'update', - label: '@i18n:buttons.update', + name: 'save', + label: '@i18n:buttons.save', click: function() { that.facet.update(function() { that.close(); @@ -765,8 +765,8 @@ IPA.dirty_dialog = function(spec) { }); that.create_button({ - name: 'reset', - label: '@i18n:buttons.reset', + name: 'revert', + label: '@i18n:buttons.revert', click: function() { that.facet.reset(); that.close(); diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index bbe334b7df774f1956a6dca98d5bb54049a7ee00..a386d9c79f6fad3317f96d5a70cc1088e435667c 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -80,7 +80,9 @@ "reset_password_and_login": "Reset Password and Login", "restore": "Restore", "retry": "Retry", + "revert": "Revert", "revoke": "Revoke", + "save": "Save", "set": "Set", "unapply": "Un-apply", "update": "Update", diff --git a/install/ui/util/make-ui.sh b/install/ui/util/make-ui.sh index d842e955bd0c17b13577fb0249f5f818557a36ce..088fa8c3ccabb72a9538addb989fa875c52a48c2 100755 --- a/install/ui/util/make-ui.sh +++ b/install/ui/util/make-ui.sh @@ -33,4 +33,4 @@ $DIR/build.sh webui # don't stop at error. Some dependency errors are expected. $DIR/compile.sh --release lib --layer freeipa/core --output $IPA_DIR/core.js $DIR/compile.sh --release lib --layer freeipa/app --output $IPA_DIR/app.js -$DIR/clean.sh \ No newline at end of file +$DIR/clean.sh diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index b85f2d077110128963e26ccf0f43e21141c46f4a..26ef4e617aca7e40631ea0950ae5bd906d44f10c 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -222,7 +222,9 @@ class i18n_messages(Command): "reset_password_and_login": _("Reset Password and Login"), "restore": _("Restore"), "retry": _("Retry"), + "revert": _("Revert"), "revoke": _("Revoke"), + "save": _("Save"), "set": _("Set"), "unapply": ("Un-apply"), "update": _("Update"), diff --git a/ipatests/test_webui/test_realmdomains.py b/ipatests/test_webui/test_realmdomains.py index 8e8f13a5c61ca660d8aa0bf872765ba643bdb8dc..87af690c7a2825770146e730ba5a30c013f2d1e9 100644 --- a/ipatests/test_webui/test_realmdomains.py +++ b/ipatests/test_webui/test_realmdomains.py @@ -39,13 +39,13 @@ class test_realmdomains(UI_driver): # add self.add_multivalued('associateddomain', 'itest.bar') - self.facet_button_click('update') + self.facet_button_click('save') self.dialog_button_click('force') self.wait_for_request() # delete self.del_multivalued('associateddomain', 'itest.bar') - self.facet_button_click('update') + self.facet_button_click('save') self.dialog_button_click('force') self.wait_for_request() self.wait_for_request() diff --git a/ipatests/test_webui/ui_driver.py b/ipatests/test_webui/ui_driver.py index bf78fcb5798f5f17f2d76650da0c0327bb4c6d71..33935a26c22dc9981dba9d17b8f433b29b20b18d 100644 --- a/ipatests/test_webui/ui_driver.py +++ b/ipatests/test_webui/ui_driver.py @@ -1226,7 +1226,7 @@ class UI_driver(object): new_count = len(self.get_rows()) self.assert_row_count(count, new_count) - def mod_record(self, entity, data, facet='details', facet_btn='update'): + def mod_record(self, entity, data, facet='details', facet_btn='save'): """ Mod record @@ -1251,7 +1251,7 @@ class UI_driver(object): add_facet_btn='add', add_dialog_btn='add', add_dialog_name='add', - update_btn='update', + update_btn='save', breadcrumb=None, navigate=True, delete=True): @@ -1469,7 +1469,7 @@ class UI_driver(object): # update self.assert_rule_tables_enabled(t_list, False) - self.facet_button_click('update') + self.facet_button_click('save') self.wait_for_request(n=3, d=0.3) self.assert_rule_tables_enabled(t_list, False) @@ -1488,7 +1488,7 @@ class UI_driver(object): for cat in categories: self.check_option(cat, '') self.assert_rule_tables_enabled(t_list, True) - self.facet_button_click('update') + self.facet_button_click('save') self.wait_for_request(n=3, d=0.3) self.assert_rule_tables_enabled(t_list, True) -- 1.8.3.1
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
