[Freeipa-devel] [PATCH] minor HTML validation fixes

[Kevin McCarthy]

Fix some HTML validation errors.  Move room number into address section.

Going to be doing some bigger stuff on these pages, so thought I'd
separate this patch out.

-Kevin

-------------- next part --------------
# HG changeset patch
# User Kevin McCarthy <kmccarth at redhat.com>
# Date 1192810731 25200
# Node ID fd6a79faf029e6c79ac618a523302360030f2aa3
# Parent  0827981e8e19135e341c7169041325d23964b244
Fix HTML errors on empty fields.  Move roomnumber to address section.

diff -r 0827981e8e19 -r fd6a79faf029 ipa-server/ipa-gui/ipagui/templates/usereditform.kid
--- a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid	Fri Oct 19 09:11:28 2007 -0700
+++ b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid	Fri Oct 19 09:18:51 2007 -0700
@@ -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>
@@ -507,18 +519,6 @@ from ipagui.helpers import ipahelper
         </th>
         <td>
            TODO
-        </td>
-      </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>
 
diff -r 0827981e8e19 -r fd6a79faf029 ipa-server/ipa-gui/ipagui/templates/usernewform.kid
--- a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid	Fri Oct 19 09:11:28 2007 -0700
+++ b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid	Fri Oct 19 09:18:51 2007 -0700
@@ -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>
@@ -495,18 +507,6 @@ from ipagui.helpers import ipahelper
         </th>
         <td>
            TODO
-        </td>
-      </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>
 
diff -r 0827981e8e19 -r fd6a79faf029 ipa-server/ipa-gui/ipagui/templates/usershow.kid
--- a/ipa-server/ipa-gui/ipagui/templates/usershow.kid	Fri Oct 19 09:11:28 2007 -0700
+++ b/ipa-server/ipa-gui/ipagui/templates/usershow.kid	Fri Oct 19 09:18:51 2007 -0700
@@ -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>
@@ -166,6 +167,12 @@ else:
             <label class="fieldlabel" py:content="fields.street.label" />:
           </th>
           <td>${user.get("street")}</td>
+        </tr>
+        <tr>
+          <th>
+            <label class="fieldlabel" py:content="fields.roomnumber.label" />:
+          </th>
+          <td>${user.get("roomnumber")}</td>
         </tr>
         <tr>
           <th>
@@ -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>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 4054 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20071019/9de6bcea/attachment.bin>