Merge lp:~jfmoy/ubuntu-html5-theme/ambiance-docs-review into lp:ubuntu-html5-theme

Proposed by Jean-Francois Moy
Status: Merged
Approved by: David Barth
Approved revision: 171
Merged at revision: 175
Proposed branch: lp:~jfmoy/ubuntu-html5-theme/ambiance-docs-review
Merge into: lp:ubuntu-html5-theme
Diff against target: 104 lines (+19/-13)
6 files modified
0.1/ambiance/js/header.js (+6/-6)
0.1/ambiance/js/option-selector.js (+8/-2)
0.1/ambiance/js/pagestacks.js (+1/-1)
0.1/ambiance/js/progress.js (+1/-1)
0.1/ambiance/js/tab.js (+2/-2)
0.1/ambiance/js/tabs.js (+1/-1)
To merge this branch: bzr merge lp:~jfmoy/ubuntu-html5-theme/ambiance-docs-review
Reviewer Review Type Date Requested Status
David Barth Approve
Alexandre Abreu Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+235022@code.launchpad.net

Commit message

Fixed alignment issues. Fixed UI.optionselector being incorrectly documented. Aligned terminology between various pages. Fixed incorrect UI.progress documentation.

Description of the change

Reviewed the documentation and fixed the invalid references, terminology and alignment.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alexandre Abreu (abreu-alexandre) :
review: Approve
Revision history for this message
David Barth (dbarth) :
review: Approve
Revision history for this message
David Barth (dbarth) wrote :

Now let's move this to a silo for landing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '0.1/ambiance/js/header.js'
2--- 0.1/ambiance/js/header.js 2014-03-03 16:54:31 +0000
3+++ 0.1/ambiance/js/header.js 2014-09-17 17:49:44 +0000
4@@ -50,12 +50,12 @@
5 </header>
6
7 <div data-role="content">
8- <div data-role="tab" id="main">
9- [...]
10- </div>
11- <div data-role="tab" id="two">
12- [...]
13- </div>
14+ <div data-role="tab" id="main">
15+ [...]
16+ </div>
17+ <div data-role="tab" id="two">
18+ [...]
19+ </div>
20 </div>
21
22 </div>
23
24=== modified file '0.1/ambiance/js/option-selector.js'
25--- 0.1/ambiance/js/option-selector.js 2014-01-27 18:42:31 +0000
26+++ 0.1/ambiance/js/option-selector.js 2014-09-17 17:49:44 +0000
27@@ -42,8 +42,14 @@
28 </ul>
29 </section>
30
31- JavaScript:
32- UI.optionselector.METHOD();
33+ JavaScript access:
34+
35+ Expanded:
36+ UI.optionselector("OptionSelectorID", true);
37+ Expanded and multi selection:
38+ UI.optionselector("OptionSelectorID", true, true);
39+ Multi selection:
40+ UI.optionselector("OptionSelectorID", false, true);
41 */
42 var OptionSelector = (function () {
43
44
45=== modified file '0.1/ambiance/js/pagestacks.js'
46--- 0.1/ambiance/js/pagestacks.js 2014-03-05 16:21:16 +0000
47+++ 0.1/ambiance/js/pagestacks.js 2014-09-17 17:49:44 +0000
48@@ -70,7 +70,7 @@
49
50 </div>
51
52- JavaScript:
53+ JavaScript access:
54 UI.pagestack.METHOD();
55
56 */
57
58=== modified file '0.1/ambiance/js/progress.js'
59--- 0.1/ambiance/js/progress.js 2014-02-25 22:08:33 +0000
60+++ 0.1/ambiance/js/progress.js 2014-09-17 17:49:44 +0000
61@@ -32,7 +32,7 @@
62 <progress value="80" max="100"></progress>
63
64 Javascript access:
65- var pre = UI.progrss("progressID");
66+ var pre = UI.progress("progressID");
67 */
68 var Progress = (function () {
69
70
71=== modified file '0.1/ambiance/js/tab.js'
72--- 0.1/ambiance/js/tab.js 2014-03-05 20:06:49 +0000
73+++ 0.1/ambiance/js/tab.js 2014-09-17 17:49:44 +0000
74@@ -33,7 +33,7 @@
75 <div data-role="mainview">
76 <header data-role="header" id="headerID">
77 <ul data-role="tabs">
78- <li data-role="tabitem" data-page="main">
79+ <li data-role="tabitem" data-page="tabID">
80 Main
81 </li>
82 <li data-role="tabitem" data-page="page2">
83@@ -43,7 +43,7 @@
84 </header>
85
86 <div data-role="content">
87- <div data-role="tab" id="main">
88+ <div data-role="tab" id="tabID">
89 [...]
90 </div>
91 <div data-role="tab" id="page2">
92
93=== modified file '0.1/ambiance/js/tabs.js'
94--- 0.1/ambiance/js/tabs.js 2014-03-19 16:51:46 +0000
95+++ 0.1/ambiance/js/tabs.js 2014-09-17 17:49:44 +0000
96@@ -58,7 +58,7 @@
97 </div>
98 </body>
99
100- JavaScript:
101+ JavaScript access:
102 UI.tabs.METHOD();
103 */
104 var Tabs = (function () {

Subscribers

People subscribed via source and target branches