Merge lp:~mterry/ubuntu-system-settings/terms-typo into lp:ubuntu-system-settings

[Michael Terry]

Fix a typo in the HERE terms link.

I didn't adjust the link in the label text, because I didn't want to change translated strings. We should eventually drop that filename from the translated string.

I also fixed the height of the WebView.

Fix a typo in the HERE terms link.

I didn't adjust the link in the label text, because I didn't want to change translated strings. We should eventually drop that filename from the translated string.

I also fixed the height of the WebView.

This would have been easily caught by an autopilot test. Which the wizard desperately needs, I know.

== Checklist ==

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
 Yes

 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
 Just QML changes

 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
 Just QML changes

 * Has your component "TestPlan” been executed successfully on emulator, N4?
 Well on krillin

 * Has a 5 minute exploratory testing run been executed on N4?
 Yes on krillin

 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 NA

 * If you changed the UI, did you subscribe the design-reviewers to this MP?
 NA

 * What components might get impacted by your changes?
 Just wizard

 * Have you requested review by the teams of these owning components?
 Sure

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1146
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1672/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/864
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5762
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7387
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7387/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14961
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3533
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4522
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4522/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1672/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

=== modified file 'wizard/qml/Pages/50-location.qml'
--- wizard/qml/Pages/50-location.qml	2014-10-07 12:54:05 +0000
+++ wizard/qml/Pages/50-location.qml	2014-10-22 15:41:21 +0000
@@ -72,7 +72,7 @@
             visible: hereInstalled
             // TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
             text: i18n.tr("Accept the HERE <a href='terms.qml'>terms and conditions</a> to enable these services.")
-            onLinkActivated: pageStack.load(Qt.resolvedUrl(link))
+            onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
             checked: System.hereEnabled
             onTriggered: System.hereEnabled = checked
         }

=== modified file 'wizard/qml/Pages/here-terms.qml'
--- wizard/qml/Pages/here-terms.qml	2014-09-23 17:29:40 +0000
+++ wizard/qml/Pages/here-terms.qml	2014-10-22 15:41:21 +0000
@@ -110,6 +110,7 @@
             id: webview
             anchors.left: parent.left
             anchors.right: parent.right
+            height: parent.height
             visible: !termsLabel.visible
         }
     }