summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorAdam Young <ayoung@redhat.com>2011-01-25 19:39:08 -0500
committerAdam Young <ayoung@redhat.com>2011-01-26 10:07:21 -0500
commit2b8cdb2c8d2dc2d115a120604267de7ad54e2c7c (patch)
treef03bef3aac100ad4b6f5cca8d410d7ef00221fa5 /install
parent6cca48cb59951db833ac517aaa1274c19e40c8d8 (diff)
downloadfreeipa-2b8cdb2c8d2dc2d115a120604267de7ad54e2c7c.tar.gz
freeipa-2b8cdb2c8d2dc2d115a120604267de7ad54e2c7c.tar.xz
freeipa-2b8cdb2c8d2dc2d115a120604267de7ad54e2c7c.zip
Tab I18N
Makes the values for the Top level tabs internationizable, and no longer just passes through their names Also uses the I18N values for SUDO and HBAC as the static text in the Action p[anel title
Diffstat (limited to 'install')
-rw-r--r--install/ui/entity.js57
-rw-r--r--install/ui/ipa.js3
-rw-r--r--install/ui/navigation.js3
-rw-r--r--install/ui/test/data/ipa_init.json479
-rw-r--r--install/ui/webui.js80
5 files changed, 167 insertions, 455 deletions
diff --git a/install/ui/entity.js b/install/ui/entity.js
index b0a6c2446..34e34d6cf 100644
--- a/install/ui/entity.js
+++ b/install/ui/entity.js
@@ -391,6 +391,21 @@ IPA.entity_setup = function (container) {
};
+IPA.nested_tab_labels = {};
+
+IPA.get_nested_tab_label = function(entity_name){
+
+ if (!IPA.nested_tab_labels[entity_name]){
+ IPA.nested_tab_labels[entity_name] = "LABEL";
+
+ }
+ return IPA.nested_tab_labels[entity_name];
+
+};
+
+
+
+
/*Returns the entity requested, as well as:
any nested tabs underneath it or
its parent tab and the others nested at the same level*/
@@ -400,7 +415,7 @@ IPA.nested_tabs = function(entity_name){
var siblings = [];
var nested_index;
var nested_entities;
-
+ var label;
if (!IPA.tab_set) {
siblings.push(entity_name);
return siblings;
@@ -416,13 +431,19 @@ IPA.nested_tabs = function(entity_name){
if(top_tab.children[subtab_index].name){
if (top_tab.children[subtab_index].name === entity_name){
siblings.push(entity_name);
+ IPA.nested_tab_labels[entity_name] =
+ top_tab.children[subtab_index].label;
if (top_tab.children[subtab_index].children){
+ label = top_tab.children[subtab_index].label
nested_entities = top_tab.children[subtab_index].children;
for ( nested_index = 0;
nested_index < nested_entities.length;
nested_index += 1){
siblings.push (nested_entities[nested_index].name);
+ IPA.nested_tab_labels[entity_name] =
+ top_tab.children[subtab_index].label;
}
+
}
}else{
if (top_tab.children[subtab_index].children){
@@ -432,10 +453,16 @@ IPA.nested_tabs = function(entity_name){
nested_index += 1){
if (nested_entities[nested_index].name === entity_name){
siblings.push(top_tab.children[subtab_index].name);
+ IPA.nested_tab_labels[entity_name] =
+ top_tab.children[subtab_index].label;
+
for (var nested_index2 = 0;
nested_index2 < nested_entities.length;
nested_index2 += 1){
siblings.push(nested_entities[nested_index2].name);
+ IPA.nested_tab_labels[nested_entities[nested_index2].name] =
+ top_tab.children[subtab_index].label;
+
}
}
}
@@ -452,14 +479,7 @@ IPA.back_icon = '<span class="ipa-icon">&#x25C0;</span>';
IPA. facet_create_action_panel = function(container) {
- var that = this;
- var entity_name = that.entity_name;
- var action_panel = $('<div/>', {
- "class": "action-panel",
- html: $('<h3>',{
- text: IPA.metadata[entity_name].label
- })
- }).appendTo(container);
+
function build_link(other_facet,label){
var li = $('<li/>', {
"class" : other_facet.display_class,
@@ -482,6 +502,24 @@ IPA. facet_create_action_panel = function(container) {
}
+ var that = this;
+ var entity_name = that.entity_name;
+ var panel_title = IPA.metadata[entity_name].label;
+ var nested_tabs = IPA.nested_tabs(entity_name);
+
+
+ if (nested_tabs.length > 1){
+ panel_title = IPA.get_nested_tab_label(entity_name);
+ }
+
+ var action_panel = $('<div/>', {
+ "class": "action-panel",
+ html: $('<h3>',{
+ text: panel_title
+ })
+ }).appendTo(container);
+
+
/*Note, for debugging purposes, it is useful to set var pkey_type = 'text';*/
var pkey_type = 'hidden';
$('<input/>', {
@@ -494,7 +532,6 @@ IPA. facet_create_action_panel = function(container) {
var facet_name = IPA.current_facet(entity);
var other_facet = entity.facets[0];
var other_facet_name = other_facet.name;
- var nested_tabs = IPA.nested_tabs(entity_name);
var main_facet = build_link(other_facet,other_facet.label);
for (var nested_index = 0 ;
nested_index < nested_tabs.length;
diff --git a/install/ui/ipa.js b/install/ui/ipa.js
index 48c116a8c..5e22b2c3f 100644
--- a/install/ui/ipa.js
+++ b/install/ui/ipa.js
@@ -84,7 +84,8 @@ var IPA = ( function () {
{"method":"i18n_messages","params":[[],{}]},
{"method":"user_find","params":[[],{
"whoami":"true","all":"true"}]},
- {"method":"env","params":[[],{}]}
+ {"method":"env","params":[[],{}]},
+ {"method":"dns_is_enabled","params":[[],{}]}
];
diff --git a/install/ui/navigation.js b/install/ui/navigation.js
index 7ae5b656e..0b8fe528e 100644
--- a/install/ui/navigation.js
+++ b/install/ui/navigation.js
@@ -82,6 +82,9 @@ function nav_generate_tabs(nls, container, tabclass, depth)
var entity = IPA.get_entity(tab.entity);
label = entity.label;
}
+ if (tab.label){
+ label = tab.label;
+ }
var li = nav_create_tab_li(tab.name, label);
ul.append(li);
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index ba236a7f7..8fe28684d 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -2,7 +2,7 @@
"error": null,
"id": 1,
"result": {
- "count": 4,
+ "count": 5,
"results": [
{
"error": null,
@@ -45,7 +45,7 @@
"object_name": "automount key",
"object_name_plural": "automount keys",
"parent_object": "automountmap",
- "primary_key": "automountkey",
+ "primary_key": "description",
"rdn_attribute": "",
"relationships": {
"member": [
@@ -86,7 +86,7 @@
"name": "automountkey",
"pattern": null,
"pattern_errmsg": null,
- "primary_key": true,
+ "primary_key": false,
"query": false,
"required": true,
"type": "unicode"
@@ -122,12 +122,19 @@
"attribute": false,
"autofill": false,
"class": "Str",
- "cli_name": "desc",
+ "cli_name": "description",
"cli_short_name": null,
"default": null,
"doc": "description",
- "exclude": null,
- "flags": [],
+ "exclude": [
+ "webui"
+ ],
+ "flags": [
+ "no_update",
+ "no_create",
+ "no_output",
+ "no_search"
+ ],
"hint": null,
"include": null,
"label": "description",
@@ -138,7 +145,7 @@
"name": "description",
"pattern": null,
"pattern_errmsg": null,
- "primary_key": false,
+ "primary_key": true,
"query": false,
"required": false,
"type": "unicode"
@@ -402,7 +409,7 @@
"hint": null,
"include": null,
"label": "Max username length",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": 1,
"multivalue": false,
"name": "ipamaxusernamelength",
@@ -529,7 +536,7 @@
"hint": null,
"include": null,
"label": "Search time limit",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": -1,
"multivalue": false,
"name": "ipasearchtimelimit",
@@ -552,7 +559,7 @@
"hint": null,
"include": null,
"label": "Search size limit",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": -1,
"multivalue": false,
"name": "ipasearchrecordslimit",
@@ -732,7 +739,7 @@
"hint": null,
"include": null,
"label": "Password Expiration Notification",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": 0,
"multivalue": false,
"name": "ipapwdexpadvnotify",
@@ -866,7 +873,6 @@
"dereferencealiases",
"description",
"destinationindicator",
- "dialupaccess",
"displayname",
"distinguishedname",
"ditcontentrules",
@@ -1722,7 +1728,7 @@
"hint": null,
"include": null,
"label": "<cospriority>",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": 0,
"multivalue": false,
"name": "cospriority",
@@ -1879,331 +1885,6 @@
}
]
},
- "dns": {
- "default_attributes": [
- "idnsname",
- "idnszoneactive",
- "idnssoamname",
- "idnssoarname",
- "idnssoaserial",
- "idnssoarefresh",
- "idnssoaretry",
- "idnssoaexpire",
- "idnssoaminimum"
- ],
- "label": "DNS",
- "methods": [
- "add",
- "del",
- "find",
- "mod",
- "show"
- ],
- "name": "dns",
- "primary_key": "idnsname",
- "takes_params": [
- {
- "alwaysask": false,
- "attribute": false,
- "autofill": false,
- "class": "Str",
- "cli_name": "name",
- "cli_short_name": null,
- "default": null,
- "doc": "Zone name (FQDN)",
- "exclude": null,
- "flags": [],
- "hint": null,
- "include": null,
- "label": "Zone",
- "length": null,
- "maxlength": null,
- "minlength": null,
- "multivalue": false,
- "name": "idnsname",
- "pattern": null,
- "pattern_errmsg": null,
- "primary_key": true,
- "query": false,
- "required": true,
- "type": "unicode"
- },
- {
- "alwaysask": false,
- "attribute": false,
- "autofill": false,
- "class": "Str",
- "cli_name": "name_server",
- "cli_short_name": null,
- "default": null,
- "doc": "Authoritative name server",
- "exclude": null,
- "flags": [],
- "hint": null,
- "include": null,
- "label": "Authoritative name server",
- "length": null,
- "maxlength": null,
- "minlength": null,
- "multivalue": false,
- "name": "idnssoamname",
- "pattern": null,
- "pattern_errmsg": null,
- "primary_key": false,
- "query": false,
- "required": true,
- "type": "unicode"
- },
- {
- "alwaysask": false,
- "attribute": false,
- "autofill": false,
- "class": "Str",
- "cli_name": "admin_email",
- "cli_short_name": null,
- "default": null,
- "doc": "administrator e-mail address",
- "exclude": null,
- "flags": [],
- "hint": null,
- "include": null,
- "label": "administrator e-mail address",
- "length": null,
- "maxlength": null,
- "minlength": null,
- "multivalue": false,
- "name": "idnssoarname",
- "pattern": null,
- "pattern_errmsg": null,
- "primary_key": false,
- "query": false,
- "required": true,
- "type": "unicode"
- },
- {
- "alwaysask": false,
- "attribute": false,
- "autofill": false,
- "class": "Int",
- "cli_name": "serial",
- "cli_short_name": null,
- "default": null,
- "doc": "SOA serial",
- "exclude": null,
- "flags": [],
- "hint": null,
- "include": null,
- "label": "SOA serial",
- "maxvalue": null,
- "minvalue": null,
- "multivalue": false,
- "name": "idnssoaserial",
- "primary_key": false,
- "query": false,
- "required": false,
- "type": "int"
- },
- {
- "alwaysask": false,
- "attribute": false,
- "autofill": false,
- "class": "Int",
- "cli_name": "refresh",
- "cli_short_name": null,
- "default": null,
- "doc": "SOA refresh",
- "exclude": null,
- "flags": [],
- "hint": null,
- "include": null,
- "label": "SOA refresh",
- "maxvalue": null,
- "minvalue": null,
- "multivalue": false,
- "name": "idnssoarefresh",
- "primary_key": false,
- "query": false,
- "required": false,
- "type": "int"
- },
- {
- "alwaysask": false,
- "attribute": false,
- "autofill": false,
- "class": "Int",
- "cli_name": "retry",
- "cli_short_name": null,
- "default": null,
- "doc": "SOA retry",
- "exclude": null,
- "flags": [],
- "hint": null,
- "include": null,
- "label": "SOA retry",
- "maxvalue": null,
- "minvalue": null,
- "multivalue": false,
- "name": "idnssoaretry",
- "primary_key": false,
- "query": false,
- "required": false,
- "type": "int"
- },
- {
- "alwaysask": false,
- "attribute": false,
- "autofill": false,
- "class": "Int",
- "cli_name": "expire",
- "cli_short_name": null,
- "default": null,
- "doc": "SOA expire",
- "exclude": null,
- "flags": [],
- "hint": null,
- "include": null,
- "label": "SOA expire",
- "maxvalue": null,
- "minvalue": null,
- "multivalue": false,
- "name": "idnssoaexpire",
- "primary_key": false,
- "query": false,
- "required": false,
- "type": "int"
- },
- {
- "alwaysask": false,
- "attribute": false,
- "autofill": false,
- "class": "Int",
- "cli_name": "minimum",
- "cli_short_name": null,
- "default": null,
- "doc": "SOA minimum",
- "exclude": null,
- "flags": [],
- "hint": null,
- "include": null,
- "label": "SOA minimum",
- "maxvalue": null,
- "minvalue": null,
- "multivalue": false,
- "name": "idnssoaminimum",
- "primary_key": false,
- "query": false,
- "required": false,
- "type": "int"
- },
- {
- "alwaysask": false,
- "attribute": false,
- "autofill": false,
- "class": "Int",
- "cli_name": "ttl",
- "cli_short_name": null,
- "default": null,
- "doc": "SOA time to live",
- "exclude": null,
- "flags": [],
- "hint": null,
- "include": null,
- "label": "SOA time to live",
- "maxvalue": null,
- "minvalue": null,
- "multivalue": false,
- "name": "dnsttl",
- "primary_key": false,
- "query": false,
- "required": false,
- "type": "int"
- },
- {
- "alwaysask": false,
- "attribute": false,
- "autofill": false,
- "class": "StrEnum",
- "cli_name": "class",
- "cli_short_name": null,
- "default": null,
- "doc": "SOA class",
- "exclude": null,
- "flags": [],
- "hint": null,
- "include": null,
- "label": "SOA class",
- "multivalue": false,
- "name": "dnsclass",
- "primary_key": false,
- "query": false,
- "required": false,
- "type": "unicode",
- "values": [
- "IN",
- "CS",
- "CH",
- "HS"
- ]
- },
- {
- "alwaysask": false,
- "attribute": false,
- "autofill": true,
- "class": "Flag",
- "cli_name": "allow_dynupdate",
- "cli_short_name": null,
- "default": false,
- "doc": "allow dynamic update?",
- "exclude": null,
- "falsehoods": [
- 0,
- "0",
- "false"
- ],
- "flags": [],
- "hint": null,
- "include": null,
- "label": "allow dynamic update?",
- "multivalue": false,
- "name": "idnsallowdynupdate",
- "primary_key": false,
- "query": false,
- "required": true,
- "truths": [
- "1",
- 1,
- "true"
- ],
- "type": "bool"
- },
- {
- "alwaysask": false,
- "attribute": false,
- "autofill": false,
- "class": "Str",
- "cli_name": "update_policy",
- "cli_short_name": null,
- "default": null,
- "doc": "BIND update policy",
- "exclude": null,
- "flags": [],
- "hint": null,
- "include": null,
- "label": "BIND update policy",
- "length": null,
- "maxlength": null,
- "minlength": null,
- "multivalue": false,
- "name": "idnsupdatepolicy",
- "pattern": null,
- "pattern_errmsg": null,
- "primary_key": false,
- "query": false,
- "required": false,
- "type": "unicode"
- }
- ]
- },
"dnsrecord": {
"aciattrs": [
"a6record",
@@ -2364,7 +2045,7 @@
"hint": null,
"include": null,
"label": "Time to live",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": null,
"multivalue": false,
"name": "dnsttl",
@@ -2634,7 +2315,7 @@
"hint": null,
"include": null,
"label": "SOA serial",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": null,
"multivalue": false,
"name": "idnssoaserial",
@@ -2657,7 +2338,7 @@
"hint": null,
"include": null,
"label": "SOA refresh",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": null,
"multivalue": false,
"name": "idnssoarefresh",
@@ -2680,7 +2361,7 @@
"hint": null,
"include": null,
"label": "SOA retry",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": null,
"multivalue": false,
"name": "idnssoaretry",
@@ -2703,7 +2384,7 @@
"hint": null,
"include": null,
"label": "SOA expire",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": null,
"multivalue": false,
"name": "idnssoaexpire",
@@ -2726,7 +2407,7 @@
"hint": null,
"include": null,
"label": "SOA minimum",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": null,
"multivalue": false,
"name": "idnssoaminimum",
@@ -2740,29 +2421,6 @@
"attribute": false,
"autofill": false,
"class": "Int",
- "cli_name": "maximum",
- "cli_short_name": null,
- "default": null,
- "doc": "SOA record maximum value",
- "exclude": null,
- "flags": [],
- "hint": null,
- "include": null,
- "label": "SOA maximum",
- "maxvalue": null,
- "minvalue": null,
- "multivalue": false,
- "name": "idnssoamaximum",
- "primary_key": false,
- "query": false,
- "required": false,
- "type": "int"
- },
- {
- "alwaysask": false,
- "attribute": false,
- "autofill": false,
- "class": "Int",
"cli_name": "ttl",
"cli_short_name": null,
"default": null,
@@ -2772,7 +2430,7 @@
"hint": null,
"include": null,
"label": "SOA time to live",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": null,
"multivalue": false,
"name": "dnsttl",
@@ -3056,7 +2714,7 @@
"hint": null,
"include": null,
"label": "GID",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": null,
"multivalue": false,
"name": "gidnumber",
@@ -4446,7 +4104,7 @@
"hint": null,
"include": null,
"label": "Max life",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": null,
"multivalue": false,
"name": "krbmaxticketlife",
@@ -4469,7 +4127,7 @@
"hint": null,
"include": null,
"label": "Max renew",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": null,
"multivalue": false,
"name": "krbmaxrenewableage",
@@ -4886,7 +4544,7 @@
"type": "tuple"
},
{
- "alwaysask": false,
+ "alwaysask": true,
"attribute": false,
"autofill": false,
"class": "List",
@@ -4909,7 +4567,7 @@
"type": "tuple"
},
{
- "alwaysask": false,
+ "alwaysask": true,
"attribute": false,
"autofill": false,
"class": "StrEnum",
@@ -4939,7 +4597,7 @@
]
},
{
- "alwaysask": false,
+ "alwaysask": true,
"attribute": false,
"autofill": false,
"class": "Str",
@@ -4965,7 +4623,7 @@
"type": "unicode"
},
{
- "alwaysask": false,
+ "alwaysask": true,
"attribute": false,
"autofill": false,
"class": "Str",
@@ -4991,7 +4649,7 @@
"type": "unicode"
},
{
- "alwaysask": false,
+ "alwaysask": true,
"attribute": false,
"autofill": false,
"class": "Str",
@@ -5017,7 +4675,7 @@
"type": "unicode"
},
{
- "alwaysask": false,
+ "alwaysask": true,
"attribute": false,
"autofill": false,
"class": "Str",
@@ -5289,7 +4947,7 @@
"hint": null,
"include": null,
"label": "Max lifetime (days)",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": 0,
"multivalue": false,
"name": "krbmaxpwdlife",
@@ -5312,7 +4970,7 @@
"hint": null,
"include": null,
"label": "Min lifetime (hours)",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": 0,
"multivalue": false,
"name": "krbminpwdlife",
@@ -5335,7 +4993,7 @@
"hint": null,
"include": null,
"label": "History size",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": 0,
"multivalue": false,
"name": "krbpwdhistorylength",
@@ -5381,7 +5039,7 @@
"hint": null,
"include": null,
"label": "Min length",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": 0,
"multivalue": false,
"name": "krbpwdminlength",
@@ -5404,7 +5062,7 @@
"hint": null,
"include": null,
"label": "Priority",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": 0,
"multivalue": false,
"name": "cospriority",
@@ -5427,7 +5085,7 @@
"hint": null,
"include": null,
"label": "Max failures",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": 0,
"multivalue": false,
"name": "krbpwdmaxfailure",
@@ -5450,7 +5108,7 @@
"hint": null,
"include": null,
"label": "Failure reset interval",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": 0,
"multivalue": false,
"name": "krbpwdfailurecountinterval",
@@ -5473,7 +5131,7 @@
"hint": null,
"include": null,
"label": "Lockout duration",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": 0,
"multivalue": false,
"name": "krbpwdlockoutduration",
@@ -7313,7 +6971,7 @@
"hint": null,
"include": null,
"label": "UID",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": 1,
"multivalue": false,
"name": "uidnumber",
@@ -7336,7 +6994,7 @@
"hint": null,
"include": null,
"label": "GID",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": null,
"multivalue": false,
"name": "gidnumber",
@@ -7437,7 +7095,7 @@
"hint": null,
"include": null,
"label": "ZIP",
- "maxvalue": null,
+ "maxvalue": 2147483647,
"minvalue": null,
"multivalue": false,
"name": "postalcode",
@@ -7662,7 +7320,7 @@
"cli_name": "nsaccountlock",
"cli_short_name": null,
"default": null,
- "doc": "Account activation status",
+ "doc": "Account disabled",
"exclude": null,
"falsehoods": [
0,
@@ -7676,7 +7334,7 @@
],
"hint": null,
"include": null,
- "label": "Account activation status",
+ "label": "Account disabled",
"multivalue": false,
"name": "nsaccountlock",
"primary_key": false,
@@ -7734,6 +7392,14 @@
"quick_links": "Quick Links",
"select_all": "Select All",
"unselect_all": "Unselect All"
+ },
+ "tabs": {
+ "audit": "Audit",
+ "hbac": "HBAC",
+ "identity": "Identity",
+ "ipaserver": "IPA Server",
+ "policy": "Policy",
+ "sudo": "SUDO"
}
}
},
@@ -7750,22 +7416,22 @@
"Administrator"
],
"gidnumber": [
- "590200000"
+ "890800000"
],
"homedirectory": [
"/home/admin"
],
"ipauniqueid": [
- "3f1c60c6-2026-11e0-80c2-52540029a798"
+ "6b8e688e-28e1-11e0-b944-52540029a798"
],
"krblastpwdchange": [
- "20110114213748Z"
+ "20110126001724Z"
],
"krblastsuccessfulauth": [
- "20110114213845Z"
+ "20110126002302Z"
],
"krbpasswordexpiration": [
- "20110414213748Z"
+ "20110426001724Z"
],
"krbprincipalname": [
"admin@IPA14.AYOUNG.BOSTON.DEVEL.REDHAT.COM"
@@ -7776,9 +7442,6 @@
"memberof_group": [
"admins"
],
- "mepmanagedentry": [
- "cn=admin,cn=groups,cn=accounts,dc=ipa14,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com"
- ],
"nsaccountlock": [
"False"
],
@@ -7789,8 +7452,7 @@
"krbprincipalaux",
"krbticketpolicyaux",
"inetuser",
- "ipaobject",
- "mepOriginEntry"
+ "ipaobject"
],
"sn": [
"Administrator"
@@ -7799,7 +7461,7 @@
"admin"
],
"uidnumber": [
- "590200000"
+ "890800000"
]
}
],
@@ -7807,7 +7469,7 @@
"truncated": false
},
{
- "count": 65,
+ "count": 66,
"error": null,
"result": {
"basedn": "dc=ipa14,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
@@ -7871,14 +7533,21 @@
"script": "/var/www/mod_wsgi",
"site_packages": "/usr/lib/python2.7/site-packages",
"startup_traceback": false,
+ "validate_api": false,
"verbose": 0,
"webui_assets_dir": null,
"webui_prod": true,
"xmlrpc_uri": "https://ipa14.ayoung.boston.devel.redhat.com/ipa/xml"
},
- "summary": "65 variables",
- "total": 65
+ "summary": "66 variables",
+ "total": 66
+ },
+ {
+ "error": null,
+ "result": true,
+ "summary": null,
+ "value": ""
}
]
}
-}
+} \ No newline at end of file
diff --git a/install/ui/webui.js b/install/ui/webui.js
index 1f45f0b1e..b1097f63a 100644
--- a/install/ui/webui.js
+++ b/install/ui/webui.js
@@ -26,43 +26,46 @@
/* tabs definition for IPA webUI */
-var admin_tab_set = [
- {name:'identity', children:[
- {name:'user', entity:'user'},
- {name:'group', entity:'group'},
- {name:'host', entity:'host'},
- {name:'hostgroup', entity:'hostgroup'},
- {name:'netgroup', entity:'netgroup'},
- {name:'service', entity:'service'}
- ]},
- {name:'policy', children:[
- {name:'dnszone', entity:'dnszone'},
- {name:'hbacrule', entity:'hbacrule', children:[
- {name:'hbacsvc', entity:'hbacsvc'},
- {name:'hbacsvcgroup', entity:'hbacsvcgroup'}
+IPA.admin_tab_set = function () {
+ return [
+ {name:'identity', label: IPA.messages.tabs.identity, children:[
+ {name:'user', entity:'user'},
+ {name:'group', entity:'group'},
+ {name:'host', entity:'host'},
+ {name:'hostgroup', entity:'hostgroup'},
+ {name:'netgroup', entity:'netgroup'},
+ {name:'service', entity:'service'}
]},
- {name:'sudorule', entity:'sudorule',children:[
- {name:'sudocmd', entity:'sudocmd'},
- {name:'sudocmdgroup', entity:'sudocmdgroup'}
+ {name:'policy', label: IPA.messages.tabs.policy, children:[
+ {name:'dnszone', entity:'dnszone'},
+ {name:'hbacrule', label: IPA.messages.tabs.hbac ,
+ entity:'hbacrule', children:[
+ {name:'hbacsvc', entity:'hbacsvc'},
+ {name:'hbacsvcgroup', entity:'hbacsvcgroup'}
+ ]},
+ {name:'sudorule', label: IPA.messages.tabs.sudo,
+ entity:'sudorule',children:[
+ {name:'sudocmd', entity:'sudocmd'},
+ {name:'sudocmdgroup', entity:'sudocmdgroup'}
+ ]},
+ {name:'pwpolicy', entity:'pwpolicy'},
+ {name:'krbtpolicy', entity:'krbtpolicy'}
]},
- {name:'pwpolicy', entity:'pwpolicy'},
- {name:'krbtpolicy', entity:'krbtpolicy'}
- ]},
- {name:'ipaserver', children: [
- {name:'role',entity:'role' ,children:[
- {name:'privilege',entity:'privilege' },
- {name:'permission', entity:'permission'}
- ]},
- {name:'selfservice' ,entity:'selfservice'},
- {name:'delegation' ,entity:'delegation'},
- {name:'config', entity:'config'}
- ]}
-];
+ {name:'ipaserver', label: IPA.messages.tabs.ipaserver, children: [
+ {name:'role',entity:'role' ,children:[
+ {name:'privilege',entity:'privilege' },
+ {name:'permission', entity:'permission'}
+ ]},
+ {name:'selfservice' ,entity:'selfservice'},
+ {name:'delegation' ,entity:'delegation'},
+ {name:'config', entity:'config'}
+ ]}];
+};
-var self_serv_tab_set =
- [
- { name:'identity', children: [
- {name:'user', entity:'user'}]}];
+IPA.self_serv_tab_set = function(){
+ return [ { name:'identity',
+ children: [ {name:'user', entity:'user'}]}];
+};
IPA.tab_state = function(entity_name){
@@ -133,11 +136,11 @@ $(function() {
var navigation = $('#navigation');
if (should_show_all_ui()){
- IPA.tab_set = admin_tab_set;
- nav_create(admin_tab_set, navigation, 'tabs');
+ IPA.tab_set = IPA.admin_tab_set();
+ nav_create(IPA.tab_set, navigation, 'tabs');
} else {
- IPA.tab_set = self_serv_tab_set;
- nav_create(self_serv_tab_set, navigation, 'tabs');
+ IPA.tab_set = self_serv_tab_set();
+ nav_create(IPA.tab_set, navigation, 'tabs');
var state = {'user-pkey':IPA.whoami_pkey ,
'user-facet': $.bbq.getState('user-facet') ||
@@ -169,4 +172,3 @@ function window_hashchange(evt){
function unimplemented_tab(jobj){
jobj.text('Not implemented yet!');
}
-