cleaning up whitespace some

mfeif · Jul 1, 2011 · ae4844d · ae4844d
1 parent 2bf1604
commit ae4844d
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 51 deletions.
diff --git a/templates/form.mako b/templates/form.mako
@@ -26,10 +26,8 @@ i18n:domain="deform"\
 
       % if field.error:
       <li class="errorLi">
-        <h3 class="errorMsgLbl" i18n:translate=""
-            >There was a problem with your submission</h3>
-        <p class="errorMsg" i18n:translate=""
-           >Errors have been highlighted below</p>
+        <h3 class="errorMsgLbl" i18n:translate="">There was a problem with your submission</h3>
+        <p class="errorMsg" i18n:translate="">Errors have been highlighted below</p>
       </li>
       % endif
 

diff --git a/templates/hidden.mako b/templates/hidden.mako
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
-<input type="hidden" name="${field.name}" value="${cstruct}"
-       id="${field.oid}"/>
+<input type="hidden" name="${field.name}" value="${cstruct}" id="${field.oid}"/>
 
diff --git a/templates/sequence.mako b/templates/sequence.mako
@@ -8,49 +8,42 @@ max_len = field.widget.max_len or 100000
 now_len = len(subfields)
 prototype = field.widget.prototype(field)
 %>
-<div class="deformSeq" id="${field.oid}">
-
-  <!-- sequence -->
-
-  <input type="hidden" name="__start__" value="${field.name}:sequence" class="deformProto" prototype="${prototype}" />
-  <ul>
-    % for tup in subfields:
-    ${rndr(item_tmpl, field=tup[1], cstruct=tup[0], parent=field)}
-    % endfor
 
-<span class="deformInsertBefore" \
+<div class="deformSeq" id="${field.oid}">
+<!-- sequence -->
+<input type="hidden" name="__start__" value="${field.name}:sequence" class="deformProto" prototype="${prototype}" />
+<ul>
+% for c, f in subfields:
+${rndr(item_tmpl, field=f, cstruct=c, parent=field)}
+% endfor
+
+<span class="deformInsertBefore"\
 % if min_len:
-min_len="${min_len}"
+ min_len="${min_len}"\
 % endif
 % if max_len:
-max_len="${max_len}"
+ max_len="${max_len}"\
 % endif
 % if now_len:
-now_len="${now_len}"
+ now_len="${now_len}"\
 % endif
 ></span>
-  </ul>
-
-  <a href="#"
-     class="deformSeqAdd"
-     id="${field.oid}-seqAdd"
-     onclick="javascript: return deform.appendSequenceItem(this);">
-    <small id="${field.oid}-addtext">${add_subitem_text}</small>
-  </a>
-
-  <script type="text/javascript">
-     deform.addCallback(
-       '${field.oid}',
-       function(oid) {
-         oid_node = $('#'+ oid);
-         deform.processSequenceButtons(oid_node, ${min_len},
-                                       ${max_len}, ${now_len});
-       }
-     )
-  </script>
-
-  <input type="hidden" name="__end__" value="${field.name}:sequence"/>
-
-  <!-- /sequence -->
-
+</ul>
+
+<a href="#" class="deformSeqAdd" id="${field.oid}-seqAdd" onclick="javascript: return deform.appendSequenceItem(this);">\
+<small id="${field.oid}-addtext">${add_subitem_text}</small>\
+</a>
+
+<script type="text/javascript">
+   deform.addCallback(
+     '${field.oid}',
+     function(oid) {
+       oid_node = $('#'+ oid);
+       deform.processSequenceButtons(oid_node, ${min_len},
+                                     ${max_len}, ${now_len});
+     }
+   )
+</script>
+<input type="hidden" name="__end__" value="${field.name}:sequence"/>
+<!-- /sequence -->
 </div>
diff --git a/templates/textinput.mako b/templates/textinput.mako
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
-<input type="text" name="${field.name}" value="${cstruct}"
-       % if field.widget.size:
-       size="${field.widget.size}"
-       % endif
-       % if field.widget.css_class:
-       class="${field.widget.css_class}"
-       % endif
-       id="${field.oid}"/>
+<input type="text" name="${field.name}" value="${cstruct}"\
+% if field.widget.size:
+ size="${field.widget.size}"\
+% endif
+% if field.widget.css_class:
+ class="${field.widget.css_class}"\
+% endif
+ id="${field.oid}"/>
+
 % if field.widget.mask:
 <script type="text/javascript">
   deform.addCallback(