Merge lp:~renatofilho/webbrowser-app/fix-1359353 into lp:webbrowser-app

[Renato Araujo Oliveira Filho]

Update the top sites visual.

[lp:~renatofilho/webbrowser-app/fix-1359353]

710. By Renato Araujo Oliveira Filho on 2014-09-10

Make backgroud image async.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:710
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1082/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4692/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/281
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/281/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/281
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4466/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5944
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5944/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13023
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2863
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3766
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3766/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1082/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

tested, works
Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'src/app/webbrowser/NewTabView.qml'
--- src/app/webbrowser/NewTabView.qml	2014-07-29 22:31:49 +0000
+++ src/app/webbrowser/NewTabView.qml	2014-09-10 13:53:17 +0000
@@ -163,22 +163,17 @@
 
                 delegate: MouseArea {
                     width: units.gu(18)
-                    height: units.gu(22)
+                    height: childrenRect.height
 
                     Column {
-                        anchors.fill: parent
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                        }
+                        //height: childrenRect.height
+
                         spacing: units.gu(1)
 
-                        UbuntuShape {
-                            width: parent.width
-                            height: width
-
-                            Favicon {
-                                anchors.centerIn: parent
-                                source: model.icon
-                            }
-                        }
-
                         Label {
                             width: parent.width
                             height: units.gu(2)
@@ -189,6 +184,58 @@
 
                             text: model.title ? model.title : model.url
                         }
+
+                        UbuntuShape {
+                            width: parent.width
+                            height: units.gu(10)
+
+                            // we need that to clip the background image
+                            clip: true
+
+                            Image {
+                                source: Qt.resolvedUrl("assets/tab-artwork.png")
+                                asynchronous: true
+                                width: parent.height
+                                height: width
+                                opacity: 0.6
+                                anchors {
+                                    right: parent.right
+                                    bottom: parent.bottom
+                                    margins: units.gu(-3)
+                                }
+                            }
+                            Column {
+                                anchors {
+                                    left: parent.left
+                                    right: parent.right
+                                    bottom: parent.bottom
+                                    margins: units.gu(1)
+                                }
+
+                                Favicon {
+                                    source: model.icon
+                                }
+
+                                Label {
+                                    anchors {
+                                        left: parent.left
+                                        right: parent.right
+                                    }
+                                    elide: Text.ElideRight
+                                    text: model.domain
+                                    fontSize: "small"
+                                }
+                                Label {
+                                    anchors {
+                                        left: parent.left
+                                        right: parent.right
+                                    }
+                                    elide: Text.ElideRight
+                                    text: model.title
+                                    fontSize: "small"
+                                }
+                            }
+                        }
                     }
 
                     onClicked: historyEntryClicked(model.url)