From 2af21743df2e09cabcf4d2209cd35786ed3cfdd6 Mon Sep 17 00:00:00 2001
From: Petr Vobornik <pvoborni@redhat.com>
Date: Tue, 13 May 2014 17:27:39 +0200
Subject: webui: move host action panel actions to action dropdown

Reviewed-By: Endi Sukma Dewata <edewata@redhat.com>
---
 install/ui/src/freeipa/certificate.js |  8 ++++----
 install/ui/src/freeipa/host.js        | 16 ++--------------
 2 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'install/ui/src')

diff --git a/install/ui/src/freeipa/certificate.js b/install/ui/src/freeipa/certificate.js
index 7b749d324..01dfee2b6 100755
--- a/install/ui/src/freeipa/certificate.js
+++ b/install/ui/src/freeipa/certificate.js
@@ -550,7 +550,7 @@ IPA.cert.view_action = function(spec) {
 
     spec = spec || {};
     spec.name = spec.name || 'view_cert';
-    spec.label = spec.label || '@i18n:buttons.view';
+    spec.label = spec.label || '@i18n:objects.cert.view_certificate_btn';
     spec.enable_cond = spec.enable_cond || ['has_certificate'];
 
     var that = IPA.action(spec);
@@ -583,7 +583,7 @@ IPA.cert.get_action = function(spec) {
 
     spec = spec || {};
     spec.name = spec.name || 'get_cert';
-    spec.label = spec.label || '@i18n:buttons.get';
+    spec.label = spec.label || '@i18n:objects.cert.get_certificate';
     spec.enable_cond = spec.enable_cond || ['has_certificate'];
 
     var that = IPA.action(spec);
@@ -672,7 +672,7 @@ IPA.cert.revoke_action = function(spec) {
 
     spec = spec || {};
     spec.name = spec.name || 'revoke_cert';
-    spec.label = spec.label || '@i18n:buttons.revoke';
+    spec.label = spec.label || '@i18n:objects.cert.revoke_certificate_simple';
     spec.enable_cond = spec.enable_cond || ['has_certificate'];
     spec.disable_cond = spec.disable_cond || ['certificate_revoked'];
     spec.hide_cond = spec.hide_cond || ['ra_disabled'];
@@ -727,7 +727,7 @@ IPA.cert.restore_action = function(spec) {
 
     spec = spec || {};
     spec.name = spec.name || 'restore_cert';
-    spec.label = spec.label || '@i18n:buttons.restore';
+    spec.label = spec.label || '@i18n:objects.cert.restore_certificate_simple';
     spec.enable_cond = spec.enable_cond || ['has_certificate', 'certificate_hold'];
     spec.hide_cond = spec.hide_cond || ['ra_disabled'];
     spec.confirm_msg = spec.confirm_msg || '@i18n:objects.cert.restore_confirmation';
diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js
index f25a4cc13..0740a3b49 100644
--- a/install/ui/src/freeipa/host.js
+++ b/install/ui/src/freeipa/host.js
@@ -117,11 +117,6 @@ return {
                 },
                 {
                     name: 'enrollment',
-                    action_panel: {
-                        $factory: IPA.action_panel,
-                        name: 'enrollment_actions',
-                        actions: ['unprovision', 'set_otp', 'reset_otp']
-                    },
                     fields: [
                         {
                             $factory: IPA.host_keytab_widget,
@@ -137,14 +132,6 @@ return {
                 },
                 {
                     name: 'certificate',
-                    action_panel: {
-                        $factory: IPA.action_panel,
-                        name: 'cert_actions',
-                        actions: [
-                            'request_cert', 'view_cert', 'get_cert',
-                            'revoke_cert', 'restore_cert'
-                        ]
-                    },
                     fields: [
                         {
                             $type: 'certificate_status',
@@ -194,7 +181,8 @@ return {
                 'cert_revoke',
                 'cert_restore'
             ],
-            header_actions: ['automember_rebuild'],
+            header_actions: ['automember_rebuild', 'unprovision', 'set_otp', 'reset_otp',
+                'request_cert', 'view_cert', 'get_cert', 'revoke_cert', 'restore_cert'],
             state: {
                 evaluators: [
                     IPA.host.has_password_evaluator,
-- 
cgit