diff options
Diffstat (limited to 'install')
| -rwxr-xr-x | install/ui/src/freeipa/certificate.js | 2 | ||||
| -rw-r--r-- | install/ui/src/freeipa/dns.js | 2 | ||||
| -rw-r--r-- | install/ui/src/freeipa/navigation/menu_spec.js | 195 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 2 |
4 files changed, 118 insertions, 83 deletions
diff --git a/install/ui/src/freeipa/certificate.js b/install/ui/src/freeipa/certificate.js index 01dfee2b6..6a11d9593 100755 --- a/install/ui/src/freeipa/certificate.js +++ b/install/ui/src/freeipa/certificate.js @@ -1293,7 +1293,7 @@ IPA.cert.cert_update_policy = function(spec) { exp.remove_menu_item = function() { if (!IPA.cert.is_enabled()) { - menu.remove_item('identity/cert'); + menu.remove_item('authentication/cert'); } }; diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js index 11285a9f0..780661740 100644 --- a/install/ui/src/freeipa/dns.js +++ b/install/ui/src/freeipa/dns.js @@ -2530,7 +2530,7 @@ IPA.network_validator = function(spec) { exp.remove_menu_item = function() { if (!IPA.dns_enabled) { - menu.remove_item('identity/dns'); + menu.remove_item('network_services/dns'); } }; diff --git a/install/ui/src/freeipa/navigation/menu_spec.js b/install/ui/src/freeipa/navigation/menu_spec.js index 01738cbe6..9182d11bf 100644 --- a/install/ui/src/freeipa/navigation/menu_spec.js +++ b/install/ui/src/freeipa/navigation/menu_spec.js @@ -43,101 +43,134 @@ var nav = {}; { entity: 'netgroup' }, { entity: 'service' }, { + name: 'automember', + label: '@i18n:tabs.automember', + children: [ + { + name: 'amgroup', + entity: 'automember', + facet: 'searchgroup', + label: '@i18n:objects.automember.usergrouprules', + children: [ + { + entity: 'automember', + facet: 'usergrouprule', + hidden: true + } + ] + }, + { + name: 'amhostgroup', + entity: 'automember', + facet: 'searchhostgroup', + label: '@i18n:objects.automember.hostgrouprules', + children: [ + { + entity: 'automember', + facet: 'hostgrouprule', + hidden: true + } + ] + } + ] + } + ] + }, + { + name: 'policy', + label: '@i18n:tabs.policy', + children: [ + { + name: 'hbac', + label: '@i18n:tabs.hbac', + children: [ + { entity: 'hbacrule' }, + { entity: 'hbacsvc' }, + { entity: 'hbacsvcgroup' }, + { entity: 'hbactest' } + ] + }, + { + name: 'sudo', + label: '@i18n:tabs.sudo', + children: [ + { entity: 'sudorule' }, + { entity: 'sudocmd' }, + { entity: 'sudocmdgroup' } + ] + }, + { entity: 'selinuxusermap' }, + { entity: 'pwpolicy' }, + { entity: 'krbtpolicy' } + ] + }, + { + name: 'authentication', + label: '@i18n:tabs.authentication', + children: [ + { entity: 'cert', label: '@i18n:tabs.cert' }, + { entity: 'otptoken' }, + { entity: 'radiusproxy' } + ] + }, + { + name: 'network_services', + label: '@i18n:tabs.network_services', + children: [ + { + name:'automount', + label: '@i18n:tabs.automount', + entity: 'automountlocation', + children: [ + { entity: 'automountlocation', hidden: true }, + { entity: 'automountmap', hidden: true }, + { entity: 'automountkey', hidden: true } + ] + }, + { name:'dns', label: '@i18n:tabs.dns', children: [ { entity: 'dnszone', children: [ - { entity: 'dnsrecord', hidden:true } + { entity: 'dnsrecord', hidden: true } ] }, { entity: 'dnsforwardzone' }, { entity: 'dnsconfig' } ] + } + ] + }, + { + name: 'ipaserver', + label: '@i18n:tabs.ipaserver', + children: [ + { + name: 'rbac', + label: '@i18n:tabs.role', + children: [ + { entity: 'role' }, + { entity: 'privilege' }, + { entity: 'permission' }, + { entity: 'selfservice' }, + { entity: 'delegation' } + ] }, - { entity: 'cert', label: '@i18n:tabs.cert' }, + { entity: 'idrange' }, { entity: 'realmdomains' }, - { entity: 'otptoken' } + { + name: 'trusts', + label: '@i18n:tabs.trust', + children: [ + { entity: 'trust' }, + { entity: 'trustconfig' } + ] + }, + { entity: 'config' } ] - }, - {name: 'policy', label: '@i18n:tabs.policy', children: [ - {name: 'hbac', label: '@i18n:tabs.hbac', children: [ - {entity: 'hbacrule'}, - {entity: 'hbacsvc'}, - {entity: 'hbacsvcgroup'}, - {entity: 'hbactest'} - ]}, - {name: 'sudo', label: '@i18n:tabs.sudo', children: [ - {entity: 'sudorule'}, - {entity: 'sudocmd'}, - {entity: 'sudocmdgroup'} - ]}, - { - name:'automount', - label: '@i18n:tabs.automount', - entity: 'automountlocation', - children:[ - {entity: 'automountlocation', hidden:true}, - {entity: 'automountmap', hidden: true}, - {entity: 'automountkey', hidden: true}] - }, - {entity: 'pwpolicy'}, - {entity: 'krbtpolicy'}, - {entity: 'selinuxusermap'}, - { - name: 'automember', - label: '@i18n:tabs.automember', - children: [ - { - name: 'amgroup', - entity: 'automember', - facet: 'searchgroup', - label: '@i18n:objects.automember.usergrouprules', - children: [ - { - entity: 'automember', - facet: 'usergrouprule', - hidden: true - } - ] - }, - { - name: 'amhostgroup', - entity: 'automember', - facet: 'searchhostgroup', - label: '@i18n:objects.automember.hostgrouprules', - children: [ - { - entity: 'automember', - facet: 'hostgrouprule', - hidden: true - } - ] - } - ] - } - ]}, - {name: 'ipaserver', label: '@i18n:tabs.ipaserver', children: [ - {name: 'rolebased', label: '@i18n:tabs.role', children: [ - {entity: 'role'}, - {entity: 'privilege'}, - {entity: 'permission'} - ]}, - {entity: 'selfservice'}, - {entity: 'delegation'}, - {entity: 'idrange'}, - { - name: 'trusts', - label: '@i18n:tabs.trust', - children:[ - {entity: 'trust'}, - {entity: 'trustconfig'} - ] - }, - {entity: 'radiusproxy'}, - {entity: 'config'} - ]} + } ] }; diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 6c387690a..284c0a643 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -553,6 +553,7 @@ }, "tabs": { "audit": "Audit", + "authentication": "Authentication", "automember": "Automember", "automount": "Automount", "cert": "Certificates", @@ -560,6 +561,7 @@ "hbac": "Host Based Access Control", "identity": "Identity", "ipaserver": "IPA Server", + "network_services": "Network Services", "policy": "Policy", "role": "Role Based Access Control", "sudo": "Sudo", |