Merge lp:~ubiquity-slideshow/ubiquity-slideshow-ubuntu/madsrh-layout into lp:ubiquity-slideshow-ubuntu
- madsrh-layout
- 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 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubiquity Slideshow | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
| Dylan McCall (dylanmccall) wrote : | # |
- 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-reflectio n-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
| 1 | === modified file 'AUTHORS' |
| 2 | --- AUTHORS 2009-07-01 19:55:36 +0000 |
| 3 | +++ AUTHORS 2009-07-31 19:47:11 +0000 |
| 4 | @@ -5,10 +5,11 @@ |
| 5 | |
| 6 | ----- |
| 7 | |
| 8 | -Dylan McCall <http://launchpad.net/~dylanmccall> Andrew |
| 9 | -Higginson <http://launchpad.net/~rugby471> Anabelle |
| 10 | -Handdoek <http://launchpad.net/~anabelle> Andrew Sayers |
| 11 | -<https://launchpad.net/~andrew-bugs-launchpad-net> |
| 12 | +Dylan McCall <http://launchpad.net/~dylanmccall> |
| 13 | +Andrew Higginson <http://launchpad.net/~rugby471> |
| 14 | +Anabelle Handdoek <http://launchpad.net/~anabelle> |
| 15 | +Andrew Sayers <https://launchpad.net/~andrew-bugs-launchpad-net> |
| 16 | +Mads Rosendahl <http://launchpad.net/~madsrh> |
| 17 | |
| 18 | ----- |
| 19 | |
| 20 | |
| 21 | === modified file 'slides/MenuTest.html' |
| 22 | --- slides/MenuTest.html 2009-07-24 23:08:27 +0000 |
| 23 | +++ slides/MenuTest.html 2009-08-03 10:21:36 +0000 |
| 24 | @@ -15,21 +15,17 @@ |
| 25 | <body> |
| 26 | |
| 27 | <div id="container"> |
| 28 | - <div id="title"> |
| 29 | - Welcome |
| 30 | - </div> |
| 31 | - |
| 32 | - <img id="icon" src="icons/ubuntu-logo.png" alt="" /> |
| 33 | - |
| 34 | - <div id="main"> |
| 35 | - |
| 36 | - <div id="content"> |
| 37 | - <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> |
| 38 | - <p>So, Peter, what's happening?<br />Aahh, now, are you going to go ahead and open up |
| 39 | - <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> |
| 40 | - </div> |
| 41 | - |
| 42 | - </div> |
| 43 | + <h1 id="title">Welcome</h1> |
| 44 | + |
| 45 | + <div id="main"> |
| 46 | + |
| 47 | + <div id="content"><ul> |
| 48 | + <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> |
| 49 | + <li>So, Peter, what's happening?<br />Aahh, now, are you going to go ahead and open up |
| 50 | + <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> |
| 51 | + </ul></div> |
| 52 | + |
| 53 | + </div> |
| 54 | </div> |
| 55 | |
| 56 | </body> |
| 57 | |
| 58 | === modified file 'slides/Template.html' |
| 59 | --- slides/Template.html 2009-07-24 23:08:27 +0000 |
| 60 | +++ slides/Template.html 2009-08-03 10:21:36 +0000 |
| 61 | @@ -1,21 +1,17 @@ |
| 62 | <!-- Assume that this slide has been linked to a CSS stylesheet at "link/general.css" --> |
| 63 | |
| 64 | -<div id="title"> |
| 65 | - <!-- Title of slide goes here. Try to keep it shorter than this one. --> |
| 66 | - Title (include name and purpose of app) |
| 67 | -</div> |
| 68 | - |
| 69 | -<img id="icon" src="icons/default.png" alt="" /> <!-- Remember to change the value of src to point to a 64x64 icon --> |
| 70 | +<!-- Title of slide goes here. Try to keep it shorter than this one. --> |
| 71 | +<h1 id="title">Title (include name and purpose of app)</h1> |
| 72 | |
| 73 | <div id="main"> |
| 74 | -<!-- The main body of your slide goes within this... --> |
| 75 | - |
| 76 | -<div id="content"> |
| 77 | - <!-- This helpful division makes sure your content text fits in smoothly and looks good, so add that here! |
| 78 | - Beware the size limit; the text here just about hits the limits. --> |
| 79 | - <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> |
| 80 | - <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> |
| 81 | - <p>Phasellus mi quam, dapibus vitae vestibulum vitae, lobortis id sapien.</p> |
| 82 | -</div> |
| 83 | - |
| 84 | -</div> |
| 85 | + |
| 86 | +<div id="content"><ul> |
| 87 | + <!-- Beware the size limit; the text here just about hits the limits. --> |
| 88 | + <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> |
| 89 | + <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> |
| 90 | + <li>Phasellus mi quam, dapibus vitae vestibulum vitae, lobortis id sapien.</li> |
| 91 | +</ul></div> |
| 92 | + |
| 93 | +</div> |
| 94 | + |
| 95 | +<img id="icon" src="icons/default.png" alt="" /> <!-- Remember to change the value of src to point to a 210x250 icon - see other icons --> |
| 96 | |
| 97 | === modified file 'slides/accessibility.html' |
| 98 | --- slides/accessibility.html 2009-07-24 23:08:27 +0000 |
| 99 | +++ slides/accessibility.html 2009-08-03 10:21:36 +0000 |
| 100 | @@ -1,15 +1,13 @@ |
| 101 | -<div id="title"> |
| 102 | - Accessibility in Ubuntu |
| 103 | +<h1 id="title">Accessibility in Ubuntu</h1> |
| 104 | + |
| 105 | +<div id="main"> |
| 106 | + |
| 107 | +<div id="content"><ul> |
| 108 | + <li>Ubuntu makes computing easy whatever your circumstances.</li> |
| 109 | + <li>A range of assistive technologies make Ubuntu one of the most accessible operating systems around.</li> |
| 110 | + <li>We have you covered whether you want slow key support, magnification, braille or more.</li> |
| 111 | +</ul></div> |
| 112 | + |
| 113 | </div> |
| 114 | |
| 115 | <img id="icon" src="icons/accessibility.png" alt="" /> |
| 116 | - |
| 117 | -<div id="main"> |
| 118 | - |
| 119 | -<div id="content"> |
| 120 | - <p>Ubuntu makes computing easy whatever your circumstances.</p> |
| 121 | - <p>A range of assistive technologies make Ubuntu one of the most accessible operating systems around.</p> |
| 122 | - <p>We have you covered whether you want slow key support, magnification, braille or more.</p> |
| 123 | -</div> |
| 124 | - |
| 125 | -</div> |
| 126 | |
| 127 | === modified file 'slides/documentation.html' |
| 128 | --- slides/documentation.html 2009-07-24 23:08:27 +0000 |
| 129 | +++ slides/documentation.html 2009-08-03 10:21:36 +0000 |
| 130 | @@ -1,17 +1,13 @@ |
| 131 | -<div id="title"> |
| 132 | - Getting Help with Ubuntu |
| 133 | -</div> |
| 134 | - |
| 135 | -<img id="icon" src="icons/docs.png" alt="" /> |
| 136 | +<h1 id="title">Getting Help with Ubuntu</h1> |
| 137 | |
| 138 | <div id="main"> |
| 139 | |
| 140 | -<div id="content"> |
| 141 | - <p>All this is just the beginning!</p> |
| 142 | - |
| 143 | - <p>Ask your questions at <a href="http://www.ubuntuforums.org">ubuntuforums.org</a>, where advanced users help people just like you.</p> |
| 144 | - |
| 145 | - <p style="text-align:center"><b>The installation will finish soon, we hope that you enjoy using Ubuntu!</b></p> |
| 146 | -</div> |
| 147 | - |
| 148 | -</div> |
| 149 | +<div id="content"><ul> |
| 150 | + <li>All this is just the beginning!</li> |
| 151 | + <li>Ask your questions at <a href="http://www.ubuntuforums.org">ubuntuforums.org</a>, where advanced users help people just like you.</li> |
| 152 | + <li class="special">The installation will finish soon, we hope that you enjoy using Ubuntu!</li> |
| 153 | +</ul></div> |
| 154 | + |
| 155 | +</div> |
| 156 | + |
| 157 | +<img id="icon" src="icons/help.png" alt="" /> |
| 158 | |
| 159 | === modified file 'slides/evolution.html' |
| 160 | --- slides/evolution.html 2009-07-24 23:08:27 +0000 |
| 161 | +++ slides/evolution.html 2009-08-03 10:21:36 +0000 |
| 162 | @@ -1,15 +1,13 @@ |
| 163 | -<div id="title"> |
| 164 | - Control your digital life with Evolution |
| 165 | +<h1 id="title">Control your digital life with Evolution</h1> |
| 166 | + |
| 167 | +<div id="main"> |
| 168 | + |
| 169 | +<div id="content"><ul> |
| 170 | + <li>Use Evolution for email, calendar, tasks and contact sharing.</li> |
| 171 | + <li>Comprehensive mail filters and search tools make managing your mail a breeze.</li> |
| 172 | + <li>Calendar events show up in the system clock, so you never miss an important meeting.</li> |
| 173 | +</ul></div> |
| 174 | + |
| 175 | </div> |
| 176 | |
| 177 | <img id="icon" src="icons/evolution.png" alt="" /> |
| 178 | - |
| 179 | -<div id="main"> |
| 180 | - |
| 181 | -<div id="content"> |
| 182 | - <p>Use Evolution for email, calendar, tasks and contact sharing.</p> |
| 183 | - <p>Comprehensive mail filters and search tools make managing your mail a breeze.</p> |
| 184 | - <p>Calendar events show up in the system clock, so you never miss an important meeting.</p> |
| 185 | -</div> |
| 186 | - |
| 187 | -</div> |
| 188 | |
| 189 | === modified file 'slides/firefox.html' |
| 190 | --- slides/firefox.html 2009-07-24 23:08:27 +0000 |
| 191 | +++ slides/firefox.html 2009-08-03 10:21:36 +0000 |
| 192 | @@ -1,15 +1,13 @@ |
| 193 | -<div id="title"> |
| 194 | - Browse the web with Firefox |
| 195 | +<h1 id="title">Browse the web with Firefox</h1> |
| 196 | + |
| 197 | +<div id="main"> |
| 198 | + |
| 199 | +<div id="content"><ul> |
| 200 | + <li>Ubuntu comes with Firefox 3, one of the most popular and useful web browsers in the world.</li> |
| 201 | + <li>Firefox keeps you safe by blocking pop-ups and warning about malware.</li> |
| 202 | + <li>You can download add-ons that adapt Firefox to your personal requirements.</li> |
| 203 | +</ul></div> |
| 204 | + |
| 205 | </div> |
| 206 | |
| 207 | <img id="icon" src="icons/firefox.png" alt="" /> |
| 208 | - |
| 209 | -<div id="main"> |
| 210 | - |
| 211 | -<div id="content"> |
| 212 | - <p>Ubuntu comes with Firefox 3, one of the most popular and useful web browsers in the world.</p> |
| 213 | - <p>Firefox keeps you safe by blocking pop-ups and warning about malware.</p> |
| 214 | - <p>You can download add-ons that adapt Firefox to your personal requirements.</p> |
| 215 | -</div> |
| 216 | - |
| 217 | -</div> |
| 218 | |
| 219 | === modified file 'slides/fspot.html' |
| 220 | --- slides/fspot.html 2009-07-24 23:08:27 +0000 |
| 221 | +++ slides/fspot.html 2009-08-03 10:21:36 +0000 |
| 222 | @@ -1,16 +1,14 @@ |
| 223 | -<div id="title"> |
| 224 | - Relive Memories with F-Spot Photo Manager |
| 225 | -</div> |
| 226 | - |
| 227 | -<img id="icon" src="icons/f-spot.png" alt="" /> |
| 228 | +<h1 id="title">Relive Memories with F-Spot Photo Manager</h1> |
| 229 | |
| 230 | <div id="main"> |
| 231 | |
| 232 | -<div id="content"> |
| 233 | - <p>F-Spot makes it easy to display, organise, edit and share all your photos.</p> |
| 234 | - <p>Import files from your phone and export them to Flickr.</p> |
| 235 | - <p>Find a picture in seconds with tagging and timelines.</p> |
| 236 | - <p>Make memories crystal clear by adjusting the colour, removing red-eye or adding effects.</p> |
| 237 | -</div> |
| 238 | - |
| 239 | -</div> |
| 240 | +<div id="content"><ul> |
| 241 | + <li>F-Spot makes it easy to display, organise, edit and share all your photos.</li> |
| 242 | + <li>Import files from your phone and export them to Flickr.</li> |
| 243 | + <li>Find a picture in seconds with tagging and timelines.</li> |
| 244 | + <li>Make memories crystal clear by adjusting the colour, removing red-eye or adding effects.</li> |
| 245 | +</ul></div> |
| 246 | + |
| 247 | +</div> |
| 248 | + |
| 249 | +<img id="icon" src="icons/fspot.png" alt="" /> |
| 250 | |
| 251 | === modified file 'slides/icons/accessibility.png' (properties changed: -x to +x) |
| 252 | Binary 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 |
| 253 | === removed file 'slides/icons/appearance.png' |
| 254 | Binary 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 |
| 255 | === added file 'slides/icons/banshee.png' |
| 256 | Binary 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 |
| 257 | === removed file 'slides/icons/clock.png' |
| 258 | Binary 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 |
| 259 | === removed file 'slides/icons/default.png' |
| 260 | Binary 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 |
| 261 | === removed file 'slides/icons/docs.png' |
| 262 | Binary 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 |
| 263 | === modified file 'slides/icons/empathy.png' (properties changed: -x to +x) |
| 264 | Binary 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 |
| 265 | === modified file 'slides/icons/evolution.png' (properties changed: -x to +x) |
| 266 | Binary 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 |
| 267 | === removed file 'slides/icons/f-spot.png' |
| 268 | Binary 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 |
| 269 | === modified file 'slides/icons/firefox.png' (properties changed: -x to +x) |
| 270 | Binary 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 |
| 271 | === added file 'slides/icons/fspot.png' |
| 272 | Binary 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 |
| 273 | === removed file 'slides/icons/gnome-app-install.png' |
| 274 | Binary 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 |
| 275 | === added file 'slides/icons/help.png' |
| 276 | Binary 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 |
| 277 | === added file 'slides/icons/install.png' |
| 278 | Binary 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 |
| 279 | === removed file 'slides/icons/locale.png' |
| 280 | Binary 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 |
| 281 | === modified file 'slides/icons/openoffice.png' (properties changed: -x to +x) |
| 282 | Binary 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 |
| 283 | === removed file 'slides/icons/pidgin.png' |
| 284 | Binary 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 |
| 285 | === modified file 'slides/icons/rhythmbox.png' (properties changed: -x to +x) |
| 286 | Binary 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 |
| 287 | === modified file 'slides/icons/ubuntu-logo.png' (properties changed: -x to +x) |
| 288 | Binary 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 |
| 289 | === removed file 'slides/icons/update-manager.png' |
| 290 | Binary 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 |
| 291 | === modified file 'slides/index.html' |
| 292 | --- slides/index.html 2009-07-31 21:01:17 +0000 |
| 293 | +++ slides/index.html 2009-08-03 17:57:04 +0000 |
| 294 | @@ -43,14 +43,14 @@ |
| 295 | |
| 296 | <script type="text/javascript"> |
| 297 | if ("#controls" == window.location.hash) { |
| 298 | - Crossfade.setup({autoLoad:false, random:false, interval:15, duration:0.5, transition:Crossfade.Transition.Crossfade, autoStart: false }); |
| 299 | + Crossfade.setup({autoLoad:false, random:false, interval:15, duration:0.5, transition:Crossfade.Transition.Cover, autoStart: false }); |
| 300 | document.addEventListener("DOMContentLoaded", function() { |
| 301 | document.getElementById('debug-controls').style.display = "block"; |
| 302 | document.getElementById("current-slide").value = cf2.filenames[0]; |
| 303 | cf2.stop() |
| 304 | }, false); |
| 305 | } else { |
| 306 | - Crossfade.setup({autoLoad:false, random:false, interval:30, duration:0.5, loop:false, transition:Crossfade.Transition.Crossfade }); |
| 307 | + Crossfade.setup({autoLoad:false, random:false, interval:30, duration:0.5, loop:false, transition:Crossfade.Transition.Cover }); |
| 308 | }; |
| 309 | var cf2 = new Crossfade('slideshow'); |
| 310 | </script> |
| 311 | |
| 312 | === modified file 'slides/installing-software.html' |
| 313 | --- slides/installing-software.html 2009-07-24 23:08:27 +0000 |
| 314 | +++ slides/installing-software.html 2009-08-03 10:21:36 +0000 |
| 315 | @@ -1,15 +1,13 @@ |
| 316 | -<div id="title"> |
| 317 | - Installing additional software |
| 318 | -</div> |
| 319 | - |
| 320 | -<img id="icon" src="icons/gnome-app-install.png" alt="" /> |
| 321 | +<h1 id="title">Installing additional software</h1> |
| 322 | |
| 323 | <div id="main"> |
| 324 | |
| 325 | -<div id="content"> |
| 326 | - <p>Use <emph>Add/Remove...</emph> to install and uninstall thousands of approved applications from our online repositories.</p> |
| 327 | - <p>The Ubuntu community makes sure these packages are polished and virus-free to make your life easier and safer.</p> |
| 328 | - <p>Regular updates keep you up-to-date when improvements and new versions become available.</p> |
| 329 | -</div> |
| 330 | - |
| 331 | -</div> |
| 332 | +<div id="content"><ul> |
| 333 | + <li>Use <emph>Add/Remove...</emph> to install and uninstall thousands of approved applications from our online repositories.</li> |
| 334 | + <li>The Ubuntu community makes sure these packages are polished and virus-free to make your life easier and safer.</li> |
| 335 | + <li>Regular updates keep you up-to-date when improvements and new versions become available.</li> |
| 336 | +</ul></div> |
| 337 | + |
| 338 | +</div> |
| 339 | + |
| 340 | +<img id="icon" src="icons/install.png" alt="" /> |
| 341 | |
| 342 | === removed file 'slides/link/background-simple.png' |
| 343 | Binary 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 |
| 344 | === added file 'slides/link/background.jpg' |
| 345 | Binary 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 |
| 346 | === added file 'slides/link/bullet-point.png' |
| 347 | Binary 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 |
| 348 | === modified file 'slides/link/crossfade.js' |
| 349 | --- slides/link/crossfade.js 2009-07-31 21:01:17 +0000 |
| 350 | +++ slides/link/crossfade.js 2009-08-02 20:33:32 +0000 |
| 351 | @@ -27,9 +27,22 @@ |
| 352 | */ |
| 353 | |
| 354 | /* |
| 355 | -* This version of Crossfade is slightly modified, with an additional |
| 356 | -* "loop" option, defined in Crossfade.defaults and applied in inside |
| 357 | -* Crossfade.prototype.cycle(). |
| 358 | +* This version of Crossfade is modified from the original as available |
| 359 | +* from Millstream Web Software. |
| 360 | +* |
| 361 | +* There is an additional "loop" option, defined in Crossfade.defaults |
| 362 | +* and applied inside Crossfade.prototype.cycle(). |
| 363 | +* |
| 364 | +* There is an additional (optional) "dir" parameter for the Cycle |
| 365 | +* function of a transition, sent from Crossfade.prototype.cycle() via |
| 366 | +* me.options.transition.cycle. |
| 367 | +* |
| 368 | +* Added a new transition option (Crossfade.Transition.Cover), which |
| 369 | +* slides the previous slide off stage and the new one on stage |
| 370 | +* horizontally. By using absolute positions, it makes some dangerous |
| 371 | +* assumptions about the layout of the page. However, it should be |
| 372 | +* adaptable to other needs. |
| 373 | +* |
| 374 | * * |
| 375 | */ |
| 376 | |
| 377 | @@ -111,7 +124,7 @@ |
| 378 | if(this.options.loop == false && this.counter >= this.slides.length-1) { |
| 379 | this.stop(); |
| 380 | } |
| 381 | - this.loadSlide(nextSlide, me.options.transition.cycle(prevSlide, nextSlide, me)); |
| 382 | + this.loadSlide(nextSlide, me.options.transition.cycle(prevSlide, nextSlide, me, dir)); |
| 383 | if(!this.loaded) { |
| 384 | this.loadSlide(this.slides[this.loopCount(this.counter+1)]); |
| 385 | } |
| 386 | @@ -214,6 +227,48 @@ |
| 387 | $(s).setStyle({opacity:(i === 0 ? 1 : 0),visibility:'visible',display:(i === 0 ? 'block' : 'none')}); |
| 388 | }); |
| 389 | } |
| 390 | +}; |
| 391 | + |
| 392 | +Crossfade.Transition.Cover = { |
| 393 | + className : 'transition-cover', |
| 394 | + cycle : function(prev, next, show, dir) { |
| 395 | + var opt = show.options; |
| 396 | + |
| 397 | + var next_x = '700px'; |
| 398 | + if ( dir > 0 ) |
| 399 | + { |
| 400 | + /* set up slides for flipping backwards */ |
| 401 | + next_x = prev.getWidth() + 'px'; |
| 402 | + } else { |
| 403 | + /* set up slides for flipping forwards */ |
| 404 | + next_x = -prev.getWidth() + 'px'; |
| 405 | + } |
| 406 | + next.setStyle({left:next_x}); |
| 407 | + |
| 408 | + prev_new_x = dir * -prev.getWidth(); |
| 409 | + next_new_x = 0; |
| 410 | + |
| 411 | + show.effect = new Effect.Parallel([ |
| 412 | + new Effect.Move(prev, {x:prev_new_x, y:0, mode:'absolute', sync:true}), |
| 413 | + new Effect.Appear(next, {sync:true}), |
| 414 | + new Effect.Move(next, {x:next_new_x, y:0, mode:'absolute', sync:true})], |
| 415 | + { duration: opt.duration, |
| 416 | + queue : 'Crossfade', |
| 417 | + afterFinish:function(){ |
| 418 | + show.slides.without(next).each(function(s){ |
| 419 | + $(s).setStyle({opacity:0,display:'none'}); |
| 420 | + }) |
| 421 | + }} |
| 422 | + ); |
| 423 | + }, |
| 424 | + cancel : function(show){ |
| 425 | + if(show.effect) { show.effect.cancel(); } |
| 426 | + }, |
| 427 | + prepare : function(show){ |
| 428 | + show.slides.each(function(s,i){ |
| 429 | + $(s).setStyle({opacity:(i === 0 ? 1 : 0),visibility:'visible',display:(i === 0 ? 'block' : 'none')}); |
| 430 | + }); |
| 431 | + } |
| 432 | }; |
| 433 | |
| 434 | Effect.DoNothing = Class.create(); |
| 435 | |
| 436 | === modified file 'slides/link/general.css' |
| 437 | --- slides/link/general.css 2009-07-22 07:51:49 +0000 |
| 438 | +++ slides/link/general.css 2009-08-03 17:57:04 +0000 |
| 439 | @@ -6,8 +6,7 @@ |
| 440 | background-color:#2e3436; |
| 441 | |
| 442 | font-family:sans-serif; |
| 443 | - |
| 444 | - line-height:20px; |
| 445 | + color:#000000; |
| 446 | } |
| 447 | |
| 448 | /* |
| 449 | @@ -26,14 +25,15 @@ |
| 450 | width:700px; |
| 451 | height:420px; |
| 452 | |
| 453 | - /* |
| 454 | - background-image:url('background-simple.png'); |
| 455 | + overflow:hidden; |
| 456 | + |
| 457 | + background-image:url('background.jpg'); |
| 458 | background-repeat:no-repeat; |
| 459 | background-position:top left; |
| 460 | - */ |
| 461 | + |
| 462 | background-color:#fdfdfd; |
| 463 | |
| 464 | - cursor:default; |
| 465 | + /*cursor:default;*/ |
| 466 | } |
| 467 | |
| 468 | #debug-controls |
| 469 | @@ -61,12 +61,14 @@ |
| 470 | #title |
| 471 | { |
| 472 | position:absolute; |
| 473 | - top:10px; |
| 474 | + top:15px; |
| 475 | left:10px; |
| 476 | + |
| 477 | font-size:20px; |
| 478 | - |
| 479 | - color:#000000; |
| 480 | - text-shadow:black 1px 1px 2px; |
| 481 | + font-weight:normal; |
| 482 | + |
| 483 | + padding:0; |
| 484 | + margin:0; |
| 485 | } |
| 486 | |
| 487 | /* |
| 488 | @@ -77,29 +79,33 @@ |
| 489 | { |
| 490 | position:absolute; |
| 491 | |
| 492 | - width:82px; |
| 493 | + width:210px; |
| 494 | height:auto; |
| 495 | |
| 496 | - top:10px; |
| 497 | + top:170px; |
| 498 | right:10px; |
| 499 | + |
| 500 | + z-index:11; |
| 501 | + border:0px; |
| 502 | } |
| 503 | |
| 504 | /* |
| 505 | -#content and #screenshots expect to be contained in |
| 506 | -here. #main creates a nice, plain surface upon which |
| 507 | -they can appear :) |
| 508 | +#content expects to be contained in here. #main |
| 509 | +creates a nice, plain surface upon which it can |
| 510 | +appear :) |
| 511 | */ |
| 512 | #main |
| 513 | { |
| 514 | position:absolute; |
| 515 | |
| 516 | - top:60px; |
| 517 | - height:382px; |
| 518 | + top:50px; |
| 519 | left:0px; |
| 520 | - right:120px; |
| 521 | + |
| 522 | + padding-right:60px; |
| 523 | |
| 524 | font-size:14px; |
| 525 | - color:#000000; |
| 526 | + |
| 527 | + z-index:12; |
| 528 | } |
| 529 | |
| 530 | /* |
| 531 | @@ -112,52 +118,28 @@ |
| 532 | padding-left:16px; |
| 533 | padding-right:16px; |
| 534 | |
| 535 | - width:100%; |
| 536 | - height:100%; |
| 537 | - |
| 538 | - vertical-align:middle; |
| 539 | - display:table-cell; |
| 540 | -} |
| 541 | - |
| 542 | -/* |
| 543 | -Three small screenshots related to the slide should |
| 544 | -go in this block. |
| 545 | -*/ |
| 546 | -#main #screenshots |
| 547 | -{ |
| 548 | - position:absolute; |
| 549 | - display:none; |
| 550 | - |
| 551 | - width:100%; |
| 552 | - |
| 553 | - padding-top:4px; |
| 554 | - padding-bottom:4px; |
| 555 | - |
| 556 | - bottom:0px; |
| 557 | - left:0px; |
| 558 | - |
| 559 | + width:490px; |
| 560 | +} |
| 561 | + |
| 562 | +#content ul |
| 563 | +{ |
| 564 | + list-style-image:url("bullet-point.png"); |
| 565 | + padding-left:2em; |
| 566 | +} |
| 567 | + |
| 568 | +#content li |
| 569 | +{ |
| 570 | + padding:0.8em; |
| 571 | +} |
| 572 | + |
| 573 | +#content li.special |
| 574 | +{ |
| 575 | + margin-top:2em; |
| 576 | + margin-bottom:2em; |
| 577 | + list-style:none; |
| 578 | + |
| 579 | + font-weight:bold; |
| 580 | text-align:center; |
| 581 | - |
| 582 | - white-space:nowrap; |
| 583 | -} |
| 584 | - |
| 585 | -/* |
| 586 | -Actual screenshots are just loose img tags in the #screenshots section. |
| 587 | -A height of 130px is enforced, though this will work with any width. |
| 588 | -There is a dark grey border. |
| 589 | -*/ |
| 590 | -#main #screenshots img |
| 591 | -{ |
| 592 | - height:130px; |
| 593 | - width:auto; |
| 594 | - |
| 595 | - /* Note that we have about 30 spare pixels (vertically) to use */ |
| 596 | - |
| 597 | - border-style:solid; |
| 598 | - border-color:#2e3436; |
| 599 | - border-width:2px; |
| 600 | - |
| 601 | - margin:2px; |
| 602 | } |
| 603 | |
| 604 | /* |
| 605 | |
| 606 | === modified file 'slides/openoffice.html' |
| 607 | --- slides/openoffice.html 2009-07-24 23:08:27 +0000 |
| 608 | +++ slides/openoffice.html 2009-08-03 10:21:36 +0000 |
| 609 | @@ -1,17 +1,13 @@ |
| 610 | -<div id="title"> |
| 611 | - OpenOffice - Office tools at your fingertips |
| 612 | +<h1 id="title">OpenOffice - Office tools at your fingertips</h1> |
| 613 | + |
| 614 | +<div id="main"> |
| 615 | + |
| 616 | +<div id="content"><ul> |
| 617 | + <li>OpenOffice.org is a powerful office application that you can start using very quickly.</li> |
| 618 | + <li>OpenOffice.org creates letters, presentations and spreadsheets, as well as drawings and databases</li> |
| 619 | + <li>OpenOffice.org keeps you compatible your friends, no matter what office software they use</li> |
| 620 | +</ul></div> |
| 621 | + |
| 622 | </div> |
| 623 | |
| 624 | <img id="icon" src="icons/openoffice.png" alt="" /> |
| 625 | - |
| 626 | -<div id="main"> |
| 627 | - |
| 628 | -<div id="content"> |
| 629 | - <p>OpenOffice.org is a powerful office application that you can start using very quickly.</p> |
| 630 | - |
| 631 | - <p>OpenOffice.org creates letters, presentations and spreadsheets, as well as drawings and databases</p> |
| 632 | - |
| 633 | - <p>OpenOffice.org keeps you compatible your friends, no matter what office software they use</p> |
| 634 | -</div> |
| 635 | - |
| 636 | -</div> |
| 637 | |
| 638 | === modified file 'slides/pidgin.html' |
| 639 | --- slides/pidgin.html 2009-07-24 23:08:27 +0000 |
| 640 | +++ slides/pidgin.html 2009-08-03 10:21:36 +0000 |
| 641 | @@ -1,17 +1,13 @@ |
| 642 | -<div id="title"> |
| 643 | - Keep in contact with Pidgin IM |
| 644 | +<h1 id="title">Keep in contact with Pidgin IM</h1> |
| 645 | + |
| 646 | +<div id="main"> |
| 647 | + |
| 648 | +<div id="content"><ul> |
| 649 | + <li>Pidgin IM is Ubuntu's instant messaging tool.</li> |
| 650 | + <li>Pidgin connects to all the major IM networks, so you only ever need to learn one interface.</li> |
| 651 | + <li>Plugins let you adapt Pidgin to your personal requirements.</li> |
| 652 | +</ul></div> |
| 653 | + |
| 654 | </div> |
| 655 | |
| 656 | <img id="icon" src="icons/pidgin.png" alt="" /> |
| 657 | - |
| 658 | -<div id="main"> |
| 659 | - |
| 660 | -<div id="content"> |
| 661 | - <p>Pidgin IM is Ubuntu's instant messaging tool.</p> |
| 662 | - |
| 663 | - <p>Pidgin connects to all the major IM networks, so you only ever need to learn one interface.</p> |
| 664 | - |
| 665 | - <p>Plugins let you adapt Pidgin to your personal requirements.</p> |
| 666 | -</div> |
| 667 | - |
| 668 | -</div> |
| 669 | |
| 670 | === modified file 'slides/rhythmbox-totem.html' |
| 671 | --- slides/rhythmbox-totem.html 2009-07-24 23:08:27 +0000 |
| 672 | +++ slides/rhythmbox-totem.html 2009-08-03 10:21:36 +0000 |
| 673 | @@ -1,17 +1,13 @@ |
| 674 | -<div id="title"> |
| 675 | - Watch and listen on Ubuntu |
| 676 | +<h1 id="title">Watch and listen on Ubuntu</h1> |
| 677 | + |
| 678 | +<div id="main"> |
| 679 | + |
| 680 | +<div id="content"><ul> |
| 681 | + <li>Movie Player makes it easy to play a huge variety of formats, including streamed content from the BBC, YouTube and other sources.</li> |
| 682 | + <li>Rhythmbox Music Player helps you share music with your friends, listen to Internet radio or download Creative Commons music.</li> |
| 683 | + <li>Rhythmbox also manages your Podcasts subscriptions and connects to your MP3 player, so you can listen to your music on the go.</li> |
| 684 | +</ul></div> |
| 685 | + |
| 686 | </div> |
| 687 | |
| 688 | <img id="icon" src="icons/rhythmbox.png" alt="" /> |
| 689 | - |
| 690 | -<div id="main"> |
| 691 | - |
| 692 | -<div id="content"> |
| 693 | - <p>Movie Player makes it easy to play a huge variety of formats, including streamed content from the BBC, YouTube and other sources.</p> |
| 694 | - |
| 695 | - <p>Rhythmbox Music Player helps you share music with your friends, listen to Internet radio or download Creative Commons music.</p> |
| 696 | - |
| 697 | - <p>Rhythmbox also manages your Podcasts subscriptions and connects to your MP3 player, so you can listen to your music on the go.</p> |
| 698 | -</div> |
| 699 | - |
| 700 | -</div> |
| 701 | |
| 702 | === modified file 'slides/translations.html' |
| 703 | --- slides/translations.html 2009-07-24 23:08:27 +0000 |
| 704 | +++ slides/translations.html 2009-08-03 10:21:36 +0000 |
| 705 | @@ -1,15 +1,13 @@ |
| 706 | -<div id="title"> |
| 707 | - Ubuntu speaks fluently |
| 708 | +<h1 id="title">Ubuntu speaks fluently</h1> |
| 709 | + |
| 710 | +<div id="main"> |
| 711 | + |
| 712 | +<div id="content"><ul> |
| 713 | + <li>Ubuntu is available in many different languages.</li> |
| 714 | + <li>Simply select your language in Language Support Administration</li> |
| 715 | + <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> |
| 716 | +</ul></div> |
| 717 | + |
| 718 | </div> |
| 719 | |
| 720 | <img id="icon" src="icons/locale.png" alt="" /> |
| 721 | - |
| 722 | -<div id="main"> |
| 723 | - |
| 724 | -<div id="content"> |
| 725 | - <p>Ubuntu is available in many different languages.</p> |
| 726 | - <p>Simply select your language in Language Support Administration</p> |
| 727 | - <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> |
| 728 | -</div> |
| 729 | - |
| 730 | -</div> |
| 731 | |
| 732 | === modified file 'slides/welcome.html' |
| 733 | --- slides/welcome.html 2009-07-24 23:08:27 +0000 |
| 734 | +++ slides/welcome.html 2009-08-03 10:21:36 +0000 |
| 735 | @@ -1,16 +1,15 @@ |
| 736 | -<div id="title"> |
| 737 | - Welcome |
| 738 | +<h1 id="title">Welcome</h1> |
| 739 | + |
| 740 | +<div id="main"> |
| 741 | + |
| 742 | +<div id="content"><ul> |
| 743 | + <li>Thank you for choosing Ubuntu Linux.</li> |
| 744 | + <li>While Ubuntu is installing, we invite you to explore your new operating system.</li> |
| 745 | + <li>Let us know about your Ubuntu Experience at <a href="http://ubuntu.com/community">ubuntu.com/community</a>!</li> |
| 746 | + <li class="special">Ubuntu is built to be safe. Feel free to explore!</li> |
| 747 | +</ul></div> |
| 748 | + |
| 749 | </div> |
| 750 | |
| 751 | <img id="icon" src="icons/ubuntu-logo.png" alt="" /> |
| 752 | |
| 753 | -<div id="main"> |
| 754 | - |
| 755 | -<div id="content"> |
| 756 | - <p>Thank you for choosing Ubuntu Linux.</p> |
| 757 | - <p>While Ubuntu is installing, we invite you to explore your new operating system.</p> |
| 758 | - <p>Let us know about your Ubuntu Experience at <a href="http://ubuntu.com/community">ubuntu.com/community</a>!</p> |
| 759 | - <p style="text-align:center"><strong>Ubuntu is built to be safe. Feel free to explore!</strong></p> |
| 760 | -</div> |
| 761 | - |
| 762 | -</div> |
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?