=== modified file 'Makefile' --- Makefile 2010-02-19 18:42:00 +0000 +++ Makefile 2010-03-13 10:37:08 +0000 @@ -11,14 +11,12 @@ build_ubuntu: build_init cp -rL $(SOURCESLIDES)/ubuntu $(BUILD) - images-source/generate-reflected-pngs.sh ubuntu $(BUILD)/ubuntu/slides/icons build_ubuntu-upgrade: build_init cp -rL $(SOURCESLIDES)/ubuntu-upgrade $(BUILD) build_kubuntu: build_init cp -rL $(SOURCESLIDES)/kubuntu $(BUILD) - images-source/generate-reflected-pngs.sh kubuntu $(BUILD)/kubuntu/slides/icons build_xubuntu: build_init cp -rL $(SOURCESLIDES)/xubuntu $(BUILD) === modified file 'README' --- README 2010-02-22 16:13:06 +0000 +++ README 2010-03-13 10:37:08 +0000 @@ -137,7 +137,8 @@ creating an automated script and placing it under the images-source directory. For example, with the Ubuntu slideshow we have a script called generate-reflected-pngs.sh which, with a GIMP script, adds a fuzzy -reflection to some SVG images and exports them as PNGs. +reflection to some SVG images and exports them as PNGs. This will help +people working on the project in the future. ----- Localization @@ -173,6 +174,10 @@ ./test-slideshow.sh: Slightly easier way of running Slideshow.py, for quick tests. +./images-source/*.sh: As mentioned in the "Adding / editing images" +section, scripts are placed here that apply common effects to source +images. This makes it easier to add images to some slideshows. + ./generate-pot-files.sh: When slideshow content has been edited, this can be run to produce new .pot files (for translators) reflecting that content. There is probably no need to do this yourself, though; the people === modified file 'Slideshow.py' --- Slideshow.py 2010-02-17 00:06:01 +0000 +++ Slideshow.py 2010-03-17 09:26:17 +0000 @@ -44,7 +44,7 @@ settings = self.get_settings() #settings.set_property("enable-default-context-menu", False) #TODO: enable-default-context-menu doesn't work yet but should land in the future. See . - settings.set_property("enable-universal-access-from-file-uris", True) + settings.set_property("enable-file-access-from-file-uris", True) config_width = int(config.get('Slideshow','width')) config_height = int(config.get('Slideshow','height')) @@ -151,14 +151,9 @@ slideshow_window.set_title("Ubiquity Slideshow with Webkit") slideshow_window.connect('destroy',gtk.main_quit) -slideshow_window_align = gtk.Alignment() -slideshow_window_align.set_padding(8,8,8,8) -#Note there's probably a convention for padding that I'm forgetting here -slideshow_window.add(slideshow_window_align) - slideshow_container = gtk.VBox() slideshow_container.set_spacing(8) -slideshow_window_align.add(slideshow_container) +slideshow_window.add(slideshow_container) slideshow = SlideshowViewer(options.path, locale=options.locale, rtl=options.rtl) @@ -168,8 +163,10 @@ install_progressbar.set_fraction(0) +slideshow_container.add(slideshow) slideshow_container.add(install_progressbar) -slideshow_container.add(slideshow) + +slideshow_container.set_child_packing(install_progressbar, True, False, 0, 0) slideshow_window.show_all() === modified file 'debian/changelog' --- debian/changelog 2010-02-26 14:38:55 +0000 +++ debian/changelog 2010-03-13 10:37:08 +0000 @@ -1,3 +1,14 @@ +ubiquity-slideshow-ubuntu (16) UNRELEASED; urgency=low + + * New look for the Ubuntu slideshow. + * Updated license details for images in debian/copyright. + * Larger dimensions for Ubuntu slideshow: 816x500, from 700x420. + * Removed GIMP build dependency. GIMP scripts in images-source no + longer to be run at build time; final icons should be added + manually in source package. + + -- Dylan McCall Fri, 12 Mar 2010 20:06:06 -0800 + ubiquity-slideshow-ubuntu (15) lucid; urgency=low [ Dylan McCall ] === modified file 'debian/control' --- debian/control 2010-02-26 13:17:27 +0000 +++ debian/control 2010-03-13 10:37:08 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubiquity Slideshow Team Build-Depends: cdbs, debhelper (>= 5) -Build-Depends-Indep: po4a, gimp, python-utidylib +Build-Depends-Indep: po4a, python-utidylib Vcs-Bzr: https://code.launchpad.net/~ubiquity-slideshow/ubiquity-slideshow-ubuntu/html Standards-Version: 3.8.3 Homepage: https://launchpad.net/ubiquity-slideshow-ubuntu === modified file 'debian/copyright' --- debian/copyright 2010-02-24 04:39:30 +0000 +++ debian/copyright 2010-03-13 10:37:08 +0000 @@ -69,49 +69,41 @@ -- -The following icon sources, placed in ./icons-source, are created -externally. These files are available with the source package or from -our source code repository mentioned above. The icons placed in -./slides/icons are derived works of those by the same name in -./images-source (where foo-icon.svg becomes foo-icon.png). Therefore, -they are also released under the same license as their predecessors. - -ubuntu/ubuntu-logo.svg - From the Human Icon Theme - Creative Commons Attribution-ShareAlike 2.5 License Agreement - (CC-BY-SA-2.5) - -ubuntu/accessibility.svg, ubuntu/evolution.svg, ubuntu/help.svg, -ubuntu/openoffice.svg, ubuntu/web.svg - From the Humanity Icon Set - GNU General Public License Version 2 or later (GPL-2) - -ubuntu/ubuntuone.svg - From the Ubuntu One Client - Creative Comons Attribution-ShareAlike 3.0 (CC-BY-SA-3.0) - -ubuntu/empathy.svg - From the Empathy project - GNU General Public License Version 2 or later (GPL-2) - -ubuntu/web.png - Via , - originally by the Mozilla Founation. - GNU General Public License Version 2 or later (GPL-2). - -ubuntu/fspot.svg - From the F-Spot project - GNU General Public License Version 2 or later (GPL-2). - -ubuntu/rhythmbox.svg - From the Breathe Icon Set - Creative Common Attribution-ShareAlike 3.0 (CC-BY-SA-3.0) - -ubuntu/softwarestore.svg - From the Software Store project. - Copyright: © 2009 Canonical, - © 2006 Sebastian Heinlein - GNU General Public License Version 2 or later (GPL-2) +This project ships with many icons which are from outside sources. This +is a list of those icons with their respective license details. +Icons which are modified from their original works are marked with +asterisks* + + +In slideshows/ubuntu/slides/icons: + + ubuntu-logo.png + + accessibility.png, evolution.png, openoffice.png, web.png + From the Humanity Icon Set + GNU General Public License Version 2 or later (GPL-2) + + ubuntuone.png* + From the Ubuntu One Client + Creative Comons Attribution-ShareAlike 3.0 (CC-BY-SA-3.0) + + empathy.png + From the Empathy project + GNU General Public License Version 2 or later (GPL-2) + + fspot.png + From the F-Spot project + GNU General Public License Version 2 or later (GPL-2). + + rhythmbox.png + From the Breathe Icon Set + Creative Common Attribution-ShareAlike 3.0 (CC-BY-SA-3.0) + + softwarecenter.png + From the Software Center project. + Copyright: © 2009 Canonical, + © 2006 Sebastian Heinlein + GNU General Public License Version 2 or later (GPL-2) ----- === removed directory 'images-source/ubuntu' === removed file 'images-source/ubuntu/accessibility.svg' --- images-source/ubuntu/accessibility.svg 2010-02-18 04:11:34 +0000 +++ images-source/ubuntu/accessibility.svg 1970-01-01 00:00:00 +0000 @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - === removed file 'images-source/ubuntu/empathy.svg' --- images-source/ubuntu/empathy.svg 2009-12-27 03:28:05 +0000 +++ images-source/ubuntu/empathy.svg 1970-01-01 00:00:00 +0000 @@ -1,261 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - === removed file 'images-source/ubuntu/evolution.svg' --- images-source/ubuntu/evolution.svg 2009-12-27 03:28:05 +0000 +++ images-source/ubuntu/evolution.svg 1970-01-01 00:00:00 +0000 @@ -1,250 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file === removed file 'images-source/ubuntu/fspot.svg' --- images-source/ubuntu/fspot.svg 2009-12-27 03:28:05 +0000 +++ images-source/ubuntu/fspot.svg 1970-01-01 00:00:00 +0000 @@ -1,496 +0,0 @@ - - -image/svg+xml \ No newline at end of file === removed file 'images-source/ubuntu/help.svg' --- images-source/ubuntu/help.svg 2010-02-18 04:11:34 +0000 +++ images-source/ubuntu/help.svg 1970-01-01 00:00:00 +0000 @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - === removed file 'images-source/ubuntu/openoffice.svg' --- images-source/ubuntu/openoffice.svg 2009-12-27 03:28:05 +0000 +++ images-source/ubuntu/openoffice.svg 1970-01-01 00:00:00 +0000 @@ -1,433 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - === removed file 'images-source/ubuntu/rhythmbox.svg' --- images-source/ubuntu/rhythmbox.svg 2009-12-27 03:28:05 +0000 +++ images-source/ubuntu/rhythmbox.svg 1970-01-01 00:00:00 +0000 @@ -1,1113 +0,0 @@ - - - - - Rhythmbox - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Breathe Icon Team - - - - - Rhythmbox - - - - - - - - - - - - - - - - - - - Rhythmbox - - - Jakub Steiner, Cory Kontros, Oxygen icon team - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - === removed file 'images-source/ubuntu/softwarecenter.svg' --- images-source/ubuntu/softwarecenter.svg 2009-12-27 03:28:05 +0000 +++ images-source/ubuntu/softwarecenter.svg 1970-01-01 00:00:00 +0000 @@ -1,1548 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - === removed file 'images-source/ubuntu/ubuntu-logo.svg' --- images-source/ubuntu/ubuntu-logo.svg 2009-12-27 03:28:05 +0000 +++ images-source/ubuntu/ubuntu-logo.svg 1970-01-01 00:00:00 +0000 @@ -1,122 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - === removed file 'images-source/ubuntu/ubuntuone.svg' --- images-source/ubuntu/ubuntuone.svg 2010-02-24 04:39:30 +0000 +++ images-source/ubuntu/ubuntuone.svg 1970-01-01 00:00:00 +0000 @@ -1,1289 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - === removed file 'images-source/ubuntu/web.svg' --- images-source/ubuntu/web.svg 2010-02-18 04:11:34 +0000 +++ images-source/ubuntu/web.svg 1970-01-01 00:00:00 +0000 @@ -1,228 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - === added directory 'slideshows/kubuntu/slides/icons' === added file 'slideshows/kubuntu/slides/icons/accessibility.png' Binary files slideshows/kubuntu/slides/icons/accessibility.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/accessibility.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/kubuntu/slides/icons/amarok.png' Binary files slideshows/kubuntu/slides/icons/amarok.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/amarok.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/kubuntu/slides/icons/help.png' Binary files slideshows/kubuntu/slides/icons/help.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/help.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/kubuntu/slides/icons/install.png' Binary files slideshows/kubuntu/slides/icons/install.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/install.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/kubuntu/slides/icons/kmail.png' Binary files slideshows/kubuntu/slides/icons/kmail.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/kmail.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/kubuntu/slides/icons/konqueror.png' Binary files slideshows/kubuntu/slides/icons/konqueror.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/konqueror.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/kubuntu/slides/icons/kopete.png' Binary files slideshows/kubuntu/slides/icons/kopete.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/kopete.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/kubuntu/slides/icons/kubuntu-logo.png' Binary files slideshows/kubuntu/slides/icons/kubuntu-logo.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/kubuntu-logo.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/kubuntu/slides/icons/openoffice.png' Binary files slideshows/kubuntu/slides/icons/openoffice.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/openoffice.png 2010-03-13 10:37:08 +0000 differ === modified file 'slideshows/link-core/crossfade.js' --- slideshows/link-core/crossfade.js 2010-02-15 04:49:49 +0000 +++ slideshows/link-core/crossfade.js 2010-03-13 10:37:08 +0000 @@ -249,8 +249,10 @@ show.effect = new Effect.Parallel([ new Effect.Move(prev, {x:prev_new_x, y:0, mode:'absolute', sync:true}), - new Effect.Appear(next, {sync:true}), - new Effect.Move(next, {x:next_new_x, y:0, mode:'absolute', sync:true})], + new Effect.Fade(prev, {sync:true}), + new Effect.Move(next, {x:next_new_x, y:0, mode:'absolute', sync:true}), + new Effect.Appear(next, {sync:true})], + { duration: opt.duration, queue : 'Crossfade', afterFinish:function(){ === modified file 'slideshows/ubuntu/slides/accessibility.html' --- slideshows/ubuntu/slides/accessibility.html 2010-02-15 04:49:49 +0000 +++ slideshows/ubuntu/slides/accessibility.html 2010-03-08 11:05:45 +0000 @@ -4,7 +4,7 @@
  • We want to make computers work for everyone, whatever your physical circumstances. So, we provide tools that make Ubuntu one of the most accessible operating systems around.
    • -
  • You can get at these tools in one place: the Assistive Technologies Preferences, inside the System Menu. From there, you can turn on helpful tools like Orca, to speak text on the screen, or dwell click to press mouse buttons automatically.
    • +
  • You can get at these tools in one place: the Assistive Technologies Preferences, inside the System Menu. From there, you can turn on helpful tools like Orca, to speak text on the screen, or dwell click to press mouse buttons automatically.
  • Remember to check out the Appearance Preferences, too. You can choose between different visual styles and even change the fonts that are used by applications.
=== modified file 'slideshows/ubuntu/slides/documentation.html' --- slideshows/ubuntu/slides/documentation.html 2010-02-15 04:49:49 +0000 +++ slideshows/ubuntu/slides/documentation.html 2010-03-13 10:37:08 +0000 @@ -7,8 +7,8 @@
  • In addition to our extensive written help, the Ubuntu community provides free technical support in person and over the Internet. There is also commercial support available through Canonical, its partners and approved companies. Learn more at ubuntu.com/support.
  • Let us know about your Ubuntu experience at ubuntu.com/community!
    • -

    The installation will finish soon. We hope you enjoy Ubuntu.

    +

    The installation will finish soon. We hope you enjoy Ubuntu.

    - + === added directory 'slideshows/ubuntu/slides/icons' === added file 'slideshows/ubuntu/slides/icons/accessibility.png' Binary files slideshows/ubuntu/slides/icons/accessibility.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/accessibility.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/ubuntu/slides/icons/empathy.png' Binary files slideshows/ubuntu/slides/icons/empathy.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/empathy.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/ubuntu/slides/icons/evolution.png' Binary files slideshows/ubuntu/slides/icons/evolution.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/evolution.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/ubuntu/slides/icons/fspot.png' Binary files slideshows/ubuntu/slides/icons/fspot.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/fspot.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/ubuntu/slides/icons/openoffice.png' Binary files slideshows/ubuntu/slides/icons/openoffice.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/openoffice.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/ubuntu/slides/icons/rhythmbox.png' Binary files slideshows/ubuntu/slides/icons/rhythmbox.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/rhythmbox.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/ubuntu/slides/icons/softwarecenter.png' Binary files slideshows/ubuntu/slides/icons/softwarecenter.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/softwarecenter.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/ubuntu/slides/icons/ubuntu-logo.png' Binary files slideshows/ubuntu/slides/icons/ubuntu-logo.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/ubuntu-logo.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/ubuntu/slides/icons/ubuntuone.png' Binary files slideshows/ubuntu/slides/icons/ubuntuone.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/ubuntuone.png 2010-03-13 10:37:08 +0000 differ === added file 'slideshows/ubuntu/slides/icons/web.png' Binary files slideshows/ubuntu/slides/icons/web.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/web.png 2010-03-13 10:37:08 +0000 differ === modified file 'slideshows/ubuntu/slides/index.html' --- slideshows/ubuntu/slides/index.html 2010-02-24 04:39:30 +0000 +++ slideshows/ubuntu/slides/index.html 2010-03-17 09:26:17 +0000 @@ -15,8 +15,6 @@ - - @@ -48,53 +46,6 @@ - - === removed file 'slideshows/ubuntu/slides/link/background.jpg' Binary files slideshows/ubuntu/slides/link/background.jpg 2010-02-15 04:49:49 +0000 and slideshows/ubuntu/slides/link/background.jpg 1970-01-01 00:00:00 +0000 differ === added file 'slideshows/ubuntu/slides/link/background.png' Binary files slideshows/ubuntu/slides/link/background.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/link/background.png 2010-03-13 10:37:08 +0000 differ === modified file 'slideshows/ubuntu/slides/link/bullet-point.png' Binary files slideshows/ubuntu/slides/link/bullet-point.png 2010-02-15 04:49:49 +0000 and slideshows/ubuntu/slides/link/bullet-point.png 2010-03-08 11:05:45 +0000 differ === removed file 'slideshows/ubuntu/slides/link/bullet-point.rtl.png' Binary files slideshows/ubuntu/slides/link/bullet-point.rtl.png 2010-02-15 04:49:49 +0000 and slideshows/ubuntu/slides/link/bullet-point.rtl.png 1970-01-01 00:00:00 +0000 differ === modified file 'slideshows/ubuntu/slides/link/general.css' --- slideshows/ubuntu/slides/link/general.css 2010-02-18 04:11:34 +0000 +++ slideshows/ubuntu/slides/link/general.css 2010-03-17 09:26:17 +0000 @@ -1,9 +1,8 @@ -html, body -{ +html, body { margin:0; padding:0; - background-color:#2e3436; + background-color:#393834; font-family:sans-serif; color:#000000; @@ -12,61 +11,62 @@ /* Hyperlink-style text */ -a -{ - color:blue; +a { + color:#731444; font-style:italic; + text-decoration:none; } -#container -{ +#container { position:absolute; - width:700px; - height:420px; + width:816px; + height:500px; overflow:hidden; - background-image:url('background.jpg'); + background-image:url('background.png'); background-repeat:no-repeat; background-position:top left; - background-color:#fdfdfd; + background-color:#EFEEED; /*cursor:default;*/ } -#debug-controls -{ +#debug-controls { display:none; position:absolute; - top: 440px; + top: 540px; width:700px; text-align:center; } -#debug-controls input -{ +#debug-controls input { width:40px; } -#debug-controls input#current-slide -{ +#debug-controls input#current-slide { width:600px; } /* Title block is positioned at the top of a slide. */ -.title -{ - position:absolute; - top:15px; - left:10px; - - font-size:20px; +.title { + /* FIXME: This is a horrible hack to keep the title from moving during slide transition */ + position:fixed; /* was position:absolute */ + + top:180px; + left:36px; /* matches padding of .content and .content ul: 16 + 20 */ + + font-size:28px; font-weight:normal; - + + letter-spacing:-1px; + + color:#ffffff; + padding:0; margin:0; } @@ -75,81 +75,93 @@ Typically an image. This is positioned at the top right of a slide and is given a size of 64x64 pixels. */ -.icon -{ - position:absolute; +.icon { + /* FIXME: This is a horrible hack to keep the title from moving during slide transition */ + position:fixed; /* was position:absolute */ width:auto; height:auto; - bottom:-420px; - right:10px; + top:100px; + left:605px; z-index:11; border:0px; } +.icon.exact { + top:69px; + left:567px; + width:215px; + height:auto; +} /* -#content expects to be contained in here. #main +.content expects to be contained in here. .main creates a nice, plain surface upon which it can -appear :) +appear, spaced appropriately from .title. */ -.main -{ +.main { position:absolute; - top:50px; + top:225px; left:0px; + width:100%; + height:275px; + padding-right:60px; + z-index:12; +} + +/* +Slide's body text goes inside here. +*/ +.content { + padding:16px; + padding-top:32px; + font-size:14px; - - z-index:12; -} - -/* -Slide's body text goes here. It appears right below -the title, at the top of the white area with heavy -margins around it. -*/ -.main .content -{ - padding-left:16px; - padding-right:16px; - - width:490px; -} - -.content ul -{ + color:#484848; +} + +.content ul { margin-top:0px; - padding-left:1.8em; + padding-left:20px; - height:230px; + width:650px; + height:210px; overflow:auto; + list-style-type:none; list-style-image:url("bullet-point.png"); } -.content li -{ - padding:0.6em; +.content li { + padding:8px; + padding-left:0px; +} +/* hack to get the text wrapping around the logo. If we could do this for +ul :first-line, there would be less room for failure. Oh well... probably better +than shrinking the whole thing */ +.content li:first-child { + width:550px; } -.content .special -{ - position:absolute; - top:240px; - left:50px; - width:440px; +.content .footer { + position:relative; + width:100%; + padding:0px; + margin:0px; + bottom:10px; + text-align:right; font-weight:bold; + color:#333333; } -.content img.inline -{ +.content img.inline { height:14px; width:auto; } @@ -159,8 +171,7 @@ for example, a place in either the system menu or an application menu. This way we can provide clear visual cues with minimal babbling. */ -.menu-item -{ +.menu-item { display:inline-block; border-radius:3px; @@ -185,8 +196,7 @@ looking arrow that can separate items in a menu much like how submenus look in Ubuntu's GTK theme. */ -.menu-item img.menu-arrow -{ +.menu-item img.menu-arrow { display:inline-block; content:url('menu-arrow.png'); @@ -197,8 +207,7 @@ /* This rule disables drag-and-drop for images. See bug #448703. */ -img -{ +img { -webkit-user-drag: none; } @@ -208,18 +217,19 @@ .rtl { direction:rtl; } -.rtl .title { +/* TODO: NEED reversed title and icon for RTL */ +/*.rtl .title { right:10px; -} -.rtl .icon { +}*/ +/*.rtl .icon { left:10px; right:auto; -} +}*/ .rtl .main { right:0px; padding-right:0px; padding-left:60px; } -.rtl .content ul { - list-style-image:url("bullet-point.rtl.png"); +.rtl .content .footer { + text-align:left; } === removed file 'slideshows/ubuntu/slides/link/scriptaculous.js' --- slideshows/ubuntu/slides/link/scriptaculous.js 2010-02-15 04:49:49 +0000 +++ slideshows/ubuntu/slides/link/scriptaculous.js 1970-01-01 00:00:00 +0000 @@ -1,56 +0,0 @@ -/* We (ubiquity-slideshow-ubuntu) are only shipping effects.js, builder.js, and -scriptalicious.js from Scriptaculous, and for space reasons have removed some -other information that was included. Please see the Scriptaculous web site at - for information on the original software. */ - -// script.aculo.us scriptaculous.js v1.7.0_beta2, Mon Dec 18 23:38:56 CET 2006 - -// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// For details, see the script.aculo.us web site: http://script.aculo.us/ - -var Scriptaculous = { - Version: '1.7.0_beta2', - require: function(libraryName) { - // inserting via DOM fails in Safari 2.0, so brute force approach - document.write(''); - }, - load: function() { - if((typeof Prototype=='undefined') || - (typeof Element == 'undefined') || - (typeof Element.Methods=='undefined') || - parseFloat(Prototype.Version.split(".")[0] + "." + - Prototype.Version.split(".")[1]) < 1.5) - throw("script.aculo.us requires the Prototype JavaScript framework >= 1.5.0"); - - $A(document.getElementsByTagName("script")).findAll( function(s) { - return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/)) - }).each( function(s) { - var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,''); - var includes = s.src.match(/\?.*load=([a-z,]*)/); - (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider').split(',').each( - function(include) { Scriptaculous.require(path+include+'.js') }); - }); - } -} - -Scriptaculous.load(); === modified file 'slideshows/ubuntu/slides/openoffice.html' --- slideshows/ubuntu/slides/openoffice.html 2010-02-18 04:11:34 +0000 +++ slideshows/ubuntu/slides/openoffice.html 2010-03-08 11:05:45 +0000 @@ -4,7 +4,7 @@
    • OpenOffice.org is a powerful office software suite that is very easy to learn.
      • -
    • It is useful to create letters, presentations and spreadsheets, as well as diagrams and databases.
      • +
    • Use it to create letters, presentations and spreadsheets, as well as diagrams and databases.
    • OpenOffice.org works with documents from other popular office applications including WordPerfect and Microsoft Office. It uses the standard OpenDocument format.
    === modified file 'slideshows/ubuntu/slides/welcome.html' --- slideshows/ubuntu/slides/welcome.html 2010-02-15 04:49:49 +0000 +++ slideshows/ubuntu/slides/welcome.html 2010-03-13 10:37:08 +0000 @@ -4,11 +4,11 @@
    • Thank you for choosing Ubuntu 10.04.
      • -
    • We believe that every computer user should be able to work in the environment of their choice and be free to download, change, study and share this software for any purpose, without paying licensing fees.
      • -
    • As part of our promise, we want Ubuntu to work as well for you as possible. So, while it installs, this slideshow will give you a quick introduction.
      • +
    • We believe every computer user should be free to work in the environment of their choice and to download, change, study and share this software for any purpose.
      • +
    • As part of our promise, we want Ubuntu to work as well for you as possible. So, while it installs, this slideshow will provide a quick introduction.
    -

    Ubuntu is designed to be easy. Feel free to explore!

    +

    Ubuntu is designed to be easy. Feel free to explore!

    - + === modified file 'slideshows/ubuntu/slideshow.conf' --- slideshows/ubuntu/slideshow.conf 2010-02-15 04:49:49 +0000 +++ slideshows/ubuntu/slideshow.conf 2010-03-13 10:37:08 +0000 @@ -1,3 +1,3 @@ [Slideshow] -width:700 -height:420 +width:816 +height:500