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

[Andrea Cimitan]

Background needs to be specified to be visible in horizontal cards

 * 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?
n
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
y

[Albert Astals Cid (aacid)]

I'd prefer if you made the new "Art, summary, - horizontal" be exactly like the existing "Art, header, summary - horizontal" (minus the background) and renamed the exiting "Art, header, summary - horizontal" to "Art, header, summary, background - horizontal"

What do you think?

review: Needs Fixing

[lp:~cimi/unity8/fix-1411748]

1570. By Andrea Cimitan on 2015-01-22

As review

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1569
http://jenkins.qa.ubuntu.com/job/unity8-ci/5173/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/936
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/337
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/338
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/827
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/934
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/934/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17355

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass? If not, please explain why.
Waiting before top approval

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1570
http://jenkins.qa.ubuntu.com/job/unity8-ci/5175/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/938
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/340
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/340
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/829
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/936
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/936/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17361

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2015-01-12 13:11:36 +0000
+++ plugins/Dash/CardCreator.js	2015-01-22 14:54:03 +0000
@@ -320,7 +320,8 @@
     var hasSummary = components["summary"] || false;
     var artAndSummary = hasArt && hasSummary;
     var isHorizontal = template["card-layout"] === "horizontal";
-    var hasBackground = (hasSummary || !isHorizontal) && (template["card-background"] || components["background"] || artAndSummary);
+    var hasBackground = (!isHorizontal && (template["card-background"] || components["background"] || artAndSummary)) ||
+                        (hasSummary && (template["card-background"] || components["background"]));
     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-12 13:11:36 +0000
+++ tests/qmltests/Dash/tst_Card.qml	2015-01-22 14:54:03 +0000
@@ -60,7 +60,7 @@
             "layout": { "components": Helpers.update(JSON.parse(Helpers.fullMapping), { "art": { "aspect-ratio": 0.7 } }) }
         },
         {
-            "name": "Art, header, summary - horizontal",
+            "name": "Art, header, summary, background - horizontal",
             "layout": { "template": { "card-layout": "horizontal", "card-background": { "type": "gradient", "elements": ["grey", "white"] } },
                         "components": JSON.parse(Helpers.fullMapping) }
         },
@@ -101,6 +101,11 @@
             "layout": { "template": { "overlay": true },
                         "components": { "art": "art", "title": "title" } }
         },
+        {
+            "name": "Art, header, summary - horizontal",
+            "layout": { "template": { "card-layout": "horizontal" },
+                        "components": JSON.parse(Helpers.fullMapping) }
+        },
     ]
 
     CardTool {
@@ -415,6 +420,7 @@
                   background: Qt.resolvedUrl("artwork/checkers.png"), index: 10 },
                 { tag: "Gradient background", visible: true, color: "#808080", gradientColor: "#ffffff", index: 11 },
                 { tag: "Image background", visible: true, image: Qt.resolvedUrl("artwork/checkers.png"), index: 12 },
+                { tag: "Horizontal no background", visible: false, index: 14 },
             ];
         }