X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/b07336c562d537ea3407d6a1c9fcb280dae7f514..490b45cdc311a09db0266a3f974289e3979bf2ea:/floof/templates/art/new.mako?ds=inline

diff --git a/floof/templates/art/new.mako b/floof/templates/art/new.mako
index 2b18b42..0adc916 100644
--- a/floof/templates/art/new.mako
+++ b/floof/templates/art/new.mako
@@ -3,24 +3,40 @@
 <h1>Add New Art</h1>
 ${h.form(h.url('create_art'), multipart=True)}
 
+##<<<<<<< HEAD
+##<div>
+##    ${normal_field(c.form.by)}
+##    ${checkbox_field(c.form.by_me)}
+##</div>
+##
+##<div>${normal_field(c.form.file)}</div>
+##=======
 ## Todo: write some macros to make outputting form fields easier.
 ${normal_field(c.form.file)}
+##>>>>>>> origin/master
 
 ${h.submit(None, 'Upload!')}
 ${h.end_form()}
 
 
+<%def name="field_errors(errors)">
+    %if errors:
+    <ul class="errors">
+        %for error in errors:
+            <li>${error}
+        %endfor
+    </ul>
+    %endif
+</%def>
+
 
 <%def name="normal_field(field)">
-<div>
-${field.label()|n}
-${field()|n} 
-%if field.errors:
-<ul class="errors">
-%for error in field.errors:
-<li>${error}
-%endfor
-</ul>
-%endif
-</div>
+    ${field.label()|n}
+    ${field()|n}
+    ${field_errors(field.errors)}
 </%def>
+
+<%def name="checkbox_field(field)">
+    ${field()|n} ${field.label()|n}
+    ${field_errors(field.errors)}
+</%def>
\ No newline at end of file