diff options
author | Kevin McCarthy <kmccarth@redhat.com> | 2007-10-25 09:18:45 -0700 |
---|---|---|
committer | Kevin McCarthy <kmccarth@redhat.com> | 2007-10-25 09:18:45 -0700 |
commit | 1d746c9fc2683afead918979923e71efb8e1ee7c (patch) | |
tree | 4aabd2496d70ae87c013647e570115fc6171b3e6 | |
parent | 358d279a53138220121379be2df546cc9ee82ae1 (diff) | |
download | freeipa.git-1d746c9fc2683afead918979923e71efb8e1ee7c.tar.gz freeipa.git-1d746c9fc2683afead918979923e71efb8e1ee7c.tar.xz freeipa.git-1d746c9fc2683afead918979923e71efb8e1ee7c.zip |
Rename the form fields parameter to be clearer:
user -> user_fields
group -> group_fields
delegate -> delegate_fields
-rw-r--r-- | ipa-server/ipa-gui/ipagui/forms/delegate.py | 4 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/forms/group.py | 8 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/forms/user.py | 8 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/delegateform.kid | 24 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/groupeditform.kid | 20 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/groupnewform.kid | 16 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/usereditform.kid | 216 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/usernewform.kid | 204 |
8 files changed, 250 insertions, 250 deletions
diff --git a/ipa-server/ipa-gui/ipagui/forms/delegate.py b/ipa-server/ipa-gui/ipagui/forms/delegate.py index c25d6c0c..89011f4a 100644 --- a/ipa-server/ipa-gui/ipagui/forms/delegate.py +++ b/ipa-server/ipa-gui/ipagui/forms/delegate.py @@ -69,7 +69,7 @@ class DelegateValidator(validators.Schema): messages = { 'empty': _("Please select at least one value"), }) class DelegateForm(widgets.Form): - params = ['delegate', 'attr_list'] + params = ['delegate_fields', 'attr_list'] hidden_fields = [ DelegateFields.source_group_dn, @@ -85,7 +85,7 @@ class DelegateForm(widgets.Form): super(DelegateForm,self).__init__(*args, **kw) (self.template_c, self.template) = widgets.meta.load_kid_template( "ipagui.templates.delegateform") - self.delegate = DelegateFields + self.delegate_fields = DelegateFields def update_params(self, params): super(DelegateForm,self).update_params(params) diff --git a/ipa-server/ipa-gui/ipagui/forms/group.py b/ipa-server/ipa-gui/ipagui/forms/group.py index 9c8c9d24..380c904a 100644 --- a/ipa-server/ipa-gui/ipagui/forms/group.py +++ b/ipa-server/ipa-gui/ipagui/forms/group.py @@ -19,7 +19,7 @@ class GroupNewValidator(validators.Schema): class GroupNewForm(widgets.Form): - params = ['group'] + params = ['group_fields'] hidden_fields = [ GroupFields.dn_to_info_json @@ -30,7 +30,7 @@ class GroupNewForm(widgets.Form): def __init__(self, *args, **kw): super(GroupNewForm,self).__init__(*args, **kw) (self.template_c, self.template) = widgets.meta.load_kid_template("ipagui.templates.groupnewform") - self.group = GroupFields + self.group_fields = GroupFields def update_params(self, params): super(GroupNewForm,self).update_params(params) @@ -45,7 +45,7 @@ class GroupEditValidator(validators.Schema): ] class GroupEditForm(widgets.Form): - params = ['members', 'group'] + params = ['members', 'group_fields'] hidden_fields = [ GroupFields.cn_hidden, GroupFields.editprotected_hidden, @@ -58,4 +58,4 @@ class GroupEditForm(widgets.Form): def __init__(self, *args, **kw): super(GroupEditForm,self).__init__(*args, **kw) (self.template_c, self.template) = widgets.meta.load_kid_template("ipagui.templates.groupeditform") - self.group = GroupFields + self.group_fields = GroupFields diff --git a/ipa-server/ipa-gui/ipagui/forms/user.py b/ipa-server/ipa-gui/ipagui/forms/user.py index 964067f4..1a35b4e0 100644 --- a/ipa-server/ipa-gui/ipagui/forms/user.py +++ b/ipa-server/ipa-gui/ipagui/forms/user.py @@ -75,7 +75,7 @@ class UserNewValidator(validators.Schema): class UserNewForm(widgets.Form): - params = ['user', 'custom_fields'] + params = ['user_fields', 'custom_fields'] hidden_fields = [ UserFields.dn_to_info_json, @@ -92,7 +92,7 @@ class UserNewForm(widgets.Form): def __init__(self, *args, **kw): super(UserNewForm,self).__init__(*args, **kw) (self.template_c, self.template) = widgets.meta.load_kid_template("ipagui.templates.usernewform") - self.user = UserFields + self.user_fields = UserFields def update_params(self, params): super(UserNewForm,self).update_params(params) @@ -116,7 +116,7 @@ class UserEditValidator(validators.Schema): ] class UserEditForm(widgets.Form): - params = ['user', 'custom_fields'] + params = ['user_fields', 'custom_fields'] hidden_fields = [ UserFields.uid_hidden, UserFields.user_orig, @@ -137,7 +137,7 @@ class UserEditForm(widgets.Form): def __init__(self, *args, **kw): super(UserEditForm,self).__init__(*args, **kw) (self.template_c, self.template) = widgets.meta.load_kid_template("ipagui.templates.usereditform") - self.user = UserFields + self.user_fields = UserFields # TODO - add dynamic field retrieval: diff --git a/ipa-server/ipa-gui/ipagui/templates/delegateform.kid b/ipa-server/ipa-gui/ipagui/templates/delegateform.kid index 63839434..9a6a6b0f 100644 --- a/ipa-server/ipa-gui/ipagui/templates/delegateform.kid +++ b/ipa-server/ipa-gui/ipagui/templates/delegateform.kid @@ -89,23 +89,23 @@ <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th valign="top"> - <label class="fieldlabel" for="${delegate.name.field_id}" - py:content="delegate.name.label" />: + <label class="fieldlabel" for="${delegate_fields.name.field_id}" + py:content="delegate_fields.name.label" />: </th> <td> - <span py:replace="delegate.name.display(value_for(delegate.name))" /> + <span py:replace="delegate_fields.name.display(value_for(delegate_fields.name))" /> <span py:if="tg.errors.get('name')" class="fielderror" py:content="tg.errors.get('name')" /> </td> </tr> <tr> <th valign="top"> - <label class="fieldlabel" for="${delegate.source_group_cn.field_id}" - py:content="delegate.source_group_cn.label" />: + <label class="fieldlabel" for="${delegate_fields.source_group_cn.field_id}" + py:content="delegate_fields.source_group_cn.label" />: </th> <td> <div> - <span id='source_group_cn'>${value_for(delegate.source_group_cn)}</span> + <span id='source_group_cn'>${value_for(delegate_fields.source_group_cn)}</span> <a href="#" id='source_change_link' onclick="new Effect.Appear($('source_searcharea'), {duration: 0.25}); new Effect.Fade(this, {duration: 0.25}); @@ -128,23 +128,23 @@ </tr> <tr> <th valign="top"> - <label class="fieldlabel" for="${delegate.attrs.field_id}" - py:content="delegate.attrs.label" />: + <label class="fieldlabel" for="${delegate_fields.attrs.field_id}" + py:content="delegate_fields.attrs.label" />: </th> <td valign="top"> <span py:if="tg.errors.get('attrs')" class="fielderror" py:content="tg.errors.get('attrs')" /> - <span py:replace="delegate.attrs.display(value_for(delegate.attrs))" /> + <span py:replace="delegate_fields.attrs.display(value_for(delegate_fields.attrs))" /> </td> </tr> <tr> <th valign="top"> - <label class="fieldlabel" for="${delegate.dest_group_cn.field_id}" - py:content="delegate.dest_group_cn.label" />: + <label class="fieldlabel" for="${delegate_fields.dest_group_cn.field_id}" + py:content="delegate_fields.dest_group_cn.label" />: </th> <td> <div> - <span id='dest_group_cn'>${value_for(delegate.dest_group_cn)}</span> + <span id='dest_group_cn'>${value_for(delegate_fields.dest_group_cn)}</span> <a href="#" id='dest_change_link' onclick="new Effect.Appear($('dest_searcharea'), {duration: 0.25}); new Effect.Fade(this, {duration: 0.25}); diff --git a/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid b/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid index 86c0590a..9b76daa0 100644 --- a/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid +++ b/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid @@ -56,25 +56,25 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${group.cn.field_id}" - py:content="group.cn.label" />: + <label class="fieldlabel" for="${group_fields.cn.field_id}" + py:content="group_fields.cn.label" />: </th> <td> - <!-- <span py:replace="group.cn.display(value_for(group.cn))" /> + <!-- <span py:replace="group_fields.cn.display(value_for(group_fields.cn))" /> <span py:if="tg.errors.get('cn')" class="fielderror" py:content="tg.errors.get('cn')" /> --> - ${value_for(group.cn)} + ${value_for(group_fields.cn)} </td> </tr> <tr> <th> - <label class="fieldlabel" for="${group.description.field_id}" - py:content="group.description.label" />: + <label class="fieldlabel" for="${group_fields.description.field_id}" + py:content="group_fields.description.label" />: </th> <td> - <span py:replace="group.description.display(value_for(group.description))" /> + <span py:replace="group_fields.description.display(value_for(group_fields.description))" /> <span py:if="tg.errors.get('description')" class="fielderror" py:content="tg.errors.get('description')" /> @@ -83,11 +83,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${group.gidnumber.field_id}" - py:content="group.gidnumber.label" />: + <label class="fieldlabel" for="${group_fields.gidnumber.field_id}" + py:content="group_fields.gidnumber.label" />: </th> <td> - <span py:replace="group.gidnumber.display(value_for(group.gidnumber))" /> + <span py:replace="group_fields.gidnumber.display(value_for(group_fields.gidnumber))" /> <span py:if="tg.errors.get('gidnumber')" class="fielderror" py:content="tg.errors.get('gidnumber')" /> diff --git a/ipa-server/ipa-gui/ipagui/templates/groupnewform.kid b/ipa-server/ipa-gui/ipagui/templates/groupnewform.kid index 538cfbdc..f55f9535 100644 --- a/ipa-server/ipa-gui/ipagui/templates/groupnewform.kid +++ b/ipa-server/ipa-gui/ipagui/templates/groupnewform.kid @@ -40,11 +40,11 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${group.cn.field_id}" - py:content="group.cn.label" />: + <label class="fieldlabel" for="${group_fields.cn.field_id}" + py:content="group_fields.cn.label" />: </th> <td> - <span py:replace="group.cn.display(value_for(group.cn))" /> + <span py:replace="group_fields.cn.display(value_for(group_fields.cn))" /> <span py:if="tg.errors.get('cn')" class="fielderror" py:content="tg.errors.get('cn')" /> @@ -53,11 +53,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${group.description.field_id}" - py:content="group.description.label" />: + <label class="fieldlabel" for="${group_fields.description.field_id}" + py:content="group_fields.description.label" />: </th> <td> - <span py:replace="group.description.display(value_for(group.description))" /> + <span py:replace="group_fields.description.display(value_for(group_fields.description))" /> <span py:if="tg.errors.get('description')" class="fielderror" py:content="tg.errors.get('description')" /> @@ -66,8 +66,8 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${group.gidnumber.field_id}" - py:content="group.gidnumber.label" />: + <label class="fieldlabel" for="${group_fields.gidnumber.field_id}" + py:content="group_fields.gidnumber.label" />: </th> <td> Generated by server diff --git a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid index 20edbced..de28f62f 100644 --- a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid +++ b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid @@ -95,11 +95,11 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${user.title.field_id}" - py:content="user.title.label" />: + <label class="fieldlabel" for="${user_fields.title.field_id}" + py:content="user_fields.title.label" />: </th> <td> - <span py:replace="user.title.display(value_for(user.title))" /> + <span py:replace="user_fields.title.display(value_for(user_fields.title))" /> <span py:if="tg.errors.get('title')" class="fielderror" py:content="tg.errors.get('title')" /> @@ -108,11 +108,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.givenname.field_id}" - py:content="user.givenname.label" />: + <label class="fieldlabel" for="${user_fields.givenname.field_id}" + py:content="user_fields.givenname.label" />: </th> <td> - <span py:replace="user.givenname.display(value_for(user.givenname))" /> + <span py:replace="user_fields.givenname.display(value_for(user_fields.givenname))" /> <span py:if="tg.errors.get('givenname')" class="fielderror" py:content="tg.errors.get('givenname')" /> @@ -121,11 +121,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.sn.field_id}" - py:content="user.sn.label" />: + <label class="fieldlabel" for="${user_fields.sn.field_id}" + py:content="user_fields.sn.label" />: </th> <td> - <span py:replace="user.sn.display(value_for(user.sn))" /> + <span py:replace="user_fields.sn.display(value_for(user_fields.sn))" /> <span py:if="tg.errors.get('sn')" class="fielderror" py:content="tg.errors.get('sn')" /> </td> @@ -133,11 +133,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.cn.field_id}" - py:content="user.cn.label" />: + <label class="fieldlabel" for="${user_fields.cn.field_id}" + py:content="user_fields.cn.label" />: </th> <td> - <span py:replace="user.cn.display(value_for(user.cn))" /> + <span py:replace="user_fields.cn.display(value_for(user_fields.cn))" /> <span py:if="tg.errors.get('cn')" class="fielderror" py:content="tg.errors.get('cn')" /> @@ -146,11 +146,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.displayname.field_id}" - py:content="user.displayname.label" />: + <label class="fieldlabel" for="${user_fields.displayname.field_id}" + py:content="user_fields.displayname.label" />: </th> <td> - <span py:replace="user.displayname.display(value_for(user.displayname))" /> + <span py:replace="user_fields.displayname.display(value_for(user_fields.displayname))" /> <span py:if="tg.errors.get('displayname')" class="fielderror" py:content="tg.errors.get('displayname')" /> @@ -159,11 +159,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.initials.field_id}" - py:content="user.initials.label" />: + <label class="fieldlabel" for="${user_fields.initials.field_id}" + py:content="user_fields.initials.label" />: </th> <td> - <span py:replace="user.initials.display(value_for(user.initials))" /> + <span py:replace="user_fields.initials.display(value_for(user_fields.initials))" /> <span py:if="tg.errors.get('initials')" class="fielderror" py:content="tg.errors.get('initials')" /> @@ -175,32 +175,32 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${user.nsAccountLock.field_id}" - py:content="user.nsAccountLock.label" />: + <label class="fieldlabel" for="${user_fields.nsAccountLock.field_id}" + py:content="user_fields.nsAccountLock.label" />: </th> <td> - <span py:replace="user.nsAccountLock.display(value_for(user.nsAccountLock))" /> + <span py:replace="user_fields.nsAccountLock.display(value_for(user_fields.nsAccountLock))" /> <span py:if="tg.errors.get('nsAccountLock')" class="fielderror" py:content="tg.errors.get('nsAccountLock')" /> </td> </tr> <tr> <th> - <label class="fieldlabel" for="${user.uid.field_id}" - py:content="user.uid.label" />: + <label class="fieldlabel" for="${user_fields.uid.field_id}" + py:content="user_fields.uid.label" />: </th> <td> - ${value_for(user.uid)} + ${value_for(user_fields.uid)} </td> </tr> <tr> <th valign="top"> - <label class="fieldlabel" for="${user.userpassword.field_id}" - py:content="user.userpassword.label" />: + <label class="fieldlabel" for="${user_fields.userpassword.field_id}" + py:content="user_fields.userpassword.label" />: </th> <td valign="top"> - <span py:replace="user.userpassword.display(value_for(user.userpassword))" /> + <span py:replace="user_fields.userpassword.display(value_for(user_fields.userpassword))" /> <span py:if="tg.errors.get('userpassword')" class="fielderror" py:content="tg.errors.get('userpassword')" /> @@ -247,12 +247,12 @@ from ipagui.helpers import ipahelper <tr> <th valign="top"> - <label class="fieldlabel" for="${user.userpassword_confirm.field_id}" - py:content="user.userpassword_confirm.label" />: + <label class="fieldlabel" for="${user_fields.userpassword_confirm.field_id}" + py:content="user_fields.userpassword_confirm.label" />: </th> <td valign="top"> - <span py:replace="user.userpassword_confirm.display( - value_for(user.userpassword_confirm))" /> + <span py:replace="user_fields.userpassword_confirm.display( + value_for(user_fields.userpassword_confirm))" /> <span py:if="tg.errors.get('userpassword_confirm')" class="fielderror" py:content="tg.errors.get('userpassword_confirm')" /> @@ -264,12 +264,12 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.uidnumber.field_id}" - py:content="user.uidnumber.label" />: + <label class="fieldlabel" for="${user_fields.uidnumber.field_id}" + py:content="user_fields.uidnumber.label" />: </th> <td> - <span py:replace="user.uidnumber.display( - value_for(user.uidnumber))" /> + <span py:replace="user_fields.uidnumber.display( + value_for(user_fields.uidnumber))" /> <span py:if="tg.errors.get('uidnumber')" class="fielderror" py:content="tg.errors.get('uidnumber')" /> @@ -281,12 +281,12 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.gidnumber.field_id}" - py:content="user.gidnumber.label" />: + <label class="fieldlabel" for="${user_fields.gidnumber.field_id}" + py:content="user_fields.gidnumber.label" />: </th> <td> - <span py:replace="user.gidnumber.display( - value_for(user.gidnumber))" /> + <span py:replace="user_fields.gidnumber.display( + value_for(user_fields.gidnumber))" /> <span py:if="tg.errors.get('gidnumber')" class="fielderror" py:content="tg.errors.get('gidnumber')" /> @@ -298,12 +298,12 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.homedirectory.field_id}" - py:content="user.homedirectory.label" />: + <label class="fieldlabel" for="${user_fields.homedirectory.field_id}" + py:content="user_fields.homedirectory.label" />: </th> <td> - <span py:replace="user.homedirectory.display( - value_for(user.homedirectory))" /> + <span py:replace="user_fields.homedirectory.display( + value_for(user_fields.homedirectory))" /> <span py:if="tg.errors.get('homedirectory')" class="fielderror" py:content="tg.errors.get('homedirectory')" /> @@ -315,12 +315,12 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.loginshell.field_id}" - py:content="user.loginshell.label" />: + <label class="fieldlabel" for="${user_fields.loginshell.field_id}" + py:content="user_fields.loginshell.label" />: </th> <td> - <span py:replace="user.loginshell.display( - value_for(user.loginshell))" /> + <span py:replace="user_fields.loginshell.display( + value_for(user_fields.loginshell))" /> <span py:if="tg.errors.get('loginshell')" class="fielderror" py:content="tg.errors.get('loginshell')" /> </td> @@ -328,12 +328,12 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.gecos.field_id}" - py:content="user.gecos.label" />: + <label class="fieldlabel" for="${user_fields.gecos.field_id}" + py:content="user_fields.gecos.label" />: </th> <td> - <span py:replace="user.gecos.display( - value_for(user.gecos))" /> + <span py:replace="user_fields.gecos.display( + value_for(user_fields.gecos))" /> <span py:if="tg.errors.get('gecos')" class="fielderror" py:content="tg.errors.get('gecos')" /> </td> @@ -344,11 +344,11 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${user.mail.field_id}" - py:content="user.mail.label" />: + <label class="fieldlabel" for="${user_fields.mail.field_id}" + py:content="user_fields.mail.label" />: </th> <td> - <span py:replace="user.mail.display(value_for(user.mail))" /> + <span py:replace="user_fields.mail.display(value_for(user_fields.mail))" /> <span py:if="tg.errors.get('mail')" class="fielderror" py:content="tg.errors.get('mail')" /> </td> @@ -356,11 +356,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.telephonenumber.field_id}" - py:content="user.telephonenumber.label" />: + <label class="fieldlabel" for="${user_fields.telephonenumber.field_id}" + py:content="user_fields.telephonenumber.label" />: </th> <td> - <span py:replace="user.telephonenumber.display(value_for(user.telephonenumber))" /> + <span py:replace="user_fields.telephonenumber.display(value_for(user_fields.telephonenumber))" /> <span py:if="tg.errors.get('telephonenumber')" class="fielderror" py:content="tg.errors.get('telephonenumber')" /> </td> @@ -368,11 +368,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.facsimiletelephonenumber.field_id}" - py:content="user.facsimiletelephonenumber.label" />: + <label class="fieldlabel" for="${user_fields.facsimiletelephonenumber.field_id}" + py:content="user_fields.facsimiletelephonenumber.label" />: </th> <td> - <span py:replace="user.facsimiletelephonenumber.display(value_for(user.facsimiletelephonenumber))" /> + <span py:replace="user_fields.facsimiletelephonenumber.display(value_for(user_fields.facsimiletelephonenumber))" /> <span py:if="tg.errors.get('facsimiletelephonenumber')" class="fielderror" py:content="tg.errors.get('facsimiletelephonenumber')" /> </td> @@ -380,11 +380,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.mobile.field_id}" - py:content="user.mobile.label" />: + <label class="fieldlabel" for="${user_fields.mobile.field_id}" + py:content="user_fields.mobile.label" />: </th> <td> - <span py:replace="user.mobile.display(value_for(user.mobile))" /> + <span py:replace="user_fields.mobile.display(value_for(user_fields.mobile))" /> <span py:if="tg.errors.get('mobile')" class="fielderror" py:content="tg.errors.get('mobile')" /> </td> @@ -392,11 +392,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.pager.field_id}" - py:content="user.pager.label" />: + <label class="fieldlabel" for="${user_fields.pager.field_id}" + py:content="user_fields.pager.label" />: </th> <td> - <span py:replace="user.pager.display(value_for(user.pager))" /> + <span py:replace="user_fields.pager.display(value_for(user_fields.pager))" /> <span py:if="tg.errors.get('pager')" class="fielderror" py:content="tg.errors.get('pager')" /> </td> @@ -404,11 +404,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.homephone.field_id}" - py:content="user.homephone.label" />: + <label class="fieldlabel" for="${user_fields.homephone.field_id}" + py:content="user_fields.homephone.label" />: </th> <td> - <span py:replace="user.homephone.display(value_for(user.homephone))" /> + <span py:replace="user_fields.homephone.display(value_for(user_fields.homephone))" /> <span py:if="tg.errors.get('homephone')" class="fielderror" py:content="tg.errors.get('homephone')" /> </td> @@ -419,11 +419,11 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${user.street.field_id}" - py:content="user.street.label" />: + <label class="fieldlabel" for="${user_fields.street.field_id}" + py:content="user_fields.street.label" />: </th> <td> - <span py:replace="user.street.display(value_for(user.street))" /> + <span py:replace="user_fields.street.display(value_for(user_fields.street))" /> <span py:if="tg.errors.get('street')" class="fielderror" py:content="tg.errors.get('street')" /> </td> @@ -431,11 +431,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.roomnumber.field_id}" - py:content="user.roomnumber.label" />: + <label class="fieldlabel" for="${user_fields.roomnumber.field_id}" + py:content="user_fields.roomnumber.label" />: </th> <td> - <span py:replace="user.roomnumber.display(value_for(user.roomnumber))" /> + <span py:replace="user_fields.roomnumber.display(value_for(user_fields.roomnumber))" /> <span py:if="tg.errors.get('roomnumber')" class="fielderror" py:content="tg.errors.get('roomnumber')" /> </td> @@ -443,11 +443,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.l.field_id}" - py:content="user.l.label" />: + <label class="fieldlabel" for="${user_fields.l.field_id}" + py:content="user_fields.l.label" />: </th> <td> - <span py:replace="user.l.display(value_for(user.l))" /> + <span py:replace="user_fields.l.display(value_for(user_fields.l))" /> <span py:if="tg.errors.get('l')" class="fielderror" py:content="tg.errors.get('l')" /> </td> @@ -455,11 +455,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.st.field_id}" - py:content="user.st.label" />: + <label class="fieldlabel" for="${user_fields.st.field_id}" + py:content="user_fields.st.label" />: </th> <td> - <span py:replace="user.st.display(value_for(user.st))" /> + <span py:replace="user_fields.st.display(value_for(user_fields.st))" /> <span py:if="tg.errors.get('st')" class="fielderror" py:content="tg.errors.get('st')" /> </td> @@ -467,11 +467,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.postalcode.field_id}" - py:content="user.postalcode.label" />: + <label class="fieldlabel" for="${user_fields.postalcode.field_id}" + py:content="user_fields.postalcode.label" />: </th> <td> - <span py:replace="user.postalcode.display(value_for(user.postalcode))" /> + <span py:replace="user_fields.postalcode.display(value_for(user_fields.postalcode))" /> <span py:if="tg.errors.get('postalcode')" class="fielderror" py:content="tg.errors.get('postalcode')" /> </td> @@ -482,11 +482,11 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${user.ou.field_id}" - py:content="user.ou.label" />: + <label class="fieldlabel" for="${user_fields.ou.field_id}" + py:content="user_fields.ou.label" />: </th> <td> - <span py:replace="user.ou.display(value_for(user.ou))" /> + <span py:replace="user_fields.ou.display(value_for(user_fields.ou))" /> <span py:if="tg.errors.get('ou')" class="fielderror" py:content="tg.errors.get('ou')" /> </td> @@ -494,11 +494,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.businesscategory.field_id}" - py:content="user.businesscategory.label" />: + <label class="fieldlabel" for="${user_fields.businesscategory.field_id}" + py:content="user_fields.businesscategory.label" />: </th> <td> - <span py:replace="user.businesscategory.display(value_for(user.businesscategory))" /> + <span py:replace="user_fields.businesscategory.display(value_for(user_fields.businesscategory))" /> <span py:if="tg.errors.get('businesscategory')" class="fielderror" py:content="tg.errors.get('businesscategory')" /> </td> @@ -506,11 +506,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.description.field_id}" - py:content="user.description.label" />: + <label class="fieldlabel" for="${user_fields.description.field_id}" + py:content="user_fields.description.label" />: </th> <td> - <span py:replace="user.description.display(value_for(user.description))" /> + <span py:replace="user_fields.description.display(value_for(user_fields.description))" /> <span py:if="tg.errors.get('description')" class="fielderror" py:content="tg.errors.get('description')" /> </td> @@ -518,11 +518,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.employeetype.field_id}" - py:content="user.employeetype.label" />: + <label class="fieldlabel" for="${user_fields.employeetype.field_id}" + py:content="user_fields.employeetype.label" />: </th> <td> - <span py:replace="user.employeetype.display(value_for(user.employeetype))" /> + <span py:replace="user_fields.employeetype.display(value_for(user_fields.employeetype))" /> <span py:if="tg.errors.get('employeetype')" class="fielderror" py:content="tg.errors.get('employeetype')" /> </td> @@ -530,12 +530,12 @@ from ipagui.helpers import ipahelper <tr> <th valign="top"> - <label class="fieldlabel" for="${user.manager.field_id}" - py:content="user.manager.label" />: + <label class="fieldlabel" for="${user_fields.manager.field_id}" + py:content="user_fields.manager.label" />: </th> <td valign="top"> <div> - <span id='manager_select_cn'>${value_for(user.manager_cn)}</span> + <span id='manager_select_cn'>${value_for(user_fields.manager_cn)}</span> <span id='manager_links'> <a href="#" onclick="return clearSelect('manager');">clear</a> <a href="#" onclick="return startSelect('manager');">change</a> @@ -559,12 +559,12 @@ from ipagui.helpers import ipahelper <tr> <th valign="top"> - <label class="fieldlabel" for="${user.secretary.field_id}" - py:content="user.secretary.label" />: + <label class="fieldlabel" for="${user_fields.secretary.field_id}" + py:content="user_fields.secretary.label" />: </th> <td valign="top"> <div> - <span id='secretary_select_cn'>${value_for(user.secretary_cn)}</span> + <span id='secretary_select_cn'>${value_for(user_fields.secretary_cn)}</span> <span id='secretary_links'> <a href="#" onclick="return clearSelect('secretary');">clear</a> <a href="#" onclick="return startSelect('secretary');">change</a> @@ -591,22 +591,22 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${user.carlicense.field_id}" - py:content="user.carlicense.label" />: + <label class="fieldlabel" for="${user_fields.carlicense.field_id}" + py:content="user_fields.carlicense.label" />: </th> <td> - <span py:replace="user.carlicense.display(value_for(user.carlicense))" /> + <span py:replace="user_fields.carlicense.display(value_for(user_fields.carlicense))" /> <span py:if="tg.errors.get('carlicense')" class="fielderror" py:content="tg.errors.get('carlicense')" /> </td> </tr> <tr> <th> - <label class="fieldlabel" for="${user.labeleduri.field_id}" - py:content="user.labeleduri.label" />: + <label class="fieldlabel" for="${user_fields.labeleduri.field_id}" + py:content="user_fields.labeleduri.label" />: </th> <td> - <span py:replace="user.labeleduri.display(value_for(user.labeleduri))" /> + <span py:replace="user_fields.labeleduri.display(value_for(user_fields.labeleduri))" /> <span py:if="tg.errors.get('labeleduri')" class="fielderror" py:content="tg.errors.get('labeleduri')" /> </td> diff --git a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid index 44314457..09a09dd3 100644 --- a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid +++ b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid @@ -65,11 +65,11 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${user.title.field_id}" - py:content="user.title.label" />: + <label class="fieldlabel" for="${user_fields.title.field_id}" + py:content="user_fields.title.label" />: </th> <td> - <span py:replace="user.title.display(value_for(user.title))" /> + <span py:replace="user_fields.title.display(value_for(user_fields.title))" /> <span py:if="tg.errors.get('title')" class="fielderror" py:content="tg.errors.get('title')" /> @@ -78,11 +78,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.givenname.field_id}" - py:content="user.givenname.label" />: + <label class="fieldlabel" for="${user_fields.givenname.field_id}" + py:content="user_fields.givenname.label" />: </th> <td> - <span py:replace="user.givenname.display(value_for(user.givenname))" /> + <span py:replace="user_fields.givenname.display(value_for(user_fields.givenname))" /> <span py:if="tg.errors.get('givenname')" class="fielderror" py:content="tg.errors.get('givenname')" /> @@ -91,11 +91,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.sn.field_id}" - py:content="user.sn.label" />: + <label class="fieldlabel" for="${user_fields.sn.field_id}" + py:content="user_fields.sn.label" />: </th> <td> - <span py:replace="user.sn.display(value_for(user.sn))" /> + <span py:replace="user_fields.sn.display(value_for(user_fields.sn))" /> <span py:if="tg.errors.get('sn')" class="fielderror" py:content="tg.errors.get('sn')" /> <script type="text/javascript"> @@ -171,11 +171,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.cn.field_id}" - py:content="user.cn.label" />: + <label class="fieldlabel" for="${user_fields.cn.field_id}" + py:content="user_fields.cn.label" />: </th> <td> - <span py:replace="user.cn.display(value_for(user.cn))" /> + <span py:replace="user_fields.cn.display(value_for(user_fields.cn))" /> <span py:if="tg.errors.get('cn')" class="fielderror" py:content="tg.errors.get('cn')" /> @@ -184,11 +184,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.displayname.field_id}" - py:content="user.displayname.label" />: + <label class="fieldlabel" for="${user_fields.displayname.field_id}" + py:content="user_fields.displayname.label" />: </th> <td> - <span py:replace="user.displayname.display(value_for(user.displayname))" /> + <span py:replace="user_fields.displayname.display(value_for(user_fields.displayname))" /> <span py:if="tg.errors.get('displayname')" class="fielderror" py:content="tg.errors.get('displayname')" /> @@ -197,11 +197,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.initials.field_id}" - py:content="user.initials.label" />: + <label class="fieldlabel" for="${user_fields.initials.field_id}" + py:content="user_fields.initials.label" />: </th> <td> - <span py:replace="user.initials.display(value_for(user.initials))" /> + <span py:replace="user_fields.initials.display(value_for(user_fields.initials))" /> <span py:if="tg.errors.get('initials')" class="fielderror" py:content="tg.errors.get('initials')" /> @@ -213,22 +213,22 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${user.nsAccountLock.field_id}" - py:content="user.nsAccountLock.label" />: + <label class="fieldlabel" for="${user_fields.nsAccountLock.field_id}" + py:content="user_fields.nsAccountLock.label" />: </th> <td> - <span py:replace="user.nsAccountLock.display(value_for(user.nsAccountLock))" /> + <span py:replace="user_fields.nsAccountLock.display(value_for(user_fields.nsAccountLock))" /> <span py:if="tg.errors.get('nsAccountLock')" class="fielderror" py:content="tg.errors.get('nsAccountLock')" /> </td> </tr> <tr> <th> - <label class="fieldlabel" for="${user.uid.field_id}" - py:content="user.uid.label" />: + <label class="fieldlabel" for="${user_fields.uid.field_id}" + py:content="user_fields.uid.label" />: </th> <td> - <span py:replace="user.uid.display(value_for(user.uid))" /> + <span py:replace="user_fields.uid.display(value_for(user_fields.uid))" /> <span py:if="tg.errors.get('uid')" class="fielderror" py:content="tg.errors.get('uid')" /> </td> @@ -236,11 +236,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.userpassword.field_id}" - py:content="user.userpassword.label" />: + <label class="fieldlabel" for="${user_fields.userpassword.field_id}" + py:content="user_fields.userpassword.label" />: </th> <td> - <span py:replace="user.userpassword.display(value_for(user.userpassword))" /> + <span py:replace="user_fields.userpassword.display(value_for(user_fields.userpassword))" /> <span py:if="tg.errors.get('userpassword')" class="fielderror" py:content="tg.errors.get('userpassword')" /> @@ -260,12 +260,12 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.userpassword_confirm.field_id}" - py:content="user.userpassword_confirm.label" />: + <label class="fieldlabel" for="${user_fields.userpassword_confirm.field_id}" + py:content="user_fields.userpassword_confirm.label" />: </th> <td> - <span py:replace="user.userpassword_confirm.display( - value_for(user.userpassword_confirm))" /> + <span py:replace="user_fields.userpassword_confirm.display( + value_for(user_fields.userpassword_confirm))" /> <span py:if="tg.errors.get('userpassword_confirm')" class="fielderror" py:content="tg.errors.get('userpassword_confirm')" /> </td> @@ -273,8 +273,8 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.uidnumber.field_id}" - py:content="user.uidnumber.label" />: + <label class="fieldlabel" for="${user_fields.uidnumber.field_id}" + py:content="user_fields.uidnumber.label" />: </th> <td> Generated by server @@ -283,8 +283,8 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.gidnumber.field_id}" - py:content="user.gidnumber.label" />: + <label class="fieldlabel" for="${user_fields.gidnumber.field_id}" + py:content="user_fields.gidnumber.label" />: </th> <td> Generated by server @@ -293,8 +293,8 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.homedirectory.field_id}" - py:content="user.homedirectory.label" />: + <label class="fieldlabel" for="${user_fields.homedirectory.field_id}" + py:content="user_fields.homedirectory.label" />: </th> <td> Generated by server @@ -303,12 +303,12 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.loginshell.field_id}" - py:content="user.loginshell.label" />: + <label class="fieldlabel" for="${user_fields.loginshell.field_id}" + py:content="user_fields.loginshell.label" />: </th> <td> - <span py:replace="user.loginshell.display( - value_for(user.loginshell))" /> + <span py:replace="user_fields.loginshell.display( + value_for(user_fields.loginshell))" /> <span py:if="tg.errors.get('loginshell')" class="fielderror" py:content="tg.errors.get('loginshell')" /> </td> @@ -316,12 +316,12 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.gecos.field_id}" - py:content="user.gecos.label" />: + <label class="fieldlabel" for="${user_fields.gecos.field_id}" + py:content="user_fields.gecos.label" />: </th> <td> - <span py:replace="user.gecos.display( - value_for(user.gecos))" /> + <span py:replace="user_fields.gecos.display( + value_for(user_fields.gecos))" /> <span py:if="tg.errors.get('gecos')" class="fielderror" py:content="tg.errors.get('gecos')" /> </td> @@ -332,11 +332,11 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${user.mail.field_id}" - py:content="user.mail.label" />: + <label class="fieldlabel" for="${user_fields.mail.field_id}" + py:content="user_fields.mail.label" />: </th> <td> - <span py:replace="user.mail.display(value_for(user.mail))" /> + <span py:replace="user_fields.mail.display(value_for(user_fields.mail))" /> <span py:if="tg.errors.get('mail')" class="fielderror" py:content="tg.errors.get('mail')" /> </td> @@ -344,11 +344,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.telephonenumber.field_id}" - py:content="user.telephonenumber.label" />: + <label class="fieldlabel" for="${user_fields.telephonenumber.field_id}" + py:content="user_fields.telephonenumber.label" />: </th> <td> - <span py:replace="user.telephonenumber.display(value_for(user.telephonenumber))" /> + <span py:replace="user_fields.telephonenumber.display(value_for(user_fields.telephonenumber))" /> <span py:if="tg.errors.get('telephonenumber')" class="fielderror" py:content="tg.errors.get('telephonenumber')" /> </td> @@ -356,11 +356,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.facsimiletelephonenumber.field_id}" - py:content="user.facsimiletelephonenumber.label" />: + <label class="fieldlabel" for="${user_fields.facsimiletelephonenumber.field_id}" + py:content="user_fields.facsimiletelephonenumber.label" />: </th> <td> - <span py:replace="user.facsimiletelephonenumber.display(value_for(user.facsimiletelephonenumber))" /> + <span py:replace="user_fields.facsimiletelephonenumber.display(value_for(user_fields.facsimiletelephonenumber))" /> <span py:if="tg.errors.get('facsimiletelephonenumber')" class="fielderror" py:content="tg.errors.get('facsimiletelephonenumber')" /> </td> @@ -368,11 +368,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.mobile.field_id}" - py:content="user.mobile.label" />: + <label class="fieldlabel" for="${user_fields.mobile.field_id}" + py:content="user_fields.mobile.label" />: </th> <td> - <span py:replace="user.mobile.display(value_for(user.mobile))" /> + <span py:replace="user_fields.mobile.display(value_for(user_fields.mobile))" /> <span py:if="tg.errors.get('mobile')" class="fielderror" py:content="tg.errors.get('mobile')" /> </td> @@ -380,11 +380,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.pager.field_id}" - py:content="user.pager.label" />: + <label class="fieldlabel" for="${user_fields.pager.field_id}" + py:content="user_fields.pager.label" />: </th> <td> - <span py:replace="user.pager.display(value_for(user.pager))" /> + <span py:replace="user_fields.pager.display(value_for(user_fields.pager))" /> <span py:if="tg.errors.get('pager')" class="fielderror" py:content="tg.errors.get('pager')" /> </td> @@ -392,11 +392,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.homephone.field_id}" - py:content="user.homephone.label" />: + <label class="fieldlabel" for="${user_fields.homephone.field_id}" + py:content="user_fields.homephone.label" />: </th> <td> - <span py:replace="user.homephone.display(value_for(user.homephone))" /> + <span py:replace="user_fields.homephone.display(value_for(user_fields.homephone))" /> <span py:if="tg.errors.get('homephone')" class="fielderror" py:content="tg.errors.get('homephone')" /> </td> @@ -407,11 +407,11 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${user.street.field_id}" - py:content="user.street.label" />: + <label class="fieldlabel" for="${user_fields.street.field_id}" + py:content="user_fields.street.label" />: </th> <td> - <span py:replace="user.street.display(value_for(user.street))" /> + <span py:replace="user_fields.street.display(value_for(user_fields.street))" /> <span py:if="tg.errors.get('street')" class="fielderror" py:content="tg.errors.get('street')" /> </td> @@ -419,11 +419,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.roomnumber.field_id}" - py:content="user.roomnumber.label" />: + <label class="fieldlabel" for="${user_fields.roomnumber.field_id}" + py:content="user_fields.roomnumber.label" />: </th> <td> - <span py:replace="user.roomnumber.display(value_for(user.roomnumber))" /> + <span py:replace="user_fields.roomnumber.display(value_for(user_fields.roomnumber))" /> <span py:if="tg.errors.get('roomnumber')" class="fielderror" py:content="tg.errors.get('roomnumber')" /> </td> @@ -431,11 +431,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.l.field_id}" - py:content="user.l.label" />: + <label class="fieldlabel" for="${user_fields.l.field_id}" + py:content="user_fields.l.label" />: </th> <td> - <span py:replace="user.l.display(value_for(user.l))" /> + <span py:replace="user_fields.l.display(value_for(user_fields.l))" /> <span py:if="tg.errors.get('l')" class="fielderror" py:content="tg.errors.get('l')" /> </td> @@ -443,11 +443,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.st.field_id}" - py:content="user.st.label" />: + <label class="fieldlabel" for="${user_fields.st.field_id}" + py:content="user_fields.st.label" />: </th> <td> - <span py:replace="user.st.display(value_for(user.st))" /> + <span py:replace="user_fields.st.display(value_for(user_fields.st))" /> <span py:if="tg.errors.get('st')" class="fielderror" py:content="tg.errors.get('st')" /> </td> @@ -455,11 +455,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.postalcode.field_id}" - py:content="user.postalcode.label" />: + <label class="fieldlabel" for="${user_fields.postalcode.field_id}" + py:content="user_fields.postalcode.label" />: </th> <td> - <span py:replace="user.postalcode.display(value_for(user.postalcode))" /> + <span py:replace="user_fields.postalcode.display(value_for(user_fields.postalcode))" /> <span py:if="tg.errors.get('postalcode')" class="fielderror" py:content="tg.errors.get('postalcode')" /> </td> @@ -470,11 +470,11 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${user.ou.field_id}" - py:content="user.ou.label" />: + <label class="fieldlabel" for="${user_fields.ou.field_id}" + py:content="user_fields.ou.label" />: </th> <td> - <span py:replace="user.ou.display(value_for(user.ou))" /> + <span py:replace="user_fields.ou.display(value_for(user_fields.ou))" /> <span py:if="tg.errors.get('ou')" class="fielderror" py:content="tg.errors.get('ou')" /> </td> @@ -482,11 +482,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.businesscategory.field_id}" - py:content="user.businesscategory.label" />: + <label class="fieldlabel" for="${user_fields.businesscategory.field_id}" + py:content="user_fields.businesscategory.label" />: </th> <td> - <span py:replace="user.businesscategory.display(value_for(user.businesscategory))" /> + <span py:replace="user_fields.businesscategory.display(value_for(user_fields.businesscategory))" /> <span py:if="tg.errors.get('businesscategory')" class="fielderror" py:content="tg.errors.get('businesscategory')" /> </td> @@ -494,11 +494,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.description.field_id}" - py:content="user.description.label" />: + <label class="fieldlabel" for="${user_fields.description.field_id}" + py:content="user_fields.description.label" />: </th> <td> - <span py:replace="user.description.display(value_for(user.description))" /> + <span py:replace="user_fields.description.display(value_for(user_fields.description))" /> <span py:if="tg.errors.get('description')" class="fielderror" py:content="tg.errors.get('description')" /> </td> @@ -506,11 +506,11 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.employeetype.field_id}" - py:content="user.employeetype.label" />: + <label class="fieldlabel" for="${user_fields.employeetype.field_id}" + py:content="user_fields.employeetype.label" />: </th> <td> - <span py:replace="user.employeetype.display(value_for(user.employeetype))" /> + <span py:replace="user_fields.employeetype.display(value_for(user_fields.employeetype))" /> <span py:if="tg.errors.get('employeetype')" class="fielderror" py:content="tg.errors.get('employeetype')" /> </td> @@ -518,12 +518,12 @@ from ipagui.helpers import ipahelper <tr> <th valign="top"> - <label class="fieldlabel" for="${user.manager.field_id}" - py:content="user.manager.label" />: + <label class="fieldlabel" for="${user_fields.manager.field_id}" + py:content="user_fields.manager.label" />: </th> <td valign="top"> <div> - <span id='manager_select_cn'>${value_for(user.manager)}</span> + <span id='manager_select_cn'>${value_for(user_fields.manager)}</span> <span id='manager_links'> <a href="#" onclick="return clearSelect('manager');">clear</a> <a href="#" onclick="return startSelect('manager');">change</a> @@ -547,12 +547,12 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.secretary.field_id}" - py:content="user.secretary.label" />: + <label class="fieldlabel" for="${user_fields.secretary.field_id}" + py:content="user_fields.secretary.label" />: </th> <td> <div> - <span id='secretary_select_cn'>${value_for(user.secretary)}</span> + <span id='secretary_select_cn'>${value_for(user_fields.secretary)}</span> <span id='secretary_links'> <a href="#" onclick="return clearSelect('secretary');">clear</a> <a href="#" onclick="return startSelect('secretary');">change</a> @@ -579,22 +579,22 @@ from ipagui.helpers import ipahelper <table class="formtable" cellpadding="2" cellspacing="0" border="0"> <tr> <th> - <label class="fieldlabel" for="${user.carlicense.field_id}" - py:content="user.carlicense.label" />: + <label class="fieldlabel" for="${user_fields.carlicense.field_id}" + py:content="user_fields.carlicense.label" />: </th> <td> - <span py:replace="user.carlicense.display(value_for(user.carlicense))" /> + <span py:replace="user_fields.carlicense.display(value_for(user_fields.carlicense))" /> <span py:if="tg.errors.get('carlicense')" class="fielderror" py:content="tg.errors.get('carlicense')" /> </td> </tr> <tr> <th> - <label class="fieldlabel" for="${user.labeleduri.field_id}" - py:content="user.labeleduri.label" />: + <label class="fieldlabel" for="${user_fields.labeleduri.field_id}" + py:content="user_fields.labeleduri.label" />: </th> <td> - <span py:replace="user.labeleduri.display(value_for(user.labeleduri))" /> + <span py:replace="user_fields.labeleduri.display(value_for(user_fields.labeleduri))" /> <span py:if="tg.errors.get('labeleduri')" class="fielderror" py:content="tg.errors.get('labeleduri')" /> </td> |