Ubuntu UI Toolkit

Merge lp:~dholbach/ubuntu-ui-toolkit/1428051 into lp:ubuntu-ui-toolkit/staging

  1. 1428051
  2. Merge into staging
Proposed by Daniel Holbach
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 1435
Merged at revision: 1434
Proposed branch: lp:~dholbach/ubuntu-ui-toolkit/1428051
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 121 lines (+8/-12)
8 files modified
examples/ubuntu-ui-toolkit-gallery/Navigation.qml (+3/-3)
modules/Ubuntu/Components/CheckBox.qml (+1/-1)
modules/Ubuntu/Components/Popups/Popover.qml (+1/-1)
modules/Ubuntu/Components/Slider.qml (+1/-1)
modules/Ubuntu/Components/Switch.qml (+1/-1)
modules/Ubuntu/Components/Tabs.qml (+0/-2)
modules/Ubuntu/Components/TextField.qml (+1/-1)
modules/Ubuntu/Components/ToolbarItems.qml (+0/-2)
To merge this branch: bzr merge lp:~dholbach/ubuntu-ui-toolkit/1428051
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zoltan Balogh Approve
Zsombor Egri Approve
Review via email: mp+251714@code.launchpad.net

Commit message

A number of links changed on design.ubuntu.com - let's make sure they're fixed in our docs.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1435
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1515/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1640
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/245
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/242
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1454
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1638
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1638/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18532

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Thanks for the fixes!

review: Approve
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

Let's give a gentle toss to the Jenkins :D too

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/834/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/141/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/141
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/141

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/ubuntu-ui-toolkit-gallery/Navigation.qml'
2--- examples/ubuntu-ui-toolkit-gallery/Navigation.qml 2014-04-23 09:39:11 +0000
3+++ examples/ubuntu-ui-toolkit-gallery/Navigation.qml 2015-03-04 10:36:05 +0000
4@@ -35,7 +35,7 @@
5 title: "Tabs (flat)"
6 className: "Tabs"
7 description: "Use them to switch between views of equal importance."
8- designUrl: "http://design.ubuntu.com/apps/building-blocks/tabs"
9+ designUrl: "https://design.ubuntu.com/apps/patterns/navigation"
10 screenshot: "nav_tabs.png"
11 }
12
13@@ -43,7 +43,7 @@
14 title: "Expansion (contextual)"
15 documentation: ""
16 description: "Use this to show more content"
17- designUrl: "http://design.ubuntu.com/apps/building-blocks/expansion"
18+ designUrl: "https://design.ubuntu.com/apps/patterns/navigation"
19 screenshot: "nav_expansion.png"
20 }
21
22@@ -51,7 +51,7 @@
23 title: "Page stack (deep)"
24 className: "PageStack"
25 description: "Use this to move from a main page to a secondary page."
26- designUrl: "http://design.ubuntu.com/apps/building-blocks/page-stack"
27+ designUrl: "https://design.ubuntu.com/apps/patterns/navigation"
28 screenshot: "nav_pagestack.png"
29 }
30 }
31
32=== modified file 'modules/Ubuntu/Components/CheckBox.qml'
33--- modules/Ubuntu/Components/CheckBox.qml 2015-03-03 12:53:42 +0000
34+++ modules/Ubuntu/Components/CheckBox.qml 2015-03-04 10:36:05 +0000
35@@ -24,7 +24,7 @@
36 be used to set boolean options. The behavior is the same as \l Switch, the
37 only difference is the graphical style.
38
39- \l {http://design.ubuntu.com/apps/building-blocks/toggles}{See also the Design Guidelines on Toggles}.
40+ \l {https://design.ubuntu.com/apps/building-blocks/selection}{See also the Design Guidelines on selection}.
41
42 Example:
43 \qml
44
45=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
46--- modules/Ubuntu/Components/Popups/Popover.qml 2015-03-03 13:01:12 +0000
47+++ modules/Ubuntu/Components/Popups/Popover.qml 2015-03-04 10:36:05 +0000
48@@ -27,7 +27,7 @@
49 A popover has a fixed width and automatic height, depending on is contents.
50 It can be closed by clicking anywhere outside of the popover area.
51
52- \l {http://design.ubuntu.com/apps/building-blocks/popover}{See also the Design Guidelines on Popovers}.
53+ \l {https://design.ubuntu.com/apps/building-blocks/dialog#popover}{See also the Design Guidelines on Popovers}.
54
55 Example:
56 \qml
57
58=== modified file 'modules/Ubuntu/Components/Slider.qml'
59--- modules/Ubuntu/Components/Slider.qml 2015-03-03 12:53:42 +0000
60+++ modules/Ubuntu/Components/Slider.qml 2015-03-04 10:36:05 +0000
61@@ -30,7 +30,7 @@
62 styles should take this into account when defining the visuals, and
63 alter these values to align the graphics' sizes.
64
65- \l {http://design.ubuntu.com/apps/building-blocks/slider}{See also the Design Guidelines on Sliders}.
66+ \l {https://design.ubuntu.com/apps/building-blocks/selection#slider}{See also the Design Guidelines on Sliders}.
67
68 Example:
69 \qml
70
71=== modified file 'modules/Ubuntu/Components/Switch.qml'
72--- modules/Ubuntu/Components/Switch.qml 2015-03-03 12:53:42 +0000
73+++ modules/Ubuntu/Components/Switch.qml 2015-03-04 10:36:05 +0000
74@@ -27,7 +27,7 @@
75 be used to set boolean options. The behavior is the same as \l CheckBox, the
76 only difference is the graphical style.
77
78- \l {http://design.ubuntu.com/apps/building-blocks/toggles}{See also the Design Guidelines on Toggles}.
79+ \l {https://design.ubuntu.com/apps/building-blocks/selection}{See also the Design Guidelines on selection}.
80
81 Example:
82 \qml
83
84=== modified file 'modules/Ubuntu/Components/Tabs.qml'
85--- modules/Ubuntu/Components/Tabs.qml 2015-03-03 13:01:12 +0000
86+++ modules/Ubuntu/Components/Tabs.qml 2015-03-04 10:36:05 +0000
87@@ -28,8 +28,6 @@
88 have a header that shows the tabs that can be selected, and the toolbar
89 which contains the tools of the \l Page in the currently selected \l Tab.
90
91- \l {http://design.ubuntu.com/apps/building-blocks/tabs}{See also the Design Guidelines on Tabs}.
92-
93 Example:
94 \qml
95 import QtQuick 2.4
96
97=== modified file 'modules/Ubuntu/Components/TextField.qml'
98--- modules/Ubuntu/Components/TextField.qml 2015-03-03 13:01:12 +0000
99+++ modules/Ubuntu/Components/TextField.qml 2015-03-04 10:36:05 +0000
100@@ -26,7 +26,7 @@
101 Input constraints can be set through validator or inputMask. Setting echoMode
102 to an appropriate value enables TextField to be used as password input field.
103
104- \l {http://design.ubuntu.com/apps/building-blocks/text-field}{See also the Design Guidelines on the Text Field}.
105+ \l {https://design.ubuntu.com/apps/building-blocks/text-input#text-field}{See also the Design Guidelines on the Text Field}.
106
107 Example:
108 \qml
109
110=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
111--- modules/Ubuntu/Components/ToolbarItems.qml 2015-03-03 13:01:12 +0000
112+++ modules/Ubuntu/Components/ToolbarItems.qml 2015-03-04 10:36:05 +0000
113@@ -35,8 +35,6 @@
114 is updated by changing the selected \l Tab or by pushing/popping a \l Page on the \l PageStack,
115 the toolbar will automatically hide, except if the new active \l Page has the \l locked property set.
116
117- \l {http://design.ubuntu.com/apps/building-blocks/toolbar}{See also the Design Guidelines on Toolbars}.
118-
119 It is recommended to use \l ToolbarButton inside the ToolbarItems to define the buttons that will
120 be visible to the user:
121 \qml

Subscribers

People subscribed via source and target branches