merged suff, commented out some of my own

[zzz-floof.git] / floof / templates / art / new.mako

diff --git a/floof/templates/art/new.mako b/floof/templates/art/new.mako
index 684c004..0adc916 100644 (file)
--- a/floof/templates/art/new.mako
+++ b/floof/templates/art/new.mako
@@ -1,22 +1,20 @@
 <%inherit file="/base.mako" />
 
 <h1>Add New Art</h1>
-<p>Now: Upload a file.  Later: Supply a link?  Not exclusive to uploading.</p>
-
-## Todo: write some macros to make outputting form fields easier.
-
 ${h.form(h.url('create_art'), multipart=True)}
 
-<div>
-    ${normal_field(c.form.by)}
-    ${checkbox_field(c.form.by_me)}
-</div>
-
-<div>${normal_field(c.form.file)}</div>
-
+##<<<<<<< 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
 
-##Artist: ${h.text('artist')}
-##${h.file('file')}
 ${h.submit(None, 'Upload!')}
 ${h.end_form()}