Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/readableDocLinks into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Use orange and no translucency for links in the gallery

[Tim Peeters (tpeeters)]

I propose using styledText instead of richText and setting the linkColor property instead of using html.

http://qt-project.org/doc/qt-5/qml-qtquick-text.html#linkColor-prop

[Tim Peeters (tpeeters)]

review: Needs Fixing

[Tim Peeters (tpeeters)]

I'd prefer
text: "<a href=" + url + ">" + label + "</a>"
over a string with args, but that's probably personal.

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/readableDocLinks]

1132. By Cris Dywan on 2014-07-02

Use styledText and linkColor for WebLink

[Cris Dywan (kalikiana)]

linkColor works well, good idea! Somehow I didn't see it before in the docs, must've been an outdated copy.

I'd keep the arg() style, I don't think we have a specific policy here, and it was like that before I touched it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1131
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/538/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1469
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/370
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/370/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1756
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2436
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2436/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1042
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1413
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1413/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/538/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

looks much better now, thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1132
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/540/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1479
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/372
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/372
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/372/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/372
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1762
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2448
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1048
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1420
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1420/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/540/rebuild

review: Approve (continuous-integration)

=== modified file 'examples/ubuntu-ui-toolkit-gallery/TemplateSection.qml'
--- examples/ubuntu-ui-toolkit-gallery/TemplateSection.qml	2014-04-23 09:39:11 +0000
+++ examples/ubuntu-ui-toolkit-gallery/TemplateSection.qml	2014-07-02 14:17:24 +0000
@@ -46,7 +46,6 @@
             url: prefix + documentation
             visible: documentation != ""
             fontSize: "small"
-            opacity: 0.3
         }
     }
 }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml'
--- examples/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml	2014-04-23 09:39:11 +0000
+++ examples/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml	2014-07-02 14:17:24 +0000
@@ -43,7 +43,6 @@
         url: prefix + documentation
         visible: documentation != ""
         fontSize: "small"
-        opacity: 0.3
         anchors.left: parent.left
     }
 
@@ -51,7 +50,6 @@
         label: "Design guidelines"
         url: templateSection.designUrl
         fontSize: "small"
-        opacity: 0.3
         anchors.left: parent.left
     }
 

=== modified file 'examples/ubuntu-ui-toolkit-gallery/WebLink.qml'
--- examples/ubuntu-ui-toolkit-gallery/WebLink.qml	2014-04-23 09:39:11 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WebLink.qml	2014-07-02 14:17:24 +0000
@@ -23,7 +23,8 @@
     property string label: url
     property url url
 
-    textFormat: Text.RichText
+    textFormat: Text.StyledText
     text: "<a href=\"%1\">%2</a>".arg(webLink.url).arg(webLink.label)
+    linkColor: UbuntuColors.orange
     onLinkActivated: Qt.openUrlExternally(link)
 }