diff options
author | Kevin McCarthy <kmccarth@redhat.com> | 2007-10-19 09:18:51 -0700 |
---|---|---|
committer | Kevin McCarthy <kmccarth@redhat.com> | 2007-10-19 09:18:51 -0700 |
commit | c4bd800b37f5056316095f0ff66bae2190eb9228 (patch) | |
tree | 6fffe06ccac6fd3159b288893402554caa6770a0 | |
parent | fd8690dd63a812361401b341f8cbf857b1b98464 (diff) | |
download | freeipa-c4bd800b37f5056316095f0ff66bae2190eb9228.tar.gz freeipa-c4bd800b37f5056316095f0ff66bae2190eb9228.tar.xz freeipa-c4bd800b37f5056316095f0ff66bae2190eb9228.zip |
Fix HTML errors on empty fields. Move roomnumber to address section.
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/usereditform.kid | 24 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/usernewform.kid | 24 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/usershow.kid | 20 |
3 files changed, 35 insertions, 33 deletions
diff --git a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid index 1c5111bec..151760882 100644 --- a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid +++ b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid @@ -415,6 +415,18 @@ from ipagui.helpers import ipahelper <tr> <th> + <label class="fieldlabel" for="${user.roomnumber.field_id}" + py:content="user.roomnumber.label" />: + </th> + <td> + <span py:replace="user.roomnumber.display(value_for(user.roomnumber))" /> + <span py:if="tg.errors.get('roomnumber')" class="fielderror" + py:content="tg.errors.get('roomnumber')" /> + </td> + </tr> + + <tr> + <th> <label class="fieldlabel" for="${user.l.field_id}" py:content="user.l.label" />: </th> @@ -512,18 +524,6 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.roomnumber.field_id}" - py:content="user.roomnumber.label" />: - </th> - <td> - <span py:replace="user.roomnumber.display(value_for(user.roomnumber))" /> - <span py:if="tg.errors.get('roomnumber')" class="fielderror" - py:content="tg.errors.get('roomnumber')" /> - </td> - </tr> - - <tr> - <th> <label class="fieldlabel" for="${user.secretary.field_id}" py:content="user.secretary.label" />: </th> diff --git a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid index e13155f3a..b0ce8d8e0 100644 --- a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid +++ b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid @@ -403,6 +403,18 @@ from ipagui.helpers import ipahelper <tr> <th> + <label class="fieldlabel" for="${user.roomnumber.field_id}" + py:content="user.roomnumber.label" />: + </th> + <td> + <span py:replace="user.roomnumber.display(value_for(user.roomnumber))" /> + <span py:if="tg.errors.get('roomnumber')" class="fielderror" + py:content="tg.errors.get('roomnumber')" /> + </td> + </tr> + + <tr> + <th> <label class="fieldlabel" for="${user.l.field_id}" py:content="user.l.label" />: </th> @@ -500,18 +512,6 @@ from ipagui.helpers import ipahelper <tr> <th> - <label class="fieldlabel" for="${user.roomnumber.field_id}" - py:content="user.roomnumber.label" />: - </th> - <td> - <span py:replace="user.roomnumber.display(value_for(user.roomnumber))" /> - <span py:if="tg.errors.get('roomnumber')" class="fielderror" - py:content="tg.errors.get('roomnumber')" /> - </td> - </tr> - - <tr> - <th> <label class="fieldlabel" for="${user.secretary.field_id}" py:content="user.secretary.label" />: </th> diff --git a/ipa-server/ipa-gui/ipagui/templates/usershow.kid b/ipa-server/ipa-gui/ipagui/templates/usershow.kid index 9220b9747..3a1c13422 100644 --- a/ipa-server/ipa-gui/ipagui/templates/usershow.kid +++ b/ipa-server/ipa-gui/ipagui/templates/usershow.kid @@ -125,7 +125,8 @@ else: <th> <label class="fieldlabel" py:content="fields.mail.label" />: </th> - <td><a href="mailto:${user.get('mail')}">${user.get("mail")}</a></td> + <td><a py:if="user.get('mail')" + href="mailto:${user.get('mail')}">${user.get("mail")}</a></td> </tr> <tr> <th> @@ -169,6 +170,12 @@ else: </tr> <tr> <th> + <label class="fieldlabel" py:content="fields.roomnumber.label" />: + </th> + <td>${user.get("roomnumber")}</td> + </tr> + <tr> + <th> <label class="fieldlabel" py:content="fields.l.label" />: </th> <td>${user.get("l")}</td> @@ -224,12 +231,6 @@ else: </tr> <tr> <th> - <label class="fieldlabel" py:content="fields.roomnumber.label" />: - </th> - <td>${user.get("roomnumber")}</td> - </tr> - <tr> - <th> <label class="fieldlabel" py:content="fields.secretary.label" />: </th> <td>TODO</td> @@ -249,13 +250,14 @@ else: <label class="fieldlabel" py:content="fields.labeleduri.label" />: </th> <td> - <a href="${user.get('labeleduri')}">${user.get('labeleduri')}</a> + <a py:if="user.get('labeleduri')" + href="${user.get('labeleduri')}">${user.get('labeleduri')}</a> </td> </tr> </table> <div class="formsection" py:if='len(user_reports) > 0'>Direct Reports</div> - <ol> + <ol py:if="len(user_reports) > 0"> <li py:for="report in user_reports"> <a href="${tg.url('/user/show', uid=report.uid)}" >${report.givenname} ${report.sn}</a> |