Merge lp:~noskcaj/ubiquity-slideshow-ubuntu/xubuntu-oem into lp:ubiquity-slideshow-ubuntu

Proposed by Jackson Doak on 2013-08-01
Status: Needs review
Proposed branch: lp:~noskcaj/ubiquity-slideshow-ubuntu/xubuntu-oem
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 903 lines (+727/-1)
17 files modified
Makefile (+5/-1)
debian/changelog (+6/-0)
debian/control (+9/-0)
debian/oem-config-slideshow-xubuntu.install (+1/-0)
generate-pot-files.sh (+1/-0)
po/oem-config-xubuntu/slideshow-oem-config-xubuntu.pot (+292/-0)
slideshows/oem-config-xubuntu/slides/00_welcome.html (+12/-0)
slideshows/oem-config-xubuntu/slides/01_web.html (+17/-0)
slideshows/oem-config-xubuntu/slides/02_messaging.html (+15/-0)
slideshows/oem-config-xubuntu/slides/03_gmusicbrowser.html (+15/-0)
slideshows/oem-config-xubuntu/slides/04_office.html (+17/-0)
slideshows/oem-config-xubuntu/slides/05_desktop.html (+21/-0)
slideshows/oem-config-xubuntu/slides/06_explore.html (+18/-0)
slideshows/oem-config-xubuntu/slides/07_thanks.html (+12/-0)
slideshows/oem-config-xubuntu/slides/index.html (+48/-0)
slideshows/oem-config-xubuntu/slides/link/base.css (+235/-0)
slideshows/oem-config-xubuntu/slideshow.conf (+3/-0)
To merge this branch: bzr merge lp:~noskcaj/ubiquity-slideshow-ubuntu/xubuntu-oem
Reviewer Review Type Date Requested Status
Ubiquity Slideshow 2013-08-01 Pending
Review via email: mp+178005@code.launchpad.net

Description of the change

Added xubuntu OEM slideshow

To post a comment you must log in.

Unmerged revisions

569. By Jackson Doak on 2013-08-01

Added Xubuntu OEM slideshow

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2012-10-08 23:06:11 +0000
3+++ Makefile 2013-08-01 06:39:32 +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_lubuntu build_edubuntu build_ubuntustudio build_ubuntu-gnome build_oem-config-ubuntu translations
9+all: clean build_ubuntu build_kubuntu build_xubuntu build_lubuntu build_edubuntu build_ubuntustudio build_ubuntu-gnome build_oem-config-ubuntu build_oem-config-xubuntu translations
10
11 build_init:
12 mkdir -p $(BUILD)
13@@ -33,6 +33,9 @@
14 build_oem-config-ubuntu: build_init
15 cp -rL $(SOURCESLIDES)/oem-config-ubuntu $(BUILD)
16
17+build_oem-config-xubuntu: build_init
18+ cp -rL $(SOURCESLIDES)/oem-config-xubuntu $(BUILD)
19+
20 translations:
21 python generate-local-slides.py ubuntu
22 python generate-local-slides.py kubuntu
23@@ -42,6 +45,7 @@
24 python generate-local-slides.py ubuntustudio
25 python generate-local-slides.py ubuntu-gnome
26 python generate-local-slides.py oem-config-ubuntu
27+ python generate-local-slides.py oem-config-xubuntu
28
29 .PHONY : clean
30
31
32=== modified file 'debian/changelog'
33--- debian/changelog 2013-07-26 13:44:56 +0000
34+++ debian/changelog 2013-08-01 06:39:32 +0000
35@@ -1,3 +1,9 @@
36+ubiquity-slideshow-ubuntu (3) saucy; urgency=low
37+
38+ * Added oem-config-xubuntu slideshow
39+
40+ -- Jackson Doak <noskcaj@ubuntu.com> Thu, 01 Aug 2013 08:10:21 +1000
41+
42 ubiquity-slideshow-ubuntu (72) saucy; urgency=low
43
44 [ Shrinivasan T ]
45
46=== modified file 'debian/control'
47--- debian/control 2013-03-21 14:02:19 +0000
48+++ debian/control 2013-08-01 06:39:32 +0000
49@@ -88,3 +88,12 @@
50 A slideshow intended for the post-OEM-install configuration, designed
51 as a quick introduction to Ubuntu.
52
53+Package: oem-config-slideshow-xubuntu
54+Architecture: all
55+Provides: oem-config-slideshow
56+Conflicts: oem-config-slideshow
57+Replaces: oem-config-slideshow
58+Depends: ${misc:Depends}
59+Description: OEM slideshow for Xubuntu
60+ A slideshow intended for the post-OEM-install configuration, designed
61+ as a quick introduction to Xubuntu.
62
63=== added file 'debian/oem-config-slideshow-xubuntu.install'
64--- debian/oem-config-slideshow-xubuntu.install 1970-01-01 00:00:00 +0000
65+++ debian/oem-config-slideshow-xubuntu.install 2013-08-01 06:39:32 +0000
66@@ -0,0 +1,1 @@
67+build/oem-config-xubuntu/* /usr/share/oem-config-slideshow
68
69=== modified file 'generate-pot-files.sh'
70--- generate-pot-files.sh 2012-10-08 20:15:12 +0000
71+++ generate-pot-files.sh 2013-08-01 06:39:32 +0000
72@@ -23,3 +23,4 @@
73 mkpo "ubuntustudio"
74 mkpo "ubuntu-gnome"
75 mkpo "oem-config-ubuntu"
76+mkpo "oem-config-xubuntu"
77
78=== added directory 'po/oem-config-xubuntu'
79=== added file 'po/oem-config-xubuntu/slideshow-oem-config-xubuntu.pot'
80--- po/oem-config-xubuntu/slideshow-oem-config-xubuntu.pot 1970-01-01 00:00:00 +0000
81+++ po/oem-config-xubuntu/slideshow-oem-config-xubuntu.pot 2013-08-01 06:39:32 +0000
82@@ -0,0 +1,292 @@
83+# SOME DESCRIPTIVE TITLE
84+# Copyright (C) YEAR Free Software Foundation, Inc.
85+# This file is distributed under the same license as the PACKAGE package.
86+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
87+#
88+#, fuzzy
89+msgid ""
90+msgstr ""
91+"Project-Id-Version: PACKAGE VERSION\n"
92+"POT-Creation-Date: 2013-08-01 08:19+1000\n"
93+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
94+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
95+"Language-Team: LANGUAGE <LL@li.org>\n"
96+"Language: \n"
97+"MIME-Version: 1.0\n"
98+"Content-Type: text/plain; charset=UTF-8\n"
99+"Content-Transfer-Encoding: 8bit\n"
100+
101+#. type: Content of: <div><h1>
102+#: slideshows/oem-config-xubuntu/slides/00_welcome.html:2
103+msgid "Congratulations!"
104+msgstr ""
105+
106+#. type: Content of: <div><div><p>
107+#: slideshows/oem-config-xubuntu/slides/00_welcome.html:7
108+msgid "You have chosen to install the latest version of Xubuntu, 13.10."
109+msgstr ""
110+
111+#. type: Content of: <div><div><p>
112+#: slideshows/oem-config-xubuntu/slides/00_welcome.html:8
113+msgid ""
114+"This exciting piece of software is brought to you free of any fees, for your "
115+"use and any others you want to share it with."
116+msgstr ""
117+
118+#. type: Content of: <div><div><p>
119+#: slideshows/oem-config-xubuntu/slides/00_welcome.html:9
120+msgid ""
121+"Since you are installing this software using the Xubuntu live installation, "
122+"feel free to examine things as it installs. After the installation, the "
123+"desktop will look much the same as it does now."
124+msgstr ""
125+
126+#. type: Content of: <div><h1>
127+#: slideshows/oem-config-xubuntu/slides/01_web.html:2
128+msgid "Your web experience"
129+msgstr ""
130+
131+#. type: Content of: <div><div><p>
132+#: slideshows/oem-config-xubuntu/slides/01_web.html:7
133+msgid ""
134+"<em>Firefox</em> and <em>Thunderbird</em> are everything you need from web "
135+"applications."
136+msgstr ""
137+
138+#. type: Content of: <div><div><p>
139+#: slideshows/oem-config-xubuntu/slides/01_web.html:8
140+msgid ""
141+"They offer you the web the way you like it: high performance, easy "
142+"customization and advanced security."
143+msgstr ""
144+
145+#. type: Content of: <div><div><div><h2>
146+#: slideshows/oem-config-xubuntu/slides/01_web.html:10
147+#: slideshows/oem-config-xubuntu/slides/02_messaging.html:10
148+#: slideshows/oem-config-xubuntu/slides/03_gmusicbrowser.html:10
149+#: slideshows/oem-config-xubuntu/slides/04_office.html:10
150+#: slideshows/oem-config-xubuntu/slides/06_explore.html:11
151+msgid "Where?"
152+msgstr ""
153+
154+#. type: Content of: <div><div><div><p>
155+#: slideshows/oem-config-xubuntu/slides/01_web.html:11
156+#: slideshows/oem-config-xubuntu/slides/01_web.html:12
157+#: slideshows/oem-config-xubuntu/slides/02_messaging.html:11
158+#: slideshows/oem-config-xubuntu/slides/03_gmusicbrowser.html:11
159+#: slideshows/oem-config-xubuntu/slides/04_office.html:11
160+#: slideshows/oem-config-xubuntu/slides/04_office.html:12
161+#: slideshows/oem-config-xubuntu/slides/06_explore.html:12
162+#: slideshows/oem-config-xubuntu/slides/06_explore.html:13
163+msgid "<span>»</span>"
164+msgstr ""
165+
166+#. type: Content of: <div><div><div><p>
167+#: slideshows/oem-config-xubuntu/slides/01_web.html:11
168+#: slideshows/oem-config-xubuntu/slides/01_web.html:12
169+#: slideshows/oem-config-xubuntu/slides/02_messaging.html:11
170+msgid "Internet <span>»</span>"
171+msgstr ""
172+
173+#. type: Content of: <div><div><div><p>
174+#: slideshows/oem-config-xubuntu/slides/01_web.html:11
175+msgid "Firefox Web Browser"
176+msgstr ""
177+
178+#. type: Content of: <div><div><div><p>
179+#: slideshows/oem-config-xubuntu/slides/01_web.html:12
180+msgid "Thunderbird Mail/News"
181+msgstr ""
182+
183+#. type: Content of: <div><h1>
184+#: slideshows/oem-config-xubuntu/slides/02_messaging.html:2
185+msgid "Instant messaging"
186+msgstr ""
187+
188+#. type: Content of: <div><div><p>
189+#: slideshows/oem-config-xubuntu/slides/02_messaging.html:7
190+msgid ""
191+"Xubuntu is shipping <em>Pidgin</em> as the default instant messaging client."
192+msgstr ""
193+
194+#. type: Content of: <div><div><p>
195+#: slideshows/oem-config-xubuntu/slides/02_messaging.html:8
196+msgid ""
197+"You can connect to various protocols such as AIM, ICQ, IRC, MSN and XMPP "
198+"(Google Talk, Facebook). You can also update your Twitter account via third-"
199+"party plugin."
200+msgstr ""
201+
202+#. type: Content of: <div><div><div><p>
203+#: slideshows/oem-config-xubuntu/slides/02_messaging.html:11
204+msgid "Pidgin Internet Messenger"
205+msgstr ""
206+
207+#. type: Content of: <div><h1>
208+#: slideshows/oem-config-xubuntu/slides/03_gmusicbrowser.html:2
209+msgid "Enjoy your media"
210+msgstr ""
211+
212+#. type: Content of: <div><div><p>
213+#: slideshows/oem-config-xubuntu/slides/03_gmusicbrowser.html:7
214+msgid ""
215+"Whether your collection is small or large, <em>gmusicbrowser</em>, the "
216+"default media player in Xubuntu, can handle it!"
217+msgstr ""
218+
219+#. type: Content of: <div><div><p>
220+#: slideshows/oem-config-xubuntu/slides/03_gmusicbrowser.html:8
221+msgid ""
222+"In Xubuntu, gmusicbrowser comes with the good-looking and easy-to-use "
223+"Shimmer theme."
224+msgstr ""
225+
226+#. type: Content of: <div><div><div><p>
227+#: slideshows/oem-config-xubuntu/slides/03_gmusicbrowser.html:11
228+msgid "Multimedia <span>»</span>"
229+msgstr ""
230+
231+#. type: Content of: <div><div><div><p>
232+#: slideshows/oem-config-xubuntu/slides/03_gmusicbrowser.html:11
233+msgid "gmusicbrowser"
234+msgstr ""
235+
236+#. type: Content of: <div><h1>
237+#: slideshows/oem-config-xubuntu/slides/04_office.html:2
238+msgid "In the office"
239+msgstr ""
240+
241+#. type: Content of: <div><div><p>
242+#: slideshows/oem-config-xubuntu/slides/04_office.html:7
243+msgid ""
244+"For your office needs, Xubuntu comes with <em>Abiword</em>, a lightweight "
245+"word processor, which can read almost all known document formats and "
246+"<em>Gnumeric</em>, a spreadsheet program with an emphasis on accuracy."
247+msgstr ""
248+
249+#. type: Content of: <div><div><p>
250+#: slideshows/oem-config-xubuntu/slides/04_office.html:8
251+msgid ""
252+"LibreOffice is also available in the repositories, if you're more "
253+"comfortable with it or need a full office suite."
254+msgstr ""
255+
256+#. type: Content of: <div><div><div><p>
257+#: slideshows/oem-config-xubuntu/slides/04_office.html:11
258+#: slideshows/oem-config-xubuntu/slides/04_office.html:12
259+msgid "Office <span>»</span>"
260+msgstr ""
261+
262+#. type: Content of: <div><div><div><p>
263+#: slideshows/oem-config-xubuntu/slides/04_office.html:11
264+msgid "Abiword"
265+msgstr ""
266+
267+#. type: Content of: <div><div><div><p>
268+#: slideshows/oem-config-xubuntu/slides/04_office.html:12
269+msgid "Gnumeric"
270+msgstr ""
271+
272+#. type: Content of: <div><h1>
273+#: slideshows/oem-config-xubuntu/slides/05_desktop.html:2
274+msgid "The Xubuntu desktop"
275+msgstr ""
276+
277+#. type: Attribute 'alt' of: <div><div><p><img>
278+#: slideshows/oem-config-xubuntu/slides/05_desktop.html:8
279+msgid "1"
280+msgstr ""
281+
282+#. type: Content of: <div><div><p>
283+#: slideshows/oem-config-xubuntu/slides/05_desktop.html:9
284+msgid ""
285+"The application-menu gives you complete access to all your applications."
286+msgstr ""
287+
288+#. type: Attribute 'alt' of: <div><div><p><img>
289+#: slideshows/oem-config-xubuntu/slides/05_desktop.html:12
290+msgid "2"
291+msgstr ""
292+
293+#. type: Content of: <div><div><p>
294+#: slideshows/oem-config-xubuntu/slides/05_desktop.html:13
295+msgid ""
296+"The launcher panel gives you <em>quick access</em> to your most important "
297+"applications. It is set to autohide by default to preserve screen space."
298+msgstr ""
299+
300+#. type: Attribute 'alt' of: <div><div><p><img>
301+#: slideshows/oem-config-xubuntu/slides/05_desktop.html:16
302+msgid "3"
303+msgstr ""
304+
305+#. Open windows of r
306+#. type: Content of: <div><div><p>
307+#: slideshows/oem-config-xubuntu/slides/05_desktop.html:17
308+msgid "Running applications are shown in the top panel."
309+msgstr ""
310+
311+#. type: Content of: <div><h1>
312+#: slideshows/oem-config-xubuntu/slides/06_explore.html:2
313+msgid "Know your desktop"
314+msgstr ""
315+
316+#. type: Content of: <div><div><p>
317+#: slideshows/oem-config-xubuntu/slides/06_explore.html:7
318+msgid ""
319+"For easy installation of new software, use the <em>Ubuntu Software Center</"
320+"em>."
321+msgstr ""
322+
323+#. type: Content of: <div><div><p>
324+#: slideshows/oem-config-xubuntu/slides/06_explore.html:8
325+msgid ""
326+"If you need help, go to <em>Help</em> in the Applications menu or see <a "
327+"href=\"http://xubuntu.org/help\">Help & Support</a> on our website."
328+msgstr ""
329+
330+#. type: Content of: <div><div><p>
331+#: slideshows/oem-config-xubuntu/slides/06_explore.html:9
332+msgid ""
333+"<em>Xfce</em> is the desktop environment in Xubuntu. Read more about Xfce on "
334+"the <a href=\"http://xfce.org/\">Xfce website</a>."
335+msgstr ""
336+
337+#. type: Content of: <div><div><div><p>
338+#: slideshows/oem-config-xubuntu/slides/06_explore.html:12
339+msgid "Software Center"
340+msgstr ""
341+
342+#. type: Content of: <div><div><div><p>
343+#: slideshows/oem-config-xubuntu/slides/06_explore.html:13
344+msgid "Help"
345+msgstr ""
346+
347+#. type: Content of: <div><h1>
348+#: slideshows/oem-config-xubuntu/slides/07_thanks.html:2
349+msgid "Thank you!"
350+msgstr ""
351+
352+#. type: Content of: <div><div><p>
353+#: slideshows/oem-config-xubuntu/slides/07_thanks.html:7
354+msgid ""
355+"Thanks for taking the time with us. We'd love to hear about your experiences "
356+"with Xubuntu. You can share them on the <a href=\"https://lists.ubuntu.com/"
357+"mailman/listinfo/xubuntu-users\">Xubuntu-users mailing list</a>."
358+msgstr ""
359+
360+#. type: Content of: <div><div><p>
361+#: slideshows/oem-config-xubuntu/slides/07_thanks.html:8
362+msgid ""
363+"Join our IRC channel <em>#xubuntu</em> for online support by <a href="
364+"\"http://webchat.freenode.net/?channels=xubuntu&nick=xubuntu..."
365+"&prompt=1\">clicking here</a>."
366+msgstr ""
367+
368+#. type: Content of: <div><div><p>
369+#: slideshows/oem-config-xubuntu/slides/07_thanks.html:9
370+msgid ""
371+"Finally, find different ways to contribute to Xubuntu on the <a href="
372+"\"http://xubuntu.org/devel\">Get Involved</a> -section of our website. We "
373+"need your help!"
374+msgstr ""
375
376=== added directory 'slideshows/oem-config-xubuntu'
377=== added directory 'slideshows/oem-config-xubuntu/slides'
378=== added file 'slideshows/oem-config-xubuntu/slides/00_welcome.html'
379--- slideshows/oem-config-xubuntu/slides/00_welcome.html 1970-01-01 00:00:00 +0000
380+++ slideshows/oem-config-xubuntu/slides/00_welcome.html 2013-08-01 06:39:32 +0000
381@@ -0,0 +1,12 @@
382+<div class="header">
383+ <h1>Congratulations!</h1>
384+</div>
385+
386+<div class="main">
387+ <div class="content">
388+ <p>You have chosen to install the latest version of Xubuntu, 13.10.</p>
389+ <p>This exciting piece of software is brought to you free of any fees, for your use and any others you want to share it with.</p>
390+ <p>Since you are installing this software using the Xubuntu live installation, feel free to examine things as it installs. After the installation, the desktop will look much the same as it does now.</p>
391+ </div>
392+ <img class="shot clip leftpad" src="shots/xubuntu.png" />
393+</div>
394
395=== added file 'slideshows/oem-config-xubuntu/slides/01_web.html'
396--- slideshows/oem-config-xubuntu/slides/01_web.html 1970-01-01 00:00:00 +0000
397+++ slideshows/oem-config-xubuntu/slides/01_web.html 2013-08-01 06:39:32 +0000
398@@ -0,0 +1,17 @@
399+<div class="header">
400+ <h1>Your web experience</h1>
401+</div>
402+
403+<div class="main">
404+ <div class="content">
405+ <p><em>Firefox</em> and <em>Thunderbird</em> are everything you need from web applications.</p>
406+ <p>They offer you the web the way you like it: high performance, easy customization and advanced security.</p>
407+ <div class="paths">
408+ <h2>Where?</h2>
409+ <p class="path"><img src="icons/menu_16.png" /> <span>»</span> <img src="icons/cat_internet_16.png" /> Internet <span>»</span> <img src="icons/firefox_16.png" /> Firefox Web Browser</p>
410+ <p class="path"><img src="icons/menu_16.png" /> <span>»</span> <img src="icons/cat_internet_16.png" /> Internet <span>»</span> <img src="icons/thunderbird_16.png" /> Thunderbird Mail/News</p>
411+ </div>
412+ </div>
413+ <img class="shot clip" src="shots/thunderbird.png" />
414+</div>
415+
416
417=== added file 'slideshows/oem-config-xubuntu/slides/02_messaging.html'
418--- slideshows/oem-config-xubuntu/slides/02_messaging.html 1970-01-01 00:00:00 +0000
419+++ slideshows/oem-config-xubuntu/slides/02_messaging.html 2013-08-01 06:39:32 +0000
420@@ -0,0 +1,15 @@
421+<div class="header">
422+ <h1>Instant messaging</h1>
423+</div>
424+
425+<div class="main">
426+ <div class="content">
427+ <p>Xubuntu is shipping <em>Pidgin</em> as the default instant messaging client.</p>
428+ <p>You can connect to various protocols such as AIM, ICQ, IRC, MSN and XMPP (Google Talk, Facebook). You can also update your Twitter account via third-party plugin.</p>
429+ <div class="paths">
430+ <h2>Where?</h2>
431+ <p class="path"><img src="icons/menu_16.png" /> <span>»</span> <img src="icons/cat_internet_16.png" /> Internet <span>»</span> <img src="icons/pidgin_16.png" /> Pidgin Internet Messenger</p>
432+ </div>
433+ </div>
434+ <img class="shot clip" src="shots/pidgin.png" />
435+</div>
436
437=== added file 'slideshows/oem-config-xubuntu/slides/03_gmusicbrowser.html'
438--- slideshows/oem-config-xubuntu/slides/03_gmusicbrowser.html 1970-01-01 00:00:00 +0000
439+++ slideshows/oem-config-xubuntu/slides/03_gmusicbrowser.html 2013-08-01 06:39:32 +0000
440@@ -0,0 +1,15 @@
441+<div class="header">
442+ <h1>Enjoy your media</h1>
443+</div>
444+
445+<div class="main">
446+ <div class="content">
447+ <p>Whether your collection is small or large, <em>gmusicbrowser</em>, the default media player in Xubuntu, can handle it!</p>
448+ <p>In Xubuntu, gmusicbrowser comes with the good-looking and easy-to-use Shimmer theme.</p>
449+ <div class="paths">
450+ <h2>Where?</h2>
451+ <p class="path"><img src="icons/menu_16.png" /> <span>»</span> <img src="icons/cat_multimedia_16.png" /> Multimedia <span>»</span> <img src="icons/gmusicbrowser_16.png" /> gmusicbrowser</p>
452+ </div>
453+ </div>
454+ <img class="shot clip" src="shots/gmusicbrowser.png" />
455+</div>
456
457=== added file 'slideshows/oem-config-xubuntu/slides/04_office.html'
458--- slideshows/oem-config-xubuntu/slides/04_office.html 1970-01-01 00:00:00 +0000
459+++ slideshows/oem-config-xubuntu/slides/04_office.html 2013-08-01 06:39:32 +0000
460@@ -0,0 +1,17 @@
461+<div class="header">
462+ <h1>In the office</h1>
463+</div>
464+
465+<div class="main">
466+ <div class="content">
467+ <p>For your office needs, Xubuntu comes with <em>Abiword</em>, a lightweight word processor, which can read almost all known document formats and <em>Gnumeric</em>, a spreadsheet program with an emphasis on accuracy.</p>
468+ <p>LibreOffice is also available in the repositories, if you're more comfortable with it or need a full office suite.</p>
469+ <div class="paths">
470+ <h2>Where?</h2>
471+ <p class="path"><img src="icons/menu_16.png" /> <span>»</span> <img src="icons/cat_office_16.png" /> Office <span>»</span> <img src="icons/abiword_16.png" /> Abiword</p>
472+ <p class="path"><img src="icons/menu_16.png" /> <span>»</span> <img src="icons/cat_office_16.png" /> Office <span>»</span> <img src="icons/gnumeric_16.png" /> Gnumeric</p>
473+ </div>
474+ </div>
475+ <img class="shot clip" src="shots/abiword.png" />
476+</div>
477+
478
479=== added file 'slideshows/oem-config-xubuntu/slides/05_desktop.html'
480--- slideshows/oem-config-xubuntu/slides/05_desktop.html 1970-01-01 00:00:00 +0000
481+++ slideshows/oem-config-xubuntu/slides/05_desktop.html 2013-08-01 06:39:32 +0000
482@@ -0,0 +1,21 @@
483+<div class="header">
484+ <h1>The Xubuntu desktop</h1>
485+</div>
486+
487+<div class="main">
488+ <div class="content">
489+ <p>
490+ <img src="icons/desktop_1.png" alt="1" class="desktop_icon" /><br />
491+ The application-menu gives you complete access to all your applications.
492+ </p>
493+ <p>
494+ <img src="icons/desktop_2.png" alt="2" class="desktop_icon" /><br />
495+ The launcher panel gives you <em>quick access</em> to your most important applications. It is set to autohide by default to preserve screen space.
496+ </p>
497+ <p>
498+ <img src="icons/desktop_3.png" alt="3" class="desktop_icon" /><br />
499+ <!--Open windows of r -->Running applications are shown in the top panel.
500+ </p>
501+ </div>
502+ <img class="shot clip" src="shots/desktop.png" />
503+</div>
504
505=== added file 'slideshows/oem-config-xubuntu/slides/06_explore.html'
506--- slideshows/oem-config-xubuntu/slides/06_explore.html 1970-01-01 00:00:00 +0000
507+++ slideshows/oem-config-xubuntu/slides/06_explore.html 2013-08-01 06:39:32 +0000
508@@ -0,0 +1,18 @@
509+<div class="header">
510+ <h1>Know your desktop</h1>
511+</div>
512+
513+<div class="main">
514+ <div class="content">
515+ <p>For easy installation of new software, use the <em>Ubuntu Software Center</em>.</p>
516+ <p>If you need help, go to <em>Help</em> in the Applications menu or see <a href="http://xubuntu.org/help">Help & Support</a> on our website.</p>
517+ <p><em>Xfce</em> is the desktop environment in Xubuntu. Read more about Xfce on the <a href="http://xfce.org/">Xfce website</a>.</p>
518+ <div class="paths">
519+ <h2>Where?</h2>
520+ <p class="path"><img src="icons/menu_16.png" /> <span>»</span> <img src="icons/softwarecenter_16.png" /> Software Center</p>
521+ <p class="path"><img src="icons/menu_16.png" /> <span>»</span> <img src="icons/help_16.png" /> Help</p>
522+ </div>
523+ </div>
524+ <img class="shot clip" src="shots/usc.png" />
525+</div>
526+
527
528=== added file 'slideshows/oem-config-xubuntu/slides/07_thanks.html'
529--- slideshows/oem-config-xubuntu/slides/07_thanks.html 1970-01-01 00:00:00 +0000
530+++ slideshows/oem-config-xubuntu/slides/07_thanks.html 2013-08-01 06:39:32 +0000
531@@ -0,0 +1,12 @@
532+<div class="header">
533+ <h1>Thank you!</h1>
534+</div>
535+
536+<div class="main">
537+ <div class="content">
538+ <p>Thanks for taking the time with us. We'd love to hear about your experiences with Xubuntu. You can share them on the <a href="https://lists.ubuntu.com/mailman/listinfo/xubuntu-users">Xubuntu-users mailing list</a>.</p>
539+ <p>Join our IRC channel <em>#xubuntu</em> for online support by <a href="http://webchat.freenode.net/?channels=xubuntu&nick=xubuntu...&prompt=1">clicking here</a>.</p>
540+ <p>Finally, find different ways to contribute to Xubuntu on the <a href="http://xubuntu.org/devel">Get Involved</a> -section of our website. We need your help!</p>
541+ </div>
542+ <img class="shot clip leftpad" src="shots/community.png" />
543+</div>
544
545=== added directory 'slideshows/oem-config-xubuntu/slides/icons'
546=== added file 'slideshows/oem-config-xubuntu/slides/icons/abiword_16.png'
547Binary files slideshows/oem-config-xubuntu/slides/icons/abiword_16.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/abiword_16.png 2013-08-01 06:39:32 +0000 differ
548=== added file 'slideshows/oem-config-xubuntu/slides/icons/cat_internet_16.png'
549Binary files slideshows/oem-config-xubuntu/slides/icons/cat_internet_16.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/cat_internet_16.png 2013-08-01 06:39:32 +0000 differ
550=== added file 'slideshows/oem-config-xubuntu/slides/icons/cat_multimedia_16.png'
551Binary files slideshows/oem-config-xubuntu/slides/icons/cat_multimedia_16.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/cat_multimedia_16.png 2013-08-01 06:39:32 +0000 differ
552=== added file 'slideshows/oem-config-xubuntu/slides/icons/cat_office_16.png'
553Binary files slideshows/oem-config-xubuntu/slides/icons/cat_office_16.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/cat_office_16.png 2013-08-01 06:39:32 +0000 differ
554=== added file 'slideshows/oem-config-xubuntu/slides/icons/desktop_1.png'
555Binary files slideshows/oem-config-xubuntu/slides/icons/desktop_1.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/desktop_1.png 2013-08-01 06:39:32 +0000 differ
556=== added file 'slideshows/oem-config-xubuntu/slides/icons/desktop_2.png'
557Binary files slideshows/oem-config-xubuntu/slides/icons/desktop_2.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/desktop_2.png 2013-08-01 06:39:32 +0000 differ
558=== added file 'slideshows/oem-config-xubuntu/slides/icons/desktop_3.png'
559Binary files slideshows/oem-config-xubuntu/slides/icons/desktop_3.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/desktop_3.png 2013-08-01 06:39:32 +0000 differ
560=== added file 'slideshows/oem-config-xubuntu/slides/icons/firefox_16.png'
561Binary files slideshows/oem-config-xubuntu/slides/icons/firefox_16.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/firefox_16.png 2013-08-01 06:39:32 +0000 differ
562=== added file 'slideshows/oem-config-xubuntu/slides/icons/gmusicbrowser_16.png'
563Binary files slideshows/oem-config-xubuntu/slides/icons/gmusicbrowser_16.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/gmusicbrowser_16.png 2013-08-01 06:39:32 +0000 differ
564=== added file 'slideshows/oem-config-xubuntu/slides/icons/gnumeric_16.png'
565Binary files slideshows/oem-config-xubuntu/slides/icons/gnumeric_16.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/gnumeric_16.png 2013-08-01 06:39:32 +0000 differ
566=== added file 'slideshows/oem-config-xubuntu/slides/icons/help_16.png'
567Binary files slideshows/oem-config-xubuntu/slides/icons/help_16.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/help_16.png 2013-08-01 06:39:32 +0000 differ
568=== added file 'slideshows/oem-config-xubuntu/slides/icons/menu_16.png'
569Binary files slideshows/oem-config-xubuntu/slides/icons/menu_16.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/menu_16.png 2013-08-01 06:39:32 +0000 differ
570=== added file 'slideshows/oem-config-xubuntu/slides/icons/pidgin_16.png'
571Binary files slideshows/oem-config-xubuntu/slides/icons/pidgin_16.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/pidgin_16.png 2013-08-01 06:39:32 +0000 differ
572=== added file 'slideshows/oem-config-xubuntu/slides/icons/softwarecenter_16.png'
573Binary files slideshows/oem-config-xubuntu/slides/icons/softwarecenter_16.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/softwarecenter_16.png 2013-08-01 06:39:32 +0000 differ
574=== added file 'slideshows/oem-config-xubuntu/slides/icons/thunderbird_16.png'
575Binary files slideshows/oem-config-xubuntu/slides/icons/thunderbird_16.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/icons/thunderbird_16.png 2013-08-01 06:39:32 +0000 differ
576=== added file 'slideshows/oem-config-xubuntu/slides/index.html'
577--- slideshows/oem-config-xubuntu/slides/index.html 1970-01-01 00:00:00 +0000
578+++ slideshows/oem-config-xubuntu/slides/index.html 2013-08-01 06:39:32 +0000
579@@ -0,0 +1,48 @@
580+<!DOCTYPE html>
581+
582+<html lang="en">
583+
584+<head>
585+ <title>ubiquity-slideshow-xubuntu</title>
586+
587+ <link href="link/base.css" rel="stylesheet" type="text/css" />
588+
589+ <base target="_blank" />
590+
591+ <script type="text/javascript" src="link-core/jquery.js"></script>
592+ <script type="text/javascript" src="link-core/jquery.cycle.all.js"></script>
593+
594+ <script type="text/javascript" src="link-core/base.js"></script>
595+
596+ <script type="text/javascript">
597+ SLIDESHOW_OPTIONS = {
598+ timeout:50000,
599+ speed:600,
600+ }
601+ </script>
602+
603+ <script type="text/javascript" src="link-core/slideshow.js"></script>
604+</head>
605+
606+<body>
607+
608+<div id="slideshow">
609+ <div><a href="00_welcome.html"></a></div>
610+ <div><a href="01_web.html"></a></div>
611+ <div><a href="02_messaging.html"></a></div>
612+ <div><a href="03_gmusicbrowser.html"></a></div>
613+ <div><a href="04_office.html"></a></div>
614+ <div><a href="05_desktop.html"></a></div>
615+ <div><a href="06_explore.html"></a></div>
616+ <div><a href="07_thanks.html"></a></div>
617+</div>
618+
619+<div id="controls">
620+ <a class="control-arrow" id="prev-slide" style="display:none;"></a>
621+ <a class="control-arrow" id="next-slide"></a>
622+ <input type="hidden" id="current-slide" />
623+</div>
624+
625+</body>
626+
627+</html>
628
629=== added directory 'slideshows/oem-config-xubuntu/slides/link'
630=== added symlink 'slideshows/oem-config-xubuntu/slides/link-core'
631=== target is u'../../link-core'
632=== added file 'slideshows/oem-config-xubuntu/slides/link/arrow-next.png'
633Binary files slideshows/oem-config-xubuntu/slides/link/arrow-next.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/link/arrow-next.png 2013-08-01 06:39:32 +0000 differ
634=== added file 'slideshows/oem-config-xubuntu/slides/link/arrow-prev.png'
635Binary files slideshows/oem-config-xubuntu/slides/link/arrow-prev.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/link/arrow-prev.png 2013-08-01 06:39:32 +0000 differ
636=== added file 'slideshows/oem-config-xubuntu/slides/link/base.css'
637--- slideshows/oem-config-xubuntu/slides/link/base.css 1970-01-01 00:00:00 +0000
638+++ slideshows/oem-config-xubuntu/slides/link/base.css 2013-08-01 06:39:32 +0000
639@@ -0,0 +1,235 @@
640+/*
641+ * CSS Reset
642+ *
643+ */
644+
645+html, body, div, span, applet, object, iframe,
646+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
647+a, abbr, acronym, address, big, cite, code,
648+del, dfn, em, font, img, ins, kbd, q, s, samp,
649+small, strike, strong, sub, sup, tt, var,
650+b, u, i, center,
651+dl, dt, dd, ol, ul, li,
652+fieldset, form, label, legend,
653+table, caption, tbody, tfoot, thead, tr, th, td,
654+hr {
655+ margin: 0;
656+ padding: 0;
657+ border: 0;
658+ outline: 0;
659+ font-size: 100%;
660+ vertical-align: baseline;
661+ background: transparent;
662+}
663+body {
664+ line-height: 1.2em;
665+}
666+ol, ul {
667+ list-style: none;
668+}
669+blockquote, q {
670+ quotes: none;
671+}
672+blockquote:before, blockquote:after,
673+q:before, q:after {
674+ content: '';
675+ content: none;
676+}
677+
678+/* remember to define focus styles! */
679+:focus {
680+ outline: 0;
681+}
682+
683+/* remember to highlight inserts somehow! */
684+ins {
685+ text-decoration: none;
686+}
687+del {
688+ text-decoration: line-through;
689+}
690+
691+img {
692+ vertical-align:middle;
693+}
694+
695+/* tables still need 'cellspacing="0"' in the markup */
696+table {
697+ border-collapse: collapse;
698+ border-spacing: 0;
699+}
700+
701+/*
702+ * Main layout
703+ *
704+ */
705+
706+html, body {
707+ font-family: "Droid Sans", sans-serif;
708+
709+ color: #bbcdde;
710+}
711+
712+#slideshow {
713+ background-image: url(wall.png);
714+
715+ width: 750px;
716+ height: 420px;
717+
718+ overflow: hidden;
719+}
720+
721+/*
722+ * Controls
723+ *
724+ */
725+
726+.control-arrow {
727+ z-index: 100;
728+ position: absolute;
729+ top: 20px;
730+
731+ width: 20px;
732+ height: 20px;
733+
734+ background: transparent;
735+ background-position: 0 0;
736+}
737+.control-arrow.disabled {
738+ cursor:default;
739+}
740+.control-arrow:hover, .control-arrow:focus {
741+ background-position: 0 -20px;
742+}
743+.control-arrow:active {
744+ background-position: 0 -40px;
745+}
746+#prev-slide {
747+ left: 670px;
748+ background-image: url(arrow-prev.png);
749+}
750+#next-slide {
751+ left: 710px;
752+ background-image: url(arrow-next.png);
753+}
754+
755+/*
756+ * Elements
757+ *
758+ */
759+
760+a {
761+ color: #fff; /*#214478; */
762+ text-decoration: none;
763+}
764+
765+.main a {
766+ border-bottom: 1px solid #bbb;
767+}
768+
769+em {
770+ font-style: italic;
771+}
772+
773+p, ul, ol {
774+ margin-bottom: 1em;
775+}
776+
777+h2 {
778+ width: 270px;
779+
780+/* border-top: 1px solid rgba( 255, 255, 255, 0.3 ); */
781+ padding-top: 5px;
782+ margin-top: 2em;
783+ margin-bottom: 0.5em;
784+
785+ font-family: "Droid Serif", serif;
786+ font-size: 90%;
787+ color: #fff;
788+}
789+
790+/*
791+ * More layout
792+ *
793+ */
794+
795+.header {
796+ display: table-cell;
797+ width: 750px;
798+
799+ padding: 0 100px 0 20px;
800+ height: 60px;
801+
802+ vertical-align: middle;
803+
804+ background-color: rgba( 0, 0, 0, 0.5 );
805+}
806+ .header h1 {
807+ color: #fff;
808+
809+ font-size: 180%;
810+ font-family: "Droid Serif", serif;
811+ font-weight: normal;
812+ }
813+
814+.main {
815+ font-size: 90%;
816+
817+ background-image: url(shadow.png);
818+ background-position: 0 0;
819+ background-repeat: repeat-x;
820+
821+ padding: 30px 0 0 0;
822+}
823+ .main .content, .main .shot {
824+ float: left;
825+ }
826+ .main .content {
827+ width: 260px;
828+ padding: 0 20px;
829+ }
830+ .main .shot {
831+ margin-left: 10px;
832+ }
833+ .main .shot.full {
834+ margin-left: -10px;
835+ width: 440px;
836+ }
837+ .main .shot.clip {
838+ margin-left: 0;
839+ }
840+ .main .shot.leftpad {
841+ margin-left: 30px;
842+ }
843+
844+
845+/*
846+ * Application paths
847+ *
848+ */
849+
850+.paths {
851+ width: 230px;
852+ position: absolute;
853+ top: 280px;
854+
855+ color: #fff;
856+}
857+.path { /* application paths */
858+ font-size: 75%;
859+ width: 270px; /* everything fits in oneliners with 270px! */
860+}
861+
862+.path span {
863+ display: inline-block;
864+ margin: 0 2px;
865+
866+ font-size: 120%;
867+ font-weight: bold;
868+
869+ color: #007fbe;
870+}
871+
872+.desktop_icon {
873+ margin-bottom: 7px;
874+}
875
876=== added file 'slideshows/oem-config-xubuntu/slides/link/shadow.png'
877Binary files slideshows/oem-config-xubuntu/slides/link/shadow.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/link/shadow.png 2013-08-01 06:39:32 +0000 differ
878=== added file 'slideshows/oem-config-xubuntu/slides/link/wall.png'
879Binary files slideshows/oem-config-xubuntu/slides/link/wall.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/link/wall.png 2013-08-01 06:39:32 +0000 differ
880=== added directory 'slideshows/oem-config-xubuntu/slides/shots'
881=== added file 'slideshows/oem-config-xubuntu/slides/shots/abiword.png'
882Binary files slideshows/oem-config-xubuntu/slides/shots/abiword.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/shots/abiword.png 2013-08-01 06:39:32 +0000 differ
883=== added file 'slideshows/oem-config-xubuntu/slides/shots/community.png'
884Binary files slideshows/oem-config-xubuntu/slides/shots/community.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/shots/community.png 2013-08-01 06:39:32 +0000 differ
885=== added file 'slideshows/oem-config-xubuntu/slides/shots/desktop.png'
886Binary files slideshows/oem-config-xubuntu/slides/shots/desktop.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/shots/desktop.png 2013-08-01 06:39:32 +0000 differ
887=== added file 'slideshows/oem-config-xubuntu/slides/shots/gmusicbrowser.png'
888Binary files slideshows/oem-config-xubuntu/slides/shots/gmusicbrowser.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/shots/gmusicbrowser.png 2013-08-01 06:39:32 +0000 differ
889=== added file 'slideshows/oem-config-xubuntu/slides/shots/pidgin.png'
890Binary files slideshows/oem-config-xubuntu/slides/shots/pidgin.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/shots/pidgin.png 2013-08-01 06:39:32 +0000 differ
891=== added file 'slideshows/oem-config-xubuntu/slides/shots/thunderbird.png'
892Binary files slideshows/oem-config-xubuntu/slides/shots/thunderbird.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/shots/thunderbird.png 2013-08-01 06:39:32 +0000 differ
893=== added file 'slideshows/oem-config-xubuntu/slides/shots/usc.png'
894Binary files slideshows/oem-config-xubuntu/slides/shots/usc.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/shots/usc.png 2013-08-01 06:39:32 +0000 differ
895=== added file 'slideshows/oem-config-xubuntu/slides/shots/xubuntu.png'
896Binary files slideshows/oem-config-xubuntu/slides/shots/xubuntu.png 1970-01-01 00:00:00 +0000 and slideshows/oem-config-xubuntu/slides/shots/xubuntu.png 2013-08-01 06:39:32 +0000 differ
897=== added file 'slideshows/oem-config-xubuntu/slideshow.conf'
898--- slideshows/oem-config-xubuntu/slideshow.conf 1970-01-01 00:00:00 +0000
899+++ slideshows/oem-config-xubuntu/slideshow.conf 2013-08-01 06:39:32 +0000
900@@ -0,0 +1,3 @@
901+[Slideshow]
902+width:750
903+height:420

Subscribers

People subscribed via source and target branches