Details to Settings

Using I18N messages for most of the details
2025-02-25 18:55:28 -06:00 · 2011-01-14 15:14:32 -05:00
parent f92c831a32
commit 285ee9db0c
18 changed files with 61 additions and 63 deletions
--- a/install/static/aci.js
+++ b/install/static/aci.js
@@ -644,8 +644,7 @@ IPA.permission_search_facet =  function (spec) {
 IPA.permission_details_facet = function () {

    var spec = {
-            name: 'details',
-            label: 'Details'
+            name: 'details'
    };
    var that = IPA.details_facet(spec);

@@ -695,9 +694,9 @@ IPA.add_entity( function() {
        that.add_facet(search_facet);

        that.add_facet(function() {
-            var that = IPA.details_facet({name:'details',label:'Details'});
+            var that = IPA.details_facet({name:'details'});
            that.add_section(
-                IPA.stanza({name:'identity', label:'Privilege Details'}).
+                IPA.stanza({name:'identity', label:'Privilege Settings'}).
                    input({name:'cn'}).
                    input({name: 'description'}));
            return that;
@@ -737,9 +736,9 @@ IPA.add_entity( function() {
        that.add_facet(search_facet);

        that.add_facet(function() {
-            var that = IPA.details_facet({name:'details',label:'Details'});
+            var that = IPA.details_facet({name:'details'});
            that.add_section(
-                IPA.stanza({name:'identity', label:'Role Details'}).
+                IPA.stanza({name:'identity', label:'Role Settings'}).
                    input({name:'cn'}).
                    input({name: 'description'}));
            return that;
@@ -783,7 +782,7 @@ IPA.add_entity( function() {


    that.add_facet(function(){
-        var that = IPA.details_facet({'name':'details',label:'Details'});
+        var that = IPA.details_facet({'name':'details'});

        that.init = function() {
            that.add_section(
@@ -835,7 +834,7 @@ IPA.add_entity( function() {
            return that;
        }());
    that.add_facet(function(){
-        var that = IPA.details_facet({'name':'details',label:'Details'});
+        var that = IPA.details_facet({'name':'details'});
        var section =
            IPA.stanza({name:'general', label:'General'}).
            input({name:'aciname'}).
--- a/install/static/details.js
+++ b/install/static/details.js
@@ -488,6 +488,7 @@ IPA.details_facet = function (spec) {

    var that = IPA.facet(spec);

+    that.label =  ( IPA.messages && IPA.messages.facets &&  IPA.messages.facets.details)  || spec.label;
    that.is_dirty = spec.is_dirty || is_dirty;
    that.create = spec.create || create;
    that.setup = spec.setup || setup;
--- a/install/static/entity.js
+++ b/install/static/entity.js
@@ -303,8 +303,7 @@ IPA.entity_get_details_facet = function (entity_name) {
    if (facet) return facet;

    facet = IPA.details_facet({
-        'name': 'details',
-        'label': 'Details'
+        'name': 'details'
    });
    entity.add_facet(facet);

--- a/install/static/group.js
+++ b/install/static/group.js
@@ -59,8 +59,7 @@ IPA.group = function () {
        that.add_facet(facet);

        facet = IPA.group_details_facet({
-            'name': 'details',
-            'label': 'Details'
+            'name': 'details'
        });
        that.add_facet(facet);

@@ -128,7 +127,7 @@ IPA.group_details_facet = function (spec) {

        var section = IPA.details_list_section({
            name: 'details',
-            label: 'Group Details'
+            label: 'Group Settings'
        });
        that.add_section(section);

--- a/install/static/hbacrule.js
+++ b/install/static/hbacrule.js
@@ -44,8 +44,7 @@ IPA.hbacrule = function () {
        that.add_facet(facet);

        facet = IPA.hbacrule_details_facet({
-            'name': 'details',
-            'label': 'Details'
+            'name': 'details'
        });
        that.add_facet(facet);

--- a/install/static/hbacsvc.js
+++ b/install/static/hbacsvc.js
@@ -44,8 +44,7 @@ IPA.hbacsvc = function () {
        that.add_facet(facet);

        facet = IPA.hbacsvc_details_facet({
-            'name': 'details',
-            'label': 'Details'
+            'name': 'details'
        });
        that.add_facet(facet);

@@ -116,4 +115,4 @@ IPA.hbacsvc_details_facet = function (spec) {
    };

    return that;
-};
+};
--- a/install/static/hbacsvcgroup.js
+++ b/install/static/hbacsvcgroup.js
@@ -50,8 +50,7 @@ IPA.hbacsvcgroup = function () {
        that.add_facet(facet);

        facet = IPA.hbacsvcgroup_details_facet({
-            'name': 'details',
-            'label': 'Details'
+            'name': 'details'
        });
        that.add_facet(facet);

--- a/install/static/host.js
+++ b/install/static/host.js
@@ -56,8 +56,7 @@ IPA.host = function () {
        that.add_facet(facet);

        facet = IPA.host_details_facet({
-            'name': 'details',
-            'label': 'Details'
+            'name': 'details'
        });
        that.add_facet(facet);

@@ -132,7 +131,7 @@ IPA.host_details_facet = function (spec) {

        var section = IPA.details_list_section({
            'name': 'details',
-            'label': 'Host Details'
+            'label': 'Host Settings'
        });
        that.add_section(section);

@@ -481,4 +480,4 @@ IPA.host_managedby_host_facet = function (spec) {
    };

    return that;
-};
+};
--- a/install/static/hostgroup.js
+++ b/install/static/hostgroup.js
@@ -38,9 +38,9 @@ IPA.add_entity( function() {
        that.add_facet(search_facet);

        that.add_facet(function() {
-            var that = IPA.details_facet({name:'details',label:'Details'});
+            var that = IPA.details_facet({name:'details'});
            that.add_section(
-                IPA.stanza({name:'identity', label:'Hostgroup Details'}).
+                IPA.stanza({name:'identity', label:'Hostgroup Settings'}).
                    input({name:'cn'}).
                    input({name: 'description'}));
            return that;
--- a/install/static/netgroup.js
+++ b/install/static/netgroup.js
@@ -37,9 +37,9 @@ IPA.add_entity( function() {
        that.add_facet(search_facet);

        that.add_facet(function() {
-            var that = IPA.details_facet({name:'details',label:'Details'});
+            var that = IPA.details_facet({name:'details'});
            that.add_section(
-                IPA.stanza({name:'identity', label:'Netgroup Details'}).
+                IPA.stanza({name:'identity', label:'Netgroup Settings'}).
                    input({name:'cn'}).
                    input({name: 'description'}).
                    input({name:'nisdomainname'}));
--- a/install/static/policy.js
+++ b/install/static/policy.js
@@ -40,9 +40,9 @@ IPA.add_entity(function (){
        that.add_facet(search_facet);

        that.add_facet(function() {
-            var that = IPA.details_facet({name:'details',label:'Details'});
+            var that = IPA.details_facet({name:'details'});
            that.add_section(
-                IPA.stanza({name:'identity', label:'DNS Zone Details'}).
+                IPA.stanza({name:'identity', label:'DNS Zone Settings'}).
                    input({name:'idnsname'}).
                    input({name:'idnszoneactive'}).
                    input({name:'idnssoamname'}).
@@ -507,9 +507,9 @@ IPA.add_entity(function (){


        that.add_facet(function() {
-            var that = IPA.details_facet({name:'details',label:'Details'});
+            var that = IPA.details_facet({name:'details'});
            that.add_section(
-                IPA.stanza({name:'identity', label:'Automount Location Details'}).
+                IPA.stanza({name:'identity', label:'Automount Location Settings'}).
                    input({name:'cn'}));
            return that;
        }());
@@ -551,7 +551,7 @@ IPA.add_entity(function (){


        that.add_facet(function() {
-            var that = IPA.details_facet({name:'details',label:'Details'});
+            var that = IPA.details_facet({name:'details'});
            that.add_section(

                IPA.stanza({name:'identity', label:'Password Policy'}).
--- a/install/static/service.js
+++ b/install/static/service.js
@@ -51,8 +51,7 @@ IPA.service = function () {
        that.add_facet(facet);

        facet = IPA.service_details_facet({
-            'name': 'details',
-            'label': 'Details'
+            'name': 'details'
        });
        that.add_facet(facet);

@@ -185,7 +184,7 @@ IPA.service_details_facet = function (spec) {

        var section = IPA.details_list_section({
            name: 'details',
-            label: 'Service Details'
+            label: 'Service Settings'
        });
        that.add_section(section);

@@ -458,4 +457,4 @@ IPA.service_managedby_host_facet = function (spec) {
    };

    return that;
-};
+};
--- a/install/static/sudocmd.js
+++ b/install/static/sudocmd.js
@@ -45,7 +45,6 @@ IPA.sudocmd = function () {

        facet = IPA.sudocmd_details_facet({
            'name': 'details',
-            'label': 'Details'
        });
        that.add_facet(facet);

@@ -276,4 +275,4 @@ IPA.sudocmd_member_sudocmdgroup_table_widget = function (spec) {
    };

    return that;
-};
+};
--- a/install/static/sudocmdgroup.js
+++ b/install/static/sudocmdgroup.js
@@ -51,7 +51,6 @@ IPA.sudocmdgroup = function () {

        facet = IPA.sudocmdgroup_details_facet({
            'name': 'details',
-            'label': 'Details'
        });
        that.add_facet(facet);

@@ -195,4 +194,4 @@ IPA.sudocmdgroup_member_sudocmd_table_widget = function (spec) {
    };

    return that;
-};
+};
--- a/install/static/sudorule.js
+++ b/install/static/sudorule.js
@@ -45,7 +45,6 @@ IPA.sudorule = function () {

        facet = IPA.sudorule_details_facet({
            'name': 'details',
-            'label': 'Details'
        });
        that.add_facet(facet);

--- a/install/static/test/data/ipa_init.json
+++ b/install/static/test/data/ipa_init.json
@@ -7714,14 +7714,18 @@
                        "update": "Update"
                    },
                    "details": {
-                        "account": "Account Details",
-                        "contact": "Contact Details",
-                        "employee": "      Employee Information",
-                        "identity": "Identity Details",
+                        "account": "Account Settings",
+                        "contact": "Contact Settings",
+                        "employee": "Employee Information",
+                        "identity": "Identity Settings",
                        "mailing": "Mailing Address",
                        "misc": "Misc. Information",
                        "to_top": "Back to Top"
                    },
+                    "facets": {
+                        "details": "Settings",
+                        "search": "Search"
+                    },
                    "login": {
                        "header": "Logged In As"
                    },
@@ -7746,22 +7750,22 @@
                            "Administrator"
                        ],
                        "gidnumber": [
-                            "1333600000"
+                            "590200000"
                        ],
                        "homedirectory": [
                            "/home/admin"
                        ],
                        "ipauniqueid": [
-                            "26f59232-1eb0-11e0-9271-52540029a798"
+                            "3f1c60c6-2026-11e0-80c2-52540029a798"
                        ],
                        "krblastpwdchange": [
-                            "20110113005936Z"
+                            "20110114213748Z"
                        ],
                        "krblastsuccessfulauth": [
-                            "20110113180851Z"
+                            "20110114213845Z"
                        ],
                        "krbpasswordexpiration": [
-                            "20110413005936Z"
+                            "20110414213748Z"
                        ],
                        "krbprincipalname": [
                            "admin@IPA14.AYOUNG.BOSTON.DEVEL.REDHAT.COM"
@@ -7795,7 +7799,7 @@
                            "admin"
                        ],
                        "uidnumber": [
-                            "1333600000"
+                            "590200000"
                        ]
                    }
                ],
--- a/install/static/user.js
+++ b/install/static/user.js
@@ -54,7 +54,7 @@ IPA.user = function (){
        search_facet.create_column({name:'telephonenumber'});
        search_facet.create_column({name:'title'});

-        that.add_facet(details_facet({name:'details',label:'Details'}));
+        that.add_facet(details_facet({name:'details'}));

        var dialog = IPA.add_dialog({
            'name': 'add',
@@ -81,14 +81,14 @@ IPA.user = function (){
        var that = IPA.details_facet(spec);

        var sections =[
-            IPA.stanza({name:'identity', label:'Identity Details'}).
+            IPA.stanza({name:'identity', label:IPA.messages.details.identity}).
                input({name:'title'}).
                input({name:'givenname'}).
                input({name:'sn'}).
                input({name:'cn'}).
                input({name:'displayname'}).
                input({name:'initials'}),
-            IPA.stanza({name:'account', label:'Account Details'}).
+            IPA.stanza({name:'account', label:IPA.messages.details.account}).
                custom_input(user_status_widget({name:'nsaccountlock'})).
                input({name:'uid'}).
                input({name:'userpassword', load: user_password_load}).
@@ -96,21 +96,21 @@ IPA.user = function (){
                input({name:'gidnumber'}).
                input({name:'loginshell'}).
                input({name:'homedirectory'}),
-            IPA.stanza({name:'contact', label:'Contact Details'}).
+            IPA.stanza({name:'contact', label:IPA.messages.details.contact}).
                input({name:'mail'}).
                input({name:'telephonenumber'}).
                input({name:'pager'}).
                input({name:'mobile'}).
                input({name:'facsimiletelephonenumber'}),
-            IPA.stanza({name:'address', label:'Mailing Address'}).
+            IPA.stanza({name:'address', label: IPA.messages.details.mailing}).
                input({name:'street'}).
                input({name:'location'}).
                input({name:'state', load:user_state_load}).
                input({name:'postalcode'}),
-            IPA.stanza({name:'employee', label:'Employee Information'}).
+            IPA.stanza({name:'employee', label:IPA.messages.details.employee}).
                input({name:'ou', label:'Org. Unit'}).
                input({name:'manager'}),
-            IPA.stanza({name:'misc', label:'Misc. Information'}).
+            IPA.stanza({name:'misc', label:IPA.messages.details.misc}).
                input({name:'carlicense'})
        ];
        for (var i = 0; i < sections.length; i += 1){
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -84,6 +84,10 @@ class i18n_messages(Command):
            "enroll":_("Enroll"),
            "remove":_("Delete"),
            },
+        "facets":{
+            "search":_("Search"),
+            "details": _("Settings"),
+            },
        "search":{
            "quick_links":_("Quick Links"),
            "select_all":_("Select All"),
@@ -91,11 +95,11 @@ class i18n_messages(Command):
            "delete_confirm":_("Do you really want to delete the selected entries?"),
            },
        "details":{
-            "identity":_("Identity Details"),
-            "account":_("Account Details"),
-            "contact":_("Contact Details"),
+            "identity":_("Identity Settings"),
+            "account":_("Account Settings"),
+            "contact":_("Contact Settings"),
            "mailing":_("Mailing Address"),
-            "employee":_("      Employee Information"),
+            "employee":_("Employee Information"),
            "misc":_("Misc. Information"),
            "to_top":_("Back to Top")},
        "association":{