Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontaineraddpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontaineraddpage.pt	(revision 6344)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontaineraddpage.pt	(revision 6345)
@@ -17,30 +17,25 @@
   <table class="zebra">
     <tbody>
-        <tal:block repeat="widget view/widgets">
+      <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>
-        </tal:block>
+      </tal:block>
     </tbody>
   </table>
Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainermanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainermanagepage.pt	(revision 6344)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainermanagepage.pt	(revision 6345)
@@ -33,25 +33,21 @@
           <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>:
+              <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>
-                <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>
               <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:replace="structure widget/error">error
-                  </span>
-                </div> </td>
+                </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>
