Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt	(revision 6344)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt	(revision 6345)
@@ -26,25 +26,20 @@
       <tal:block repeat="widget view/widgets">
         <tr>
-          <td class="label" tal:define="hint widget/hint">
-    	<label tal:condition="python:hint"
-    	       tal:attributes="for widget/name">
-    	  <span class="required" tal:condition="widget/required"
-    		>*</span><span i18n:translate=""
-    		tal:content="widget/label">label</span>
-    	</label>
-    	<label tal:condition="python:not hint"
-    	       tal:attributes="for widget/name">
-    	  <span class="required" tal:condition="widget/required"
-    		>*</span><span i18n:translate=""
-    		tal:content="widget/label">label</span>
-    	</label>:
+          <td class="label">
+            <label tal:attributes="for widget/name">
+              <span class="required" tal:condition="widget/required">*</span>
+              <span i18n:translate="" tal:content="widget/label">label</span>:
+            </label>
           </td>
           <td class="field">
-    	<div class="widget" tal:content="structure widget">
-    	  <input type="text" />
-    	</div>
-    	<div class="error" tal:condition="widget/error">
-    	  <span tal:replace="structure widget/error">error</span>
-    	</div>
+            <span class="widget" tal:content="structure widget">
+              <input type="text" />
+            </span>
+            <tal:error tal:condition="widget/error">
+              <span tal:replace="structure widget/error">error</span>
+            </tal:error>
+            <tal:hint tal:condition="widget/hint">
+              <span class="hint" tal:content="structure widget/hint">hint</span>
+            </tal:hint>
           </td>
         </tr>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_edit_form.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_edit_form.pt	(revision 6344)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_edit_form.pt	(revision 6345)
@@ -19,25 +19,20 @@
       <tal:block repeat="widget view/widgets">
         <tr>
-          <td class="label" tal:define="hint widget/hint">
-            <label tal:condition="python:hint"
-                   tal:attributes="for widget/name">
-              <span class="required" tal:condition="widget/required"
-              >*</span><span i18n:translate=""
-                             tal:content="widget/label">label</span>:
-            </label>
-            <label tal:condition="python:not hint"
-                   tal:attributes="for widget/name">
-              <span class="required" tal:condition="widget/required"
-              >*</span><span i18n:translate=""
-                             tal:content="widget/label">label</span>:
+          <td class="label">
+            <label tal:attributes="for widget/name">
+              <span class="required" tal:condition="widget/required">*</span>
+              <span i18n:translate="" tal:content="widget/label">label</span>:
             </label>
           </td>
           <td class="field">
-            <div class="widget" tal:content="structure widget">
+            <span class="widget" tal:content="structure widget">
               <input type="text" />
-            </div>
-            <div class="error" tal:condition="widget/error">
+            </span>
+            <tal:error tal:condition="widget/error">
               <span tal:replace="structure widget/error">error</span>
-            </div>
+            </tal:error>
+            <tal:hint tal:condition="widget/hint">
+              <span class="hint" tal:content="structure widget/hint">hint</span>
+            </tal:hint>
           </td>
         </tr>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentmanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentmanagepage.pt	(revision 6344)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentmanagepage.pt	(revision 6345)
@@ -28,31 +28,25 @@
             <table class="zebra">
                 <tbody>
-                    <tal:block repeat="widget view/widgets">
-                        <tr>
-                            <td class="label" tal:define="hint widget/hint">
-                                <label tal:condition="python:hint" tal:attributes="for widget/name">
-                                    <span class="required" tal:condition="widget/required">*
-                                    </span>
-                                    <span i18n:translate="" tal:content="widget/label">label
-                                    </span>
-                                </label>
-                                <label tal:condition="python:not hint" tal:attributes="for widget/name">
-                                    <span class="required" tal:condition="widget/required">*
-                                    </span>
-                                    <span i18n:translate="" tal:content="widget/label">label
-                                    </span>
-                                </label>:
-                            </td>
-                            <td class="field">
-                                <div class="widget" tal:content="structure widget">
-                                    <input type="text" />
-                                </div>
-                                <div class="error" tal:condition="widget/error">
-                                    <span tal:replace="structure widget/error">error
-                                    </span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tal:block>
+                  <tal:block repeat="widget view/widgets">
+                    <tr>
+                      <td class="label">
+                        <label tal:attributes="for widget/name">
+                          <span class="required" tal:condition="widget/required">*</span>
+                          <span i18n:translate="" tal:content="widget/label">label</span>:
+                        </label>
+                      </td>
+                      <td class="field">
+                        <span class="widget" tal:content="structure widget">
+                          <input type="text" />
+                        </span>
+                        <tal:error tal:condition="widget/error">
+                          <span tal:replace="structure widget/error">error</span>
+                        </tal:error>
+                        <tal:hint tal:condition="widget/hint">
+                          <span class="hint" tal:content="structure widget/hint">hint</span>
+                        </tal:hint>
+                      </td>
+                    </tr>
+                  </tal:block>
                 </tbody>
             </table>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt	(revision 6344)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt	(revision 6345)
@@ -24,31 +24,25 @@
             <table class="zebra">
                 <tbody>
-                    <tal:block repeat="widget view/widgets">
-                        <tr>
-                            <td class="label" tal:define="hint widget/hint">
-                                <label tal:condition="python:hint" tal:attributes="for widget/name">
-                                    <span class="required" tal:condition="widget/required" >*
-                                    </span>
-                                    <span i18n:translate="" tal:content="widget/label">label
-                                    </span>
-                                </label>
-                                <label tal:condition="python:not hint" tal:attributes="for widget/name">
-                                    <span class="required" tal:condition="widget/required" >*
-                                    </span>
-                                    <span i18n:translate="" tal:content="widget/label">label
-                                    </span>
-                                </label>:
-                            </td>
-                            <td class="field">
-                                <div class="widget" tal:content="structure widget">
-                                    <input type="text" />
-                                </div>
-                                <div class="error" tal:condition="widget/error">
-                                    <span tal:replace="structure widget/error">error
-                                    </span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tal:block>
+                  <tal:block repeat="widget view/widgets">
+                    <tr>
+                      <td class="label">
+                        <label tal:attributes="for widget/name">
+                          <span class="required" tal:condition="widget/required">*</span>
+                          <span i18n:translate="" tal:content="widget/label">label</span>:
+                        </label>
+                      </td>
+                      <td class="field">
+                        <span class="widget" tal:content="structure widget">
+                          <input type="text" />
+                        </span>
+                        <tal:error tal:condition="widget/error">
+                          <span tal:replace="structure widget/error">error</span>
+                        </tal:error>
+                        <tal:hint tal:condition="widget/hint">
+                          <span class="hint" tal:content="structure widget/hint">hint</span>
+                        </tal:hint>
+                      </td>
+                    </tr>
+                  </tal:block>
                 </tbody>
             </table>
