diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2014-05-13 17:27:39 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2014-06-10 10:23:30 +0200 |
| commit | 2af21743df2e09cabcf4d2209cd35786ed3cfdd6 (patch) | |
| tree | 84511c2467b25252c4c4e744ee85ed9b059d9d55 /install/ui | |
| parent | 841e0cd3ae904cb8021c4387472b4e66487a5c6a (diff) | |
| download | freeipa-2af21743df2e09cabcf4d2209cd35786ed3cfdd6.tar.gz freeipa-2af21743df2e09cabcf4d2209cd35786ed3cfdd6.tar.xz freeipa-2af21743df2e09cabcf4d2209cd35786ed3cfdd6.zip | |
webui: move host action panel actions to action dropdown
Reviewed-By: Endi Sukma Dewata <edewata@redhat.com>
Diffstat (limited to 'install/ui')
| -rwxr-xr-x | install/ui/src/freeipa/certificate.js | 8 | ||||
| -rw-r--r-- | install/ui/src/freeipa/host.js | 16 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 4 |
3 files changed, 9 insertions, 19 deletions
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, diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 5fa8b3e6f..8a96e2330 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -209,6 +209,7 @@ "find_validnotafter_to": "Valid not after to", "find_validnotbefore_from": "Valid not before from", "find_validnotbefore_to": "Valid not before to", + "get_certificate": "Get Certificate", "issue_certificate": "Issue New Certificate for ${entity} ${primary_key}", "issued_by": "Issued By", "issued_on": "Issued On", @@ -242,7 +243,8 @@ "unspecified": "Unspecified", "valid": "Valid Certificate Present", "validity": "Validity", - "view_certificate": "Certificate for ${entity} ${primary_key}" + "view_certificate": "Certificate for ${entity} ${primary_key}", + "view_certificate_btn": "View Certificate" }, "config": { "group": "Group Options", |