Merge lp:~dylanmccall/ubiquity-slideshow-ubuntu/1499088-change-layout into lp:ubiquity-slideshow-ubuntu

[Dylan McCall]

Fix for bug #1406972 that changes the layout of the last slide to better accommodate its contents. Please remember to update pot files after merging this change. No string changes, but the surrounding markup is a little different :)

[Gunnar Hjalmarsson (gunnarhj)]

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

Would it not be simpler to have a one-off style= which sets the right CSS attributes on that slide, rather than putting each paragraph in its separate div? It would at least make it so that there are no translation changes required.

For instance, I suggest <div class="text"> to become <div class="text" style="font-color: white"> or something appropriate; as taken from whatever CSS properties should actually be applied here. You also wouldn't need to remove "wide" in that case.

review: Needs Fixing

[Dylan McCall (dylanmccall)]

PO4A already splits each <p> element into its own string - generating a new .pot file only changes the translation hints, so (as far as I know?) should just merge automatically without any new translations. Were you seeing a different result?

With that said, it seems a typo was left in the .pot files (https://translations.launchpad.net/ubuntu/wily/+source/ubiquity-slideshow-ubuntu/+pots/ubiquity-slideshow-ubuntu/fr_CA/15/+translate) and removed in the html files, sooo, that *will* break stuff. But it's easy enough to fix - just a find and replace across the .pos :)

[Gunnar Hjalmarsson (gunnarhj)]

@Mathieu:
I agree with Dylan that this MP wouldn't break translations.

Also, I submitted a MP before this one, which in effect gave the same result as your example. However, I withdrew it, since the last slide looks better with this solution.

[Mathieu Trudel-Lapierre (cyphermox)]

I was going to merge it now, but has it been properly tested in the installer? Changing the image for the slide sounds to me like we'll have a vastly different image from the welcome slide to the gethelp slide, resulting it is looking really bad. Do we absolutely need to change the gethelp image?

review: Needs Information

[Mathieu Trudel-Lapierre (cyphermox)]

All that really is needed is the addition of <div>; the rest breaks the flow of slides to make the gethelp slide look like the previous screenshot slides, but the screenshot being the same image as welcome.jpg; except cropped.

We should try to preserve the same look for now as the welcome slide, and above all not duplicate the codename animal picture we get, since that adds work for us later down the line (updating these logos is easy to forget, and tends to get done very late in the cycle... more to update means more unnecessary work).

I'm all for a redesign of the slideshows though; but I don't think this is the right time to do it. I'll merge this but only keep the <div> tags around the <p> tags; not the removal of wide or the image change -- this way we keep the original intent with the first and last slides having the same style.

review: Approve

=== modified file 'slideshows/ubuntu/slides/gethelp.html'
--- slideshows/ubuntu/slides/gethelp.html	2015-09-13 21:14:53 +0000
+++ slideshows/ubuntu/slides/gethelp.html	2015-10-04 18:25:10 +0000
@@ -1,17 +1,23 @@
 <div class="header"><h1 class="slidetitle">Help and support</h1></div>
 
-<div class="main wide">
+<div class="main">
 
 <div class="text">
 
+<div>
 <p>The <span class="app" data-app="docs">Official documentation</span> covers many of the most common areas about Ubuntu. It's available both <a href="https://help.ubuntu.com">online</a> and via the Ubuntu Help item in the System menu.</p>
+</div>
 
+<div>
 <p>At <a href="http://askubuntu.com">Ask Ubuntu</a> you can ask questions and search an impressive collection of already answered questions. Support in your own language may be provided by your <a href="http://loco.ubuntu.com/teams/">Local Community Team</a>.</p>
+</div>
 
+<div>
 <p>For pointers to other useful resources, please visit <a href="http://community.ubuntu.com/help-information/">community.ubuntu.com/help-information</a> or <a href="http://www.ubuntu.com/support">ubuntu.com/support</a>.</p>
-
-</div>
-
-<img class="background" src="screenshots/welcome.jpg" />
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/gethelp.jpg" />
 
 </div>

=== added file 'slideshows/ubuntu/slides/screenshots/gethelp.jpg'
Binary files slideshows/ubuntu/slides/screenshots/gethelp.jpg	1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/screenshots/gethelp.jpg	2015-10-04 18:25:10 +0000 differ