Merge lp:~stolowski/unity-scope-click/update-preview into lp:unity-scope-click/devel

[Paweł Stołowski]

Update preview for current designs (screenshots first, then the icon/header & buttons).

Update preview for current designs (screenshots first, then the icon/header & buttons).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:322
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/180/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/154
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/154/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/154

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/180/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good!

review: Approve

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-06-23 15:00:28 +0000
+++ libclickscope/click/preview.cpp	2014-07-11 08:53:37 +0000
@@ -205,16 +205,6 @@
 
     bool has_screenshots = !details.main_screenshot_url.empty() || !details.more_screenshots_urls.empty();
 
-    scopes::PreviewWidget header("hdr", "header");
-    header.add_attribute_value("title", scopes::Variant(details.package.title));
-    if (!details.publisher.empty())
-    {
-        header.add_attribute_value("subtitle", scopes::Variant(details.publisher));
-    }
-    if (!details.package.icon_url.empty())
-        header.add_attribute_value("mascot", scopes::Variant(details.package.icon_url));
-    widgets.push_back(header);
-
     if (has_screenshots)
     {
         scopes::PreviewWidget gallery("screenshots", "gallery");
@@ -234,6 +224,16 @@
         widgets.push_back(gallery);
     }
 
+    scopes::PreviewWidget header("hdr", "header");
+    header.add_attribute_value("title", scopes::Variant(details.package.title));
+    if (!details.publisher.empty())
+    {
+        header.add_attribute_value("subtitle", scopes::Variant(details.publisher));
+    }
+    if (!details.package.icon_url.empty())
+        header.add_attribute_value("mascot", scopes::Variant(details.package.icon_url));
+    widgets.push_back(header);
+
     return widgets;
 }