Merge lp:~gilir/ubiquity-slideshow-ubuntu/lubuntu into lp:ubiquity-slideshow-ubuntu
- lubuntu
- Merge into html
Proposed by
Julien Lavergne
Status: | Merged |
---|---|
Merged at revision: | 278 |
Proposed branch: | lp:~gilir/ubiquity-slideshow-ubuntu/lubuntu |
Merge into: | lp:ubiquity-slideshow-ubuntu |
Diff against target: |
559 lines (+416/-1) 17 files modified
Makefile (+5/-1) debian/changelog (+6/-0) debian/control (+10/-0) debian/ubiquity-slideshow-lubuntu.install (+1/-0) generate-pot-files.sh (+1/-0) slideshows/lubuntu/slides/abiword-gnumeric.html (+14/-0) slideshows/lubuntu/slides/chromium-browser.html (+14/-0) slideshows/lubuntu/slides/gnome-mplayer.html (+15/-0) slideshows/lubuntu/slides/help.html (+15/-0) slideshows/lubuntu/slides/index.html (+49/-0) slideshows/lubuntu/slides/link/general.css (+216/-0) slideshows/lubuntu/slides/lxde.html (+13/-0) slideshows/lubuntu/slides/pidgin.html (+14/-0) slideshows/lubuntu/slides/sylpheed.html (+14/-0) slideshows/lubuntu/slides/synaptic.html (+14/-0) slideshows/lubuntu/slides/welcome.html (+12/-0) slideshows/lubuntu/slideshow.conf (+3/-0) |
To merge this branch: | bzr merge lp:~gilir/ubiquity-slideshow-ubuntu/lubuntu |
Related bugs: | |
Related blueprints: |
Integrate Lubuntu into Ubuntu ecosystem
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dylan McCall | Approve | ||
Review via email: mp+32133@code.launchpad.net |
Commit message
Description of the change
Proposed branch add support for lubuntu slideshow (see also bug 614721)
To post a comment you must log in.
Revision history for this message
Dylan McCall (dylanmccall) wrote : | # |
Revision history for this message
Julien Lavergne (gilir) wrote : | # |
Thanks Dylan.
I announced it on the mailing sometimes ago : https:/
Also, the first version is in the Alpha 3 : https:/
If you need more information, or any modifications, just let me know :)
Revision history for this message
Dylan McCall (dylanmccall) wrote : | # |
Okay, looks like you got everything! I just merged it and updated the .pot files! :)
review:
Approve
Revision history for this message
Julien Lavergne (gilir) wrote : | # |
Thank you Dylan :)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile' |
2 | --- Makefile 2010-03-13 04:27:06 +0000 |
3 | +++ Makefile 2010-08-09 17:57:46 +0000 |
4 | @@ -4,7 +4,7 @@ |
5 | BUILD=$(SOURCE)/build |
6 | SOURCESLIDES=$(SOURCE)/slideshows |
7 | |
8 | -all: clean build_ubuntu build_kubuntu build_xubuntu build_ubuntu-upgrade translations |
9 | +all: clean build_ubuntu build_kubuntu build_xubuntu build_ubuntu-upgrade build_lubuntu translations |
10 | |
11 | build_init: |
12 | mkdir -p $(BUILD) |
13 | @@ -21,11 +21,15 @@ |
14 | build_xubuntu: build_init |
15 | cp -rL $(SOURCESLIDES)/xubuntu $(BUILD) |
16 | |
17 | +build_lubuntu: build_init |
18 | + cp -rL $(SOURCESLIDES)/lubuntu $(BUILD) |
19 | + |
20 | translations: |
21 | ./generate-local-slides.sh ubuntu |
22 | ./generate-local-slides.sh ubuntu-upgrade |
23 | ./generate-local-slides.sh kubuntu |
24 | ./generate-local-slides.sh xubuntu |
25 | + ./generate-local-slides.sh lubuntu |
26 | |
27 | .PHONY : clean |
28 | |
29 | |
30 | === modified file 'debian/changelog' |
31 | --- debian/changelog 2010-06-25 16:33:43 +0000 |
32 | +++ debian/changelog 2010-08-09 17:57:46 +0000 |
33 | @@ -1,3 +1,9 @@ |
34 | +ubiquity-slideshow-ubuntu (24~ppa1) maverick; urgency=low |
35 | + |
36 | + * Add a slideshow for Lubuntu. |
37 | + |
38 | + -- Julien Lavergne <gilir@ubuntu.com> Fri, 09 Jul 2010 19:28:07 +0200 |
39 | + |
40 | ubiquity-slideshow-ubuntu (23) maverick; urgency=low |
41 | |
42 | * Bump version numbers to 10.10. Many slides still need to be rewritten; |
43 | |
44 | === modified file 'debian/control' |
45 | --- debian/control 2010-06-25 16:32:44 +0000 |
46 | +++ debian/control 2010-08-09 17:57:46 +0000 |
47 | @@ -47,3 +47,13 @@ |
48 | Description: Ubiquity slideshow for Xubuntu |
49 | A slideshow intended for the Ubiquity installer, designed as a quick |
50 | introduction to Xubuntu. |
51 | + |
52 | +Package: ubiquity-slideshow-lubuntu |
53 | +Architecture: all |
54 | +Provides: ubiquity-slideshow |
55 | +Conflicts: ubiquity-slideshow |
56 | +Replaces: ubiquity-slideshow |
57 | +Depends: ${misc:Depends} |
58 | +Description: Ubiquity slideshow for Lubuntu |
59 | + A slideshow intended for the Ubiquity installer, designed as a quick |
60 | + introduction to Lubuntu. |
61 | |
62 | === added file 'debian/ubiquity-slideshow-lubuntu.install' |
63 | --- debian/ubiquity-slideshow-lubuntu.install 1970-01-01 00:00:00 +0000 |
64 | +++ debian/ubiquity-slideshow-lubuntu.install 2010-08-09 17:57:46 +0000 |
65 | @@ -0,0 +1,1 @@ |
66 | +build/lubuntu/* /usr/share/ubiquity-slideshow |
67 | |
68 | === modified file 'generate-pot-files.sh' |
69 | --- generate-pot-files.sh 2010-02-26 12:38:43 +0000 |
70 | +++ generate-pot-files.sh 2010-08-09 17:57:46 +0000 |
71 | @@ -19,3 +19,4 @@ |
72 | mkpo "ubuntu-upgrade" |
73 | mkpo "kubuntu" |
74 | mkpo "xubuntu" |
75 | +mkpo "lubuntu" |
76 | |
77 | === added directory 'po/lubuntu' |
78 | === added directory 'slideshows/lubuntu' |
79 | === added directory 'slideshows/lubuntu/slides' |
80 | === added file 'slideshows/lubuntu/slides/abiword-gnumeric.html' |
81 | --- slideshows/lubuntu/slides/abiword-gnumeric.html 1970-01-01 00:00:00 +0000 |
82 | +++ slideshows/lubuntu/slides/abiword-gnumeric.html 2010-08-09 17:57:46 +0000 |
83 | @@ -0,0 +1,14 @@ |
84 | +<div class="header"><h1 class="title">Abiword and Gnumeric</h1></div> |
85 | + |
86 | +<div class="main"> |
87 | + |
88 | +<div class="content wrap-top"><ul> |
89 | + <li>Lubuntu comes with <em>Abiword and Gnumeric</em>, lightweight alternatives for OpenOffice.</li> |
90 | + <li>You can create and edit documents like spreadsheets and letters.</li> |
91 | + <li>More information on <a href="http://www.abisource.com/">Abiword</a> and <a href="http://projects.gnome.org/gnumeric/">Gnumeric websites</a>.</li> |
92 | +</ul> |
93 | +</div> |
94 | + |
95 | +</div> |
96 | + |
97 | +<img class="icon" src="icons/office.png" alt="" /> |
98 | |
99 | === added file 'slideshows/lubuntu/slides/chromium-browser.html' |
100 | --- slideshows/lubuntu/slides/chromium-browser.html 1970-01-01 00:00:00 +0000 |
101 | +++ slideshows/lubuntu/slides/chromium-browser.html 2010-08-09 17:57:46 +0000 |
102 | @@ -0,0 +1,14 @@ |
103 | +<div class="header"><h1 class="title">Internet with Chromium</h1></div> |
104 | + |
105 | +<div class="main"> |
106 | + |
107 | +<div class="content wrap-top"><ul> |
108 | + <li>Lubuntu is shipped with <em>Chromium</em>, the open-source version of Chrome, a browser developed by Google.</li> |
109 | + <li>It's fast with a clean user interface.</li> |
110 | + <li>More information on the <a href="http://sites.google.com/a/chromium.org/dev/Home">Chromium website</a>.</li> |
111 | +</ul> |
112 | +</div> |
113 | + |
114 | +</div> |
115 | + |
116 | +<img class="icon" src="icons/chromium.png" alt="" /> |
117 | |
118 | === added file 'slideshows/lubuntu/slides/gnome-mplayer.html' |
119 | --- slideshows/lubuntu/slides/gnome-mplayer.html 1970-01-01 00:00:00 +0000 |
120 | +++ slideshows/lubuntu/slides/gnome-mplayer.html 2010-08-09 17:57:46 +0000 |
121 | @@ -0,0 +1,15 @@ |
122 | +<div class="header"><h1 class="title">Videos with gnome-mplayer</h1></div> |
123 | + |
124 | +<div class="main"> |
125 | + |
126 | +<div class="content wrap-top"><ul> |
127 | + <li>You will be able to watch videos with <em>gnome-mplayer</em>, a fast video player using mplayer.</li> |
128 | + <li>Support for many formats is included.</li> |
129 | + <li>You can also obtain additional non-free support by installing the lubuntu-restricted-extras package. </li> |
130 | + <li>More information on <a href="http://sites.google.com/site/kdekorte2/gnomemplayer">gnome-mplayer website.</a></li> |
131 | +</ul> |
132 | +</div> |
133 | + |
134 | +</div> |
135 | + |
136 | +<img class="icon" src="icons/gnome-mplayer.png" alt="" /> |
137 | |
138 | === added file 'slideshows/lubuntu/slides/help.html' |
139 | --- slideshows/lubuntu/slides/help.html 1970-01-01 00:00:00 +0000 |
140 | +++ slideshows/lubuntu/slides/help.html 2010-08-09 17:57:46 +0000 |
141 | @@ -0,0 +1,15 @@ |
142 | +<div class="header"><h1 class="title">Getting Help</h1></div> |
143 | + |
144 | +<div class="main"> |
145 | + |
146 | +<div class="content wrap-top"><ul> |
147 | + <li>If you need help, you can contact us :</li> |
148 | + <li><!-- The url should not be translated -->Using the <a href="https://wiki.ubuntu.com/Lubuntu/ContactUs">wiki page</a>.</li> |
149 | + <li>On the mailing list, subscribe on <a href="https://launchpad.net/~lubuntu-desktop">the page</a>.</li> |
150 | + <li>On the IRC chan #lubuntu on irc.freenode.net.</li> |
151 | +</ul> |
152 | + |
153 | +<p class="footer">The installation will finish soon. We hope you enjoy Lubuntu.</p></div> |
154 | +</div> |
155 | + |
156 | +<img class="icon" src="icons/help.png" alt="" /> |
157 | |
158 | === added directory 'slideshows/lubuntu/slides/icons' |
159 | === added file 'slideshows/lubuntu/slides/icons/chromium.png' |
160 | Binary files slideshows/lubuntu/slides/icons/chromium.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/chromium.png 2010-08-09 17:57:46 +0000 differ |
161 | === added file 'slideshows/lubuntu/slides/icons/gnome-mplayer.png' |
162 | Binary files slideshows/lubuntu/slides/icons/gnome-mplayer.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/gnome-mplayer.png 2010-08-09 17:57:46 +0000 differ |
163 | === added file 'slideshows/lubuntu/slides/icons/help.png' |
164 | Binary files slideshows/lubuntu/slides/icons/help.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/help.png 2010-08-09 17:57:46 +0000 differ |
165 | === added file 'slideshows/lubuntu/slides/icons/lxde.png' |
166 | Binary files slideshows/lubuntu/slides/icons/lxde.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/lxde.png 2010-08-09 17:57:46 +0000 differ |
167 | === added file 'slideshows/lubuntu/slides/icons/office.png' |
168 | Binary files slideshows/lubuntu/slides/icons/office.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/office.png 2010-08-09 17:57:46 +0000 differ |
169 | === added file 'slideshows/lubuntu/slides/icons/pidgin.png' |
170 | Binary files slideshows/lubuntu/slides/icons/pidgin.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/pidgin.png 2010-08-09 17:57:46 +0000 differ |
171 | === added file 'slideshows/lubuntu/slides/icons/sylpheed.png' |
172 | Binary files slideshows/lubuntu/slides/icons/sylpheed.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/sylpheed.png 2010-08-09 17:57:46 +0000 differ |
173 | === added file 'slideshows/lubuntu/slides/icons/synaptic.png' |
174 | Binary files slideshows/lubuntu/slides/icons/synaptic.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/synaptic.png 2010-08-09 17:57:46 +0000 differ |
175 | === added file 'slideshows/lubuntu/slides/icons/welcome.png' |
176 | Binary files slideshows/lubuntu/slides/icons/welcome.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/welcome.png 2010-08-09 17:57:46 +0000 differ |
177 | === added file 'slideshows/lubuntu/slides/index.html' |
178 | --- slideshows/lubuntu/slides/index.html 1970-01-01 00:00:00 +0000 |
179 | +++ slideshows/lubuntu/slides/index.html 2010-08-09 17:57:46 +0000 |
180 | @@ -0,0 +1,49 @@ |
181 | +<!DOCTYPE html> |
182 | + |
183 | +<html lang="en"> |
184 | + |
185 | +<head> |
186 | + <title>ubiquity-slideshow-lubuntu</title> |
187 | + |
188 | + <link href="link/general.css" rel="stylesheet" type="text/css" /> |
189 | + |
190 | + <base target="_blank" /> |
191 | + |
192 | + <script type="text/javascript" src="link-core/prototype.js"></script> |
193 | + <script type="text/javascript" src="link-core/effects.js"></script> |
194 | + <script type="text/javascript" src="link-core/fastinit.js"></script> |
195 | + <script type="text/javascript" src="link-core/crossfade.js"></script> |
196 | + <script type="text/javascript" src="directory.js"></script> |
197 | + <script type="text/javascript" src="link-core/slideshow.js"></script> |
198 | +</head> |
199 | + |
200 | +<body> |
201 | + |
202 | +<div id="container"> |
203 | + <div id="slideshow"> |
204 | + |
205 | + <!-- Slides go here. Simply place the following snippet |
206 | + in the order you wish it to appear, replacing "MY SLIDE" |
207 | + with the filename of your slide. |
208 | + <div><a href="MY SLIDE" class="load"></a></div> --> |
209 | + <div><a href="welcome.html" class="load"></a></div> |
210 | + <div><a href="lxde.html" class="load"></a></div> |
211 | + <div><a href="chromium-browser.html" class="load"></a></div> |
212 | + <div><a href="abiword-gnumeric.html" class="load"></a></div> |
213 | + <div><a href="gnome-mplayer.html" class="load"></a></div> |
214 | + <div><a href="pidgin.html" class="load"></a></div> |
215 | + <div><a href="sylpheed.html" class="load"></a></div> |
216 | + <div><a href="synaptic.html" class="load"></a></div> |
217 | + <div><a href="help.html" class="load"></a></div> |
218 | + </div> |
219 | +</div> |
220 | + |
221 | +<div id="debug-controls"> |
222 | +<input type="button" id="prev-slide" value="<"/> |
223 | +<input type="text" id="current-slide" /> |
224 | +<input type="button" id="next-slide" value=">"/> |
225 | +</div> |
226 | + |
227 | +</body> |
228 | + |
229 | +</html> |
230 | |
231 | === added directory 'slideshows/lubuntu/slides/link' |
232 | === added symlink 'slideshows/lubuntu/slides/link-core' |
233 | === target is u'../../link-core' |
234 | === added file 'slideshows/lubuntu/slides/link/background.png' |
235 | Binary files slideshows/lubuntu/slides/link/background.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/link/background.png 2010-08-09 17:57:46 +0000 differ |
236 | === added file 'slideshows/lubuntu/slides/link/background.rtl.png' |
237 | Binary files slideshows/lubuntu/slides/link/background.rtl.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/link/background.rtl.png 2010-08-09 17:57:46 +0000 differ |
238 | === added file 'slideshows/lubuntu/slides/link/bullet-point.png' |
239 | Binary files slideshows/lubuntu/slides/link/bullet-point.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/link/bullet-point.png 2010-08-09 17:57:46 +0000 differ |
240 | === added file 'slideshows/lubuntu/slides/link/general.css' |
241 | --- slideshows/lubuntu/slides/link/general.css 1970-01-01 00:00:00 +0000 |
242 | +++ slideshows/lubuntu/slides/link/general.css 2010-08-09 17:57:46 +0000 |
243 | @@ -0,0 +1,216 @@ |
244 | +html, body { |
245 | + margin:0; |
246 | + padding:0; |
247 | + |
248 | + background-color:#F0F2F4; |
249 | + |
250 | + font-family:sans-serif; |
251 | + color:#000000; |
252 | +} |
253 | + |
254 | +/* |
255 | +Hyperlink-style text |
256 | +*/ |
257 | +a { |
258 | + color:#731444; |
259 | + font-style:italic; |
260 | + text-decoration:none; |
261 | +} |
262 | + |
263 | +#container { |
264 | + position:absolute; |
265 | + |
266 | + width:798px; |
267 | + height:451px; |
268 | + |
269 | + overflow:hidden; |
270 | + |
271 | + background-image:url('background.png'); |
272 | + background-repeat:no-repeat; |
273 | + background-position:top right; |
274 | + |
275 | + background-color:#F0F2F4; |
276 | + |
277 | + /*cursor:default;*/ |
278 | +} |
279 | + |
280 | +#debug-controls { |
281 | + display:none; |
282 | + position:absolute; |
283 | + top:470px; |
284 | + width:798px; |
285 | + text-align:center; |
286 | +} |
287 | + |
288 | +#debug-controls input { |
289 | + width:40px; |
290 | +} |
291 | + |
292 | +#debug-controls input#current-slide { |
293 | + width:680px; |
294 | +} |
295 | + |
296 | +/* fixed container to align title */ |
297 | +.header { |
298 | + position:fixed; /* FIXME: This is a terrible hack to keep the header from moving during a transition */ |
299 | + top:0px; |
300 | + height:176px; |
301 | +} |
302 | + |
303 | +/* title block is positioned at the bottom of its parent, which should be .header */ |
304 | +.title { |
305 | + position:absolute; |
306 | + |
307 | + bottom:12px; |
308 | + width:385px; /* the ideal width would leave more space on the right */ |
309 | + left:36px; /* matches padding of .content and .content ul: 16 + 20 */ |
310 | + |
311 | + font-size:20px; /* applies to all lines except first */ |
312 | + font-weight:normal; |
313 | + |
314 | + letter-spacing:-1px; |
315 | + |
316 | + color:#ffffff; |
317 | + |
318 | + padding:0px; |
319 | + margin:0px; |
320 | +} |
321 | +.title:first-line { |
322 | + font-size:28px; |
323 | +} |
324 | + |
325 | +/* |
326 | +Typically an image. This is positioned at the top right of a slide. |
327 | +Icons should be 215x156 pixels tall, though some can overflow with a height |
328 | +of 215px. The actual content should be 128x128px. (The rest is padding). |
329 | +*/ |
330 | +.icon { |
331 | + /* FIXME: This is a horrible hack to keep the title from moving during slide transition */ |
332 | + position:fixed; /* was position:absolute */ |
333 | + |
334 | + top:20px; |
335 | + left:549px; |
336 | + width:215px; |
337 | + height:auto; |
338 | + |
339 | + z-index:11; |
340 | + border:0px; |
341 | +} |
342 | +.icon#firefox { |
343 | + top:47px; |
344 | + left:590px; |
345 | + width:128px; |
346 | + height:auto; |
347 | +} |
348 | + |
349 | +/* |
350 | +.content expects to be contained in here. .main |
351 | +creates a nice, plain surface upon which it can |
352 | +appear, spaced appropriately from .title. |
353 | +*/ |
354 | +.main { |
355 | + position:absolute; |
356 | + |
357 | + top:163px; |
358 | + left:0px; |
359 | + |
360 | + width:100%; |
361 | + height:288px; |
362 | + |
363 | + padding-right:60px; |
364 | + |
365 | + z-index:12; |
366 | +} |
367 | + |
368 | +/* |
369 | +Slide's body text goes inside here. |
370 | +*/ |
371 | +.content { |
372 | + padding:16px; |
373 | + padding-top:32px; |
374 | + |
375 | + font-size:14px; |
376 | + color:#484848; |
377 | +} |
378 | + |
379 | +.content ul { |
380 | + margin-top:0px; |
381 | + padding-left:20px; |
382 | + |
383 | + width:726px; /* was 650px */ |
384 | + height:223px; |
385 | + |
386 | + line-height:1.4em; |
387 | + |
388 | + overflow:auto; |
389 | + |
390 | + list-style-type:none; |
391 | + list-style-image:url("bullet-point.png"); |
392 | +} |
393 | + |
394 | +.content li { |
395 | + padding:8px; |
396 | + padding-left:0px; |
397 | +} |
398 | +/* hack to get the text wrapping around the icon. If we could do this for |
399 | +ul :first-line, there would be less room for failure. */ |
400 | +.content.wrap-top li:first-child { |
401 | + width:550px; |
402 | +} |
403 | + |
404 | +.content .footer { |
405 | + position:relative; |
406 | + width:100%; |
407 | + padding:0px; |
408 | + margin:0px; |
409 | + bottom:10px; |
410 | + text-align:right; |
411 | + |
412 | + font-weight:bold; |
413 | + color:#333333; |
414 | +} |
415 | + |
416 | +.content img.inline { |
417 | + height:14px; |
418 | + width:auto; |
419 | +} |
420 | + |
421 | +/* |
422 | +This rule disables drag-and-drop for images. See bug #448703. |
423 | +*/ |
424 | +img { |
425 | + -webkit-user-drag: none; |
426 | +} |
427 | + |
428 | + |
429 | + |
430 | +/* RTL stuff */ |
431 | +.rtl { |
432 | + direction:rtl; |
433 | +} |
434 | +.rtl #container { |
435 | + background-image:url('background.rtl.png'); |
436 | + background-repeat:no-repeat; |
437 | + background-position:top left; |
438 | +} |
439 | +/* TODO: NEED reversed title and icon for RTL */ |
440 | +.rtl .title { |
441 | + left:377px; |
442 | +} |
443 | +.rtl .icon { |
444 | + /* FIXME: This is a horrible hack to keep the title from moving during slide transition */ |
445 | + position:fixed; /* was position:absolute */ |
446 | + |
447 | + left:34px; |
448 | +} |
449 | +.rtl .icon#firefox { |
450 | + left:80px; |
451 | +} |
452 | +.rtl .main { |
453 | + right:0px; |
454 | + padding-right:0px; |
455 | + padding-left:60px; |
456 | +} |
457 | +.rtl .content .footer { |
458 | + text-align:left; |
459 | +} |
460 | |
461 | === added file 'slideshows/lubuntu/slides/lxde.html' |
462 | --- slideshows/lubuntu/slides/lxde.html 1970-01-01 00:00:00 +0000 |
463 | +++ slideshows/lubuntu/slides/lxde.html 2010-08-09 17:57:46 +0000 |
464 | @@ -0,0 +1,13 @@ |
465 | +<div class="header"><h1 class="title">Based on LXDE Desktop</h1></div> |
466 | + |
467 | +<div class="main"> |
468 | + |
469 | +<div class="content wrap-top"><ul> |
470 | + <li>Lubuntu is based on <em>LXDE Desktop Environment</em>, a fast-performing and energy-saving desktop environment.</li> |
471 | + <li><!-- The url "lxde.org" should not be translated -->More information on the <a href="http://lxde.org">LXDE website</a>.</li> |
472 | +</ul> |
473 | +</div> |
474 | + |
475 | +</div> |
476 | + |
477 | +<img class="icon" src="icons/lxde.png" alt="" /> |
478 | |
479 | === added file 'slideshows/lubuntu/slides/pidgin.html' |
480 | --- slideshows/lubuntu/slides/pidgin.html 1970-01-01 00:00:00 +0000 |
481 | +++ slideshows/lubuntu/slides/pidgin.html 2010-08-09 17:57:46 +0000 |
482 | @@ -0,0 +1,14 @@ |
483 | +<div class="header"><h1 class="title">Chatting with your friends</h1></div> |
484 | + |
485 | +<div class="main"> |
486 | + |
487 | +<div class="content wrap-top"><ul> |
488 | + <li>With <em>Pidgin</em>, you will be able to chat with your friends.</li> |
489 | + <li>Go to the menu, and click on Pidgin icon to connect to many Instant Message services, such as Jabber or Windows Live.</li> |
490 | + <li>More information on <a href="http://pidgin.im/">Pidgin website</a>.</li> |
491 | +</ul> |
492 | +</div> |
493 | + |
494 | +</div> |
495 | + |
496 | +<img class="icon" src="icons/pidgin.png" alt="" /> |
497 | |
498 | === added file 'slideshows/lubuntu/slides/sylpheed.html' |
499 | --- slideshows/lubuntu/slides/sylpheed.html 1970-01-01 00:00:00 +0000 |
500 | +++ slideshows/lubuntu/slides/sylpheed.html 2010-08-09 17:57:46 +0000 |
501 | @@ -0,0 +1,14 @@ |
502 | +<div class="header"><h1 class="title">Checking your emails</h1></div> |
503 | + |
504 | +<div class="main"> |
505 | + |
506 | +<div class="content wrap-top"><ul> |
507 | + <li>Lubuntu provides a mail client named <em>Sylpheed</em>.</li> |
508 | + <li>It will allow you to check your email messages, and read them even if you are offline.</li> |
509 | + <li>More information on <a href="http://sylpheed.sraoss.jp/en/">Sylpheed website</a>.</li> |
510 | +</ul> |
511 | +</div> |
512 | + |
513 | +</div> |
514 | + |
515 | +<img class="icon" src="icons/sylpheed.png" alt="" /> |
516 | |
517 | === added file 'slideshows/lubuntu/slides/synaptic.html' |
518 | --- slideshows/lubuntu/slides/synaptic.html 1970-01-01 00:00:00 +0000 |
519 | +++ slideshows/lubuntu/slides/synaptic.html 2010-08-09 17:57:46 +0000 |
520 | @@ -0,0 +1,14 @@ |
521 | +<div class="header"><h1 class="title">Installing softwares</h1></div> |
522 | + |
523 | +<div class="main"> |
524 | + |
525 | +<div class="content wrap-top"><ul> |
526 | + <li>With Lubuntu, you have access to the whole Ubuntu repository and all the software included.</li> |
527 | + <li>Go to the menu, click on Preferences and <em>Synaptic Software Manager</em>.</li> |
528 | + <li>You can search for software by clicking on the Search button.</li> |
529 | +</ul> |
530 | +</div> |
531 | + |
532 | +</div> |
533 | + |
534 | +<img class="icon" src="icons/synaptic.png" alt="" /> |
535 | |
536 | === added file 'slideshows/lubuntu/slides/welcome.html' |
537 | --- slideshows/lubuntu/slides/welcome.html 1970-01-01 00:00:00 +0000 |
538 | +++ slideshows/lubuntu/slides/welcome.html 2010-08-09 17:57:46 +0000 |
539 | @@ -0,0 +1,12 @@ |
540 | +<div class="header"><h1 class="title">Welcome</h1></div> |
541 | + |
542 | +<div class="main"> |
543 | + |
544 | +<div class="content wrap-top"><ul> |
545 | + <li>Thank you for choosing Lubuntu 10.10.</li> |
546 | +</ul> |
547 | +<p class="footer">Lubuntu is designed to be easy and fast. Feel free to explore!</p></div> |
548 | + |
549 | +</div> |
550 | + |
551 | +<img class="icon" src="icons/welcome.png" alt="" /> |
552 | |
553 | === added file 'slideshows/lubuntu/slideshow.conf' |
554 | --- slideshows/lubuntu/slideshow.conf 1970-01-01 00:00:00 +0000 |
555 | +++ slideshows/lubuntu/slideshow.conf 2010-08-09 17:57:46 +0000 |
556 | @@ -0,0 +1,3 @@ |
557 | +[Slideshow] |
558 | +width:798 |
559 | +height:451 |
Sorry this is taking me a while, Julien. I'll be reviewing it (and probably merging it) in a few days!
Is there a blueprint or a discussion on the Lubuntu mailing lists on this? I like to be sure a package is in a derivative's plan before releasing something with its name on it :)