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

Conflicts:
	app/views/packages/details.slim

app/views/packages/details.slim

@@ -4,20 +4,20 @@
 
   .small-7.medium-7.columns
     p.subtitle = @package.description
-
-    - @package.screenshots.each do |screenshot|
-      .row.listview
-        .small-12.columns
-          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
-            .imgstatus =screenshot.status
-            // TODO: Enable button only if admin or uploader
-            a.button.tiny.alert[
-              href=delete_screenshot_path(@package.name, screenshot.id)
-              onclick="return confirm('Really delete the screenshot?');"
-              ] Delete screenshot
-
+    - if @package.screenshots.count > 0
+      - @package.screenshots.each do |screenshot|
+        .row.listview
+          .small-12.columns
+            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
+              // TODO: Enable button only if admin or uploader
+              a.button.tiny.alert[
+                href=delete_screenshot_path(@package.name, screenshot.id)
+                onclick="return confirm('Really delete the screenshot?');"
+                ] Delete screenshot
+    - else
+      img src='/images/dummy/no-screenshots-upload-one.svg' width='100%'
 
     // TODO: Enable comments in a later version
     // = partial '/package/comments'
@@ -26,15 +26,9 @@
     .bigpanel
       // Use action long description
       // TODO: Use actual description instead of placeholder text
-      p
-        ' Mail client suitable for free distribution. It supports different mail
-        ' accounts (POP, IMAP, Gmail), has an integrated learning Spam filter, and
-        ' offers easy organization of mails with tagging and virtual folders. Also,
-        ' more features can be added by installing extensions.
-
-      p
-        ' The goal of Icedove is to produce a cross platform standalone mail
-        ' application using the XUL user interface language.
+      // TODO: split long_description by <p> tags
+      // TODO: What to do if long description is missing?
+      p =@package.long_description
 
 
     a.button.round.expand data-reveal-id="upload-modal" Upload more screenshots for #{@package.name}