Refactor user and role views to use master3

tailbone/templates/deform/permissions.pt

@@ -0,0 +1,28 @@
+<div tal:define="oid oid|field.oid;
+                 true_val true_val|field.widget.true_val;"
+     tal:omit-tag="">
+  ${field.start_mapping()}
+
+  <tal:loop tal:repeat="groupkey sorted(permissions, key=lambda k: permissions[k]['label'].lower())">
+    <div tal:define="perms permissions[groupkey]['perms'];"
+         class="group">
+      <p class="group">${permissions[groupkey]['label']}</p>
+
+      <tal:loop tal:repeat="key sorted(perms, key=lambda p: perms[p]['label'].lower())">
+        <div class="perm">
+          <label>
+            <input type="checkbox"
+                   name="${key}"
+                   id="${oid}-${key}"
+                   value="${true_val}"
+                   tal:attributes="checked python:field.widget.get_checked_value(cstruct, key);" />
+            ${perms[key]['label']}
+          </label>
+        </div>
+      </tal:loop>
+
+    </div>
+  </tal:loop>
+
+  ${field.end_mapping()}
+</div>

tailbone/templates/forms2/deform.mako

@@ -26,11 +26,13 @@ ${h.csrf_token(request)}
     ##                 <div class="field-error">${error}</div>
     ##             % endfor
               % if field.error:
-                  <div class="field-error">${field.error.msg}</div>
+                  <div class="field-error"><span class="error-msg">${field.error.msg}</span></div>
               % endif
-              <label for="${field.oid}">${field.title}</label>
-              <div class="field">
-                ${field.serialize()|n}
+              <div class="field-row">
+                <label for="${field.oid}">${field.title}</label>
+                <div class="field">
+                  ${field.serialize()|n}
+                </div>
               </div>
               % if form.has_helptext(field.name):
                   <span class="instructions">${form.render_helptext(field.name)}</span>