git.iko.soy/unity8
on xenial help sign in
fixup the terms text and links
6f098feLukáš Tinkl
qml/Wizard/Pages/here-terms.qml+2−21
compare with xenial
unifiedsplit
@@ -40,7 +40,6 @@ LocalComponents.Page {
40 label2.visible = false
40 label2.visible = false
41 label3.visible = false
41 label3.visible = false
42 label4.visible = false
42 label4.visible = false
43− label5.visible = false
44 webview.visible = true
43 webview.visible = true
45 } else {
44 } else {
46 webview.visible = false
45 webview.visible = false
@@ -48,7 +47,6 @@ LocalComponents.Page {
48 label2.visible = true
47 label2.visible = true
49 label3.visible = true
48 label3.visible = true
50 label4.visible = true
49 label4.visible = true
51− label5.visible = true
52 }
50 }
53 }
51 }
54
52
@@ -104,31 +102,14 @@ LocalComponents.Page {
104 fontSize: "small"
102 fontSize: "small"
105 font.weight: Font.Light
103 font.weight: Font.Light
106 linkColor: UbuntuColors.orange
104 linkColor: UbuntuColors.orange
107− text: i18n.tr("By continuing, you agree to the HERE Platform Service Terms:") +
105+ text: i18n.tr("By continuing, you agree to the <a href=\"http://here.com/terms/service-terms\">HERE Platform Service Terms</a> " +
108− " <a href=\"http://here.com/terms/service-terms\">http://here.com/terms/service-terms</a>"
106+ "and <a href=\"http://here.com/privacy/privacy-policy\">Privacy Policy</a>.");
109 onLinkActivated: {
107 onLinkActivated: {
110 showBrowser(true)
108 showBrowser(true)
111 webview.url = link
109 webview.url = link
112 }
110 }
113 }
111 }
114
112
115− Label {
116− id: label5
117− anchors.left: parent.left
118− anchors.right: parent.right
119− wrapMode: Text.Wrap
120− color: textColor
121− fontSize: "small"
122− font.weight: Font.Light
123− linkColor: UbuntuColors.orange
124− text: i18n.tr("and Privacy Policy:") +
125− " <a href=\"http://here.com/privacy/privacy-policy\">http://here.com/privacy/privacy-policy</a>"
126− onLinkActivated: {
127− showBrowser(true);
128− webview.url = link;
129− }
130− }
131−
132 WebView {
113 WebView {
133 id: webview
114 id: webview
134 objectName: "webview"
115 objectName: "webview"