IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix HTML errors on empty fields. Move roomnumber to address section.

Browse Source
This commit is contained in:
Kevin McCarthy 2007-10-19 09:18:51 -07:00
parent fd8690dd63
commit c4bd800b37
3 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ipa-server/ipa-gui/ipagui/templates/usereditform.kid
View File

@ -413,6 +413,18 @@ from ipagui.helpers import ipahelper
</td> </td>
</tr> </tr>
<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> <tr>
<th> <th>
<label class="fieldlabel" for="${user.l.field_id}" <label class="fieldlabel" for="${user.l.field_id}"
@ -510,18 +522,6 @@ from ipagui.helpers import ipahelper
</td> </td>
</tr> </tr>
<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> <tr>
<th> <th>
<label class="fieldlabel" for="${user.secretary.field_id}" <label class="fieldlabel" for="${user.secretary.field_id}"

24
ipa-server/ipa-gui/ipagui/templates/usernewform.kid
View File

@ -401,6 +401,18 @@ from ipagui.helpers import ipahelper
</td> </td>
</tr> </tr>
<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> <tr>
<th> <th>
<label class="fieldlabel" for="${user.l.field_id}" <label class="fieldlabel" for="${user.l.field_id}"
@ -498,18 +510,6 @@ from ipagui.helpers import ipahelper
</td> </td>
</tr> </tr>
<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> <tr>
<th> <th>
<label class="fieldlabel" for="${user.secretary.field_id}" <label class="fieldlabel" for="${user.secretary.field_id}"

20
ipa-server/ipa-gui/ipagui/templates/usershow.kid
View File

@ -125,7 +125,8 @@ else:
<th> <th>
<label class="fieldlabel" py:content="fields.mail.label" />: <label class="fieldlabel" py:content="fields.mail.label" />:
</th> </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>
<tr> <tr>
<th> <th>
@ -167,6 +168,12 @@ else:
</th> </th>
<td>${user.get("street")}</td> <td>${user.get("street")}</td>
</tr> </tr>
<tr>
<th>
<label class="fieldlabel" py:content="fields.roomnumber.label" />:
</th>
<td>${user.get("roomnumber")}</td>
</tr>
<tr> <tr>
<th> <th>
<label class="fieldlabel" py:content="fields.l.label" />: <label class="fieldlabel" py:content="fields.l.label" />:
@ -222,12 +229,6 @@ else:
>${user_manager.givenname} ${user_manager.sn}</a> >${user_manager.givenname} ${user_manager.sn}</a>
</td> </td>
</tr> </tr>
<tr>
<th>
<label class="fieldlabel" py:content="fields.roomnumber.label" />:
</th>
<td>${user.get("roomnumber")}</td>
</tr>
<tr> <tr>
<th> <th>
<label class="fieldlabel" py:content="fields.secretary.label" />: <label class="fieldlabel" py:content="fields.secretary.label" />:
@ -249,13 +250,14 @@ else:
<label class="fieldlabel" py:content="fields.labeleduri.label" />: <label class="fieldlabel" py:content="fields.labeleduri.label" />:
</th> </th>
<td> <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> </td>
</tr> </tr>
</table> </table>
<div class="formsection" py:if='len(user_reports) &gt; 0'>Direct Reports</div> <div class="formsection" py:if='len(user_reports) &gt; 0'>Direct Reports</div>
<ol> <ol py:if="len(user_reports) &gt; 0">
<li py:for="report in user_reports"> <li py:for="report in user_reports">
<a href="${tg.url('/user/show', uid=report.uid)}" <a href="${tg.url('/user/show', uid=report.uid)}"
>${report.givenname} ${report.sn}</a> >${report.givenname} ${report.sn}</a>