Merge branch 'master' of bitbucket.org:signum/debshots

Conflicts:
	app/views/packages/upload.slim

app/views/packages/upload.slim

@@ -4,11 +4,19 @@
     p.subtitle = @package.description
 
 .row.packagepage
-  .small-8.columns
+  .small-12.medium-7.large-8.columns
     // First row contains the upload form
     .row
       .small-6.columns
-        input id="fileupload" type="file" name="files[]" data-url=upload_image_path(name: @package.name) multiple=true
+        //input id="fileupload" type="file" name="files[]" data-url=upload_image_path(name: @package.name) multiple=true
+
+        //= form_for @new_screenshot, :url => upload_image_path, :html => { :multipart => true } do |form|
+        //  = form.file_field :image
+        //  = form.submit 'Save'
+        = form_tag(upload_image_path, multipart: true)
+          = file_field_tag('image')
+          = submit_tag
+
         a.button.radius.expand href=upload_package_by_name_path(name: @package.name)
           ' Click or drag a PNG screenshot file here
       .small-6.columns
@@ -17,8 +25,19 @@
       .row
         img src=screenshot.url('large')
 
+    - puts @package.screenshots
+    - @package.screenshots.each do |screenshot|
+      .listview
+        a.black.fancybox href=screenshot.image.url(:large, timestamp: false) rel='fancybox-thumb' title=screenshot.caption
+          = image_tag(screenshot.image.url(:large, timestamp: false), alt: screenshot.caption)
+//          .imgcaption
+//            => screenshot.caption
+//            - if screenshot.uploader
+//              | (Uploaded by
+//              =< screenshot.uploader
+//              | )
 
-  .small-4.columns
+  .small-12.medium-5.large-4.columns
     .bigpanel
       p Thanks for uploading more screenshots. Please note:
       ul