Merge lp:~mattsturgeon/ubiquity-slideshow-ubuntu/login-slide into lp:ubiquity-slideshow-ubuntu

Proposed by Matt Sturgeon
Status: Rejected
Rejected by: Dimitri John Ledkov
Proposed branch: lp:~mattsturgeon/ubiquity-slideshow-ubuntu/login-slide
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 49 lines (+29/-0)
2 files modified
slideshows/ubuntu/slides/index.html (+1/-0)
slideshows/ubuntu/slides/login.html (+28/-0)
To merge this branch: bzr merge lp:~mattsturgeon/ubiquity-slideshow-ubuntu/login-slide
Reviewer Review Type Date Requested Status
Ubiquity Slideshow Pending
Review via email: mp+43186@code.launchpad.net

Description of the change

I have implemented a "Logging In" slide, after the Welcome slide, that alerts users of the availability of both the default "Ubuntu Desktop Edition", but also the "Ubuntu Classic Desktop". See bug #687670.

Slide includes a screenshot demonstrating GDM and the session-chooser menu on Natty Alpha 1.
A layered version of the screenshot is available here:
http://www.kicks.co.cc/login_small2.jpeg
the layers allow moving of the window/toolbar-panel and changing of the wallpaper.

The text on the slide is:

<div class="header"><h1 class="slidetitle">Loging In</h1></div>

<div class="main">

<div class="text">

<div>
<p>Logging into Ubuntu couldn&#8217;t be faster, simpler or easier...</p>
</div>

<div class="featured">
<ul>
 <li>
   <img class="icon" src="icons/bullet-50.png" />
   <p class="caption">Simply click on your name, enter your password and click login.</p>
 </li>
 <li>
   <img class="icon" src="icons/bullet-50.png" />
   <p class="caption">Choose between Ubuntu Desktop Edition, with the Unity shell, or use the Ubuntu Classic Desktop.</p>
 </li>
</ul>
</div>

</div>

<img class="screenshot" src="screenshots/login.jpeg" />

</div>

To post a comment you must log in.

Unmerged revisions

311. By Matt Sturgeon

fixed bullets for login slide (using bullet-50.png icon)

310. By Matt Sturgeon

Fixed formatting for login slide. Added a small amount of text to the first paragraph. Added bullet points.

309. By Matt Sturgeon

Adds the screenshot for the login slide. An xcf is available at http://www.kicks.co.cc/downloads/login_small.xcf (the wallpaper, panel and window are seperate layers.

308. By Matt Sturgeon

Added login slide.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'slideshows/ubuntu/slides/icons/bullet-50.png'
2Binary files slideshows/ubuntu/slides/icons/bullet-50.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/bullet-50.png 2010-12-09 11:11:03 +0000 differ
3=== modified file 'slideshows/ubuntu/slides/index.html'
4--- slideshows/ubuntu/slides/index.html 2010-09-13 03:57:39 +0000
5+++ slideshows/ubuntu/slides/index.html 2010-12-09 11:11:03 +0000
6@@ -25,6 +25,7 @@
7
8 <div id="slideshow">
9 <div><a href="welcome.html"></a></div>
10+ <div><a href="login.html"></a></div>
11 <div><a href="usc.html"></a></div>
12 <div><a href="photos.html"></a></div>
13 <div><a href="mobilise.html"></a></div>
14
15=== added file 'slideshows/ubuntu/slides/login.html'
16--- slideshows/ubuntu/slides/login.html 1970-01-01 00:00:00 +0000
17+++ slideshows/ubuntu/slides/login.html 2010-12-09 11:11:03 +0000
18@@ -0,0 +1,28 @@
19+<div class="header"><h1 class="slidetitle">Loging In</h1></div>
20+
21+<div class="main">
22+
23+<div class="text">
24+
25+<div>
26+<p>Logging into Ubuntu couldn&#8217;t be faster, simpler or easier...</p>
27+</div>
28+
29+<div class="featured">
30+<ul>
31+ <li>
32+ <img class="icon" src="icons/bullet-50.png" />
33+ <p class="caption">Simply click on your name, enter your password and click login.</p>
34+ </li>
35+ <li>
36+ <img class="icon" src="icons/bullet-50.png" />
37+ <p class="caption">Choose between Ubuntu Desktop Edition, with the Unity shell, or use the Ubuntu Classic Desktop.</p>
38+ </li>
39+</ul>
40+</div>
41+
42+</div>
43+
44+<img class="screenshot" src="screenshots/login.jpeg" />
45+
46+</div>
47
48=== added file 'slideshows/ubuntu/slides/screenshots/login.jpeg'
49Binary files slideshows/ubuntu/slides/screenshots/login.jpeg 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/screenshots/login.jpeg 2010-12-09 11:11:03 +0000 differ

Subscribers

People subscribed via source and target branches