diff options
| -rw-r--r-- | install/ui/add.js | 3 | ||||
| -rw-r--r-- | install/ui/association.js | 7 | ||||
| -rw-r--r-- | install/ui/automount.js | 11 | ||||
| -rw-r--r-- | install/ui/details.js | 7 | ||||
| -rw-r--r-- | install/ui/entity.js | 34 | ||||
| -rw-r--r-- | install/ui/ipa.css | 33 | ||||
| -rw-r--r-- | install/ui/search.js | 7 | ||||
| -rw-r--r-- | install/ui/test/data/i18n_messages.json | 293 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 45 | ||||
| -rw-r--r-- | install/ui/webui.js | 6 | ||||
| -rw-r--r-- | ipalib/plugins/delegation.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/dns.py | 4 | ||||
| -rw-r--r-- | ipalib/plugins/hbacrule.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/hbacsvcgroup.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/internal.py | 30 | ||||
| -rw-r--r-- | ipalib/plugins/pwpolicy.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/role.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/sudorule.py | 2 |
18 files changed, 65 insertions, 427 deletions
diff --git a/install/ui/add.js b/install/ui/add.js index 67e14eddc..eb4484346 100644 --- a/install/ui/add.js +++ b/install/ui/add.js @@ -29,9 +29,6 @@ IPA.add_dialog = function (spec) { var that = IPA.dialog(spec); - that.name = spec.name; - that.title = spec.title; - that._entity_name = spec.entity_name; that.method = spec.method || 'add'; function show_edit_page(entity_name,result){ diff --git a/install/ui/association.js b/install/ui/association.js index 54a8f6ae2..ad2268f5c 100644 --- a/install/ui/association.js +++ b/install/ui/association.js @@ -817,13 +817,6 @@ IPA.association_facet = function (spec) { that.pkey = $.bbq.getState(that.entity_name+'-pkey'); var other_label = IPA.metadata.objects[that.other_entity].label; - var title = that.title; - title = title.replace('${entity}', that.entity_name); - title = title.replace('${primary_key}', that.pkey); - title = title.replace('${other_entity}', other_label); - - that.set_title(container, title); - if (!that.read_only) { that.remove_button = IPA.action_button({ name: 'remove', diff --git a/install/ui/automount.js b/install/ui/automount.js index 6ef970544..d4f113d51 100644 --- a/install/ui/automount.js +++ b/install/ui/automount.js @@ -38,8 +38,7 @@ IPA.entity_factories.automountlocation = function() { nested_entity : 'automountmap', label : IPA.metadata.objects.automountmap.label, name: 'maps', - columns:['automountmapname'], - back_link_text: 'Back to Locations' + columns:['automountmapname'] }). details_facet({ sections:[ @@ -48,8 +47,7 @@ IPA.entity_factories.automountlocation = function() { label: IPA.messages.details.identity, fields:['cn'] } - ], - back_link_text: 'Back to Locations' + ] }). adder_dialog({ fields:['cn'] @@ -66,7 +64,6 @@ IPA.entity_factories.automountmap = function() { label : IPA.metadata.objects.automountkey.label, name: 'keys', get_values: IPA.get_option_values, - back_link_text: 'Back to Locations', columns:[ { factory: IPA.automount_key_column, @@ -83,8 +80,7 @@ IPA.entity_factories.automountmap = function() { label: IPA.messages.details.identity, fields:['automountmapname','description'] } - ], - back_link_text: 'Back to Locations' + ] }). adder_dialog({ factory: IPA.automountmap_adder_dialog, @@ -131,7 +127,6 @@ IPA.entity_factories.automountkey = function() { } ], disable_breadcrumb: false, - back_link_text: 'Back to Locations', pre_execute_hook : function (command){ var entity_name = this.entity_name; var info = IPA.nav.get_state(entity_name + '-info'); diff --git a/install/ui/details.js b/install/ui/details.js index 3b73e5b49..91e349a38 100644 --- a/install/ui/details.js +++ b/install/ui/details.js @@ -379,13 +379,6 @@ IPA.details_facet = function(spec) { that.facet_create_header(container); that.pkey = $.bbq.getState(that.entity_name+'-pkey'); - var label = IPA.metadata.objects[that.entity_name].label; - - var title = that.title; - title = title.replace('${entity}', label); - title = title.replace('${primary_key}', that.pkey); - - that.set_title(container, title); that.create_controls(); diff --git a/install/ui/entity.js b/install/ui/entity.js index b24a874e6..4a22c58ab 100644 --- a/install/ui/entity.js +++ b/install/ui/entity.js @@ -38,7 +38,6 @@ IPA.facet = function (spec) { that.disable_breadcrumb = spec.disable_breadcrumb; that.disable_facet_tabs = spec.disable_facet_tabs; - that.back_link_text = spec.back_link_text || IPA.messages.buttons.back_to_list; that.header = spec.header || IPA.facet_header({ facet: that }); @@ -242,7 +241,7 @@ IPA.facet_header = function(spec) { that.title_container.empty(); var h3 = $('<h3/>').appendTo(that.title_container); - h3.append(that.facet.entity.title); + h3.append(that.facet.title); h3.append(': '); $('<span/>', { @@ -308,10 +307,11 @@ IPA.facet_header = function(spec) { 'class': 'back-link' }).appendTo(that.breadcrumb); - that.back_link.append('« '); + var entity = that.facet.entity; + while (entity.containing_entity) entity = entity.containing_entity; $('<a/>', { - text: that.facet.back_link_text, + text: entity.metadata.label, click: function() { that.facet.redirect(); return false; @@ -724,7 +724,7 @@ IPA.entity_builder = function(){ } if (!facet_group.label) { - var relationships = IPA.metadata.objects[entity.name].relationships; + var relationships = entity.metadata.relationships; if (relationships) { var relationship = relationships[facet_group.name]; if (relationship) { @@ -763,7 +763,7 @@ IPA.entity_builder = function(){ that.search_facet = function(spec) { spec.entity_name = entity.name; - spec.title = spec.title || spec.label; + spec.title = spec.title || entity.metadata.label; spec.label = spec.label || IPA.messages.facets.search; var factory = spec.factory || IPA.search_facet; @@ -777,6 +777,7 @@ IPA.entity_builder = function(){ that.nested_search_facet = function(spec) { spec.entity_name = entity.name; + spec.title = spec.title || entity.metadata.label_singular; spec.label = spec.label || IPA.messages.facets.search; var factory = spec.factory || IPA.nested_search_facet; @@ -791,7 +792,7 @@ IPA.entity_builder = function(){ var sections = spec.sections; spec.sections = null; spec.entity_name = entity.name; - spec.title = spec.title || spec.label || IPA.messages.details.settings; + spec.title = spec.title || entity.metadata.label_singular; spec.label = spec.label || IPA.messages.facets.details; var factory = spec.factory || IPA.details_facet; @@ -838,20 +839,12 @@ IPA.entity_builder = function(){ } } + spec.title = spec.label || entity.metadata.label_singular; + spec.label = spec.label || (IPA.metadata.objects[spec.other_entity] ? IPA.metadata.objects[spec.other_entity].label : spec.other_entity); - if (!spec.title) { - if (spec.facet_group == 'member' || - spec.facet_group == 'memberindirect') { - spec.title = IPA.messages.association.member; - } else if (spec.facet_group == 'memberof' || - spec.facet_group == 'memberofindirect') { - spec.title = IPA.messages.association.memberof; - } - } - var factory = spec.factory || IPA.association_facet; facet = factory(spec); entity.add_facet(facet); @@ -964,10 +957,9 @@ IPA.entity_builder = function(){ spec.name = spec.name || 'add'; if (!spec.title) { - var messages = IPA.messages.objects[entity.name]; - if (messages) { - spec.title = messages.add; - } + var title = IPA.messages.dialogs.add_title; + var label = entity.metadata.label_singular; + spec.title = title.replace('${entity}', label); } return that.dialog(spec); diff --git a/install/ui/ipa.css b/install/ui/ipa.css index b2a9ffe0c..09585adea 100644 --- a/install/ui/ipa.css +++ b/install/ui/ipa.css @@ -925,28 +925,15 @@ span.attrhint { background-position: -176px -97px; } -.ui-dialog .ui-dialog-titlebar-close span { - background-color: transparent !important; -} - .ui-icon { /* background-image: url("ui-icons_222222_256x240.png"); */ background-color: #e2e2e2; display: inline-block; } -.ui-dialog .ui-dialog-content { - /* this should go away once we can fix table scrolling */ - overflow:auto; -} .ui-widget-content { } -.ui-dialog .ui-dialog-titlebar { - padding: 0.5em 1em; - position: relative; -} - a { text-decoration: none; color: #1d85d5; @@ -961,6 +948,26 @@ a { font-weight: bold; } +/* ---- Dialog ---- */ + +.ui-dialog .ui-dialog-title { + text-transform: capitalize; +} + +.ui-dialog .ui-dialog-titlebar-close span { + background-color: transparent !important; +} + +.ui-dialog .ui-dialog-content { + /* this should go away once we can fix table scrolling */ + overflow:auto; +} + +.ui-dialog .ui-dialog-titlebar { + padding: 0.5em 1em; + position: relative; +} + .ui-dialog .ui-dialog-buttonpane button { cursor: pointer; margin: 0.5em 0.4em 0.5em 0; diff --git a/install/ui/search.js b/install/ui/search.js index 382e26bc5..4f3802781 100644 --- a/install/ui/search.js +++ b/install/ui/search.js @@ -56,7 +56,7 @@ IPA.search_facet = function(spec) { that.table = IPA.table_widget({ 'class': 'content-table', name: 'search', - label: IPA.metadata.objects[entity.name].label, + label: entity.metadata.label, entity_name: entity.name, search_all: that.search_all, scrollable: true, @@ -188,17 +188,18 @@ IPA.search_facet = function(spec) { that.remove_instances = function(entity) { var values = that.get_values(); + var label = entity.metadata.label; var title; if (!values.length) { title = IPA.messages.dialogs.remove_empty; - title = title.replace('${entity}', that.label); + title = title.replace('${entity}', label); alert(title); return; } title = IPA.messages.dialogs.remove_title; - title = title.replace('${entity}', that.label); + title = title.replace('${entity}', label); var dialog = IPA.deleter_dialog({ 'title': title, diff --git a/install/ui/test/data/i18n_messages.json b/install/ui/test/data/i18n_messages.json deleted file mode 100644 index 004b3fde6..000000000 --- a/install/ui/test/data/i18n_messages.json +++ /dev/null @@ -1,293 +0,0 @@ -{ - "error": null, - "id": 0, - "result": { - "messages": { - "ajax": { - "401": "Your kerberos ticket is no longer valid. Please run kinit and then click 'Retry'. If this is your first time running the IPA Web UI <a href='/ipa/config/unauthorized.html'>follow these directions</a> to configure your browser." - }, - "association": { - "add": "Add ${other_entity} into ${entity} ${primary_key}", - "member": "${other_entity} enrolled in ${entity} ${primary_key}", - "memberof": "${entity} ${primary_key} is enrolled in the following ${other_entity}", - "remove": "Remove ${other_entity} from ${entity} ${primary_key}" - }, - "buttons": { - "add": "Add", - "add_and_add_another": "Add and Add Another", - "add_and_close": "Add and Close", - "add_and_edit": "Add and Edit", - "add_many": "Add Many", - "back_to_list": "Back to List", - "cancel": "Cancel", - "close": "Close", - "enroll": "Enroll", - "find": "Find", - "get": "Get", - "issue": "Issue", - "ok": "OK", - "remove": "Delete", - "reset": "Reset", - "restore": "Restore", - "retry": "Retry", - "revoke": "Revoke", - "update": "Update", - "view": "View" - }, - "details": { - "general": "General", - "identity": "Identity Settings", - "settings": "${entity} ${primary_key} Settings", - "to_top": "Back to Top" - }, - "dialogs": { - "available": "Available", - "dirty_message": "This page has unsaved changes. Please save or revert.", - "dirty_title": "Dirty", - "hide_already_enrolled": "Hide already enrolled.", - "prospective": "Prospective", - "remove_empty": "Select ${entity} to be removed.", - "remove_title": "Remove ${entity}." - }, - "facets": { - "details": "Settings", - "search": "Search" - }, - "login": { - "header": "Logged In As" - }, - "objects": { - "aci": { - "attribute": "Attribute" - }, - "automountlocation": { - "add": "Add Automount Location", - "identity": "Automount Location Settings" - }, - "cert": { - "aa_compromise": "AA Compromise", - "affiliation_changed": "Affiliation Changed", - "ca_compromise": "CA Compromise", - "certificate_hold": "Certificate Hold", - "cessation_of_operation": "Cessation of Operation", - "common_name": "Common Name", - "enter_csr": "Enter the Base64-encoded CSR below", - "expires_on": "Expires On", - "fingerprints": "Fingerprints", - "issue_certificate": "Issue New Certificate for ${entity} ${primary_key}", - "issued_by": "Issued By", - "issued_on": "Issued On", - "issued_to": "Issued To", - "key_compromise": "Key Compromise", - "md5_fingerprint": "MD5 Fingerprint", - "missing": "No Valid Certificate", - "new_certificate": "New Certificate", - "note": "Note", - "organization": "Organization", - "organizational_unit": "Organizational Unit", - "privilege_withdrawn": "Privilege Withdrawn", - "reason": "Reason for Revocation", - "remove_from_crl": "Remove from CRL", - "restore_certificate": "Restore Certificate for ${entity} ${primary_key}", - "restore_confirmation": "To confirm your intention to restore this certificate, click the \"Restore\" button.", - "revoke_certificate": "Revoke Certificate for ${entity} ${primary_key}", - "revoke_confirmation": "To confirm your intention to revoke this certificate, select a reason from the pull-down list, and click the \"Revoke\" button.", - "revoked": "Certificate Revoked", - "serial_number": "Serial Number", - "sha1_fingerprint": "SHA1 Fingerprint", - "superseded": "Superseded", - "unspecified": "Unspecified", - "valid": "Valid Certificate Present", - "validity": "Validity", - "view_certificate": "Certificate for ${entity} ${primary_key}" - }, - "config": { - "cn": "Name", - "ipaserver": "Configuration" - }, - "delegation": { - "add": "Add Delegation" - }, - "dnsrecord": { - "add": "Add DNS Resource Record", - "data": "Data", - "resource": "Resource", - "title": "Records for DNS Zone", - "type": "Type" - }, - "dnszone": { - "add": "Add DNS Zone", - "identity": "DNS Zone Settings" - }, - "group": { - "add": "Add Group", - "details": "Group Settings", - "posix": "Is this a POSIX group?" - }, - "hbacrule": { - "active": "Active", - "add": "Add HBAC Rule", - "allow": "Allow", - "any_host": "Any Host", - "any_service": "Any Service", - "anyone": "Anyone", - "deny": "Deny", - "host": "Accessing", - "inactive": "Inactive", - "ipaenabledflag": "Rule status", - "service": "Via Service", - "sourcehost": "From", - "specified_hosts": "Specified Hosts and Groups", - "specified_services": "Specified Services and Groups", - "specified_users": "Specified Users and Groups", - "user": "Who" - }, - "hbacsvc": { - "add": "Add HBAC Service" - }, - "hbacsvcgroup": { - "add": "Add HBAC Service Group", - "services": "Services" - }, - "host": { - "add": "Add Host", - "certificate": "Host Certificate", - "cn": "Host Name", - "delete_key_unprovision": "Delete Key, Unprovision", - "details": "Host Settings", - "enroll_otp": "Enroll via One-Time-Password", - "enrolled": "Enrolled?", - "enrollment": "Enrollment", - "fqdn": "Fully Qualified Host Name", - "missing": "Kerberos Key Not Present", - "otp_confirmation": "One-Time-Password has been set.", - "posix": "Is this a POSIX group?", - "set_otp": "Set OTP", - "status": "Status", - "unprovision": "Unprovision", - "unprovision_confirmation": "Are you sure you want to unprovision this host?", - "unprovision_title": "Unprovisioning ${entity}", - "valid": "Kerberos Key Present, Host Provisioned" - }, - "hostgroup": { - "add": "Add Host Group", - "identity": "Host Group Settings" - }, - "krbtpolicy": { - "identity": "Kerberos ticket policy" - }, - "netgroup": { - "add": "Add Netgroup", - "identity": "Netgroup Settings" - }, - "permission": { - "add": "Add Permission", - "filter": "Filter", - "identity": "Identity", - "invalid_target": "Permission with invalid target specification", - "rights": "Rights", - "subtree": "By Subtree", - "target": "Target", - "targetgroup": "Target Group", - "type": "Object By Type" - }, - "privilege": { - "add": "Add Privilege", - "identity": "Privilege Settings" - }, - "pwpolicy": { - "add": "Add Password Policy", - "identity": "Password Policy" - }, - "role": { - "add": "Add Role", - "identity": "Role Settings" - }, - "selfservice": { - "add": "Add Self Service Definition" - }, - "service": { - "add": "Add Service", - "certificate": "Service Certificate", - "delete_key_unprovision": "Delete Key, Unprovision", - "details": "Service Settings", - "host": "Host Name", - "missing": "Kerberos Key Not Present", - "provisioning": "Provisioning", - "service": "Service", - "status": "Status", - "unprovision": "Unprovision", - "unprovision_confirmation": "Are you sure you want to unprovision this service?", - "unprovision_title": "Unprovisioning ${entity}", - "valid": "Kerberos Key Present, Service Provisioned" - }, - "sudocmd": { - "add": "Add Sudo Command", - "groups": "Groups" - }, - "sudocmdgroup": { - "add": "Add Sudo Command Group", - "commands": "Commands" - }, - "sudorule": { - "active": "Active", - "add": "Add Sudo Rule", - "allow": "Allow", - "any_command": "Any Command", - "any_group": "Any Group", - "any_host": "Any Host", - "anyone": "Anyone", - "command": "Run Commands", - "deny": "Deny", - "external": "External", - "host": "Access this host", - "inactive": "Inactive", - "ipaenabledflag": "Rule status", - "runas": "As Whom", - "specified_commands": "Specified Commands and Groups", - "specified_groups": "Specified Groups", - "specified_hosts": "Specified Hosts and Groups", - "specified_users": "Specified Users and Groups", - "user": "Who" - }, - "user": { - "account": "Account Settings", - "activate": "Click to Activate", - "active": "Active", - "add": "Add User", - "contact": "Contact Settings", - "deactivate": "Click to Deactivate", - "employee": "Employee Information", - "error_changing_status": "Error changing account status", - "inactive": "Inactive", - "mailing": "Mailing Address", - "misc": "Misc. Information", - "new_password": "New Password", - "password_change_complete": "Password change complete", - "password_must_match": "Passwords must match", - "repeat_password": "Repeat Password", - "reset_password": "Reset Password" - } - }, - "search": { - "delete_confirm": "Are you sure you want to delete selected entries?", - "quick_links": "Quick Links", - "select_all": "Select All", - "truncated": "Query returned results than configured size limit will show. First ${counter} results shown.", - "unselect_all": "Unselect All" - }, - "tabs": { - "audit": "Audit", - "hbac": "HBAC", - "identity": "Identity", - "ipaserver": "IPA Server", - "policy": "Policy", - "role": "Role Based Access Control", - "sudo": "Sudo" - }, - "widget": { - "validation_error": "Text does not match field pattern" - } - } - } -} diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 94bd68868..914240367 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -9464,7 +9464,7 @@ }, "delegation": { "bindable": false, - "label": "Delegation", + "label": "Delegations", "label_singular": "delegation", "methods": [ "add", @@ -9686,7 +9686,7 @@ "objectclass", "aci" ], - "label": "DNS resource record", + "label": "DNS Resource Records", "label_singular": "DNS resource record", "methods": [ "add", @@ -9904,7 +9904,7 @@ "objectclass", "aci" ], - "label": "DNS", + "label": "DNS Zones", "label_singular": "DNS zone", "methods": [ "add", @@ -10588,7 +10588,7 @@ "objectclass", "aci" ], - "label": "HBAC Rule", + "label": "HBAC Rules", "label_singular": "HBAC rule", "methods": [ "add", @@ -11239,7 +11239,7 @@ "objectclass", "aci" ], - "label": "HBAC service Groups", + "label": "HBAC Service Groups", "label_singular": "HBAC service group", "methods": [ "add", @@ -12772,7 +12772,7 @@ "objectclass", "aci" ], - "label": "Password Policy", + "label": "Password Policies", "label_singular": "password policy", "methods": [ "add", @@ -13090,7 +13090,7 @@ "objectclass", "aci" ], - "label": "Role", + "label": "Roles", "label_singular": "role", "methods": [ "add", @@ -13803,7 +13803,7 @@ "objectclass", "aci" ], - "label": "Sudo Rule", + "label": "Sudo Rules", "label_singular": "sudo rule", "methods": [ "add", @@ -15339,8 +15339,6 @@ }, "association": { "add": "Add ${other_entity} into ${entity} ${primary_key}", - "member": "${other_entity} enrolled in ${entity} ${primary_key}", - "memberof": "${entity} ${primary_key} is enrolled in the following ${other_entity}", "remove": "Remove ${other_entity} from ${entity} ${primary_key}" }, "buttons": { @@ -15349,7 +15347,6 @@ "add_and_close": "Add and Close", "add_and_edit": "Add and Edit", "add_many": "Add Many", - "back_to_list": "Back to List", "cancel": "Cancel", "close": "Close", "enroll": "Enroll", @@ -15372,13 +15369,14 @@ "to_top": "Back to Top" }, "dialogs": { + "add_title": "Add ${entity}", "available": "Available", "dirty_message": "This page has unsaved changes. Please save or revert.", "dirty_title": "Dirty", "hide_already_enrolled": "Hide already enrolled.", "prospective": "Prospective", "remove_empty": "Select ${entity} to be removed.", - "remove_title": "Remove ${entity}." + "remove_title": "Remove ${entity}" }, "facet_groups": { "managedby": "Managed by", @@ -15400,14 +15398,12 @@ "attribute": "Attribute" }, "automountkey": { - "add": "Add Automount Key" }, "automountlocation": { "add": "Add Automount Location", "identity": "Automount Location Settings" }, "automountmap": { - "add": "Add Automount Map" }, "cert": { "aa_compromise": "AA Compromise", @@ -15451,27 +15447,22 @@ "ipaserver": "Configuration" }, "delegation": { - "add": "Add Delegation" }, "dnsrecord": { - "add": "Add DNS Resource Record", "data": "Data", "resource": "Resource", "title": "Records for DNS Zone", "type": "Type" }, "dnszone": { - "add": "Add DNS Zone", "identity": "DNS Zone Settings" }, "group": { - "add": "Add Group", "details": "Group Settings", "posix": "Is this a POSIX group?" }, "hbacrule": { "active": "Active", - "add": "Add HBAC Rule", "allow": "Allow", "any_host": "Any Host", "any_service": "Any Service", @@ -15488,14 +15479,11 @@ "user": "Who" }, "hbacsvc": { - "add": "Add HBAC Service" }, "hbacsvcgroup": { - "add": "Add HBAC Service Group", "services": "Services" }, "host": { - "add": "Add Host", "certificate": "Host Certificate", "cn": "Host Name", "delete_key_unprovision": "Delete Key, Unprovision", @@ -15515,18 +15503,15 @@ "valid": "Kerberos Key Present, Host Provisioned" }, "hostgroup": { - "add": "Add Host Group", "identity": "Host Group Settings" }, "krbtpolicy": { "identity": "Kerberos ticket policy" }, "netgroup": { - "add": "Add Netgroup", "identity": "Netgroup Settings" }, "permission": { - "add": "Add Permission", "filter": "Filter", "identity": "Identity", "invalid_target": "Permission with invalid target specification", @@ -15537,22 +15522,17 @@ "type": "Object By Type" }, "privilege": { - "add": "Add Privilege", "identity": "Privilege Settings" }, "pwpolicy": { - "add": "Add Password Policy", "identity": "Password Policy" }, "role": { - "add": "Add Role", "identity": "Role Settings" }, "selfservice": { - "add": "Add Self Service Definition" }, "service": { - "add": "Add Service", "certificate": "Service Certificate", "delete_key_unprovision": "Delete Key, Unprovision", "details": "Service Settings", @@ -15567,16 +15547,13 @@ "valid": "Kerberos Key Present, Service Provisioned" }, "sudocmd": { - "add": "Add Sudo Command", "groups": "Groups" }, "sudocmdgroup": { - "add": "Add Sudo Command Group", "commands": "Commands" }, "sudorule": { "active": "Active", - "add": "Add Sudo Rule", "allow": "Allow", "any_command": "Any Command", "any_group": "Any Group", @@ -15599,7 +15576,6 @@ "account": "Account Settings", "activate": "Click to Activate", "active": "Active", - "add": "Add User", "contact": "Contact Settings", "deactivate": "Click to Deactivate", "employee": "Employee Information", @@ -15624,6 +15600,7 @@ "tabs": { "audit": "Audit", "automount": "Automount", + "dns": "DNS", "hbac": "Host Based Access Control", "identity": "Identity", "ipaserver": "IPA Server", diff --git a/install/ui/webui.js b/install/ui/webui.js index 5dc2cead6..72f9f729c 100644 --- a/install/ui/webui.js +++ b/install/ui/webui.js @@ -42,7 +42,7 @@ IPA.admin_navigation = function(spec) { {entity: 'service'} ]}, {name: 'policy', label: IPA.messages.tabs.policy, children: [ - {entity: 'dnszone'}, + {entity: 'dnszone', label: IPA.messages.tabs.dns}, {name: 'hbac', label: IPA.messages.tabs.hbac, children: [ {entity: 'hbacrule'}, {entity: 'hbacsvc'}, @@ -54,8 +54,8 @@ IPA.admin_navigation = function(spec) { {entity: 'sudocmdgroup'} ]}, {entity: 'automountlocation', label: IPA.messages.tabs.automount}, - {entity: 'automountmap',hidden:true}, - {entity: 'automountkey',hidden:true}, + {entity: 'automountmap', hidden: true}, + {entity: 'automountkey', hidden: true}, {entity: 'pwpolicy'}, {entity: 'krbtpolicy'} ]}, diff --git a/ipalib/plugins/delegation.py b/ipalib/plugins/delegation.py index 07f602be7..ad6106a4b 100644 --- a/ipalib/plugins/delegation.py +++ b/ipalib/plugins/delegation.py @@ -99,7 +99,7 @@ class delegation(Object): bindable = False object_name = 'delegation', object_name_plural = 'delegation', - label = _('Delegation') + label = _('Delegations') label_singular = _('delegation') takes_params = ( diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index d5cffe46d..2bba446d0 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -282,7 +282,7 @@ class dnszone(LDAPObject): 'idnssoaserial', 'idnssoarefresh', 'idnssoaretry', 'idnssoaexpire', 'idnssoaminimum' ] + _record_attributes - label = _('DNS') + label = _('DNS Zones') label_singular = _('DNS zone') takes_params = ( @@ -521,7 +521,7 @@ class dnsrecord(LDAPObject): object_class = ['top', 'idnsrecord'] default_attributes = _record_attributes + ['idnsname'] - label = _('DNS resource record') + label = _('DNS Resource Records') label_singular = _('DNS resource record') takes_params = ( diff --git a/ipalib/plugins/hbacrule.py b/ipalib/plugins/hbacrule.py index 531d2d90f..3eff396fc 100644 --- a/ipalib/plugins/hbacrule.py +++ b/ipalib/plugins/hbacrule.py @@ -123,7 +123,7 @@ class hbacrule(LDAPObject): 'memberservice': ['hbacsvc', 'hbacsvcgroup'], } - label = _('HBAC Rule') + label = _('HBAC Rules') label_singular = _('HBAC rule') takes_params = ( diff --git a/ipalib/plugins/hbacsvcgroup.py b/ipalib/plugins/hbacsvcgroup.py index 1685f9115..4823a8b37 100644 --- a/ipalib/plugins/hbacsvcgroup.py +++ b/ipalib/plugins/hbacsvcgroup.py @@ -61,7 +61,7 @@ class hbacsvcgroup(LDAPObject): 'member': ['hbacsvc'], } - label = _('HBAC service Groups') + label = _('HBAC Service Groups') label_singular = _('HBAC service group') takes_params = ( diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index 78c5a8480..06f07dbd8 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -99,14 +99,11 @@ class i18n_messages(Command): "attribute":_("Attribute"), }, "automountlocation": { - "add":_("Add Automount Location"), "identity":_("Automount Location Settings") }, "automountmap": { - "add":_("Add Automount Map") }, "automountkey": { - "add":_("Add Automount Key") }, "cert": { "unspecified":_("Unspecified"), @@ -152,26 +149,21 @@ class i18n_messages(Command): "cn":_("Name"), }, "delegation": { - "add":_("Add Delegation"), }, "dnszone": { - "add":_("Add DNS Zone"), "identity":_("DNS Zone Settings"), }, "dnsrecord": { - "add":_("Add DNS Resource Record"), "resource":_("Resource"), "type":_("Type"), "data":_("Data"), "title":_("Records for DNS Zone"), }, "group": { - "add":_("Add Group"), "details":_("Group Settings"), "posix":_("Is this a POSIX group?"), }, "hbacrule": { - "add":_("Add HBAC Rule"), "active":_("Active"), "allow":_("Allow"), "deny":_("Deny"), @@ -189,14 +181,11 @@ class i18n_messages(Command): "sourcehost":_("From"), }, "hbacsvc": { - "add":_("Add HBAC Service"), }, "hbacsvcgroup": { - "add":_("Add HBAC Service Group"), "services":_("Services"), }, "host": { - "add":_("Add Host"), "certificate":_("Host Certificate"), "cn":_("Host Name"), "details":_("Host Settings"), @@ -216,18 +205,15 @@ class i18n_messages(Command): "unprovision":_("Unprovision"), }, "hostgroup": { - "add":_("Add Host Group"), "identity":_("Host Group Settings"), }, "krbtpolicy": { "identity":_("Kerberos ticket policy"), }, "netgroup": { - "add":_("Add Netgroup"), "identity":_("Netgroup Settings"), }, "permission": { - "add":_("Add Permission"), "identity":_("Identity"), "rights":_("Rights"), "target":_("Target"), @@ -238,22 +224,17 @@ class i18n_messages(Command): "invalid_target":_("Permission with invalid target specification"), }, "privilege": { - "add":_("Add Privilege"), "identity":_("Privilege Settings"), }, "pwpolicy": { - "add":_("Add Password Policy"), "identity":_("Password Policy"), }, "role": { - "add":_("Add Role"), "identity":_("Role Settings"), }, "selfservice": { - "add":_("Add Self Service Definition"), }, "service": { - "add":_("Add Service"), "certificate":_("Service Certificate"), "details":_("Service Settings"), "host":_("Host Name"), @@ -268,15 +249,12 @@ class i18n_messages(Command): "unprovision":_("Unprovision"), }, "sudocmd": { - "add":_("Add Sudo Command"), "groups":_("Groups"), }, "sudocmdgroup": { - "add":_("Add Sudo Command Group"), "commands":_("Commands"), }, "sudorule": { - "add":_("Add Sudo Rule"), "active":_("Active"), "inactive":_("Inactive"), "allow":_("Allow"), @@ -297,7 +275,6 @@ class i18n_messages(Command): "external":_("External"), }, "user": { - "add":_("Add User"), "account":_("Account Settings"), "contact":_("Contact Settings"), "mailing":_("Mailing Address"), @@ -321,7 +298,6 @@ class i18n_messages(Command): "add_and_edit":_("Add and Edit"), "add_and_close":_("Add and Close"), "add_many":_("Add Many"), - "back_to_list":_("Back to List"), "cancel": _("Cancel"), "close": _("Close"), "enroll":_("Enroll"), @@ -338,12 +314,13 @@ class i18n_messages(Command): "view":_("View"), }, "dialogs":{ + "add_title":_("Add ${entity}"), "available":_("Available"), "dirty_message":_("This page has unsaved changes. Please save or revert."), "dirty_title":_("Dirty"), "hide_already_enrolled":_("Hide already enrolled."), "remove_empty":_("Select ${entity} to be removed."), - "remove_title":_("Remove ${entity}."), + "remove_title":_("Remove ${entity}"), "prospective":_("Prospective"), }, "facet_groups":{ @@ -373,6 +350,7 @@ class i18n_messages(Command): "to_top":_("Back to Top") }, "tabs": { + "dns":_("DNS"), "identity":_("Identity"), "policy":_("Policy"), "audit": _("Audit"), @@ -384,8 +362,6 @@ class i18n_messages(Command): }, "association":{ "add":_("Add ${other_entity} into ${entity} ${primary_key}"), - "member":_("${other_entity} enrolled in ${entity} ${primary_key}"), - "memberof":_("${entity} ${primary_key} is enrolled in the following ${other_entity}"), "remove":_("Remove ${other_entity} from ${entity} ${primary_key}"), }, "widget":{ diff --git a/ipalib/plugins/pwpolicy.py b/ipalib/plugins/pwpolicy.py index fc1f7015f..db1671365 100644 --- a/ipalib/plugins/pwpolicy.py +++ b/ipalib/plugins/pwpolicy.py @@ -216,7 +216,7 @@ class pwpolicy(LDAPObject): ), ) - label = _('Password Policy') + label = _('Password Policies') label_singular = _('password policy') takes_params = ( diff --git a/ipalib/plugins/role.py b/ipalib/plugins/role.py index dc6341ac4..cdbe5130a 100644 --- a/ipalib/plugins/role.py +++ b/ipalib/plugins/role.py @@ -78,7 +78,7 @@ class role(LDAPObject): } rdnattr='cn' - label = _('Role') + label = _('Roles') label_singular = _('role') takes_params = ( diff --git a/ipalib/plugins/sudorule.py b/ipalib/plugins/sudorule.py index 1f0775783..a85e943f8 100644 --- a/ipalib/plugins/sudorule.py +++ b/ipalib/plugins/sudorule.py @@ -65,7 +65,7 @@ class sudorule(LDAPObject): 'ipasudorunasgroup': ['group'], } - label = _('Sudo Rule') + label = _('Sudo Rules') label_singular = _('sudo rule') takes_params = ( |