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
=== added file '0.1/examples/ubuntu-html5-ui-gallery.desktop'
--- 0.1/examples/ubuntu-html5-ui-gallery.desktop 1970-01-01 00:00:00 +0000
+++ 0.1/examples/ubuntu-html5-ui-gallery.desktop 2013-09-10 19:33:02 +0000
@@ -0,0 +1,7 @@
1[Desktop Entry]
2Name=Ubuntu HTML5 Theme UI Gallery
3Type=Application
4Exec=xdg-open /usr/share/ubuntu-html5-theme/examples/ui-gallery/index.html
5Icon=ubuntu
6Terminal=false
7
08
=== renamed directory '0.1/ui-gallery' => '0.1/examples/ui-gallery'
=== modified file '0.1/examples/ui-gallery/index.html'
--- 0.1/ui-gallery/index.html 2013-07-10 14:16:28 +0000
+++ 0.1/examples/ui-gallery/index.html 2013-09-10 19:33:02 +0000
@@ -26,7 +26,7 @@
26 <meta name="copyright" content="Adnane Belmadiaf <daker@ubuntu.com>">26 <meta name="copyright" content="Adnane Belmadiaf <daker@ubuntu.com>">
27 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">27 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
28 <title>Ubuntu UI HTML5 Theme: UI Gallery</title>28 <title>Ubuntu UI HTML5 Theme: UI Gallery</title>
29 <link href="../ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />29 <link href="../../ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />
30</head>30</head>
31<body>31<body>
32 <div data-role="page">32 <div data-role="page">
@@ -44,7 +44,7 @@
4444
45 <div data-role="content">45 <div data-role="content">
46 <iframe src="widgets.html" frameborder="0" style="min-height: 600px; width: 300px; display: inline-block;" ></iframe>46 <iframe src="widgets.html" frameborder="0" style="min-height: 600px; width: 300px; display: inline-block;" ></iframe>
47 <iframe src="../examples/widgets/Toggles.html" name="component" frameborder="0" style="min-height: 600px; width: calc(100% - 305px); display: inline-block;"></iframe>47 <iframe src="../widgets/Toggles.html" name="component" frameborder="0" style="min-height: 600px; width: calc(100% - 305px); display: inline-block;"></iframe>
48 </div>48 </div>
49 </div>49 </div>
50</body>50</body>
5151
=== modified file '0.1/examples/ui-gallery/widgets.html'
--- 0.1/ui-gallery/widgets.html 2013-07-10 14:16:28 +0000
+++ 0.1/examples/ui-gallery/widgets.html 2013-09-10 19:33:02 +0000
@@ -26,7 +26,7 @@
26 <meta name="copyright" content="Adnane Belmadiaf <daker@ubuntu.com>">26 <meta name="copyright" content="Adnane Belmadiaf <daker@ubuntu.com>">
27 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">27 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
28 <title>Ubuntu UI HTML5 Theme: ListItems</title>28 <title>Ubuntu UI HTML5 Theme: ListItems</title>
29 <link href="../ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />29 <link href="../../ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />
30</head>30</head>
31<body>31<body>
32 <div data-role="page">32 <div data-role="page">
@@ -34,37 +34,37 @@
34 <section data-role="list">34 <section data-role="list">
35 <ul data-role="listview">35 <ul data-role="listview">
36 <li>36 <li>
37 <a href="../examples/widgets/Toggles.html" target="component">Toggles</a>37 <a href="../widgets/Toggles.html" target="component">Toggles</a>
38 </li>38 </li>
39 <li>39 <li>
40 <a href="../examples/widgets/Buttons.html" target="component">Buttons</a>40 <a href="../widgets/Buttons.html" target="component">Buttons</a>
41 </li>41 </li>
42 <li>42 <li>
43 <a href="../examples/widgets/Sliders.html" target="component">Sliders</a>43 <a href="../widgets/Sliders.html" target="component">Sliders</a>
44 </li>44 </li>
45 <li>45 <li>
46 <a href="../examples/widgets/TextInputs.html" target="component">Text Field</a>46 <a href="../widgets/TextInputs.html" target="component">Text Field</a>
47 </li>47 </li>
48 <li>48 <li>
49 <a href="../examples/widgets/ProgressBars.html" target="component">Progress and activity</a>49 <a href="../widgets/ProgressBars.html" target="component">Progress and activity</a>
50 </li>50 </li>
51 <li>51 <li>
52 <a href="../examples/widgets/UbuntuShape.html" target="component">Ubuntu Shape</a>52 <a href="../widgets/UbuntuShape.html" target="component">Ubuntu Shape</a>
53 </li>53 </li>
54 <li>54 <li>
55 <a href="../examples/widgets/ListItems.html" target="component">List Items</a>55 <a href="../widgets/ListItems.html" target="component">List Items</a>
56 </li>56 </li>
57 <li>57 <li>
58 <a href="../examples/widgets/Dialog.html" target="component">Dialog</a>58 <a href="../widgets/Dialog.html" target="component">Dialog</a>
59 </li>59 </li>
60 <li>60 <li>
61 <a href="../examples/widgets/Dialog-Spinner.html" target="component">Dialog + Spinner</a>61 <a href="../widgets/Dialog-Spinner.html" target="component">Dialog + Spinner</a>
62 </li>62 </li>
63 <li>63 <li>
64 <a href="../examples/widgets/Popovers.html" target="component">Popover</a>64 <a href="../widgets/Popovers.html" target="component">Popover</a>
65 </li>65 </li>
66 <li>66 <li>
67 <a href="../examples/widgets/Toolbar.html" target="component">Toolbar</a>67 <a href="../widgets/Toolbar.html" target="component">Toolbar</a>
68 </li>68 </li>
69 </ul>69 </ul>
70 </section>70 </section>
7171
=== modified file 'debian/ubuntu-html5-theme-examples.install'
--- debian/ubuntu-html5-theme-examples.install 2013-06-26 16:29:15 +0000
+++ debian/ubuntu-html5-theme-examples.install 2013-09-10 19:33:02 +0000
@@ -1,1 +1,2 @@
10.1/examples usr/share/ubuntu-html5-theme/0.110.1/examples usr/share/ubuntu-html5-theme/0.1
20.1/examples/ubuntu-html5-ui-gallery.desktop usr/share/applications
2\ No newline at end of file3\ No newline at end of file

Subscribers

People subscribed via source and target branches