From d1a0474d1851cd54a1fa7bdf4a0dc0ed452a0090 Mon Sep 17 00:00:00 2001
From: Gabe <redhatrises@gmail.com>
Date: Tue, 5 May 2015 06:33:27 -0600
Subject: Unsaved changes dialog internally inconsistent

https://fedorahosted.org/freeipa/ticket/4926

Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
---
 install/ui/src/freeipa/details.js | 30 +++++++++++++++---------------
 install/ui/src/freeipa/dns.js     |  2 +-
 install/ui/src/freeipa/ipa.js     |  8 ++++----
 3 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'install/ui/src/freeipa')

diff --git a/install/ui/src/freeipa/details.js b/install/ui/src/freeipa/details.js
index 7aa4c0ef6..e428dc908 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 7b66c8674..8dce6a96d 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 a78d1f063..836ad689b 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();
-- 
cgit