Merge lp:~cimi/unity8/fix-1393008 into lp:unity8

[Andrea Cimitan]

support background on horizontal cards with summary

 * Are there any related MPs required for this MP to build/function as expected? Please list.
n
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * Did you make sure that your branch does not contain spurious tags?
y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n
 * If you changed the UI, has there been a design review?
y

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1545
http://jenkins.qa.ubuntu.com/job/unity8-ci/5139/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/772
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/303
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/304
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/304
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/672
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/770
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/770/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17002

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5139/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
unstable :/
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2014-11-26 08:27:45 +0000
+++ plugins/Dash/CardCreator.js	2015-01-12 13:13:52 +0000
@@ -320,7 +320,7 @@
     var hasSummary = components["summary"] || false;
     var artAndSummary = hasArt && hasSummary;
     var isHorizontal = template["card-layout"] === "horizontal";
-    var hasBackground = !isHorizontal && (template["card-background"] || components["background"] || artAndSummary);
+    var hasBackground = (hasSummary || !isHorizontal) && (template["card-background"] || components["background"] || artAndSummary);
     var hasTitle = components["title"] || false;
     var hasMascot = components["mascot"] || false;
     var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;

=== modified file 'tests/qmltests/Dash/tst_Card.qml'
--- tests/qmltests/Dash/tst_Card.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/tst_Card.qml	2015-01-12 13:13:52 +0000
@@ -61,7 +61,7 @@
         },
         {
             "name": "Art, header, summary - horizontal",
-            "layout": { "template": { "card-layout": "horizontal" },
+            "layout": { "template": { "card-layout": "horizontal", "card-background": { "type": "gradient", "elements": ["grey", "white"] } },
                         "components": JSON.parse(Helpers.fullMapping) }
         },
         {
@@ -407,7 +407,7 @@
             return [
                 { tag: "Art and summary", visible: true, color: "#ffffff", index: 0 },
                 { tag: "No Summary", visible: false, index: 6 },
-                { tag: "Horizontal", visible: false, index: 5 },
+                { tag: "Horizontal", visible: true, color: "#808080", index: 5 },
                 { tag: "Grey background", visible: true, color: "#808080", index: 10 },
                 { tag: "Overriden Gradient background", visible: true, color: "#808080", gradientColor: "#ffffff",
                   background: {type: "color", elements: ["grey", "white"]}, index: 10 },