ubiquity-slideshow team mailing list archive
-
ubiquity-slideshow team
-
Mailing list archive
-
Message #02007
lp:~jbicha/ubiquity-slideshow-ubuntu/new-ubuntu-gnome-slideshow into lp:ubiquity-slideshow-ubuntu
Jeremy Bicha has proposed merging lp:~jbicha/ubiquity-slideshow-ubuntu/new-ubuntu-gnome-slideshow into lp:ubiquity-slideshow-ubuntu.
Requested reviews:
Ubiquity Slideshow (ubiquity-slideshow)
Related bugs:
Bug #1154715 in ubiquity-slideshow-ubuntu (Ubuntu): "Ubuntu GNOME installer shows screenshots which do not apply"
https://bugs.launchpad.net/ubuntu/+source/ubiquity-slideshow-ubuntu/+bug/1154715
For more details, see:
https://code.launchpad.net/~jbicha/ubiquity-slideshow-ubuntu/new-ubuntu-gnome-slideshow/+merge/183026
--
https://code.launchpad.net/~jbicha/ubiquity-slideshow-ubuntu/new-ubuntu-gnome-slideshow/+merge/183026
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~jbicha/ubiquity-slideshow-ubuntu/new-ubuntu-gnome-slideshow into lp:ubiquity-slideshow-ubuntu.
=== modified file 'debian/changelog'
--- debian/changelog 2013-08-21 17:50:03 +0000
+++ debian/changelog 2013-08-29 21:02:11 +0000
@@ -1,3 +1,9 @@
+ubiquity-slideshow-ubuntu (74) UNRELEASED; urgency=low
+
+ * New Ubuntu GNOME slideshow (LP: #1154715)
+
+ -- Alfredo Hernández <aldomann.designs@xxxxxxxxx> Thu, 29 Aug 2013 16:58:44 -0400
+
ubiquity-slideshow-ubuntu (73) saucy; urgency=low
* Make U1 logo same color as the titles.
=== modified file 'po/ubuntu-gnome/slideshow-ubuntu-gnome.pot'
--- po/ubuntu-gnome/slideshow-ubuntu-gnome.pot 2013-07-26 13:37:59 +0000
+++ po/ubuntu-gnome/slideshow-ubuntu-gnome.pot 2013-08-29 21:02:11 +0000
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-06-25 08:51-0600\n"
+"POT-Creation-Date: 2013-08-29 16:56-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,19 +17,123 @@
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <div><h1>
-#: slideshows/ubuntu-gnome/slides/00_welcome.html:1
-#: slideshows/ubuntu-gnome/slides/01_overview.html:1
-#: slideshows/ubuntu-gnome/slides/02_everything.html:1
-#: slideshows/ubuntu-gnome/slides/03_beautiful.html:1
-#: slideshows/ubuntu-gnome/slides/04_web.html:1
-#: slideshows/ubuntu-gnome/slides/05_documents.html:1
-#: slideshows/ubuntu-gnome/slides/06_messaging.html:1
-#: slideshows/ubuntu-gnome/slides/07_gethelp.html:1
-msgid "Ubuntu GNOME 13.10"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-#: slideshows/ubuntu-gnome/slides/07_gethelp.html:8
+#: slideshows/ubuntu-gnome/slides/accessibility.html:2
+msgid "Access for everyone"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/ubuntu-gnome/slides/accessibility.html:10
+msgid ""
+"At the heart of the Ubuntu GNOME philosophy is the belief that computing is "
+"for everyone. With advanced accessibility tools and options to change "
+"language, color scheme and text size, Ubuntu GNOME makes computing easy – "
+"whoever and wherever you are."
+msgstr ""
+
+#. type: Content of: <div><div><div><h2>
+#: slideshows/ubuntu-gnome/slides/accessibility.html:14
+msgid "Customization options"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/accessibility.html:18
+msgid "Appearance"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/accessibility.html:22
+msgid "Assistive technologies"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/accessibility.html:26
+msgid "Language support"
+msgstr ""
+
+#. type: Content of: <div><h1>
+#: slideshows/ubuntu-gnome/slides/browse.html:2
+msgid "Make the most of the web"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/ubuntu-gnome/slides/browse.html:10
+msgid ""
+"Bored of waiting to get online? Leave the days of slow surfing behind you. "
+"With Firefox already installed, Ubuntu GNOME has everything you need to "
+"browse the web."
+msgstr ""
+
+#. type: Content of: <div><div><div><h2>
+#: slideshows/ubuntu-gnome/slides/browse.html:14
+#: slideshows/ubuntu-gnome/slides/media.html:15
+#: slideshows/ubuntu-gnome/slides/office.html:14
+#: slideshows/ubuntu-gnome/slides/photos.html:14
+msgid "Included software"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/browse.html:18
+msgid "Firefox Web Browser"
+msgstr ""
+
+#. type: Content of: <div><div><div><h2>
+#: slideshows/ubuntu-gnome/slides/browse.html:21
+#: slideshows/ubuntu-gnome/slides/media.html:26
+#: slideshows/ubuntu-gnome/slides/photos.html:21
+msgid "Supported software"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/browse.html:25
+msgid "Flash"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/browse.html:29
+msgid "Chromium"
+msgstr ""
+
+#. type: Content of: <div><h1>
+#: slideshows/ubuntu-gnome/slides/desktop.html:2
+msgid "Simple and easy to use"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/ubuntu-gnome/slides/desktop.html:10
+msgid ""
+"<strong>The Activities Overview is an easy way to access all your basic "
+"tasks. </strong>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/ubuntu-gnome/slides/desktop.html:11
+msgid ""
+"Having everything in one place is convenient and means that you don't have "
+"to learn your way around a maze of different technologies."
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/desktop.html:18
+msgid "Lauch and manage <strong>your apps</strong> from the Dash"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/desktop.html:22
+msgid "Check <strong>your notifications</strong> easily"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/desktop.html:26
+msgid "Enhance your workflow with <strong>dynamic workspaces</strong>"
+msgstr ""
+
+#. type: Content of: <div><h1>
+#: slideshows/ubuntu-gnome/slides/gethelp.html:2
+msgid "Any questions?"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/ubuntu-gnome/slides/gethelp.html:10
msgid ""
"Check out <a href=\"http://askubuntu.com/\";>askubuntu.com</a> for answers to "
"all your Ubuntu questions. There’s a good chance your question will have "
@@ -37,3 +141,154 @@
"to help. For more support options, go to <a href=\"http://www.ubuntu.com/";
"support\">ubuntu.com/support</a>."
msgstr ""
+
+#. type: Content of: <div><h1>
+#: slideshows/ubuntu-gnome/slides/goa.html:2
+msgid "Easily access your personal cloud"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/ubuntu-gnome/slides/goa.html:10
+msgid ""
+"Ubuntu GNOME will seamlessly integrate with your online accounts, so that "
+"all your data can be accessed from the same place. This takes the work out "
+"of using online accounts and makes it easy to find things when you need them."
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/goa.html:17
+msgid "Acess <strong>your online documents</strong> natively"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/goa.html:21
+msgid "Manage <strong>your address book</strong> easily"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/goa.html:25
+msgid "Chat with <strong>your friends</strong> from Facebook, Google, etc."
+msgstr ""
+
+#. type: Content of: <div><h1>
+#: slideshows/ubuntu-gnome/slides/media.html:2
+msgid "Enjoy your music and videos"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/ubuntu-gnome/slides/media.html:10
+msgid ""
+"Rhythmbox lets you organize your music and listen to Internet radio, "
+"podcasts, and more."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/ubuntu-gnome/slides/media.html:11
+msgid ""
+"GNOME Videos allows you to easily watch videos from your computer, DVD, or "
+"streamed over the Internet."
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/media.html:19
+msgid "Rhythmbox Music Player"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/media.html:23
+msgid "Videos"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/media.html:30
+msgid "Pitivi Video Editor"
+msgstr ""
+
+#. type: Content of: <div><h1>
+#: slideshows/ubuntu-gnome/slides/office.html:2
+msgid "Everything you need for the office"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/ubuntu-gnome/slides/office.html:10
+msgid ""
+"We understand how important your computer is for day-to-day tasks. Create "
+"professional documents, spreadsheets and presentations with LibreOffice and "
+"manage your local and online documents in a single place with GNOME "
+"Documents."
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/office.html:18
+msgid "LibreOffice Suite"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/office.html:22
+msgid "Documents"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/office.html:26
+msgid "Evince Document Viewer"
+msgstr ""
+
+#. type: Content of: <div><h1>
+#: slideshows/ubuntu-gnome/slides/photos.html:2
+msgid "Have fun with your photos"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/ubuntu-gnome/slides/photos.html:10
+msgid ""
+"With Shotwell, you can quickly and easily import, organize, edit and view "
+"your pictures. And you can share your favorite snaps on all popular photo "
+"sites and social networks."
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/photos.html:18
+msgid "Shotwell Photo Manager"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/photos.html:25
+msgid "GIMP Image Editor"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><p>
+#: slideshows/ubuntu-gnome/slides/photos.html:29
+msgid "Inkscape"
+msgstr ""
+
+#. type: Content of: <div><h1>
+#: slideshows/ubuntu-gnome/slides/usc.html:2
+msgid "Find even more software"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/ubuntu-gnome/slides/usc.html:10
+msgid "<strong>Say goodbye to searching the web for new software. </strong>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/ubuntu-gnome/slides/usc.html:11
+msgid ""
+"Ubuntu Software Centre gives you instant access to thousands of great games "
+"and applications — some free and some available commercially. If you see "
+"something you like, you can see more information and then install it in just "
+"a couple of clicks."
+msgstr ""
+
+#. type: Content of: <div><h1>
+#: slideshows/ubuntu-gnome/slides/welcome.html:2
+msgid "Welcome to Ubuntu GNOME 13.10"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/ubuntu-gnome/slides/welcome.html:10
+msgid ""
+"Fast and full of new features, the latest version of Ubuntu GNOME makes "
+"computing easier than ever. Here are just a few cool new things to look out "
+"for…"
+msgstr ""
=== removed file 'slideshows/ubuntu-gnome/slides/00_welcome.html'
--- slideshows/ubuntu-gnome/slides/00_welcome.html 2013-06-25 15:52:49 +0000
+++ slideshows/ubuntu-gnome/slides/00_welcome.html 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<div class="header"><h1 class="slidetitle">Ubuntu GNOME 13.10</h1></div>
-
-<div class="main wide">
-
-<img class="background" src="screenshots/welcome.jpg" />
-
-<img class="screenshot" src="screenshots/gnome.png" />
-
-</div>
=== removed file 'slideshows/ubuntu-gnome/slides/01_overview.html'
--- slideshows/ubuntu-gnome/slides/01_overview.html 2013-06-25 15:52:49 +0000
+++ slideshows/ubuntu-gnome/slides/01_overview.html 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<div class="header"><h1 class="slidetitle">Ubuntu GNOME 13.10</h1></div>
-
-<div class="main">
-
-<img class="screenshot" src="screenshots/overview.png" />
-
-</div>
=== removed file 'slideshows/ubuntu-gnome/slides/02_everything.html'
--- slideshows/ubuntu-gnome/slides/02_everything.html 2013-06-25 15:52:49 +0000
+++ slideshows/ubuntu-gnome/slides/02_everything.html 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<div class="header"><h1 class="slidetitle">Ubuntu GNOME 13.10</h1></div>
-
-<div class="main">
-
-<img class="screenshot" src="screenshots/everything.png" />
-
-</div>
=== removed file 'slideshows/ubuntu-gnome/slides/03_beautiful.html'
--- slideshows/ubuntu-gnome/slides/03_beautiful.html 2013-06-25 15:52:49 +0000
+++ slideshows/ubuntu-gnome/slides/03_beautiful.html 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<div class="header"><h1 class="slidetitle">Ubuntu GNOME 13.10</h1></div>
-
-<div class="main">
-
-<img class="screenshot" src="screenshots/beautiful.png" />
-
-</div>
=== removed file 'slideshows/ubuntu-gnome/slides/04_web.html'
--- slideshows/ubuntu-gnome/slides/04_web.html 2013-06-25 15:52:49 +0000
+++ slideshows/ubuntu-gnome/slides/04_web.html 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<div class="header"><h1 class="slidetitle">Ubuntu GNOME 13.10</h1></div>
-
-<div class="main">
-
-<img class="screenshot" src="screenshots/web.png" />
-
-</div>
=== removed file 'slideshows/ubuntu-gnome/slides/05_documents.html'
--- slideshows/ubuntu-gnome/slides/05_documents.html 2013-06-25 15:52:49 +0000
+++ slideshows/ubuntu-gnome/slides/05_documents.html 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<div class="header"><h1 class="slidetitle">Ubuntu GNOME 13.10</h1></div>
-
-<div class="main">
-
-<img class="screenshot" src="screenshots/documents.png" />
-
-</div>
=== removed file 'slideshows/ubuntu-gnome/slides/06_messaging.html'
--- slideshows/ubuntu-gnome/slides/06_messaging.html 2013-06-25 15:52:49 +0000
+++ slideshows/ubuntu-gnome/slides/06_messaging.html 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<div class="header"><h1 class="slidetitle">Ubuntu GNOME 13.10</h1></div>
-
-<div class="main">
-
-<img class="screenshot" src="screenshots/messaging.png" />
-
-</div>
=== removed file 'slideshows/ubuntu-gnome/slides/07_gethelp.html'
--- slideshows/ubuntu-gnome/slides/07_gethelp.html 2013-06-25 15:52:49 +0000
+++ slideshows/ubuntu-gnome/slides/07_gethelp.html 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<div class="header"><h1 class="slidetitle">Ubuntu GNOME 13.10</h1></div>
-
-<div class="main wide">
-
-<div class="text">
-
-<div>
-<p>Check out <a href="http://askubuntu.com/";>askubuntu.com</a> for answers to all your Ubuntu questions. There’s a good chance your question will have been answered already and, if not, you’ll find thousands of volunteers eager to help. For more support options, go to <a href="http://www.ubuntu.com/support";>ubuntu.com/support</a>.</p>
-</div>
-
-</div>
-
-<img class="background" src="screenshots/welcome.jpg" />
-
-<img class="icon" src="icons/help-browser.png" />
-
-</div>
=== added file 'slideshows/ubuntu-gnome/slides/accessibility.html'
--- slideshows/ubuntu-gnome/slides/accessibility.html 1970-01-01 00:00:00 +0000
+++ slideshows/ubuntu-gnome/slides/accessibility.html 2013-08-29 21:02:11 +0000
@@ -0,0 +1,33 @@
+<div class="header">
+ <h1 class="slidetitle">Access for everyone
+ <div style="float: left;"><img src="icons/pic-accessibility.png"/></div>
+ </h1>
+</div>
+
+<div class="main">
+ <div class="text">
+ <div>
+ <p>At the heart of the Ubuntu GNOME philosophy is the belief that computing is for everyone. With advanced accessibility tools and options to change language, color scheme and text size, Ubuntu GNOME makes computing easy – whoever and wherever you are.</p>
+ </div>
+
+ <div class="featured">
+ <h2 class="subtitle">Customization options</h2>
+ <ul>
+ <li>
+ <img class="icon" src="icons/themes.png" />
+ <p class="caption">Appearance</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/access.png" />
+ <p class="caption">Assistive technologies</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/languages.png" />
+ <p class="caption">Language support</p>
+ </li>
+ </ul>
+ </div>
+ </div>
+
+ <img class="screenshot" src="screenshots/accessibility.jpg" />
+</div>
\ No newline at end of file
=== added file 'slideshows/ubuntu-gnome/slides/browse.html'
--- slideshows/ubuntu-gnome/slides/browse.html 1970-01-01 00:00:00 +0000
+++ slideshows/ubuntu-gnome/slides/browse.html 2013-08-29 21:02:11 +0000
@@ -0,0 +1,36 @@
+<div class="header">
+ <h1 class="slidetitle">Make the most of the web
+ <div style="float: left;"><img src="icons/pic-browser.png"/></div>
+ </h1>
+</div>
+
+<div class="main">
+ <div class="text">
+ <div>
+ <p>Bored of waiting to get online? Leave the days of slow surfing behind you. With Firefox already installed, Ubuntu GNOME has everything you need to browse the web.</p>
+ </div>
+
+ <div class="featured">
+ <h2 class="subtitle">Included software</h2>
+ <ul>
+ <li>
+ <img class="icon" src="icons/firefox.png" />
+ <p class="caption">Firefox Web Browser</p>
+ </li>
+ </ul>
+ <h2 class="subtitle">Supported software</h2>
+ <ul>
+ <li>
+ <img class="icon" src="icons/flash.png" />
+ <p class="caption">Flash</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/chromium.png" />
+ <p class="caption">Chromium</p>
+ </li>
+ </ul>
+ </div>
+ </div>
+
+ <img class="screenshot" src="screenshots/browse.png" />
+</div>
\ No newline at end of file
=== added file 'slideshows/ubuntu-gnome/slides/desktop.html'
--- slideshows/ubuntu-gnome/slides/desktop.html 1970-01-01 00:00:00 +0000
+++ slideshows/ubuntu-gnome/slides/desktop.html 2013-08-29 21:02:11 +0000
@@ -0,0 +1,33 @@
+<div class="header">
+ <h1 class="slidetitle" style="overflow: auto;">Simple and easy to use
+ <div style="float: left;"><img src="icons/pic-welcome.png"/></div>
+ </h1>
+</div>
+
+<div class="main">
+ <div class="text">
+ <div>
+ <p><strong>The Activities Overview is an easy way to access all your basic tasks. </strong> <br /> <br />
+ Having everything in one place is convenient and means that you don't have to learn your way around a maze of different technologies.</p>
+ </div>
+
+ <div class="featured">
+ <ul>
+ <li>
+ <img class="icon" src="icons/overview1.png"/>
+ <p class="caption">Lauch and manage <strong>your apps</strong> from the Dash</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/overview2.png"/>
+ <p class="caption">Check <strong>your notifications</strong> easily</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/overview3.png"/>
+ <p class="caption">Enhance your workflow with <strong>dynamic workspaces</strong></p>
+ </li>
+ </ul>
+ </div>
+ </div>
+
+ <img class="screenshot" src="screenshots/desktop.png"/>
+</div>
\ No newline at end of file
=== added file 'slideshows/ubuntu-gnome/slides/gethelp.html'
--- slideshows/ubuntu-gnome/slides/gethelp.html 1970-01-01 00:00:00 +0000
+++ slideshows/ubuntu-gnome/slides/gethelp.html 2013-08-29 21:02:11 +0000
@@ -0,0 +1,16 @@
+<div class="header">
+ <h1 class="slidetitle">Any questions?
+ <div style="float: left;"><img src="icons/pic-gethelp.png"/></div>
+ </h1>
+</div>
+
+<div class="main wide">
+ <div class="text">
+ <div>
+ <p>Check out <a href="http://askubuntu.com/";>askubuntu.com</a> for answers to all your Ubuntu questions. There’s a good chance your question will have been answered already and, if not, you’ll find thousands of volunteers eager to help. For more support options, go to <a href="http://www.ubuntu.com/support";>ubuntu.com/support</a>.</p>
+ </div>
+
+ </div>
+
+ <img class="background" src="screenshots/gethelp.jpg" />
+</div>
\ No newline at end of file
=== added file 'slideshows/ubuntu-gnome/slides/goa.html'
--- slideshows/ubuntu-gnome/slides/goa.html 1970-01-01 00:00:00 +0000
+++ slideshows/ubuntu-gnome/slides/goa.html 2013-08-29 21:02:11 +0000
@@ -0,0 +1,32 @@
+<div class="header">
+ <h1 class="slidetitle" style="overflow: auto;">Easily access your personal cloud
+ <div style="float: left;"><img src="icons/pic-goa.png"/></div>
+ </h1>
+</div>
+
+<div class="main">
+ <div class="text">
+ <div>
+ <p>Ubuntu GNOME will seamlessly integrate with your online accounts, so that all your data can be accessed from the same place. This takes the work out of using online accounts and makes it easy to find things when you need them.</p>
+ </div>
+
+ <div class="featured">
+ <ul>
+ <li>
+ <img class="icon" src="icons/gnome-documents.png"/>
+ <p class="caption">Acess <strong>your online documents</strong> natively</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/gnome-contacts.png"/>
+ <p class="caption">Manage <strong>your address book</strong> easily</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/gnome-chat.png"/>
+ <p class="caption">Chat with <strong>your friends</strong> from Facebook, Google, etc.</p>
+ </li>
+ </ul>
+ </div>
+ </div>
+
+ <img class="screenshot" src="screenshots/goa.png"/>
+</div>
\ No newline at end of file
=== added file 'slideshows/ubuntu-gnome/slides/icons/access.png'
Binary files slideshows/ubuntu-gnome/slides/icons/access.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/access.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/chromium.png'
Binary files slideshows/ubuntu-gnome/slides/icons/chromium.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/chromium.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/evince.png'
Binary files slideshows/ubuntu-gnome/slides/icons/evince.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/evince.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/firefox.png'
Binary files slideshows/ubuntu-gnome/slides/icons/firefox.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/firefox.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/flash.png'
Binary files slideshows/ubuntu-gnome/slides/icons/flash.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/flash.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/gimp.png'
Binary files slideshows/ubuntu-gnome/slides/icons/gimp.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/gimp.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/gnome-chat.png'
Binary files slideshows/ubuntu-gnome/slides/icons/gnome-chat.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/gnome-chat.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/gnome-contacts.png'
Binary files slideshows/ubuntu-gnome/slides/icons/gnome-contacts.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/gnome-contacts.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/gnome-documents.png'
Binary files slideshows/ubuntu-gnome/slides/icons/gnome-documents.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/gnome-documents.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/gnome-videos.png'
Binary files slideshows/ubuntu-gnome/slides/icons/gnome-videos.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/gnome-videos.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/gnome-web.png'
Binary files slideshows/ubuntu-gnome/slides/icons/gnome-web.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/gnome-web.png 2013-08-29 21:02:11 +0000 differ
=== removed file 'slideshows/ubuntu-gnome/slides/icons/help-browser.png'
Binary files slideshows/ubuntu-gnome/slides/icons/help-browser.png 2012-10-08 20:15:12 +0000 and slideshows/ubuntu-gnome/slides/icons/help-browser.png 1970-01-01 00:00:00 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/inkscape.png'
Binary files slideshows/ubuntu-gnome/slides/icons/inkscape.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/inkscape.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/languages.png'
Binary files slideshows/ubuntu-gnome/slides/icons/languages.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/languages.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/libreoffice.png'
Binary files slideshows/ubuntu-gnome/slides/icons/libreoffice.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/libreoffice.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/overview1.png'
Binary files slideshows/ubuntu-gnome/slides/icons/overview1.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/overview1.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/overview2.png'
Binary files slideshows/ubuntu-gnome/slides/icons/overview2.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/overview2.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/overview3.png'
Binary files slideshows/ubuntu-gnome/slides/icons/overview3.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/overview3.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/pic-accessibility.png'
Binary files slideshows/ubuntu-gnome/slides/icons/pic-accessibility.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/pic-accessibility.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/pic-browser.png'
Binary files slideshows/ubuntu-gnome/slides/icons/pic-browser.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/pic-browser.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/pic-gethelp.png'
Binary files slideshows/ubuntu-gnome/slides/icons/pic-gethelp.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/pic-gethelp.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/pic-goa.png'
Binary files slideshows/ubuntu-gnome/slides/icons/pic-goa.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/pic-goa.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/pic-media.png'
Binary files slideshows/ubuntu-gnome/slides/icons/pic-media.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/pic-media.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/pic-office.png'
Binary files slideshows/ubuntu-gnome/slides/icons/pic-office.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/pic-office.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/pic-photos.png'
Binary files slideshows/ubuntu-gnome/slides/icons/pic-photos.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/pic-photos.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/pic-usc.png'
Binary files slideshows/ubuntu-gnome/slides/icons/pic-usc.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/pic-usc.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/pic-welcome.png'
Binary files slideshows/ubuntu-gnome/slides/icons/pic-welcome.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/pic-welcome.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/pitivi.png'
Binary files slideshows/ubuntu-gnome/slides/icons/pitivi.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/pitivi.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/rhythmbox.png'
Binary files slideshows/ubuntu-gnome/slides/icons/rhythmbox.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/rhythmbox.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/shotwell.png'
Binary files slideshows/ubuntu-gnome/slides/icons/shotwell.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/shotwell.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/themes.png'
Binary files slideshows/ubuntu-gnome/slides/icons/themes.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/themes.png 2013-08-29 21:02:11 +0000 differ
=== modified file 'slideshows/ubuntu-gnome/slides/index.html'
--- slideshows/ubuntu-gnome/slides/index.html 2012-10-08 22:44:50 +0000
+++ slideshows/ubuntu-gnome/slides/index.html 2013-08-29 21:02:11 +0000
@@ -1,52 +1,50 @@
<!DOCTYPE html>
<html lang="en">
-
-<head>
- <title>ubiquity-slideshow-ubuntu</title>
-
- <link href="link/base.css" rel="stylesheet" type="text/css" />
-
- <base target="_blank" />
-
- <script type="text/javascript" src="link-core/jquery.js"></script>
- <script type="text/javascript" src="link-core/jquery.cycle.all.js"></script>
-
- <script type="text/javascript" src="link-core/base.js"></script>
-
- <script type="text/javascript">
- SLIDESHOW_OPTIONS = {
- timeout:50000,
- speed:600,
- }
- </script>
-
- <script type="text/javascript" src="link/twitter.js"></script>
-
- <script type="text/javascript" src="link-core/slideshow.js"></script>
-</head>
-
-<body>
-
-<div id="wrapper">
- <div id="slideshow">
- <div><a href="00_welcome.html"></a></div>
- <div><a href="01_overview.html"></a></div>
- <div><a href="02_everything.html"></a></div>
- <div><a href="03_beautiful.html"></a></div>
- <div><a href="04_web.html"></a></div>
- <div><a href="05_documents.html"></a></div>
- <div><a href="06_messaging.html"></a></div>
- <div><a href="07_gethelp.html"></a></div>
- </div>
-
- <div id="controls">
- <a class="control-arrow" id="prev-slide" style="display:none;"></a>
- <a class="control-arrow" id="next-slide"></a>
- <input type="hidden" id="current-slide" />
- </div>
-</div>
-
-</body>
-
-</html>
+ <head>
+ <title>ubiquity-slideshow-ubuntu-gnome</title>
+
+ <link href="link/base.css" rel="stylesheet" type="text/css" />
+
+ <base target="_blank" />
+
+ <script type="text/javascript" src="link-core/jquery.js"></script>
+ <script type="text/javascript" src="link-core/jquery.cycle.all.js"></script>
+
+ <script type="text/javascript" src="link-core/base.js"></script>
+
+ <script type="text/javascript">
+ SLIDESHOW_OPTIONS = {
+ timeout:50000,
+ speed:600,
+ }
+ </script>
+
+ <script type="text/javascript" src="link/twitter.js"></script>
+
+ <script type="text/javascript" src="link-core/slideshow.js"></script>
+ </head>
+
+ <body>
+ <div id="wrapper">
+ <div id="slideshow">
+ <div><a href="welcome.html"></a></div>
+ <div><a href="desktop.html"></a></div>
+ <div><a href="browse.html"></a></div>
+ <div><a href="goa.html"></a></div>
+ <div><a href="office.html"></a></div>
+ <div><a href="media.html"></a></div>
+ <div><a href="photos.html"></a></div>
+ <div><a href="usc.html"></a></div>
+ <div><a href="accessibility.html"></a></div>
+ <div><a href="gethelp.html"></a></div>
+ </div>
+
+ <div id="controls">
+ <a class="control-arrow" id="prev-slide" style="display:none;"></a>
+ <a class="control-arrow" id="next-slide"></a>
+ <input type="hidden" id="current-slide" />
+ </div>
+ </div>
+ </body>
+</html>
\ No newline at end of file
=== modified file 'slideshows/ubuntu-gnome/slides/link/background.png'
Binary files slideshows/ubuntu-gnome/slides/link/background.png 2012-10-06 21:41:22 +0000 and slideshows/ubuntu-gnome/slides/link/background.png 2013-08-29 21:02:11 +0000 differ
=== modified file 'slideshows/ubuntu-gnome/slides/link/base.css'
--- slideshows/ubuntu-gnome/slides/link/base.css 2012-10-09 09:58:28 +0000
+++ slideshows/ubuntu-gnome/slides/link/base.css 2013-08-29 21:02:11 +0000
@@ -22,19 +22,17 @@
list-style:none;
}
-
-
html, body {
margin:0;
padding:0;
background-color:#F7F6F6;
- font-family:'Ubuntu', 'UbuntuBeta', sans-serif;
- font-size:12px;
+ font-family: 'Cantarell','Ubuntu', 'UbuntuBeta', sans-serif;
+ font-size:13px;
line-height:1.4em;
- color:#333333;
+ color:#000000;
/* no reason to expose this extra stuff to the user */
-webkit-user-select:none;
@@ -47,8 +45,7 @@
Hyperlink-style text
*/
a {
- color:#f39534;
- text-shadow:1px 1px 2px #311e0b;
+ color:#0087ED;
text-decoration:none;
display:inline;
}
@@ -57,6 +54,10 @@
text-decoration:underline;
}
+strong {
+ font-weight: bolder;
+}
+
#wrapper {
position:absolute;
@@ -115,36 +116,34 @@
which isn't working with display:table */
top:0px;
width:100%;
- height:70px;
- background-color:#000000;
+ height:68px;
+ background-color:#2E3436;
}
.header > .slidetitle {
display:table-cell;
- /*margin:10px 25px 10px 25px;*/
padding:0px 25px;
vertical-align:middle;
- font-size:20px; /* applies to all lines except first */
- line-height:1em;
+ font-size:24px;
+ line-height:50px;
font-weight:normal;
- color:#DEDEDE;
+ color:#F7F6F6;
}
-.slidetitle:first-line {
- font-size:36px; /* TODO: 24px? */
- line-height:32px;
+.header > .slidetitle img {
+ display: block;
}
.main {
position:absolute;
top:70px; /* 68px + 2px margin */
- bottom:0;
- left:0;
- right:0;
+ bottom:2px;
+ left:2px;
+ right:2px;
min-height:370px; /* 442px (from #slideshow) - 70px - 2px */
/* move this to #slideshow if we don't want the background image to move with slides */
- background: white url('background.png') 0 0 repeat-x;
+ background-image:url('background.png');
}
.main.wide {
@@ -173,6 +172,7 @@
.text > div {
margin-bottom:8px;
padding:6px 12px;
+ background-color:#FCFCFC;
}
.text > div:last-child {
margin-bottom:0px;
@@ -189,12 +189,12 @@
.main.wide > .text {
top:25px;
- width:350px;
+ width:450px;
}
.main.wide > .text > div {
background:none;
- font-size:16px;
+ font-size:20px;
line-height:1.2em;
color:#F7F6F6;
text-shadow:1px 1px 2px #333333;
@@ -220,25 +220,18 @@
vertical-align:middle;
}
-/* Expects icon to be 512x512 px */
-.main > .icon {
- position:absolute;
- top:50px;
- right:50px;
-
- z-index:2;
-}
-
-/* Expects screenshot to be 448x304 px */
+/* Expects screenshot to be 448x347 px */
.main > .screenshot {
position:absolute;
- top:30px;
- right:125px;
+ top:25px;
+ right:-2px; /* offsets 2px margin of .main */
z-index:2;
-
- -webkit-border-radius: 3px;
- border-radius: 3px;
+
+ /* Screenshot shadow, not in use but might be useful in future releases*/
+ /* -webkit-box-shadow:#999999 0px 0px 5px;
+ -moz-box-shadow:#999999 0px 0px 5px;
+ box-shadow:#999999 0px 0px 5px; */
}
/* Expects screenshot to be 748x370 px */
@@ -246,6 +239,7 @@
top:0px;
right:0px;
width:100%;
+ height:auto;
-webkit-box-shadow:none;
-moz-box-shadow:none;
box-shadow:none;
@@ -253,104 +247,6 @@
z-index:0;
}
-.main.wide > .twitter-stream {
- display:none; /* always revealed by javascript */
-
- position:absolute;
- width:334px;
- height:304px; /* 304 - 22 (for .twitter-stream-input) */
- top:25px;
- right:16px;
- z-index:2;
-
- padding:0 6px;
-
- color:#eee;
-}
-
-.twitter-stream .twitter-stream-header {
- display:block;
- padding:6px 2px 0px 2px;
-}
-.twitter-stream .twitter-stream-header h2 {
- display:inline;
- color:#fff;
-
- font-size:16px;
-}
-.twitter-stream .twitter-stream-header img {
- opacity:0.6;
- float:right;
-
- margin-left:22px;
-
- -webkit-transition:opacity 150ms linear;
-}
-.twitter-stream .twitter-stream-header:hover img {
- opacity:0.8;
-}
-
-.twitter-stream .twitter-stream-tweets {
- overflow:hidden;
-
- height:100%;
-
- /* Warning: this is non-standard, only works in Webkit, could break at any time */
- -webkit-mask-image:-webkit-linear-gradient(top, rgba(0,0,0,1) 0%, rgba(0,0,0,1) 70%, rgba(0,0,0,0) 100%);
-}
-
-.twitter-stream .tweet {
- padding:6px 2px;
- border-bottom:1px dotted rgba(255, 255, 255, 0.2);
-}
-.tweet .tweet-avatar {
- display:table-cell;
- vertical-align:top;
- padding:0 6px;
-}
-
-.tweet .tweet-author-details {
- display:inline-block;
-}
-
-.tweet .tweet-author-name {
- color:#fff;
- font-weight:bold;
-}
-.tweet .tweet-author-id {
- color:#bbb;
- font-weight:normal;
- margin-left:1em;
- font-size:0.9em;
-}
-
-.tweet .tweet-text {
- display:block;
-}
-
-.tweet .tweet-text a {
- color:#bbb;
-}
-
-.twitter-stream input.twitter-stream-input {
- width:100%;
-
- -webkit-box-sizing:border-box;
- padding:4px 2px 4px 22px;
-
- background-color:rgba(0, 0, 0, 0);
- border:none;
- outline:none;
- color:#fff;
-
- background-image:url('twitter-bird-16.png');
- background-position:left center;
- background-repeat:no-repeat;
-}
-.twitter-stream input.twitter-stream-input:focus {
- background-color:rgba(0, 0, 0, 0.1);
-}
-
/*
This rule disables drag-and-drop for images. See bug #448703.
*/
@@ -389,23 +285,6 @@
padding-left:12px;
}
-.rtl .main.wide > .twitter-stream {
- right:auto;
- left:16px;
-}
-
-.rtl .twitter-stream .twitter-stream-header img {
- float:left;
- margin-left:0;
- margin-right:22px;
-}
-
-.rtl .twitter-stream input.twitter-stream-input {
- padding:4px 22px 4px 2px;
- background-position:right center;
-}
-
.l10n-string {
display:none;
-}
-
+}
\ No newline at end of file
=== removed file 'slideshows/ubuntu-gnome/slides/link/twitter.js'
--- slideshows/ubuntu-gnome/slides/link/twitter.js 2012-10-06 21:41:22 +0000
+++ slideshows/ubuntu-gnome/slides/link/twitter.js 1970-01-01 00:00:00 +0000
@@ -1,383 +0,0 @@
-/* requires jquery.tweet.js */
-
-/* TODO: Fix tweet slideDown animation to actually slide down instead of changing height */
-
-function escapeHTML(text) {
- return $('<div/>').text(text).html();
-}
-
-function spliceText(text, indices) {
- // Copyright 2010, Wade Simmons <https://gist.github.com/442463>
- // Licensed under the MIT license
- var result = "";
- var last_i = 0;
- var i = 0;
-
- for (i=0; i < text.length; ++i) {
- var ind = indices[i];
- if (ind) {
- var end = ind[0];
- var output = ind[1];
- if (i > last_i) {
- result += escapeHTML(text.substring(last_i, i));
- }
- result += output;
- i = end - 1;
- last_i = end;
- }
- }
-
- if (i > last_i) {
- result += escapeHTML(text.substring(last_i, i));
- }
-
- return result;
-}
-
-function Tweet(data) {
- var tweet = this;
-
- var innerData = data;
- if (data.retweeted_status) innerData = data.retweeted_status;
-
- var userID = innerData.from_user || innerData.user.id;
- var userRealName = innerData.from_user_name || innerData.user.name;
- var userScreenName = innerData.from_user || innerData.user.screen_name;
-
- var linkHashTag = function(hashTag) {
- return 'https://twitter.com/search?q='+encodeURIComponent('#'+hashTag);
- }
-
- var linkUser = function(userName) {
- return 'https://twitter.com/'+encodeURIComponent(userName);
- }
-
- var linkUserID = function(userID) {
- return 'https://twitter.com/account/redirect_by_id?id='+encodeURIComponent(userID);
- }
-
- var linkEntities = function(entities, text) {
- entityIndices = {};
-
- $.each(entities.media || [], function(i, entry) {
- var link = '<a class="twitter-url twitter-media" href="'+encodeURI(entry.media_url)+'">'+escapeHTML(entry.display_url || entry.url)+'</a>';
- entityIndices[entry.indices[0]] = [entry.indices[1], link];
- });
-
- $.each(entities.urls || [], function(i, entry) {
- var link = '<a class="twitter-url" href="'+encodeURI(entry.url)+'">'+escapeHTML(entry.display_url || entry.url)+'</a>';
- entityIndices[entry.indices[0]] = [entry.indices[1], link];
- });
-
- $.each(entities.hashtags || [], function(i, entry) {
- var link = '<a class="twitter-hashtag" href="'+linkHashTag(entry.text)+'">'+escapeHTML('#'+entry.text)+'</a>';
- entityIndices[entry.indices[0]] = [entry.indices[1], link];
- });
-
- $.each(entities.user_mentions || [], function(i, entry) {
- var link = '<a class="twitter-mention" href="'+linkUserID(entry.id)+'">'+escapeHTML('@'+entry.screen_name)+'</a>';
- entityIndices[entry.indices[0]] = [entry.indices[1], link];
- });
-
- return spliceText(text, entityIndices);
- }
- var linkedText = linkEntities(innerData.entities, innerData.text);
-
- this.getHtml = function() {
- var container = $('<div class="tweet">');
-
- var authorDetails = $('<a class="tweet-author-details">');
- authorDetails.attr('href', linkUserID(userID));
-
- var authorName = $('<span class="tweet-author-name">');
- authorName.text(userRealName);
-
- var authorID = $('<span class="tweet-author-id">');
- authorID.text(userScreenName);
-
- authorDetails.append(authorName, authorID);
- container.append(authorDetails);
-
- var text = $('<div class="tweet-text">');
- text.html(linkedText);
- container.append(text);
-
- return container;
- }
-}
-
-function TweetsList(container) {
- var tweetsList = this;
-
- container = $(container);
- var list = $('<ul class="tweets-list">');
- container.append(list);
-
- var cleanup = function() {
- var bottom = container.height();
- list.children().each(function(index, listItem) {
- if ($(listItem).position().top > bottom) {
- $(listItem).remove();
- }
- });
- }
-
- this.showTweet = function(tweet) {
- var listItem = $('<li>');
- listItem.html(tweet.getHtml());
- listItem.hide();
- listItem.css('opacity', '0');
-
- list.prepend(listItem);
-
- var expandTime = listItem.height() * 8;
- listItem.animate({
- 'height': 'show',
- 'opacity': '1'
- }, expandTime, 'linear', function() {
- cleanup();
- });
-
- /*listItem.slideDown(500);*/
- }
-}
-
-function TweetQuery(lang) {
- var tweetQuery = this;
-
- // request is tightly encapsulated because we might move that logic to a remote server
-
- var QUERY_URL = 'https://api.twitter.com/1/lists/statuses.json';
- var request = {
- 'owner_screen_name' : 'hello_ubuntu',
- 'slug' : 'installer-slideshow',
- 'include_entities' : true,
- 'include_rts' : true,
- 'per_page' : 25
- }
-
- //var QUERY_URL = 'https://search.twitter.com/search.json';
- /*var request = {
- 'q' : 'from:ubuntu OR from:ubuntudev OR from:planetubuntu OR from:ubuntul10n OR from:ubuntucloud OR from:ubuntuone OR from:ubuntudesigners OR from:ubuntuunity OR from:canonical',
- 'lang' : 'all',
- 'result_type' : 'recent',
- 'rpp' : 25,
- 'include_entities' : true
- }*/
-
- var lastUpdate = 0;
-
- /** Time since last update, in seconds */
- this.getTimeSinceUpdate = function() {
- var now = Date.now();
- return now - lastUpdate;
- }
-
- this.loadTweets = function(loadedCallback) {
- var newTweets = [];
-
- $.ajax({
- url: QUERY_URL,
- dataType: 'jsonp',
- data: request,
- timeout: 5000,
- success: function(data, status, xhr) {
- //var results = data.results || [];
- var results = data || [];
- if ('results' in results) results = results.results;
- $.each(results, function(index, tweetData) {
- var tweet = new Tweet(tweetData);
- newTweets.unshift(tweet);
- });
- },
- complete: function(xhr, status) {
- loadedCallback(newTweets);
- }
- });
- lastUpdate = Date.now();
- }
-}
-
-function TweetBuffer() {
- var tweetBuffer = this;
-
- var query = new TweetQuery('all');
-
- var tweets = [];
- var nextTweetIndex = 0;
-
- var loadedCallback = function(newTweets) {
- if (newTweets.length > 0) {
- tweets = newTweets;
- }
- nextTweet = 0;
- }
-
- var getNextTweet = function(returnTweet) {
- if (nextTweetIndex < tweets.length) {
- returnTweet(tweets[nextTweetIndex]);
- } else {
- nextTweetIndex = 0;
- if (query.getTimeSinceUpdate() > 15 * 60 * 1000) {
- // load new tweets every 15 minutes
- query.loadTweets(function(newTweets) {
- loadedCallback(newTweets);
- returnTweet(tweets[nextTweetIndex]);
- });
- } else {
- returnTweet(tweets[nextTweetIndex]);
- }
- }
- }
-
-
- this.dataIsAvailable = function(response) {
- getNextTweet(function(tweet) {
- response ( (tweet !== undefined) );
- });
- }
-
- /* Loads (if necessary) the next tweet and sends it asynchronously to
- * the tweetReceived(tweet) callback. The tweet parameter is undefined
- * if no tweets are available.
- */
- this.popTweet = function(tweetReceived) {
- getNextTweet(function(tweet) {
- nextTweetIndex += 1;
- tweetReceived(tweet);
- });
- }
-}
-
-function TwitterStream(streamContainer) {
- var twitterStream = this;
-
- var tweetsContainer = $(streamContainer).children('.twitter-stream-tweets');
- var tweetsList = new TweetsList(tweetsContainer);
-
- var tweetBuffer = new TweetBuffer();
-
- var showNextInterval = undefined;
-
- var showNextTweet = function() {
- tweetBuffer.popTweet(function(tweet) {
- if (tweet) {
- twitterStream.enable();
- tweetsList.showTweet(tweet);
- } else {
- // this isn't working, so we'll hide the stream
- twitterStream.disable();
- }
- });
- }
-
- var _enabled = false;
- this.isEnabled = function() {
- return _enabled;
- }
- this.enable = function(immediate) {
- if (_enabled) return;
- if (immediate) {
- $(streamContainer).show();
- } else {
- $(streamContainer).fadeIn(150);
- }
- _enabled = true;
- }
- this.disable = function(immediate) {
- if (! _enabled) return;
- if (immediate) {
- $(streamContainer).hide();
- } else {
- $(streamContainer).fadeOut(150);
- }
- _enabled = false;
- this.stop();
- }
-
- this.start = function() {
- this.stop();
- showNextInterval = window.setInterval(showNextTweet, 6000);
- }
- this.stop = function() {
- if (showNextInterval) window.clearInterval(showNextInterval);
- }
-
- var _init = function() {
- tweetBuffer.dataIsAvailable(function(available) {
- if (available) {
- twitterStream.enable(true);
- // make sure there is some content visible from the start
- showNextTweet();
- } else {
- twitterStream.disable(true);
- }
- });
- }
- _init();
-}
-
-/* Only show the Twitter stuff if the slideshow is supposed to be English */
-if ('locale' in INSTANCE_OPTIONS) {
- var locale_data = parse_locale_code(INSTANCE_OPTIONS['locale']);
- var language = locale_data['language'];
-} else {
- var language = 'C';
-}
-
-var twitterLanguages = ['en', 'C'];
-if (twitterLanguages.indexOf(language) >= 0) {
- var doTwitter = true;
-} else {
- var doTwitter = false;
-}
-
-// Turn off Twitter for security reason
-doTwitter = false;
-
-Signals.watch('slideshow-loaded', function() {
- if (doTwitter) {
- $('.twitter-stream').each(function(index, streamContainer) {
- var stream = new TwitterStream(streamContainer);
- $(streamContainer).data('stream-object', stream);
- // TODO: test connection, show immediately if connection is good
- });
-
- $('.twitter-post-status-link').each(function(index, linkContent) {
- // Twitter-post-status-link is a <div> to avoid being translated. We need to wrap it around an <a> tag
- var statusText = $(linkContent).children('.twitter-post-status-text').text();
- var link = $('<a>');
- link.attr('href', 'https://twitter.com/home?status='+encodeURIComponent(statusText));
- link.insertBefore(linkContent);
- $(linkContent).appendTo(link);
- });
- } else {
- $('.twitter-stream').hide();
- /* TODO: show something charming? */
- }
-});
-
-Signals.watch('slide-opened', function(slide) {
- if (! doTwitter) return;
-
- var streamContainers = $('.twitter-stream', slide);
- streamContainers.each(function(index, streamContainer) {
- var stream = $(streamContainer).data('stream-object');
- if (stream) {
- stream.start();
- }
- });
-});
-
-Signals.watch('slide-closing', function(slide) {
- if (! doTwitter) return;
-
- var streamContainers = $('.twitter-stream', slide);
- streamContainers.each(function(index, streamContainer) {
- var stream = $(streamContainer).data('stream-object');
- if (stream) {
- stream.stop();
- }
- });
-});
-
=== added file 'slideshows/ubuntu-gnome/slides/media.html'
--- slideshows/ubuntu-gnome/slides/media.html 1970-01-01 00:00:00 +0000
+++ slideshows/ubuntu-gnome/slides/media.html 2013-08-29 21:02:11 +0000
@@ -0,0 +1,37 @@
+<div class="header">
+ <h1 class="slidetitle">Enjoy your music and videos
+ <div style="float: left;"><img src="icons/pic-media.png"/></div>
+ </h1>
+</div>
+
+<div class="main">
+ <div class="text">
+ <div>
+ <p>Rhythmbox lets you organize your music and listen to Internet radio, podcasts, and more. <br /> <br />
+ GNOME Videos allows you to easily watch videos from your computer, DVD, or streamed over the Internet.</p>
+ </div>
+
+ <div class="featured">
+ <h2 class="subtitle">Included software</h2>
+ <ul>
+ <li>
+ <img class="icon" src="icons/rhythmbox.png"/>
+ <p class="caption">Rhythmbox Music Player</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/gnome-videos.png"/>
+ <p class="caption">Videos</p>
+ </li>
+ </ul>
+ <h2 class="subtitle">Supported software</h2>
+ <ul>
+ <li>
+ <img class="icon" src="icons/pitivi.png" />
+ <p class="caption">Pitivi Video Editor</p>
+ </li>
+ </ul>
+ </div>
+ </div>
+
+ <img class="screenshot" src="screenshots/media.png"/>
+</div>
\ No newline at end of file
=== added file 'slideshows/ubuntu-gnome/slides/office.html'
--- slideshows/ubuntu-gnome/slides/office.html 1970-01-01 00:00:00 +0000
+++ slideshows/ubuntu-gnome/slides/office.html 2013-08-29 21:02:11 +0000
@@ -0,0 +1,33 @@
+<div class="header">
+ <h1 class="slidetitle">Everything you need for the office
+ <div style="float: left;"><img src="icons/pic-office.png"/></div>
+ </h1>
+</div>
+
+<div class="main">
+ <div class="text">
+ <div>
+ <p>We understand how important your computer is for day-to-day tasks. Create professional documents, spreadsheets and presentations with LibreOffice and manage your local and online documents in a single place with GNOME Documents.</p>
+ </div>
+
+ <div class="featured">
+ <h2 class="subtitle">Included software</h2>
+ <ul>
+ <li>
+ <img class="icon" src="icons/libreoffice.png" />
+ <p class="caption">LibreOffice Suite</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/gnome-documents.png" />
+ <p class="caption">Documents</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/evince.png" />
+ <p class="caption">Evince Document Viewer</p>
+ </li>
+ </ul>
+ </div>
+ </div>
+
+ <img class="screenshot" src="screenshots/office.png" />
+</div>
\ No newline at end of file
=== added file 'slideshows/ubuntu-gnome/slides/photos.html'
--- slideshows/ubuntu-gnome/slides/photos.html 1970-01-01 00:00:00 +0000
+++ slideshows/ubuntu-gnome/slides/photos.html 2013-08-29 21:02:11 +0000
@@ -0,0 +1,36 @@
+<div class="header">
+ <h1 class="slidetitle">Have fun with your photos
+ <div style="float: left;"><img src="icons/pic-photos.png"/></div>
+ </h1>
+</div>
+
+<div class="main">
+ <div class="text">
+ <div>
+ <p>With Shotwell, you can quickly and easily import, organize, edit and view your pictures. And you can share your favorite snaps on all popular photo sites and social networks.</p>
+ </div>
+
+ <div class="featured">
+ <h2 class="subtitle">Included software</h2>
+ <ul>
+ <li>
+ <img class="icon" src="icons/shotwell.png" />
+ <p class="caption">Shotwell Photo Manager</p>
+ </li>
+ </ul>
+ <h2 class="subtitle">Supported software</h2>
+ <ul>
+ <li>
+ <img class="icon" src="icons/gimp.png" />
+ <p class="caption">GIMP Image Editor</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/inkscape.png" />
+ <p class="caption">Inkscape</p>
+ </li>
+ </ul>
+ </div>
+ </div>
+
+ <img class="screenshot" src="screenshots/photos.png" />
+</div>
\ No newline at end of file
=== added file 'slideshows/ubuntu-gnome/slides/screenshots/accessibility.jpg'
Binary files slideshows/ubuntu-gnome/slides/screenshots/accessibility.jpg 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/screenshots/accessibility.jpg 2013-08-29 21:02:11 +0000 differ
=== removed file 'slideshows/ubuntu-gnome/slides/screenshots/beautiful.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/beautiful.png 2012-10-09 00:23:58 +0000 and slideshows/ubuntu-gnome/slides/screenshots/beautiful.png 1970-01-01 00:00:00 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/screenshots/browse.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/browse.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/screenshots/browse.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/screenshots/desktop.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/desktop.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/screenshots/desktop.png 2013-08-29 21:02:11 +0000 differ
=== removed file 'slideshows/ubuntu-gnome/slides/screenshots/documents.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/documents.png 2012-10-08 22:44:50 +0000 and slideshows/ubuntu-gnome/slides/screenshots/documents.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'slideshows/ubuntu-gnome/slides/screenshots/everything.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/everything.png 2012-10-08 22:44:50 +0000 and slideshows/ubuntu-gnome/slides/screenshots/everything.png 1970-01-01 00:00:00 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/screenshots/gethelp.jpg'
Binary files slideshows/ubuntu-gnome/slides/screenshots/gethelp.jpg 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/screenshots/gethelp.jpg 2013-08-29 21:02:11 +0000 differ
=== removed file 'slideshows/ubuntu-gnome/slides/screenshots/gnome.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/gnome.png 2012-10-08 22:44:50 +0000 and slideshows/ubuntu-gnome/slides/screenshots/gnome.png 1970-01-01 00:00:00 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/screenshots/goa.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/goa.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/screenshots/goa.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/screenshots/media.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/media.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/screenshots/media.png 2013-08-29 21:02:11 +0000 differ
=== removed file 'slideshows/ubuntu-gnome/slides/screenshots/messaging.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/messaging.png 2012-10-08 23:34:42 +0000 and slideshows/ubuntu-gnome/slides/screenshots/messaging.png 1970-01-01 00:00:00 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/screenshots/office.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/office.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/screenshots/office.png 2013-08-29 21:02:11 +0000 differ
=== removed file 'slideshows/ubuntu-gnome/slides/screenshots/overview.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/overview.png 2012-10-08 22:44:50 +0000 and slideshows/ubuntu-gnome/slides/screenshots/overview.png 1970-01-01 00:00:00 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/screenshots/photos.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/photos.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/screenshots/photos.png 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/screenshots/usc.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/usc.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/screenshots/usc.png 2013-08-29 21:02:11 +0000 differ
=== removed file 'slideshows/ubuntu-gnome/slides/screenshots/web.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/web.png 2012-10-09 00:23:58 +0000 and slideshows/ubuntu-gnome/slides/screenshots/web.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/welcome.jpg'
Binary files slideshows/ubuntu-gnome/slides/screenshots/welcome.jpg 2012-10-06 21:41:22 +0000 and slideshows/ubuntu-gnome/slides/screenshots/welcome.jpg 2013-08-29 21:02:11 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/usc.html'
--- slideshows/ubuntu-gnome/slides/usc.html 1970-01-01 00:00:00 +0000
+++ slideshows/ubuntu-gnome/slides/usc.html 2013-08-29 21:02:11 +0000
@@ -0,0 +1,16 @@
+<div class="header">
+ <h1 class="slidetitle">Find even more software
+ <div style="float: left;"><img src="icons/pic-usc.png"/></div>
+ </h1>
+</div>
+
+<div class="main">
+ <div class="text">
+ <div>
+ <p><strong>Say goodbye to searching the web for new software. </strong> <br /> <br />
+ Ubuntu Software Centre gives you instant access to thousands of great games and applications — some free and some available commercially. If you see something you like, you can see more information and then install it in just a couple of clicks.</p>
+ </div>
+ </div>
+
+ <img class="screenshot" src="screenshots/usc.png" />
+</div>
\ No newline at end of file
=== added file 'slideshows/ubuntu-gnome/slides/welcome.html'
--- slideshows/ubuntu-gnome/slides/welcome.html 1970-01-01 00:00:00 +0000
+++ slideshows/ubuntu-gnome/slides/welcome.html 2013-08-29 21:02:11 +0000
@@ -0,0 +1,15 @@
+<div class="header">
+ <h1 class="slidetitle">Welcome to Ubuntu GNOME 13.10
+ <div style="float: left;"><img src="icons/pic-welcome.png"/></div>
+ </h1>
+</div>
+
+<div class="main wide">
+ <div class="text">
+ <div>
+ <p>Fast and full of new features, the latest version of Ubuntu GNOME makes computing easier than ever. Here are just a few cool new things to look out for…</p>
+ </div>
+ </div>
+
+ <img class="background" src="screenshots/welcome.jpg"/>
+</div>
\ No newline at end of file
