Merge branch 'master' of git.workaround.org:chaas/debshots

app/views/packages/upload.slim

@@ -1,5 +1,5 @@
 .row
-  h1 = "Upload a screenshot for #{@package.name}"
+  h1 = "Upload screenshots for #{@package.name}"
 
 .row
   .small-7.columns
@@ -7,20 +7,33 @@
     p
       ' You are about to upload a screenshot for the #{@package.name}
       ' package. Thanks for your contribution.
-    - if @package.screenshots.any?
-      p
+
+      = form_tag(upload_image_path, multipart: true)
+
+        .row
+          .small-6.columns
+            input.hidden-inputfile type="file" name="file[]" id="file" multiple=true
+            label for="file"
+              a.button id="file-select-button"
+                = fa_stacked_icon "image", base: "circle-thin"
+                span id="file-label"
+                  '  Select screenshot file(s)
+
+          .small-6.columns
+            button.button type="submit" id="file-submit"
+              = fa_stacked_icon "upload", base: "circle-thin"
+              '  Start upload
+
+    p
+      - if @package.screenshots.any?
         ' Just for your information - these screenshots have already been uploaded.
 
-      .small-up-1.medium-up-3.large-up-4.grid-thumbnails
-        - @package.screenshots.all.each do |ss|
-          a.black.fancybox href=ss.image.url(:large, timestamp: false) rel='fancybox-thumb' title=ss.caption
-            = image_tag(ss.image.url(:thumb, timestamp: false), alt: ss.caption, class: 'thumbnail')
-
-          // = render partial: 'packages/grid_thumbnail', locals: { pkg: pkg }
-
-    - else
-      ' There are no screenshots yet for #{@package.name}.
+        .small-up-1.medium-up-3.large-up-4.grid-thumbnails
+          - @package.screenshots.all.each do |ss|
+            a.black.fancybox href=ss.image.url(:large, timestamp: false) rel='fancybox-thumb' title=ss.caption
+              = image_tag(ss.image.url(:thumb, timestamp: false), alt: ss.caption, class: 'thumbnail')
 
+// <<<<<<< HEAD
     = form_for :screenshot, url: upload_image_path, html: { multipart: true, id: 'file-form' } do |f|
 
       / = form_tag(upload_image_path, multipart: true, id: 'file-form')
@@ -34,11 +47,14 @@
               = fa_stacked_icon "image", base: "circle-thin"
               span id="file-label"
                 '  Select screenshot files
+// =======
+            // = render partial: 'packages/grid_thumbnail', locals: { pkg: pkg }
+
+      //- else
+      //  ' There are no screenshots yet for #{@package.name}. Your upload will
+      //  ' be the first.
+// >>>>>>> 652c2d4126c628403bb8223ffd5f6fb633da95de
 
-        .small-6.columns
-          button.button type="submit" id="file-submit"
-            = fa_stacked_icon "upload", base: "circle-thin"
-            '  Start upload
 
 
   .small-5.columns.bigpanel
@@ -58,7 +74,7 @@
       li
         ' will be reduced if it is lager than 800x600 pixels.
         ' So don't try to capture too much detail in a screenshot. It may become
-        ' unreadable. Shrink the applications window if possible.
+        ' unreadable. Shrink the application's window if possible.
       li
         ' will be made public and can freely be used by anyone.
       li