Ubiquity Slideshow

Merge lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/15.04-2 into lp:ubiquity-slideshow-ubuntu

  1. 15.04-2
  2. Merge into html
Proposed by Aaron Honeycutt on 2015-03-12
Status: Merged
Merged at revision: 676
Proposed branch: lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/15.04-2
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 220 lines (+19/-22)
12 files modified
slideshows/kubuntu/slides/accessibility.html (+3/-6)
slideshows/kubuntu/slides/games.html (+2/-1)
slideshows/kubuntu/slides/get-help.html (+1/-1)
slideshows/kubuntu/slides/get-involved.html (+2/-2)
slideshows/kubuntu/slides/graphics.html (+1/-1)
slideshows/kubuntu/slides/installing-software.html (+3/-3)
slideshows/kubuntu/slides/internet.html (+1/-1)
slideshows/kubuntu/slides/link/base.css (+2/-1)
slideshows/kubuntu/slides/multimedia.html (+1/-1)
slideshows/kubuntu/slides/office.html (+1/-1)
slideshows/kubuntu/slides/pim.html (+1/-3)
slideshows/kubuntu/slides/welcome.html (+1/-1)
To merge this branch: bzr merge lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/15.04-2
Reviewer Review Type Date Requested Status
Jonathan Riddell 2015-03-12 Pending
Review via email: mp+252819@code.launchpad.net

Description of the Change

Update to reflect Plasma 5 changes.

To post a comment you must log in.
lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/15.04-2 updated on 2015-03-12
677. By Aaron Honeycutt on 2015-03-12

fix kubuntu logo and firefox

678. By Aaron Honeycutt on 2015-03-12

added new icons and edited base.css

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'slideshows/kubuntu/slides/accessibility.html'
2--- slideshows/kubuntu/slides/accessibility.html 2011-09-28 13:35:02 +0000
3+++ slideshows/kubuntu/slides/accessibility.html 2015-03-12 21:46:50 +0000
4@@ -7,15 +7,12 @@
5 physical circumstances. So, we provide tools that make Kubuntu one
6 of the most accessible operating systems around.</li>
7 <li>You can get at these tools in one place: the
8- <em>Accessibility</em> preferences, inside the System Settings
9- application from the menu. From there, you can turn on helpful
10+ <em>Accessibility</em> preferences, inside the Desktop Behavior from the System Settings application from the menu. From there, you can turn on helpful
11 tools like <em>Modifier Keys</em>, <em>Keyboard Filters</em>, and
12 <em>Activation Gestures</em>.</li>
13- <li>Remember to also look over the <em>Appearance Preferences</em>,
14- too. You can choose between different visual styles and even change
15- the fonts that are used by applications.</li>
16+ <li>Remember to also look over the <em>Application Style</em>.</li>
17 </ul>
18 </div>
19 </div>
20
21-<img class="icon" src="icons/accessibility.png" alt="" />
22+<img class="icon" src="icons/preferences-desktop-accessibility.png" alt="" />
23
24=== modified file 'slideshows/kubuntu/slides/games.html'
25--- slideshows/kubuntu/slides/games.html 2013-07-04 05:42:33 +0000
26+++ slideshows/kubuntu/slides/games.html 2015-03-12 21:46:50 +0000
27@@ -6,6 +6,7 @@
28 <li>With hundreds of game titles in our online repository, Kubuntu
29 allows you to not be all about work, but also allows you to
30 play.</li>
31+ <li>You can easily install Steam with help from here: https://userbase.kde.org/Kubuntu/Software#Steam </li>
32 <li>The <em>KDE Software Compilation</em> has quite a few games
33 ranging from card games to logic games and board games.</li>
34 <li>First Person Shooters, Role Playing Games, and more are also
35@@ -14,4 +15,4 @@
36 </div>
37 </div>
38
39-<img class="icon" src="icons/games.png" alt="" />
40+<img class="icon" src="icons/hi128-app-kblocks.png" alt="" />
41
42=== modified file 'slideshows/kubuntu/slides/get-help.html'
43--- slideshows/kubuntu/slides/get-help.html 2012-06-19 16:19:38 +0000
44+++ slideshows/kubuntu/slides/get-help.html 2015-03-12 21:46:50 +0000
45@@ -15,4 +15,4 @@
46 </div>
47 </div>
48
49-<img class="icon" src="icons/get-help.png" alt="" />
50+<img class="icon" src="icons/system-help.png" alt="" />
51
52=== modified file 'slideshows/kubuntu/slides/get-involved.html'
53--- slideshows/kubuntu/slides/get-involved.html 2011-09-28 13:35:02 +0000
54+++ slideshows/kubuntu/slides/get-involved.html 2015-03-12 21:46:50 +0000
55@@ -12,7 +12,7 @@
56 mold the future of Kubuntu is easy, and you are more than welcome
57 to help out.</li>
58 <li>Look over <a
59- href="https://wiki.kubuntu.org/Kubuntu/GettingInvolved">wiki.kubuntu.org/Kubuntu/GettingInvolved</a>
60+ href="https://userbase.kde.org/Kubuntu/Contribute">userbase.kde.org/Kubuntu/Contribute</a>
61 and see where you might be able to help out. Remember, it is easy
62 to get involved and the work you do will be seen by millions of
63 people around the world.</li>
64@@ -22,4 +22,4 @@
65 </div>
66 </div>
67
68-<img class="icon" src="icons/get-involved.png" alt="" />
69+<img class="icon" src="icons/system-users.png" alt="" />
70
71=== modified file 'slideshows/kubuntu/slides/graphics.html'
72--- slideshows/kubuntu/slides/graphics.html 2011-09-28 13:35:02 +0000
73+++ slideshows/kubuntu/slides/graphics.html 2015-03-12 21:46:50 +0000
74@@ -12,4 +12,4 @@
75 </ul>
76 </div>
77 </div>
78-<img class="icon" src="icons/graphics.png" alt="" />
79+<img class="icon" src="icons/krita.png" alt="" />
80
81=== removed file 'slideshows/kubuntu/slides/icons/accessibility.png'
82Binary files slideshows/kubuntu/slides/icons/accessibility.png 2011-09-28 13:35:02 +0000 and slideshows/kubuntu/slides/icons/accessibility.png 1970-01-01 00:00:00 +0000 differ
83=== added file 'slideshows/kubuntu/slides/icons/applications-multimedia.png'
84Binary files slideshows/kubuntu/slides/icons/applications-multimedia.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/applications-multimedia.png 2015-03-12 21:46:50 +0000 differ
85=== added file 'slideshows/kubuntu/slides/icons/email.png'
86Binary files slideshows/kubuntu/slides/icons/email.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/email.png 2015-03-12 21:46:50 +0000 differ
87=== added file 'slideshows/kubuntu/slides/icons/firefox.png'
88Binary files slideshows/kubuntu/slides/icons/firefox.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/firefox.png 2015-03-12 21:46:50 +0000 differ
89=== removed file 'slideshows/kubuntu/slides/icons/games.png'
90Binary files slideshows/kubuntu/slides/icons/games.png 2011-09-28 13:35:02 +0000 and slideshows/kubuntu/slides/icons/games.png 1970-01-01 00:00:00 +0000 differ
91=== removed file 'slideshows/kubuntu/slides/icons/get-help.png'
92Binary files slideshows/kubuntu/slides/icons/get-help.png 2011-09-28 13:35:02 +0000 and slideshows/kubuntu/slides/icons/get-help.png 1970-01-01 00:00:00 +0000 differ
93=== removed file 'slideshows/kubuntu/slides/icons/get-involved.png'
94Binary files slideshows/kubuntu/slides/icons/get-involved.png 2011-09-28 13:35:02 +0000 and slideshows/kubuntu/slides/icons/get-involved.png 1970-01-01 00:00:00 +0000 differ
95=== removed file 'slideshows/kubuntu/slides/icons/graphics.png'
96Binary files slideshows/kubuntu/slides/icons/graphics.png 2011-09-28 13:35:02 +0000 and slideshows/kubuntu/slides/icons/graphics.png 1970-01-01 00:00:00 +0000 differ
97=== added file 'slideshows/kubuntu/slides/icons/hi128-app-kblocks.png'
98Binary files slideshows/kubuntu/slides/icons/hi128-app-kblocks.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/hi128-app-kblocks.png 2015-03-12 21:46:50 +0000 differ
99=== removed file 'slideshows/kubuntu/slides/icons/installing-software.png'
100Binary files slideshows/kubuntu/slides/icons/installing-software.png 2011-09-28 13:35:02 +0000 and slideshows/kubuntu/slides/icons/installing-software.png 1970-01-01 00:00:00 +0000 differ
101=== removed file 'slideshows/kubuntu/slides/icons/internet.png'
102Binary files slideshows/kubuntu/slides/icons/internet.png 2014-03-05 15:23:28 +0000 and slideshows/kubuntu/slides/icons/internet.png 1970-01-01 00:00:00 +0000 differ
103=== added file 'slideshows/kubuntu/slides/icons/krita.png'
104Binary files slideshows/kubuntu/slides/icons/krita.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/krita.png 2015-03-12 21:46:50 +0000 differ
105=== removed file 'slideshows/kubuntu/slides/icons/kubuntu-logo.png'
106Binary files slideshows/kubuntu/slides/icons/kubuntu-logo.png 2011-09-28 13:35:02 +0000 and slideshows/kubuntu/slides/icons/kubuntu-logo.png 1970-01-01 00:00:00 +0000 differ
107=== added file 'slideshows/kubuntu/slides/icons/kubuntu-logo_15.04.png'
108Binary files slideshows/kubuntu/slides/icons/kubuntu-logo_15.04.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/kubuntu-logo_15.04.png 2015-03-12 21:46:50 +0000 differ
109=== added file 'slideshows/kubuntu/slides/icons/libreoffice-writer.png'
110Binary files slideshows/kubuntu/slides/icons/libreoffice-writer.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/libreoffice-writer.png 2015-03-12 21:46:50 +0000 differ
111=== removed file 'slideshows/kubuntu/slides/icons/multimedia.png'
112Binary files slideshows/kubuntu/slides/icons/multimedia.png 2011-09-28 13:35:02 +0000 and slideshows/kubuntu/slides/icons/multimedia.png 1970-01-01 00:00:00 +0000 differ
113=== added file 'slideshows/kubuntu/slides/icons/muondiscover.png'
114Binary files slideshows/kubuntu/slides/icons/muondiscover.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/muondiscover.png 2015-03-12 21:46:50 +0000 differ
115=== removed file 'slideshows/kubuntu/slides/icons/office.png'
116Binary files slideshows/kubuntu/slides/icons/office.png 2011-09-28 13:35:02 +0000 and slideshows/kubuntu/slides/icons/office.png 1970-01-01 00:00:00 +0000 differ
117=== removed file 'slideshows/kubuntu/slides/icons/pim.png'
118Binary files slideshows/kubuntu/slides/icons/pim.png 2011-09-28 13:35:02 +0000 and slideshows/kubuntu/slides/icons/pim.png 1970-01-01 00:00:00 +0000 differ
119=== added file 'slideshows/kubuntu/slides/icons/preferences-desktop-accessibility.png'
120Binary files slideshows/kubuntu/slides/icons/preferences-desktop-accessibility.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/preferences-desktop-accessibility.png 2015-03-12 21:46:50 +0000 differ
121=== modified file 'slideshows/kubuntu/slides/installing-software.html'
122--- slideshows/kubuntu/slides/installing-software.html 2011-09-28 13:35:02 +0000
123+++ slideshows/kubuntu/slides/installing-software.html 2015-03-12 21:46:50 +0000
124@@ -3,8 +3,8 @@
125 <div class="main">
126 <div class="content">
127 <ul>
128- <li>Take a look at <em>Software Management</em> application in the
129- menu under the System tab. Software Management will allow you to
130+ <li>Take a look at the <em>Muon Discover</em> application in the
131+ menu. Muon Discover will allow you to
132 install (and remove) software from our online repositories, which
133 we carefully organize to be safe and up to date.</li>
134 <li>There is great software for everything from creating music and
135@@ -17,4 +17,4 @@
136 </div>
137 </div>
138
139-<img class="icon" src="icons/installing-software.png" alt="" />
140+<img class="icon" src="icons/muondiscover.png" alt="" />
141
142=== modified file 'slideshows/kubuntu/slides/internet.html'
143--- slideshows/kubuntu/slides/internet.html 2014-01-30 17:06:18 +0000
144+++ slideshows/kubuntu/slides/internet.html 2015-03-12 21:46:50 +0000
145@@ -10,4 +10,4 @@
146 </ul>
147 </div>
148 </div>
149-<img class="icon" src="icons/internet.png" alt="" />
150+<img class="icon" src="icons/firefox.png" alt="" />
151
152=== modified file 'slideshows/kubuntu/slides/link/background.png'
153Binary files slideshows/kubuntu/slides/link/background.png 2011-09-28 13:35:02 +0000 and slideshows/kubuntu/slides/link/background.png 2015-03-12 21:46:50 +0000 differ
154=== modified file 'slideshows/kubuntu/slides/link/base.css'
155--- slideshows/kubuntu/slides/link/base.css 2013-07-09 14:48:55 +0000
156+++ slideshows/kubuntu/slides/link/base.css 2015-03-12 21:46:50 +0000
157@@ -4,6 +4,7 @@
158 padding:0;
159 font-family: ubuntu;
160 color:#000000;
161+ background-image: url("background.png");
162 }
163
164 /*
165@@ -70,7 +71,7 @@
166 width:auto;
167 height:auto;
168
169- bottom:0px;
170+ bottom:10px;
171 right:10px;
172
173 z-index:11;
174
175=== modified file 'slideshows/kubuntu/slides/link/bullet-point.png'
176Binary files slideshows/kubuntu/slides/link/bullet-point.png 2011-09-28 13:35:02 +0000 and slideshows/kubuntu/slides/link/bullet-point.png 2015-03-12 21:46:50 +0000 differ
177=== modified file 'slideshows/kubuntu/slides/multimedia.html'
178--- slideshows/kubuntu/slides/multimedia.html 2011-09-28 13:35:02 +0000
179+++ slideshows/kubuntu/slides/multimedia.html 2015-03-12 21:46:50 +0000
180@@ -12,4 +12,4 @@
181 </ul>
182 </div>
183 </div>
184-<img class="icon" src="icons/multimedia.png" alt="" />
185+<img class="icon" src="icons/applications-multimedia.png" alt="" />
186
187=== modified file 'slideshows/kubuntu/slides/office.html'
188--- slideshows/kubuntu/slides/office.html 2013-07-04 04:20:37 +0000
189+++ slideshows/kubuntu/slides/office.html 2015-03-12 21:46:50 +0000
190@@ -12,4 +12,4 @@
191 </ul>
192 </div>
193 </div>
194-<img class="icon" src="icons/office.png" alt="" />
195+<img class="icon" src="icons/libreoffice-writer.png" alt="" />
196
197=== modified file 'slideshows/kubuntu/slides/pim.html'
198--- slideshows/kubuntu/slides/pim.html 2011-09-28 13:35:02 +0000
199+++ slideshows/kubuntu/slides/pim.html 2015-03-12 21:46:50 +0000
200@@ -14,9 +14,7 @@
201 import or export your contacts with nearly every address book
202 standard as well synchronize with various groupware services.</li>
203 </ul>
204- <p class="special"><em>Kontact</em> is the perfect personal
205- information management integration for you!</p>
206 </div>
207 </div>
208
209-<img class="icon" src="icons/pim.png" alt="" />
210+<img class="icon" src="icons/email.png" alt="" />
211
212=== modified file 'slideshows/kubuntu/slides/welcome.html'
213--- slideshows/kubuntu/slides/welcome.html 2015-01-11 22:55:04 +0000
214+++ slideshows/kubuntu/slides/welcome.html 2015-03-12 21:46:50 +0000
215@@ -17,4 +17,4 @@
216 </div>
217 </div>
218
219-<img class="icon" src="icons/kubuntu-logo.png" alt="" />
220+<img class="icon" src="icons/kubuntu-logo_15.04.png" alt="" />

Subscribers

People subscribed via source and target branches