Ubuntu HTML5 UI SDK

Merge lp:~abreu-alexandre/ubuntu-html5-theme/enable-ui-gallery-add-desktop into lp:~ubuntu-html5-theme-devs/ubuntu-html5-theme/ambiance

  1. enable-ui-gallery-add-desktop
  2. Merge into ambiance
Proposed by Alexandre Abreu
Status: Merged
Approved by: Alexandre Abreu
Approved revision: 80
Merged at revision: 78
Proposed branch: lp:~abreu-alexandre/ubuntu-html5-theme/enable-ui-gallery-add-desktop
Merge into: lp:~ubuntu-html5-theme-devs/ubuntu-html5-theme/ambiance
Diff against target: 124 lines (+42/-34)
4 files modified
0.1/examples/ubuntu-html5-ui-gallery.desktop (+7/-0)
0.1/examples/ui-gallery/index.html (+2/-2)
0.1/examples/ui-gallery/widgets.html (+32/-32)
debian/ubuntu-html5-theme-examples.install (+1/-0)
To merge this branch: bzr merge lp:~abreu-alexandre/ubuntu-html5-theme/enable-ui-gallery-add-desktop
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu HTML5 Theme Developers Pending
Review via email: mp+184854@code.launchpad.net

Commit message

The ui-gallery app was not being installed
Add simple desktop file

Description of the change

The ui-gallery app was not being installed
Add simple desktop file

To post a comment you must log in.
lp:~abreu-alexandre/ubuntu-html5-theme/enable-ui-gallery-add-desktop updated
79. By Alexandre Abreu

remove dup lines in install file

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3273
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-saucy-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-saucy-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3279
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3279/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2763

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-html5-theme-ci/12/rebuild

review: Approve (continuous-integration)
lp:~abreu-alexandre/ubuntu-html5-theme/enable-ui-gallery-add-desktop updated
80. By Alexandre Abreu

update icon

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:80
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-saucy-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-saucy-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3280
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3280/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2764

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-html5-theme-ci/13/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '0.1/examples/ubuntu-html5-ui-gallery.desktop'
2--- 0.1/examples/ubuntu-html5-ui-gallery.desktop 1970-01-01 00:00:00 +0000
3+++ 0.1/examples/ubuntu-html5-ui-gallery.desktop 2013-09-10 19:33:02 +0000
4@@ -0,0 +1,7 @@
5+[Desktop Entry]
6+Name=Ubuntu HTML5 Theme UI Gallery
7+Type=Application
8+Exec=xdg-open /usr/share/ubuntu-html5-theme/examples/ui-gallery/index.html
9+Icon=ubuntu
10+Terminal=false
11+
12
13=== renamed directory '0.1/ui-gallery' => '0.1/examples/ui-gallery'
14=== modified file '0.1/examples/ui-gallery/index.html'
15--- 0.1/ui-gallery/index.html 2013-07-10 14:16:28 +0000
16+++ 0.1/examples/ui-gallery/index.html 2013-09-10 19:33:02 +0000
17@@ -26,7 +26,7 @@
18 <meta name="copyright" content="Adnane Belmadiaf <daker@ubuntu.com>">
19 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
20 <title>Ubuntu UI HTML5 Theme: UI Gallery</title>
21- <link href="../ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />
22+ <link href="../../ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />
23 </head>
24 <body>
25 <div data-role="page">
26@@ -44,7 +44,7 @@
27
28 <div data-role="content">
29 <iframe src="widgets.html" frameborder="0" style="min-height: 600px; width: 300px; display: inline-block;" ></iframe>
30- <iframe src="../examples/widgets/Toggles.html" name="component" frameborder="0" style="min-height: 600px; width: calc(100% - 305px); display: inline-block;"></iframe>
31+ <iframe src="../widgets/Toggles.html" name="component" frameborder="0" style="min-height: 600px; width: calc(100% - 305px); display: inline-block;"></iframe>
32 </div>
33 </div>
34 </body>
35
36=== modified file '0.1/examples/ui-gallery/widgets.html'
37--- 0.1/ui-gallery/widgets.html 2013-07-10 14:16:28 +0000
38+++ 0.1/examples/ui-gallery/widgets.html 2013-09-10 19:33:02 +0000
39@@ -26,7 +26,7 @@
40 <meta name="copyright" content="Adnane Belmadiaf <daker@ubuntu.com>">
41 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
42 <title>Ubuntu UI HTML5 Theme: ListItems</title>
43- <link href="../ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />
44+ <link href="../../ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />
45 </head>
46 <body>
47 <div data-role="page">
48@@ -34,37 +34,37 @@
49 <section data-role="list">
50 <ul data-role="listview">
51 <li>
52- <a href="../examples/widgets/Toggles.html" target="component">Toggles</a>
53- </li>
54- <li>
55- <a href="../examples/widgets/Buttons.html" target="component">Buttons</a>
56- </li>
57- <li>
58- <a href="../examples/widgets/Sliders.html" target="component">Sliders</a>
59- </li>
60- <li>
61- <a href="../examples/widgets/TextInputs.html" target="component">Text Field</a>
62- </li>
63- <li>
64- <a href="../examples/widgets/ProgressBars.html" target="component">Progress and activity</a>
65- </li>
66- <li>
67- <a href="../examples/widgets/UbuntuShape.html" target="component">Ubuntu Shape</a>
68- </li>
69- <li>
70- <a href="../examples/widgets/ListItems.html" target="component">List Items</a>
71- </li>
72- <li>
73- <a href="../examples/widgets/Dialog.html" target="component">Dialog</a>
74- </li>
75- <li>
76- <a href="../examples/widgets/Dialog-Spinner.html" target="component">Dialog + Spinner</a>
77- </li>
78- <li>
79- <a href="../examples/widgets/Popovers.html" target="component">Popover</a>
80- </li>
81- <li>
82- <a href="../examples/widgets/Toolbar.html" target="component">Toolbar</a>
83+ <a href="../widgets/Toggles.html" target="component">Toggles</a>
84+ </li>
85+ <li>
86+ <a href="../widgets/Buttons.html" target="component">Buttons</a>
87+ </li>
88+ <li>
89+ <a href="../widgets/Sliders.html" target="component">Sliders</a>
90+ </li>
91+ <li>
92+ <a href="../widgets/TextInputs.html" target="component">Text Field</a>
93+ </li>
94+ <li>
95+ <a href="../widgets/ProgressBars.html" target="component">Progress and activity</a>
96+ </li>
97+ <li>
98+ <a href="../widgets/UbuntuShape.html" target="component">Ubuntu Shape</a>
99+ </li>
100+ <li>
101+ <a href="../widgets/ListItems.html" target="component">List Items</a>
102+ </li>
103+ <li>
104+ <a href="../widgets/Dialog.html" target="component">Dialog</a>
105+ </li>
106+ <li>
107+ <a href="../widgets/Dialog-Spinner.html" target="component">Dialog + Spinner</a>
108+ </li>
109+ <li>
110+ <a href="../widgets/Popovers.html" target="component">Popover</a>
111+ </li>
112+ <li>
113+ <a href="../widgets/Toolbar.html" target="component">Toolbar</a>
114 </li>
115 </ul>
116 </section>
117
118=== modified file 'debian/ubuntu-html5-theme-examples.install'
119--- debian/ubuntu-html5-theme-examples.install 2013-06-26 16:29:15 +0000
120+++ debian/ubuntu-html5-theme-examples.install 2013-09-10 19:33:02 +0000
121@@ -1,1 +1,2 @@
122 0.1/examples usr/share/ubuntu-html5-theme/0.1
123+0.1/examples/ubuntu-html5-ui-gallery.desktop usr/share/applications
124\ No newline at end of file

Subscribers

People subscribed via source and target branches