ubiquity-slideshow team mailing list archive
-
ubiquity-slideshow team
-
Mailing list archive
-
Message #00830
[Merge] lp:~gilir/ubiquity-slideshow-ubuntu/lp-729197 into lp:ubiquity-slideshow-ubuntu
Julien Lavergne has proposed merging lp:~gilir/ubiquity-slideshow-ubuntu/lp-729197 into lp:ubiquity-slideshow-ubuntu.
Requested reviews:
Ubiquity Slideshow (ubiquity-slideshow)
Related bugs:
Bug #729197 in Ubiquity Slideshow: "Update Lubuntu slideshows with Ubuntu layout"
https://bugs.launchpad.net/ubiquity-slideshow-ubuntu/+bug/729197
For more details, see:
https://code.launchpad.net/~gilir/ubiquity-slideshow-ubuntu/lp-729197/+merge/53722
Updates of Lubuntu slides for Lubuntu 11.04.
--
https://code.launchpad.net/~gilir/ubiquity-slideshow-ubuntu/lp-729197/+merge/53722
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~gilir/ubiquity-slideshow-ubuntu/lp-729197 into lp:ubiquity-slideshow-ubuntu.
=== modified file 'debian/changelog'
--- debian/changelog 2011-03-07 23:58:49 +0000
+++ debian/changelog 2011-03-17 00:20:54 +0000
@@ -1,3 +1,9 @@
+ubiquity-slideshow-ubuntu (34) UNRELEASED; urgency=low
+
+ * Update lubuntu layout to Ubuntu one (LP: #729197)
+
+ -- Julien Lavergne <gilir@xxxxxxxxxx> Thu, 17 Mar 2011 01:10:56 +0100
+
ubiquity-slideshow-ubuntu (33) natty; urgency=low
[ Dylan McCall ]
=== renamed file 'slideshows/lubuntu/slides/chromium-browser.html' => 'slideshows/lubuntu/slides/browser.html'
--- slideshows/lubuntu/slides/chromium-browser.html 2010-08-07 12:26:09 +0000
+++ slideshows/lubuntu/slides/browser.html 2011-03-17 00:20:54 +0000
@@ -1,14 +1,40 @@
-<div class="header"><h1 class="title">Internet with Chromium</h1></div>
+<div class="header"><h1 class="slidetitle">Internet with Chromium</h1></div>
<div class="main">
-<div class="content wrap-top"><ul>
- <li>Lubuntu is shipped with <em>Chromium</em>, the open-source version of Chrome, a browser developed by Google.</li>
- <li>It's fast with a clean user interface.</li>
- <li>More information on the <a href="http://sites.google.com/a/chromium.org/dev/Home";>Chromium website</a>.</li>
-</ul>
-</div>
-
-</div>
-
-<img class="icon" src="icons/chromium.png" alt="" />
+<div class="text">
+
+<div>
+ <p>Lubuntu is shipped with <em>Chromium</em>, the open-source version of Chrome, a browser developed by Google.</p>
+</div>
+
+<div>
+ <p>It's fast with a clean user interface.</p>
+</div>
+
+<div>
+ <p>More information on the <a href="http://sites.google.com/a/chromium.org/dev/Home";>Chromium website</a>.</p>
+</div>
+
+<div class="featured">
+<h2 class="subtitle">Included software</h2>
+<ul>
+ <li>
+ <img class="icon" src="icons/chromium.png" />
+ <p class="caption">Chromium web browser</p>
+ </li>
+</ul>
+<h2 class="subtitle">Supported software</h2>
+<ul>
+ <li>
+ <img class="icon" src="icons/firefox.png" />
+ <p class="caption">Firefox web browser</p>
+ </li>
+</ul>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/slide_browser.png" />
+
+</div>
=== renamed file 'slideshows/lubuntu/slides/sylpheed.html' => 'slideshows/lubuntu/slides/email.html'
--- slideshows/lubuntu/slides/sylpheed.html 2010-08-07 14:57:42 +0000
+++ slideshows/lubuntu/slides/email.html 2011-03-17 00:20:54 +0000
@@ -1,14 +1,40 @@
-<div class="header"><h1 class="title">Checking your emails</h1></div>
+<div class="header"><h1 class="slidetitle">Checking your emails</h1></div>
<div class="main">
-<div class="content wrap-top"><ul>
- <li>Lubuntu provides a mail client named <em>Sylpheed</em>.</li>
- <li>It will allow you to check your email messages, and read them even if you are offline.</li>
- <li>More information on <a href="http://sylpheed.sraoss.jp/en/";>Sylpheed website</a>.</li>
-</ul>
-</div>
-
-</div>
-
-<img class="icon" src="icons/sylpheed.png" alt="" />
+<div class="text">
+
+<div>
+ <p>Lubuntu provides a mail client named <em>Sylpheed</em>.</p>
+</div>
+
+<div>
+ <p>It will allow you to check your email messages, and read them even if you are offline.</p>
+</div>
+
+<div>
+ <p>More information on <a href="http://sylpheed.sraoss.jp/en/";>Sylpheed website</a>.</li>
+</div>
+
+<div class="featured">
+<h2 class="subtitle">Included software</h2>
+<ul>
+ <li>
+ <img class="icon" src="icons/sylpheed.png" />
+ <p class="caption">Sylpheed</p>
+ </li>
+</ul>
+<h2 class="subtitle">Supported software</h2>
+<ul>
+ <li>
+ <img class="icon" src="icons/thunderbird.png" />
+ <p class="caption">Thunderbird mail client</p>
+ </li>
+</ul>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/slide_email.png"/>
+
+</div>
=== modified file 'slideshows/lubuntu/slides/help.html'
--- slideshows/lubuntu/slides/help.html 2010-11-22 21:11:45 +0000
+++ slideshows/lubuntu/slides/help.html 2011-03-17 00:20:54 +0000
@@ -1,15 +1,29 @@
-<div class="header"><h1 class="title">Getting Help</h1></div>
+<div class="header"><h1 class="slidetitle">Getting Help</h1></div>
<div class="main">
-<div class="content wrap-top"><ul>
- <li>If you need help, you can contact us:</li>
+<div class="text">
+
+<div>
+ <p>If you need help, you can contact us:</p>
+</div>
+
+<div>
<li><!-- The url should not be translated -->Using the <a href="https://wiki.ubuntu.com/Lubuntu/ContactUs";>wiki page</a>.</li>
+</div>
+
+<div>
<li>On the mailing list, subscribe on <a href="https://launchpad.net/~lubuntu-desktop";>the page</a>.</li>
+</div>
+
+<div>
<li>On the IRC chan #lubuntu on irc.freenode.net.</li>
-</ul>
-
-<p class="footer">The installation will finish soon. We hope you enjoy Lubuntu.</p></div>
-</div>
-
-<img class="icon" src="icons/help.png" alt="" />
+</div>
+
+<div>
+<p>The installation will finish soon. We hope you enjoy Lubuntu.</p></div>
+</div>
+
+<img class="screenshot" src="screenshots/slide_help.png"/>
+
+</div>
=== added file 'slideshows/lubuntu/slides/icons/abiword.png'
Binary files slideshows/lubuntu/slides/icons/abiword.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/abiword.png 2011-03-17 00:20:54 +0000 differ
=== modified file 'slideshows/lubuntu/slides/icons/chromium.png'
Binary files slideshows/lubuntu/slides/icons/chromium.png 2010-07-09 17:17:43 +0000 and slideshows/lubuntu/slides/icons/chromium.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/empathy.png'
Binary files slideshows/lubuntu/slides/icons/empathy.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/empathy.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/firefox.png'
Binary files slideshows/lubuntu/slides/icons/firefox.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/firefox.png 2011-03-17 00:20:54 +0000 differ
=== modified file 'slideshows/lubuntu/slides/icons/gnome-mplayer.png'
Binary files slideshows/lubuntu/slides/icons/gnome-mplayer.png 2010-07-09 17:17:43 +0000 and slideshows/lubuntu/slides/icons/gnome-mplayer.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/gnumeric.png'
Binary files slideshows/lubuntu/slides/icons/gnumeric.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/gnumeric.png 2011-03-17 00:20:54 +0000 differ
=== removed file 'slideshows/lubuntu/slides/icons/help.png'
Binary files slideshows/lubuntu/slides/icons/help.png 2010-07-09 17:17:43 +0000 and slideshows/lubuntu/slides/icons/help.png 1970-01-01 00:00:00 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/libreoffice.png'
Binary files slideshows/lubuntu/slides/icons/libreoffice.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/libreoffice.png 2011-03-17 00:20:54 +0000 differ
=== removed file 'slideshows/lubuntu/slides/icons/lxde.png'
Binary files slideshows/lubuntu/slides/icons/lxde.png 2010-07-09 17:17:43 +0000 and slideshows/lubuntu/slides/icons/lxde.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'slideshows/lubuntu/slides/icons/office.png'
Binary files slideshows/lubuntu/slides/icons/office.png 2010-07-09 17:17:43 +0000 and slideshows/lubuntu/slides/icons/office.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'slideshows/lubuntu/slides/icons/pidgin.png'
Binary files slideshows/lubuntu/slides/icons/pidgin.png 2010-07-09 17:17:43 +0000 and slideshows/lubuntu/slides/icons/pidgin.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/skype.png'
Binary files slideshows/lubuntu/slides/icons/skype.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/skype.png 2011-03-17 00:20:54 +0000 differ
=== modified file 'slideshows/lubuntu/slides/icons/sylpheed.png'
Binary files slideshows/lubuntu/slides/icons/sylpheed.png 2010-07-09 17:17:43 +0000 and slideshows/lubuntu/slides/icons/sylpheed.png 2011-03-17 00:20:54 +0000 differ
=== removed file 'slideshows/lubuntu/slides/icons/synaptic.png'
Binary files slideshows/lubuntu/slides/icons/synaptic.png 2010-07-09 17:17:43 +0000 and slideshows/lubuntu/slides/icons/synaptic.png 1970-01-01 00:00:00 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/thunderbird.png'
Binary files slideshows/lubuntu/slides/icons/thunderbird.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/thunderbird.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/tomboy.png'
Binary files slideshows/lubuntu/slides/icons/tomboy.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/tomboy.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/vlc.png'
Binary files slideshows/lubuntu/slides/icons/vlc.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/vlc.png 2011-03-17 00:20:54 +0000 differ
=== removed file 'slideshows/lubuntu/slides/icons/welcome.png'
Binary files slideshows/lubuntu/slides/icons/welcome.png 2010-07-09 17:17:43 +0000 and slideshows/lubuntu/slides/icons/welcome.png 1970-01-01 00:00:00 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/xpad.png'
Binary files slideshows/lubuntu/slides/icons/xpad.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/xpad.png 2011-03-17 00:20:54 +0000 differ
=== renamed file 'slideshows/lubuntu/slides/pidgin.html' => 'slideshows/lubuntu/slides/im.html'
--- slideshows/lubuntu/slides/pidgin.html 2010-08-07 14:57:42 +0000
+++ slideshows/lubuntu/slides/im.html 2011-03-17 00:20:54 +0000
@@ -1,14 +1,44 @@
-<div class="header"><h1 class="title">Chatting with your friends</h1></div>
+<div class="header"><h1 class="slidetitle">Chatting with your friends</h1></div>
<div class="main">
-<div class="content wrap-top"><ul>
- <li>With <em>Pidgin</em>, you will be able to chat with your friends.</li>
- <li>Go to the menu, and click on Pidgin icon to connect to many Instant Message services, such as Jabber or Windows Live.</li>
- <li>More information on <a href="http://pidgin.im/";>Pidgin website</a>.</li>
-</ul>
-</div>
-
-</div>
-
-<img class="icon" src="icons/pidgin.png" alt="" />
+<div class="text">
+
+<div>
+ <p>With <em>Pidgin</em>, you will be able to chat with your friends.</p>
+</div>
+
+<div>
+ <p>Go to the menu, and click on Pidgin icon to connect to many services, such as Jabber, Google Talk or Windows Live.</p>
+</div>
+
+<div>
+ <p>More information on <a href="http://pidgin.im/";>Pidgin website</a>.</p>
+</div>
+
+<div class="featured">
+<h2 class="subtitle">Included software</h2>
+<ul>
+ <li>
+ <img class="icon" src="icons/pidgin.png" />
+ <p class="caption">Pidgin</p>
+ </li>
+</ul>
+<h2 class="subtitle">Supported software</h2>
+<ul>
+ <li>
+ <img class="icon" src="icons/empathy.png" />
+ <p class="caption">Empathy IM</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/skype.png" />
+ <p class="caption">Skype</p>
+ </li>
+</ul>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/slide_social.png"/>
+
+</div>
=== modified file 'slideshows/lubuntu/slides/index.html'
--- slideshows/lubuntu/slides/index.html 2010-09-13 22:47:23 +0000
+++ slideshows/lubuntu/slides/index.html 2011-03-17 00:20:54 +0000
@@ -14,8 +14,8 @@
<script type="text/javascript" src="directory.js"></script>
<script type="text/javascript">
SLIDESHOW_OPTIONS = {
- fx:'fade',
- speed:300,
+ timeout:50000,
+ speed:600,
}
</script>
<script type="text/javascript" src="link-core/slideshow.js"></script>
@@ -26,18 +26,19 @@
<div id="slideshow">
<div><a href="welcome.html" class="load"></a></div>
<div><a href="lxde.html" class="load"></a></div>
- <div><a href="chromium-browser.html" class="load"></a></div>
- <div><a href="abiword-gnumeric.html" class="load"></a></div>
- <div><a href="gnome-mplayer.html" class="load"></a></div>
- <div><a href="pidgin.html" class="load"></a></div>
- <div><a href="sylpheed.html" class="load"></a></div>
- <div><a href="synaptic.html" class="load"></a></div>
+ <div><a href="browser.html" class="load"></a></div>
+ <div><a href="office.html" class="load"></a></div>
+ <div><a href="videos.html" class="load"></a></div>
+ <div><a href="im.html" class="load"></a></div>
+ <div><a href="email.html" class="load"></a></div>
+ <div><a href="install.html" class="load"></a></div>
<div><a href="help.html" class="load"></a></div>
</div>
-<div id="debug-controls">
-<input type="button" id="prev-slide" value="<"/>
-<input type="button" id="next-slide" value=">"/>
+<div id="controls">
+<a class="control-arrow" id="prev-slide"></a>
+<a class="control-arrow" id="next-slide"></a>
+<input type="hidden" id="current-slide" />
</div>
</body>
=== renamed file 'slideshows/lubuntu/slides/synaptic.html' => 'slideshows/lubuntu/slides/install.html'
--- slideshows/lubuntu/slides/synaptic.html 2010-08-07 14:57:42 +0000
+++ slideshows/lubuntu/slides/install.html 2011-03-17 00:20:54 +0000
@@ -1,14 +1,23 @@
-<div class="header"><h1 class="title">Installing softwares</h1></div>
+<div class="header"><h1 class="slidetitle">Install software</h1></div>
<div class="main">
-<div class="content wrap-top"><ul>
- <li>With Lubuntu, you have access to the whole Ubuntu repository and all the software included.</li>
- <li>Go to the menu, click on Preferences and <em>Synaptic Software Manager</em>.</li>
- <li>You can search for software by clicking on the Search button.</li>
-</ul>
-</div>
-
-</div>
-
-<img class="icon" src="icons/synaptic.png" alt="" />
+<div class="text">
+
+<div>
+ <p>With Lubuntu, you have access to the whole Ubuntu repository and all the software included.</p>
+</div>
+
+<div>
+ <p>Go to the menu, click on System Tools and <em>Synaptic Software Manager</em>.</p>
+</div>
+
+<div>
+ <p>You can search for software by clicking on the Search button.</p>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/slide_synaptic.png"/>
+
+</div>
=== added file 'slideshows/lubuntu/slides/link/arrow-back.png'
Binary files slideshows/lubuntu/slides/link/arrow-back.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/link/arrow-back.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/link/arrow-next.png'
Binary files slideshows/lubuntu/slides/link/arrow-next.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/link/arrow-next.png 2011-03-17 00:20:54 +0000 differ
=== modified file 'slideshows/lubuntu/slides/link/background.png'
Binary files slideshows/lubuntu/slides/link/background.png 2010-07-09 17:17:43 +0000 and slideshows/lubuntu/slides/link/background.png 2011-03-17 00:20:54 +0000 differ
=== removed file 'slideshows/lubuntu/slides/link/background.rtl.png'
Binary files slideshows/lubuntu/slides/link/background.rtl.png 2010-07-09 17:17:43 +0000 and slideshows/lubuntu/slides/link/background.rtl.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'slideshows/lubuntu/slides/link/bullet-point.png'
Binary files slideshows/lubuntu/slides/link/bullet-point.png 2010-07-09 17:17:43 +0000 and slideshows/lubuntu/slides/link/bullet-point.png 2011-03-17 00:20:54 +0000 differ
=== modified file 'slideshows/lubuntu/slides/link/general.css'
--- slideshows/lubuntu/slides/link/general.css 2010-09-13 22:47:23 +0000
+++ slideshows/lubuntu/slides/link/general.css 2011-03-17 00:20:54 +0000
@@ -1,37 +1,63 @@
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+ margin:0;
+ padding:0;
+ border:0;
+ outline:0;
+ font-size: 100%;
+ font-style:normal;
+ text-decoration:none;
+ font-weight:normal;
+ vertical-align:baseline;
+ background:transparent;
+}
+ol, ul {
+ list-style:none;
+}
+
+
+
html, body {
margin:0;
padding:0;
-
- background-color:#F0F2F4;
-
- font-family:sans-serif;
- color:#000000;
+ background-color:#F7F6F6;
+ font-family:'Ubuntu', 'UbuntuBeta', sans-serif;
+ font-size:12px;
+ line-height:1.4em;
+
+ color:#333333;
+
+ /* no reason to expose this extra stuff to the user */
+ -webkit-user-select:none;
+ -moz-user-select:none;
+ user-select:none;
+ cursor:default;
}
/*
Hyperlink-style text
*/
a {
- color:#731444;
- font-style:italic;
+ color:#145E73;
text-decoration:none;
+ display:inline;
}
#slideshow {
position:absolute;
- width:798px;
- height:451px;
+ width:752px;
+ min-height:442px;
+ height:100%;
overflow:hidden;
-
- background-image:url('background.png');
- background-repeat:no-repeat;
- background-position:top right;
-
- background-color:#F0F2F4;
-
- /*cursor:default;*/
}
#slideshow > div {
position:absolute;
@@ -39,145 +65,140 @@
height:100%;
}
-#debug-controls {
- display:none;
+.control-arrow {
+ display:block;
position:absolute;
- top:470px;
- width:798px;
- text-align:center;
-}
-#debug-controls input {
- width:40px;
+
+ z-index:100;
+ top:218px;
+ height:64px;
+ width:33px;
+
+ background-repeat:no-repeat;
+ cursor:pointer;
+}
+.control-arrow:hover {
+ background-position: 0px -65px;
+}
+.control-arrow:active {
+ background-position: 0px -130px;
+}
+.control-arrow#prev-slide {
+ background-image:url('arrow-back.png');
+ left:0px;
+}
+.control-arrow#next-slide {
+ background-image:url('arrow-next.png');
+ left:719px; /* 752px - 33px */
}
+/* Fixed container for a slide's title */
.header {
- position:absolute; /* use position:fixed to keep still with sliding transition effect */
+ display:table; /* this is a bit evil, but it lets us vertically centre stuff */
+ position:absolute;
+ /* FIXME: better to use position:relative here and for #main.
+ Need to have a specific maximum height, though,
+ which isn't working with display:table */
top:0px;
- height:176px;
+ width:100%;
+ height:68px;
+ background-color:#809FBD;
}
-
-/* title block is positioned at the bottom of its parent, which should be .header */
-.title {
- position:absolute;
-
- bottom:12px;
- width:385px; /* the ideal width would leave more space on the right */
- left:36px; /* matches padding of .content and .content ul: 16 + 20 */
+.header > .slidetitle {
+ display:table-cell;
+ /*margin:10px 25px 10px 25px;*/
+ padding:0px 25px;
+ vertical-align:middle;
font-size:20px; /* applies to all lines except first */
+ line-height:1em;
font-weight:normal;
-
- letter-spacing:-1px;
-
- color:#ffffff;
-
- padding:0px;
- margin:0px;
-}
-.title:first-line {
- font-size:28px;
-}
-
-/*
-Typically an image. This is positioned at the top right of a slide.
-Icons should be 215x156 pixels tall, though some can overflow with a height
-of 215px. The actual content should be 128x128px. (The rest is padding).
-*/
-.icon {
- position:absolute; /* use position:fixed to keep still with sliding transition effect */
-
- top:20px;
- left:549px;
- width:215px;
- height:auto;
-
- z-index:11;
- border:0px;
-}
-.icon#firefox {
- top:47px;
- left:590px;
- width:128px;
- height:auto;
-}
-
-/*
-.content expects to be contained in here. .main
-creates a nice, plain surface upon which it can
-appear, spaced appropriately from .title.
-*/
+ color:white;
+}
+.slidetitle:first-line {
+ font-size:36px; /* TODO: 24px? */
+ line-height:32px;
+}
+
.main {
position:absolute;
-
- top:163px;
- left:0px;
-
- width:100%;
- height:288px;
-
- padding-right:60px;
-
- z-index:12;
+ top:70px; /* 68px + 2px margin */
+ bottom:2px;
+ left:2px;
+ right:2px;
+ min-height:370px; /* 442px (from #slideshow) - 70px - 2px */
+
+ /* move this to #slideshow if we don't want the background image to move with slides */
+ background-image:url('background.png');
}
/*
-Slide's body text goes inside here.
+A slide's body text goes inside here.
+Inner space is 224px wide.
*/
-.content {
- padding:16px;
- padding-top:32px;
-
- font-size:14px;
- color:#484848;
-}
-
-.content ul {
- margin-top:0px;
- padding-left:20px;
-
- width:726px; /* was 650px */
- height:223px;
-
- line-height:1.4em;
-
+.main > .text {
+ position:absolute;
+ top:25px;
+ left:36px;
+ width:248px;
+ bottom:35px;
+ min-height:329px; /* 369 - 25 - 15 (for bottom) */
overflow:auto;
-
- list-style-type:none;
- list-style-image:url("bullet-point.png");
-}
-
-.content li {
- padding:8px;
- padding-left:0px;
-}
-/* hack to get the text wrapping around the icon. If we could do this for
-ul :first-line, there would be less room for failure. */
-.content.wrap-top li:first-child {
- width:550px;
-}
-
-.content .footer {
- position:relative;
- width:100%;
- padding:0px;
- margin:0px;
- bottom:10px;
- text-align:right;
-
- font-weight:bold;
- color:#333333;
-}
-
-.content img.inline {
- height:14px;
- width:auto;
+}
+
+.text > div {
+ margin-bottom:8px;
+ padding:6px 12px;
+ background-color:#F7F6F6;
+}
+.text > div:last-child {
+ margin-bottom:0px;
+}
+
+.text > div > .subtitle {
+ padding-bottom:2px;
+ margin-bottom:5px;
+ font-size:inherit;
+ font-weight:normal;
+ text-decoration:none;
+ border-bottom:#333333 dotted 1px;
+}
+
+.featured ul {
+ display:table;
+}
+.featured li {
+ display:table-row;
+}
+.featured li > * {
+ padding-bottom:12px;
+}
+.featured li .icon {
+ display:table-cell;
+ width:24px;
+ height:auto;
+ padding-right:12px;
+}
+.featured li .caption {
+ display:table-cell;
+ vertical-align:middle;
+}
+
+.main > .screenshot {
+ position:absolute;
+ top:25px;
+ right:-2px; /* offsets 2px margin of .main */
+
+ -webkit-box-shadow:#999999 0px 0px 5px;
+ -moz-box-shadow:#999999 0px 0px 5px;
+ box-shadow:#999999 0px 0px 5px;
}
/*
This rule disables drag-and-drop for images. See bug #448703.
*/
img {
- -webkit-user-drag: none;
+ -webkit-user-drag:none;
}
@@ -186,29 +207,28 @@
.rtl {
direction:rtl;
}
-.rtl #container {
- background-image:url('background.rtl.png');
- background-repeat:no-repeat;
- background-position:top left;
-}
-/* TODO: NEED reversed title and icon for RTL */
-.rtl .title {
- left:377px;
-}
-.rtl .icon {
- /* FIXME: This is a horrible hack to keep the title from moving during slide transition */
- position:fixed; /* was position:absolute */
-
- left:34px;
-}
-.rtl .icon#firefox {
- left:80px;
-}
-.rtl .main {
- right:0px;
+
+.rtl .control-arrow#prev-slide {
+ background-image:url('arrow-next.png');
+ left:719px;
+}
+.rtl .control-arrow#next-slide {
+ background-image:url('arrow-back.png');
+ left:0px; /* 752px - 33px */
+}
+
+.rtl .main > .text {
+ left:auto;
+ right:36px;
+}
+
+.rtl .main > .screenshot {
+ right:normal;
+ left:-2px;
+}
+
+.rtl .featured li .icon {
padding-right:0px;
- padding-left:60px;
-}
-.rtl .content .footer {
- text-align:left;
-}
+ padding-left:12px;
+}
+
=== modified file 'slideshows/lubuntu/slides/lxde.html'
--- slideshows/lubuntu/slides/lxde.html 2010-08-07 12:26:09 +0000
+++ slideshows/lubuntu/slides/lxde.html 2011-03-17 00:20:54 +0000
@@ -1,13 +1,19 @@
-<div class="header"><h1 class="title">Based on LXDE Desktop</h1></div>
+<div class="header"><h1 class="slidetitle">Based on LXDE Desktop</h1></div>
<div class="main">
-<div class="content wrap-top"><ul>
- <li>Lubuntu is based on <em>LXDE Desktop Environment</em>, a fast-performing and energy-saving desktop environment.</li>
- <li><!-- The url "lxde.org" should not be translated -->More information on the <a href="http://lxde.org";>LXDE website</a>.</li>
-</ul>
-</div>
-
-</div>
-
-<img class="icon" src="icons/lxde.png" alt="" />
+<div class="text">
+
+<div>
+ <p>Lubuntu is based on <em>LXDE Desktop Environment</em>, a fast-performing and energy-saving desktop environment.</p>
+</div>
+
+<div>
+ <p><!-- The url "lxde.org" should not be translated -->More information on the <a href="http://lxde.org";>LXDE website</a>.</p>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/slide_desktop.png"/>
+
+</div>
=== renamed file 'slideshows/lubuntu/slides/abiword-gnumeric.html' => 'slideshows/lubuntu/slides/office.html'
--- slideshows/lubuntu/slides/abiword-gnumeric.html 2011-02-11 12:55:20 +0000
+++ slideshows/lubuntu/slides/office.html 2011-03-17 00:20:54 +0000
@@ -1,14 +1,43 @@
-<div class="header"><h1 class="title">Abiword and Gnumeric</h1></div>
+<div class="header"><h1 class="slidetitle">Abiword and Gnumeric</h1></div>
<div class="main">
-<div class="content wrap-top"><ul>
- <li>Lubuntu comes with <em>Abiword and Gnumeric</em>, lightweight alternatives for LibreOffice.</li>
- <li>You can create and edit documents like spreadsheets and letters.</li>
- <li>More information on <a href="http://www.abisource.com/";>Abiword</a> and <a href="http://projects.gnome.org/gnumeric/";>Gnumeric websites</a>.</li>
-</ul>
-</div>
-
-</div>
-
-<img class="icon" src="icons/office.png" alt="" />
+<div class="text">
+
+<div>
+<p>Use <em>Abiword and Gnumeric</em>, lightweight alternatives for LibreOffice, and create letters, spreadsheets, etc. Information on <a href="http://www.abisource.com/";>Abiword</a> and <a href="http://projects.gnome.org/gnumeric/";>Gnumeric</a> websites.</p>
+</div>
+
+<div class="featured">
+<h2 class="subtitle">Included software</h2>
+<ul>
+ <li>
+ <img class="icon" src="icons/abiword.png" />
+ <p class="caption">Abiword</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/gnumeric.png" />
+ <p class="caption">Gnumeric</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/xpad.png" />
+ <p class="caption">Xpad Notes</p>
+ </li>
+</ul>
+<h2 class="subtitle">Supported software</h2>
+<ul>
+ <li>
+ <img class="icon" src="icons/libreoffice.png" />
+ <p class="caption">LibreOffice</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/tomboy.png" />
+ <p class="caption">Tomboy Notes</p>
+ </li>
+</ul>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/slide_office.png"/>
+</div>
=== added directory 'slideshows/lubuntu/slides/screenshots'
=== added file 'slideshows/lubuntu/slides/screenshots/slide_browser.png'
Binary files slideshows/lubuntu/slides/screenshots/slide_browser.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/screenshots/slide_browser.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/screenshots/slide_desktop.png'
Binary files slideshows/lubuntu/slides/screenshots/slide_desktop.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/screenshots/slide_desktop.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/screenshots/slide_email.png'
Binary files slideshows/lubuntu/slides/screenshots/slide_email.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/screenshots/slide_email.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/screenshots/slide_help.png'
Binary files slideshows/lubuntu/slides/screenshots/slide_help.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/screenshots/slide_help.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/screenshots/slide_office.png'
Binary files slideshows/lubuntu/slides/screenshots/slide_office.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/screenshots/slide_office.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/screenshots/slide_social.png'
Binary files slideshows/lubuntu/slides/screenshots/slide_social.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/screenshots/slide_social.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/screenshots/slide_startfast.png'
Binary files slideshows/lubuntu/slides/screenshots/slide_startfast.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/screenshots/slide_startfast.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/screenshots/slide_synaptic.png'
Binary files slideshows/lubuntu/slides/screenshots/slide_synaptic.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/screenshots/slide_synaptic.png 2011-03-17 00:20:54 +0000 differ
=== added file 'slideshows/lubuntu/slides/screenshots/slide_video.png'
Binary files slideshows/lubuntu/slides/screenshots/slide_video.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/screenshots/slide_video.png 2011-03-17 00:20:54 +0000 differ
=== renamed file 'slideshows/lubuntu/slides/gnome-mplayer.html' => 'slideshows/lubuntu/slides/videos.html'
--- slideshows/lubuntu/slides/gnome-mplayer.html 2010-11-22 21:13:51 +0000
+++ slideshows/lubuntu/slides/videos.html 2011-03-17 00:20:54 +0000
@@ -1,15 +1,40 @@
-<div class="header"><h1 class="title">Videos with gnome-mplayer</h1></div>
+<div class="header"><h1 class="slidetitle">Videos with gnome-mplayer</h1></div>
<div class="main">
-<div class="content wrap-top"><ul>
- <li>You will be able to watch videos with <em>gnome-mplayer</em>, a fast video player using mplayer.</li>
- <li>Support for many formats is included.</li>
- <li>You can also obtain additional non-free support by installing the lubuntu-restricted-extras package.</li>
- <li>More information on <a href="http://sites.google.com/site/kdekorte2/gnomemplayer";>gnome-mplayer website</a>.</li>
-</ul>
-</div>
-
-</div>
-
-<img class="icon" src="icons/gnome-mplayer.png" alt="" />
+<div class="text">
+
+<div>
+ <p>Watch videos with <em>gnome-mplayer</em>, a fast video player using mplayer. Support for many formats is included.</p>
+</div>
+
+<div>
+ <p>You can also obtain additional non-free support by installing the lubuntu-restricted-extras package.</p>
+</div>
+
+<div>
+ <p>More information on <a href="http://sites.google.com/site/kdekorte2/gnomemplayer";>gnome-mplayer website</a>.</p>
+</div>
+
+<div class="featured">
+<h2 class="subtitle">Included software</h2>
+<ul>
+ <li>
+ <img class="icon" src="icons/gnome-mplayer.png" />
+ <p class="caption">Gnome-Mplayer videos player</p>
+ </li>
+</ul>
+<h2 class="subtitle">Supported software</h2>
+<ul>
+ <li>
+ <img class="icon" src="icons/vlc.png" />
+ <p class="caption">VLC videos player</p>
+ </li>
+</ul>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/slide_video.png"/>
+
+</div>
=== modified file 'slideshows/lubuntu/slides/welcome.html'
--- slideshows/lubuntu/slides/welcome.html 2011-02-11 12:55:20 +0000
+++ slideshows/lubuntu/slides/welcome.html 2011-03-17 00:20:54 +0000
@@ -1,12 +1,17 @@
-<div class="header"><h1 class="title">Welcome</h1></div>
+<div class="header"><h1 class="slidetitle">Welcome</h1></div>
<div class="main">
-<div class="content wrap-top"><ul>
- <li>Thank you for choosing Lubuntu 11.04.</li>
-</ul>
-<p class="footer">Lubuntu is designed to be easy and fast. Feel free to explore!</p></div>
-
-</div>
-
-<img class="icon" src="icons/welcome.png" alt="" />
+<div class="text">
+
+<div>
+<p>Thank you for choosing Lubuntu 11.04.</p>
+</div>
+
+<div>
+<p>Lubuntu is designed to be easy and fast. Feel free to explore!</p></div>
+</div>
+
+<img class="screenshot" src="screenshots/slide_startfast.png" />
+
+</div>
=== modified file 'slideshows/lubuntu/slideshow.conf'
--- slideshows/lubuntu/slideshow.conf 2010-04-17 16:43:44 +0000
+++ slideshows/lubuntu/slideshow.conf 2011-03-17 00:20:54 +0000
@@ -1,3 +1,3 @@
[Slideshow]
-width:798
-height:451
+width:752
+height:442
