Ubiquity Slideshow

Merge lp:~ubiquity-slideshow/ubiquity-slideshow-ubuntu/madsrh-layout into lp:ubiquity-slideshow-ubuntu

  1. madsrh-layout
  2. Merge into html
Proposed by Dylan McCall
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ubiquity-slideshow/ubiquity-slideshow-ubuntu/madsrh-layout
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp:~ubiquity-slideshow/ubiquity-slideshow-ubuntu/madsrh-layout
Reviewer Review Type Date Requested Status
Ubiquity Slideshow Pending
Review via email: mp+9834@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dylan McCall (dylanmccall) wrote :

I don't think anyone is looking at that branch now, but I need to be sure nobody minds the new look. Any objections to calling this THE visual style (and thus the focus branch), or should we hold off for a little while?

lp:~ubiquity-slideshow/ubiquity-slideshow-ubuntu/madsrh-layout updated
124. By Dylan McCall <dmccall@dylan-laptop>

Added details on icons to debian/copyright.
(Is there a nice, "right" way to have both COPYING and debian/copyright without duplicating text?)

Updated TODO

Removed reference to screenshots in README, and briefly explained the new process for icons.

Reflection script now outputs to ../slides/icons.

125. By Dylan McCall <dmccall@dylan-laptop>

generate-pngs.sh can now run from any directory.

reflection-script.scm: batch-reflection-svg now has output path as a parameter, making it a bit easier to modify.

icons rule now in Makefile. Run make icons to do the same thing as ./icons-source/generate-pngs.sh.

Tweaked general.css: icon is no longer scaled by the browser and is aligned by its bottom axis since height can not be predicted.

Removed the unnecessary web-browser.png that had found its way in somehow.

126. By Dylan McCall <dmccall@dylan-laptop>

Added script to remove pngs, which can be run with make clean-icons.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'AUTHORS'
--- AUTHORS 2009-07-01 19:55:36 +0000
+++ AUTHORS 2009-07-31 19:47:11 +0000
@@ -5,10 +5,11 @@
55
6-----6-----
77
8Dylan McCall <http://launchpad.net/~dylanmccall> Andrew8Dylan McCall <http://launchpad.net/~dylanmccall>
9Higginson <http://launchpad.net/~rugby471> Anabelle9Andrew Higginson <http://launchpad.net/~rugby471>
10Handdoek <http://launchpad.net/~anabelle> Andrew Sayers10Anabelle Handdoek <http://launchpad.net/~anabelle>
11<https://launchpad.net/~andrew-bugs-launchpad-net>11Andrew Sayers <https://launchpad.net/~andrew-bugs-launchpad-net>
12Mads Rosendahl <http://launchpad.net/~madsrh>
1213
13-----14-----
1415
1516
=== modified file 'slides/MenuTest.html'
--- slides/MenuTest.html 2009-07-24 23:08:27 +0000
+++ slides/MenuTest.html 2009-08-03 10:21:36 +0000
@@ -15,21 +15,17 @@
15<body>15<body>
1616
17<div id="container">17<div id="container">
18 <div id="title">18 <h1 id="title">Welcome</h1>
19 Welcome19
20 </div>20 <div id="main">
2121
22 <img id="icon" src="icons/ubuntu-logo.png" alt="" />22 <div id="content"><ul>
2323 <li>Hi, Peter. What's happening? We need to talk about your TPS reports. ...Yeah. Did you get that memo? ...Ah! Yeah. It's just we're putting new coversheets on all the TPS reports before they go out now. So if you could go ahead and try to remember to do that from now on, that'd be great. All right!</li>
24 <div id="main">24 <li>So, Peter, what's happening?<br />Aahh, now, are you going to go ahead and open up
2525 <span class="menu-item">Office <img class="menu-arrow" />OpenOffice.org Word Processor</span> and have those TPS reports for us this afternoon? ...Oh, and remember: next Friday... is Hawaiian shirt day. So, you know, if you want to, go ahead and wear a Hawaiian shirt and jeans.</li>
26 <div id="content">26 </ul></div>
27 <p>Hi, Peter. What's happening? We need to talk about your TPS reports. ...Yeah. Did you get that memo? ...Ah! Yeah. It's just we're putting new coversheets on all the TPS reports before they go out now. So if you could go ahead and try to remember to do that from now on, that'd be great. All right!</p>27
28 <p>So, Peter, what's happening?<br />Aahh, now, are you going to go ahead and open up28 </div>
29 <span class="menu-item">Office <img class="menu-arrow" />OpenOffice.org Word Processor</span> and have those TPS reports for us this afternoon? ...Oh, and remember: next Friday... is Hawaiian shirt day. So, you know, if you want to, go ahead and wear a Hawaiian shirt and jeans.</p>
30 </div>
31
32 </div>
33</div>29</div>
3430
35</body>31</body>
3632
=== modified file 'slides/Template.html'
--- slides/Template.html 2009-07-24 23:08:27 +0000
+++ slides/Template.html 2009-08-03 10:21:36 +0000
@@ -1,21 +1,17 @@
1<!-- Assume that this slide has been linked to a CSS stylesheet at "link/general.css" -->1<!-- Assume that this slide has been linked to a CSS stylesheet at "link/general.css" -->
22
3<div id="title">3<!-- Title of slide goes here. Try to keep it shorter than this one. -->
4 <!-- Title of slide goes here. Try to keep it shorter than this one. -->4<h1 id="title">Title (include name and purpose of app)</h1>
5 Title (include name and purpose of app)
6</div>
7
8<img id="icon" src="icons/default.png" alt="" /> <!-- Remember to change the value of src to point to a 64x64 icon -->
95
10<div id="main">6<div id="main">
11<!-- The main body of your slide goes within this... -->7
128<div id="content"><ul>
13<div id="content">9 <!-- Beware the size limit; the text here just about hits the limits. -->
14 <!-- This helpful division makes sure your content text fits in smoothly and looks good, so add that here!10 <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed libero sem, eleifend at auctor vel, porta et ligula. Sed egestas ante at eros rutrum pellentesque id sit amet arcu. Fusce id justo ante, rhoncus laoreet est.</li>
15 Beware the size limit; the text here just about hits the limits. -->11 <li>Suspendisse venenatis mi eget sapien ornare pretium euismod ante vestibulum. Vivamus tellus metus, volutpat ornare laoreet non, egestas vel lectus. Nam dapibus felis ut orci tincidunt imperdiet. Donec sagittis mi ut diam volutpat ultrices.</li>
16 <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed libero sem, eleifend at auctor vel, porta et ligula. Sed egestas ante at eros rutrum pellentesque id sit amet arcu. Fusce id justo ante, rhoncus laoreet est.</p>12 <li>Phasellus mi quam, dapibus vitae vestibulum vitae, lobortis id sapien.</li>
17 <p>Suspendisse venenatis mi eget sapien ornare pretium euismod ante vestibulum. Vivamus tellus metus, volutpat ornare laoreet non, egestas vel lectus. Nam dapibus felis ut orci tincidunt imperdiet. Donec sagittis mi ut diam volutpat ultrices.</p>13</ul></div>
18 <p>Phasellus mi quam, dapibus vitae vestibulum vitae, lobortis id sapien.</p>14
19</div>15</div>
2016
21</div>17<img id="icon" src="icons/default.png" alt="" /> <!-- Remember to change the value of src to point to a 210x250 icon - see other icons -->
2218
=== modified file 'slides/accessibility.html'
--- slides/accessibility.html 2009-07-24 23:08:27 +0000
+++ slides/accessibility.html 2009-08-03 10:21:36 +0000
@@ -1,15 +1,13 @@
1<div id="title">1<h1 id="title">Accessibility in Ubuntu</h1>
2 Accessibility in Ubuntu2
3<div id="main">
4
5<div id="content"><ul>
6 <li>Ubuntu makes computing easy whatever your circumstances.</li>
7 <li>A range of assistive technologies make Ubuntu one of the most accessible operating systems around.</li>
8 <li>We have you covered whether you want slow key support, magnification, braille or more.</li>
9</ul></div>
10
3</div>11</div>
412
5<img id="icon" src="icons/accessibility.png" alt="" />13<img id="icon" src="icons/accessibility.png" alt="" />
6
7<div id="main">
8
9<div id="content">
10 <p>Ubuntu makes computing easy whatever your circumstances.</p>
11 <p>A range of assistive technologies make Ubuntu one of the most accessible operating systems around.</p>
12 <p>We have you covered whether you want slow key support, magnification, braille or more.</p>
13</div>
14
15</div>
1614
=== modified file 'slides/documentation.html'
--- slides/documentation.html 2009-07-24 23:08:27 +0000
+++ slides/documentation.html 2009-08-03 10:21:36 +0000
@@ -1,17 +1,13 @@
1<div id="title">1<h1 id="title">Getting Help with Ubuntu</h1>
2 Getting Help with Ubuntu
3</div>
4
5<img id="icon" src="icons/docs.png" alt="" />
62
7<div id="main">3<div id="main">
84
9<div id="content">5<div id="content"><ul>
10 <p>All this is just the beginning!</p> 6 <li>All this is just the beginning!</li>
117 <li>Ask your questions at <a href="http://www.ubuntuforums.org">ubuntuforums.org</a>, where advanced users help people just like you.</li>
12 <p>Ask your questions at <a href="http://www.ubuntuforums.org">ubuntuforums.org</a>, where advanced users help people just like you.</p>8 <li class="special">The installation will finish soon, we hope that you enjoy using Ubuntu!</li>
139</ul></div>
14 <p style="text-align:center"><b>The installation will finish soon, we hope that you enjoy using Ubuntu!</b></p>10
15</div>11</div>
1612
17</div>13<img id="icon" src="icons/help.png" alt="" />
1814
=== modified file 'slides/evolution.html'
--- slides/evolution.html 2009-07-24 23:08:27 +0000
+++ slides/evolution.html 2009-08-03 10:21:36 +0000
@@ -1,15 +1,13 @@
1<div id="title">1<h1 id="title">Control your digital life with Evolution</h1>
2 Control your digital life with Evolution2
3<div id="main">
4
5<div id="content"><ul>
6 <li>Use Evolution for email, calendar, tasks and contact sharing.</li>
7 <li>Comprehensive mail filters and search tools make managing your mail a breeze.</li>
8 <li>Calendar events show up in the system clock, so you never miss an important meeting.</li>
9</ul></div>
10
3</div>11</div>
412
5<img id="icon" src="icons/evolution.png" alt="" />13<img id="icon" src="icons/evolution.png" alt="" />
6
7<div id="main">
8
9<div id="content">
10 <p>Use Evolution for email, calendar, tasks and contact sharing.</p>
11 <p>Comprehensive mail filters and search tools make managing your mail a breeze.</p>
12 <p>Calendar events show up in the system clock, so you never miss an important meeting.</p>
13</div>
14
15</div>
1614
=== modified file 'slides/firefox.html'
--- slides/firefox.html 2009-07-24 23:08:27 +0000
+++ slides/firefox.html 2009-08-03 10:21:36 +0000
@@ -1,15 +1,13 @@
1<div id="title">1<h1 id="title">Browse the web with Firefox</h1>
2 Browse the web with Firefox2
3<div id="main">
4
5<div id="content"><ul>
6 <li>Ubuntu comes with Firefox 3, one of the most popular and useful web browsers in the world.</li>
7 <li>Firefox keeps you safe by blocking pop-ups and warning about malware.</li>
8 <li>You can download add-ons that adapt Firefox to your personal requirements.</li>
9</ul></div>
10
3</div>11</div>
412
5<img id="icon" src="icons/firefox.png" alt="" />13<img id="icon" src="icons/firefox.png" alt="" />
6
7<div id="main">
8
9<div id="content">
10 <p>Ubuntu comes with Firefox 3, one of the most popular and useful web browsers in the world.</p>
11 <p>Firefox keeps you safe by blocking pop-ups and warning about malware.</p>
12 <p>You can download add-ons that adapt Firefox to your personal requirements.</p>
13</div>
14
15</div>
1614
=== modified file 'slides/fspot.html'
--- slides/fspot.html 2009-07-24 23:08:27 +0000
+++ slides/fspot.html 2009-08-03 10:21:36 +0000
@@ -1,16 +1,14 @@
1<div id="title">1<h1 id="title">Relive Memories with F-Spot Photo Manager</h1>
2 Relive Memories with F-Spot Photo Manager
3</div>
4
5<img id="icon" src="icons/f-spot.png" alt="" />
62
7<div id="main">3<div id="main">
84
9<div id="content">5<div id="content"><ul>
10 <p>F-Spot makes it easy to display, organise, edit and share all your photos.</p>6 <li>F-Spot makes it easy to display, organise, edit and share all your photos.</li>
11 <p>Import files from your phone and export them to Flickr.</p>7 <li>Import files from your phone and export them to Flickr.</li>
12 <p>Find a picture in seconds with tagging and timelines.</p>8 <li>Find a picture in seconds with tagging and timelines.</li>
13 <p>Make memories crystal clear by adjusting the colour, removing red-eye or adding effects.</p>9 <li>Make memories crystal clear by adjusting the colour, removing red-eye or adding effects.</li>
14</div>10</ul></div>
1511
16</div>12</div>
13
14<img id="icon" src="icons/fspot.png" alt="" />
1715
=== modified file 'slides/icons/accessibility.png' (properties changed: -x to +x)
18Binary files slides/icons/accessibility.png 2009-07-22 01:02:56 +0000 and slides/icons/accessibility.png 2009-08-03 10:21:36 +0000 differ16Binary files slides/icons/accessibility.png 2009-07-22 01:02:56 +0000 and slides/icons/accessibility.png 2009-08-03 10:21:36 +0000 differ
=== removed file 'slides/icons/appearance.png'
19Binary files slides/icons/appearance.png 2009-07-22 01:02:56 +0000 and slides/icons/appearance.png 1970-01-01 00:00:00 +0000 differ17Binary files slides/icons/appearance.png 2009-07-22 01:02:56 +0000 and slides/icons/appearance.png 1970-01-01 00:00:00 +0000 differ
=== added file 'slides/icons/banshee.png'
20Binary files slides/icons/banshee.png 1970-01-01 00:00:00 +0000 and slides/icons/banshee.png 2009-08-03 10:22:02 +0000 differ18Binary files slides/icons/banshee.png 1970-01-01 00:00:00 +0000 and slides/icons/banshee.png 2009-08-03 10:22:02 +0000 differ
=== removed file 'slides/icons/clock.png'
21Binary files slides/icons/clock.png 2009-07-22 01:02:56 +0000 and slides/icons/clock.png 1970-01-01 00:00:00 +0000 differ19Binary files slides/icons/clock.png 2009-07-22 01:02:56 +0000 and slides/icons/clock.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'slides/icons/default.png'
22Binary files slides/icons/default.png 2009-07-22 01:02:56 +0000 and slides/icons/default.png 1970-01-01 00:00:00 +0000 differ20Binary files slides/icons/default.png 2009-07-22 01:02:56 +0000 and slides/icons/default.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'slides/icons/docs.png'
23Binary files slides/icons/docs.png 2009-07-22 01:02:56 +0000 and slides/icons/docs.png 1970-01-01 00:00:00 +0000 differ21Binary files slides/icons/docs.png 2009-07-22 01:02:56 +0000 and slides/icons/docs.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'slides/icons/empathy.png' (properties changed: -x to +x)
24Binary files slides/icons/empathy.png 2009-07-22 01:02:56 +0000 and slides/icons/empathy.png 2009-08-03 10:21:36 +0000 differ22Binary files slides/icons/empathy.png 2009-07-22 01:02:56 +0000 and slides/icons/empathy.png 2009-08-03 10:21:36 +0000 differ
=== modified file 'slides/icons/evolution.png' (properties changed: -x to +x)
25Binary files slides/icons/evolution.png 2009-07-22 01:02:56 +0000 and slides/icons/evolution.png 2009-08-03 10:21:36 +0000 differ23Binary files slides/icons/evolution.png 2009-07-22 01:02:56 +0000 and slides/icons/evolution.png 2009-08-03 10:21:36 +0000 differ
=== removed file 'slides/icons/f-spot.png'
26Binary files slides/icons/f-spot.png 2009-07-22 01:02:56 +0000 and slides/icons/f-spot.png 1970-01-01 00:00:00 +0000 differ24Binary files slides/icons/f-spot.png 2009-07-22 01:02:56 +0000 and slides/icons/f-spot.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'slides/icons/firefox.png' (properties changed: -x to +x)
27Binary files slides/icons/firefox.png 2009-07-22 01:02:56 +0000 and slides/icons/firefox.png 2009-08-03 10:21:36 +0000 differ25Binary files slides/icons/firefox.png 2009-07-22 01:02:56 +0000 and slides/icons/firefox.png 2009-08-03 10:21:36 +0000 differ
=== added file 'slides/icons/fspot.png'
28Binary files slides/icons/fspot.png 1970-01-01 00:00:00 +0000 and slides/icons/fspot.png 2009-08-03 10:22:02 +0000 differ26Binary files slides/icons/fspot.png 1970-01-01 00:00:00 +0000 and slides/icons/fspot.png 2009-08-03 10:22:02 +0000 differ
=== removed file 'slides/icons/gnome-app-install.png'
29Binary files slides/icons/gnome-app-install.png 2009-07-22 01:02:56 +0000 and slides/icons/gnome-app-install.png 1970-01-01 00:00:00 +0000 differ27Binary files slides/icons/gnome-app-install.png 2009-07-22 01:02:56 +0000 and slides/icons/gnome-app-install.png 1970-01-01 00:00:00 +0000 differ
=== added file 'slides/icons/help.png'
30Binary files slides/icons/help.png 1970-01-01 00:00:00 +0000 and slides/icons/help.png 2009-08-03 10:22:02 +0000 differ28Binary files slides/icons/help.png 1970-01-01 00:00:00 +0000 and slides/icons/help.png 2009-08-03 10:22:02 +0000 differ
=== added file 'slides/icons/install.png'
31Binary files slides/icons/install.png 1970-01-01 00:00:00 +0000 and slides/icons/install.png 2009-08-03 10:22:02 +0000 differ29Binary files slides/icons/install.png 1970-01-01 00:00:00 +0000 and slides/icons/install.png 2009-08-03 10:22:02 +0000 differ
=== removed file 'slides/icons/locale.png'
32Binary files slides/icons/locale.png 2009-07-22 01:02:56 +0000 and slides/icons/locale.png 1970-01-01 00:00:00 +0000 differ30Binary files slides/icons/locale.png 2009-07-22 01:02:56 +0000 and slides/icons/locale.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'slides/icons/openoffice.png' (properties changed: -x to +x)
33Binary files slides/icons/openoffice.png 2009-07-22 01:02:56 +0000 and slides/icons/openoffice.png 2009-08-03 10:21:36 +0000 differ31Binary files slides/icons/openoffice.png 2009-07-22 01:02:56 +0000 and slides/icons/openoffice.png 2009-08-03 10:21:36 +0000 differ
=== removed file 'slides/icons/pidgin.png'
34Binary files slides/icons/pidgin.png 2009-07-22 01:02:56 +0000 and slides/icons/pidgin.png 1970-01-01 00:00:00 +0000 differ32Binary files slides/icons/pidgin.png 2009-07-22 01:02:56 +0000 and slides/icons/pidgin.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'slides/icons/rhythmbox.png' (properties changed: -x to +x)
35Binary files slides/icons/rhythmbox.png 2009-07-22 01:02:56 +0000 and slides/icons/rhythmbox.png 2009-08-03 10:21:36 +0000 differ33Binary files slides/icons/rhythmbox.png 2009-07-22 01:02:56 +0000 and slides/icons/rhythmbox.png 2009-08-03 10:21:36 +0000 differ
=== modified file 'slides/icons/ubuntu-logo.png' (properties changed: -x to +x)
36Binary files slides/icons/ubuntu-logo.png 2009-07-22 01:02:56 +0000 and slides/icons/ubuntu-logo.png 2009-08-03 10:21:36 +0000 differ34Binary files slides/icons/ubuntu-logo.png 2009-07-22 01:02:56 +0000 and slides/icons/ubuntu-logo.png 2009-08-03 10:21:36 +0000 differ
=== removed file 'slides/icons/update-manager.png'
37Binary files slides/icons/update-manager.png 2009-07-22 01:02:56 +0000 and slides/icons/update-manager.png 1970-01-01 00:00:00 +0000 differ35Binary files slides/icons/update-manager.png 2009-07-22 01:02:56 +0000 and slides/icons/update-manager.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'slides/index.html'
--- slides/index.html 2009-07-31 21:01:17 +0000
+++ slides/index.html 2009-08-03 17:57:04 +0000
@@ -43,14 +43,14 @@
4343
44<script type="text/javascript">44<script type="text/javascript">
45 if ("#controls" == window.location.hash) {45 if ("#controls" == window.location.hash) {
46 Crossfade.setup({autoLoad:false, random:false, interval:15, duration:0.5, transition:Crossfade.Transition.Crossfade, autoStart: false });46 Crossfade.setup({autoLoad:false, random:false, interval:15, duration:0.5, transition:Crossfade.Transition.Cover, autoStart: false });
47 document.addEventListener("DOMContentLoaded", function() {47 document.addEventListener("DOMContentLoaded", function() {
48 document.getElementById('debug-controls').style.display = "block";48 document.getElementById('debug-controls').style.display = "block";
49 document.getElementById("current-slide").value = cf2.filenames[0];49 document.getElementById("current-slide").value = cf2.filenames[0];
50 cf2.stop()50 cf2.stop()
51 }, false);51 }, false);
52 } else {52 } else {
53 Crossfade.setup({autoLoad:false, random:false, interval:30, duration:0.5, loop:false, transition:Crossfade.Transition.Crossfade });53 Crossfade.setup({autoLoad:false, random:false, interval:30, duration:0.5, loop:false, transition:Crossfade.Transition.Cover });
54 };54 };
55 var cf2 = new Crossfade('slideshow');55 var cf2 = new Crossfade('slideshow');
56</script>56</script>
5757
=== modified file 'slides/installing-software.html'
--- slides/installing-software.html 2009-07-24 23:08:27 +0000
+++ slides/installing-software.html 2009-08-03 10:21:36 +0000
@@ -1,15 +1,13 @@
1<div id="title">1<h1 id="title">Installing additional software</h1>
2 Installing additional software
3</div>
4
5<img id="icon" src="icons/gnome-app-install.png" alt="" />
62
7<div id="main">3<div id="main">
84
9<div id="content">5<div id="content"><ul>
10 <p>Use <emph>Add/Remove...</emph> to install and uninstall thousands of approved applications from our online repositories.</p>6 <li>Use <emph>Add/Remove...</emph> to install and uninstall thousands of approved applications from our online repositories.</li>
11 <p>The Ubuntu community makes sure these packages are polished and virus-free to make your life easier and safer.</p>7 <li>The Ubuntu community makes sure these packages are polished and virus-free to make your life easier and safer.</li>
12 <p>Regular updates keep you up-to-date when improvements and new versions become available.</p>8 <li>Regular updates keep you up-to-date when improvements and new versions become available.</li>
13</div>9</ul></div>
1410
15</div>11</div>
12
13<img id="icon" src="icons/install.png" alt="" />
1614
=== removed file 'slides/link/background-simple.png'
17Binary files slides/link/background-simple.png 2009-06-19 19:19:23 +0000 and slides/link/background-simple.png 1970-01-01 00:00:00 +0000 differ15Binary files slides/link/background-simple.png 2009-06-19 19:19:23 +0000 and slides/link/background-simple.png 1970-01-01 00:00:00 +0000 differ
=== added file 'slides/link/background.jpg'
18Binary files slides/link/background.jpg 1970-01-01 00:00:00 +0000 and slides/link/background.jpg 2009-07-31 19:47:11 +0000 differ16Binary files slides/link/background.jpg 1970-01-01 00:00:00 +0000 and slides/link/background.jpg 2009-07-31 19:47:11 +0000 differ
=== added file 'slides/link/bullet-point.png'
19Binary files slides/link/bullet-point.png 1970-01-01 00:00:00 +0000 and slides/link/bullet-point.png 2009-08-03 10:21:36 +0000 differ17Binary files slides/link/bullet-point.png 1970-01-01 00:00:00 +0000 and slides/link/bullet-point.png 2009-08-03 10:21:36 +0000 differ
=== modified file 'slides/link/crossfade.js'
--- slides/link/crossfade.js 2009-07-31 21:01:17 +0000
+++ slides/link/crossfade.js 2009-08-02 20:33:32 +0000
@@ -27,9 +27,22 @@
27*/27*/
2828
29/*29/*
30* This version of Crossfade is slightly modified, with an additional30* This version of Crossfade is modified from the original as available
31* "loop" option, defined in Crossfade.defaults and applied in inside31* from Millstream Web Software.
32* Crossfade.prototype.cycle().32*
33* There is an additional "loop" option, defined in Crossfade.defaults
34* and applied inside Crossfade.prototype.cycle().
35*
36* There is an additional (optional) "dir" parameter for the Cycle
37* function of a transition, sent from Crossfade.prototype.cycle() via
38* me.options.transition.cycle.
39*
40* Added a new transition option (Crossfade.Transition.Cover), which
41* slides the previous slide off stage and the new one on stage
42* horizontally. By using absolute positions, it makes some dangerous
43* assumptions about the layout of the page. However, it should be
44* adaptable to other needs.
45*
33* *46* *
34*/47*/
35 48
@@ -111,7 +124,7 @@
111 if(this.options.loop == false && this.counter >= this.slides.length-1) {124 if(this.options.loop == false && this.counter >= this.slides.length-1) {
112 this.stop();125 this.stop();
113 }126 }
114 this.loadSlide(nextSlide, me.options.transition.cycle(prevSlide, nextSlide, me));127 this.loadSlide(nextSlide, me.options.transition.cycle(prevSlide, nextSlide, me, dir));
115 if(!this.loaded) {128 if(!this.loaded) {
116 this.loadSlide(this.slides[this.loopCount(this.counter+1)]);129 this.loadSlide(this.slides[this.loopCount(this.counter+1)]);
117 }130 }
@@ -214,6 +227,48 @@
214 $(s).setStyle({opacity:(i === 0 ? 1 : 0),visibility:'visible',display:(i === 0 ? 'block' : 'none')});227 $(s).setStyle({opacity:(i === 0 ? 1 : 0),visibility:'visible',display:(i === 0 ? 'block' : 'none')});
215 }); 228 });
216 }229 }
230};
231
232Crossfade.Transition.Cover = {
233 className : 'transition-cover',
234 cycle : function(prev, next, show, dir) {
235 var opt = show.options;
236
237 var next_x = '700px';
238 if ( dir > 0 )
239 {
240 /* set up slides for flipping backwards */
241 next_x = prev.getWidth() + 'px';
242 } else {
243 /* set up slides for flipping forwards */
244 next_x = -prev.getWidth() + 'px';
245 }
246 next.setStyle({left:next_x});
247
248 prev_new_x = dir * -prev.getWidth();
249 next_new_x = 0;
250
251 show.effect = new Effect.Parallel([
252 new Effect.Move(prev, {x:prev_new_x, y:0, mode:'absolute', sync:true}),
253 new Effect.Appear(next, {sync:true}),
254 new Effect.Move(next, {x:next_new_x, y:0, mode:'absolute', sync:true})],
255 { duration: opt.duration,
256 queue : 'Crossfade',
257 afterFinish:function(){
258 show.slides.without(next).each(function(s){
259 $(s).setStyle({opacity:0,display:'none'});
260 })
261 }}
262 );
263 },
264 cancel : function(show){
265 if(show.effect) { show.effect.cancel(); }
266 },
267 prepare : function(show){
268 show.slides.each(function(s,i){
269 $(s).setStyle({opacity:(i === 0 ? 1 : 0),visibility:'visible',display:(i === 0 ? 'block' : 'none')});
270 });
271 }
217};272};
218273
219Effect.DoNothing = Class.create();274Effect.DoNothing = Class.create();
220275
=== modified file 'slides/link/general.css'
--- slides/link/general.css 2009-07-22 07:51:49 +0000
+++ slides/link/general.css 2009-08-03 17:57:04 +0000
@@ -6,8 +6,7 @@
6 background-color:#2e3436;6 background-color:#2e3436;
7 7
8 font-family:sans-serif;8 font-family:sans-serif;
9 9 color:#000000;
10 line-height:20px;
11}10}
1211
13/*12/*
@@ -26,14 +25,15 @@
26 width:700px;25 width:700px;
27 height:420px;26 height:420px;
28 27
29 /*28 overflow:hidden;
30 background-image:url('background-simple.png');29
30 background-image:url('background.jpg');
31 background-repeat:no-repeat;31 background-repeat:no-repeat;
32 background-position:top left;32 background-position:top left;
33 */33
34 background-color:#fdfdfd;34 background-color:#fdfdfd;
35 35
36 cursor:default;36 /*cursor:default;*/
37}37}
3838
39#debug-controls39#debug-controls
@@ -61,12 +61,14 @@
61#title61#title
62{62{
63 position:absolute;63 position:absolute;
64 top:10px;64 top:15px;
65 left:10px;65 left:10px;
66
66 font-size:20px;67 font-size:20px;
67 68 font-weight:normal;
68 color:#000000;69
69 text-shadow:black 1px 1px 2px;70 padding:0;
71 margin:0;
70}72}
7173
72/*74/*
@@ -77,29 +79,33 @@
77{79{
78 position:absolute;80 position:absolute;
79 81
80 width:82px;82 width:210px;
81 height:auto;83 height:auto;
82 84
83 top:10px;85 top:170px;
84 right:10px;86 right:10px;
87
88 z-index:11;
89 border:0px;
85}90}
8691
87/*92/*
88#content and #screenshots expect to be contained in93#content expects to be contained in here. #main
89here. #main creates a nice, plain surface upon which94creates a nice, plain surface upon which it can
90they can appear :)95appear :)
91*/96*/
92#main97#main
93{98{
94 position:absolute;99 position:absolute;
95 100
96 top:60px;101 top:50px;
97 height:382px;
98 left:0px;102 left:0px;
99 right:120px;103
104 padding-right:60px;
100 105
101 font-size:14px;106 font-size:14px;
102 color:#000000;107
108 z-index:12;
103}109}
104110
105/*111/*
@@ -112,52 +118,28 @@
112 padding-left:16px;118 padding-left:16px;
113 padding-right:16px;119 padding-right:16px;
114 120
115 width:100%;121 width:490px;
116 height:100%;122}
117 123
118 vertical-align:middle;124#content ul
119 display:table-cell;125{
120}126 list-style-image:url("bullet-point.png");
121127 padding-left:2em;
122/*128}
123Three small screenshots related to the slide should129
124go in this block.130#content li
125*/131{
126#main #screenshots132 padding:0.8em;
127{133}
128 position:absolute;134
129 display:none;135#content li.special
130 136{
131 width:100%;137 margin-top:2em;
132 138 margin-bottom:2em;
133 padding-top:4px;139 list-style:none;
134 padding-bottom:4px;140
135 141 font-weight:bold;
136 bottom:0px;
137 left:0px;
138
139 text-align:center;142 text-align:center;
140
141 white-space:nowrap;
142}
143
144/*
145Actual screenshots are just loose img tags in the #screenshots section.
146A height of 130px is enforced, though this will work with any width.
147There is a dark grey border.
148*/
149#main #screenshots img
150{
151 height:130px;
152 width:auto;
153
154 /* Note that we have about 30 spare pixels (vertically) to use */
155
156 border-style:solid;
157 border-color:#2e3436;
158 border-width:2px;
159
160 margin:2px;
161}143}
162144
163/*145/*
164146
=== modified file 'slides/openoffice.html'
--- slides/openoffice.html 2009-07-24 23:08:27 +0000
+++ slides/openoffice.html 2009-08-03 10:21:36 +0000
@@ -1,17 +1,13 @@
1<div id="title">1<h1 id="title">OpenOffice - Office tools at your fingertips</h1>
2 OpenOffice - Office tools at your fingertips2
3<div id="main">
4
5<div id="content"><ul>
6 <li>OpenOffice.org is a powerful office application that you can start using very quickly.</li>
7 <li>OpenOffice.org creates letters, presentations and spreadsheets, as well as drawings and databases</li>
8 <li>OpenOffice.org keeps you compatible your friends, no matter what office software they use</li>
9</ul></div>
10
3</div>11</div>
412
5<img id="icon" src="icons/openoffice.png" alt="" />13<img id="icon" src="icons/openoffice.png" alt="" />
6
7<div id="main">
8
9<div id="content">
10 <p>OpenOffice.org is a powerful office application that you can start using very quickly.</p>
11
12 <p>OpenOffice.org creates letters, presentations and spreadsheets, as well as drawings and databases</p>
13
14 <p>OpenOffice.org keeps you compatible your friends, no matter what office software they use</p>
15</div>
16
17</div>
1814
=== modified file 'slides/pidgin.html'
--- slides/pidgin.html 2009-07-24 23:08:27 +0000
+++ slides/pidgin.html 2009-08-03 10:21:36 +0000
@@ -1,17 +1,13 @@
1<div id="title">1<h1 id="title">Keep in contact with Pidgin IM</h1>
2 Keep in contact with Pidgin IM2
3<div id="main">
4
5<div id="content"><ul>
6 <li>Pidgin IM is Ubuntu's instant messaging tool.</li>
7 <li>Pidgin connects to all the major IM networks, so you only ever need to learn one interface.</li>
8 <li>Plugins let you adapt Pidgin to your personal requirements.</li>
9</ul></div>
10
3</div>11</div>
412
5<img id="icon" src="icons/pidgin.png" alt="" />13<img id="icon" src="icons/pidgin.png" alt="" />
6
7<div id="main">
8
9<div id="content">
10 <p>Pidgin IM is Ubuntu's instant messaging tool.</p>
11
12 <p>Pidgin connects to all the major IM networks, so you only ever need to learn one interface.</p>
13
14 <p>Plugins let you adapt Pidgin to your personal requirements.</p>
15</div>
16
17</div>
1814
=== modified file 'slides/rhythmbox-totem.html'
--- slides/rhythmbox-totem.html 2009-07-24 23:08:27 +0000
+++ slides/rhythmbox-totem.html 2009-08-03 10:21:36 +0000
@@ -1,17 +1,13 @@
1<div id="title">1<h1 id="title">Watch and listen on Ubuntu</h1>
2 Watch and listen on Ubuntu2
3<div id="main">
4
5<div id="content"><ul>
6 <li>Movie Player makes it easy to play a huge variety of formats, including streamed content from the BBC, YouTube and other sources.</li>
7 <li>Rhythmbox Music Player helps you share music with your friends, listen to Internet radio or download Creative Commons music.</li>
8 <li>Rhythmbox also manages your Podcasts subscriptions and connects to your MP3 player, so you can listen to your music on the go.</li>
9</ul></div>
10
3</div>11</div>
412
5<img id="icon" src="icons/rhythmbox.png" alt="" />13<img id="icon" src="icons/rhythmbox.png" alt="" />
6
7<div id="main">
8
9<div id="content">
10 <p>Movie Player makes it easy to play a huge variety of formats, including streamed content from the BBC, YouTube and other sources.</p>
11
12 <p>Rhythmbox Music Player helps you share music with your friends, listen to Internet radio or download Creative Commons music.</p>
13
14 <p>Rhythmbox also manages your Podcasts subscriptions and connects to your MP3 player, so you can listen to your music on the go.</p>
15</div>
16
17</div>
1814
=== modified file 'slides/translations.html'
--- slides/translations.html 2009-07-24 23:08:27 +0000
+++ slides/translations.html 2009-08-03 10:21:36 +0000
@@ -1,15 +1,13 @@
1<div id="title">1<h1 id="title">Ubuntu speaks fluently</h1>
2 Ubuntu speaks fluently2
3<div id="main">
4
5<div id="content"><ul>
6 <li>Ubuntu is available in many different languages.</li>
7 <li>Simply select your language in Language Support Administration</li>
8 <li>Ubuntu's translations are contributed by our generous users. Feel free to help out at <a href="http://translations.launchpad.net/ubuntu">launchpad.net</a>.</li>
9</ul></div>
10
3</div>11</div>
412
5<img id="icon" src="icons/locale.png" alt="" />13<img id="icon" src="icons/locale.png" alt="" />
6
7<div id="main">
8
9<div id="content">
10 <p>Ubuntu is available in many different languages.</p>
11 <p>Simply select your language in Language Support Administration</p>
12 <p>Ubuntu's translations are contributed by our generous users. Feel free to help out at <a href="http://translations.launchpad.net/ubuntu">launchpad.net</a>.</p>
13</div>
14
15</div>
1614
=== modified file 'slides/welcome.html'
--- slides/welcome.html 2009-07-24 23:08:27 +0000
+++ slides/welcome.html 2009-08-03 10:21:36 +0000
@@ -1,16 +1,15 @@
1<div id="title">1<h1 id="title">Welcome</h1>
2 Welcome2
3<div id="main">
4
5<div id="content"><ul>
6 <li>Thank you for choosing Ubuntu Linux.</li>
7 <li>While Ubuntu is installing, we invite you to explore your new operating system.</li>
8 <li>Let us know about your Ubuntu Experience at <a href="http://ubuntu.com/community">ubuntu.com/community</a>!</li>
9 <li class="special">Ubuntu is built to be safe. Feel free to explore!</li>
10</ul></div>
11
3</div>12</div>
413
5<img id="icon" src="icons/ubuntu-logo.png" alt="" />14<img id="icon" src="icons/ubuntu-logo.png" alt="" />
615
7<div id="main">
8
9<div id="content">
10 <p>Thank you for choosing Ubuntu Linux.</p>
11 <p>While Ubuntu is installing, we invite you to explore your new operating system.</p>
12 <p>Let us know about your Ubuntu Experience at <a href="http://ubuntu.com/community">ubuntu.com/community</a>!</p>
13 <p style="text-align:center"><strong>Ubuntu is built to be safe. Feel free to explore!</strong></p>
14</div>
15
16</div>

Subscribers

People subscribed via source and target branches