Merge lp:~prysdieheer/ubuntu-za/menu-revisions2 into lp:ubuntu-za
- menu-revisions2
- Merge into website
Proposed by
Ashton van Niekerk
Status: | Superseded |
---|---|
Proposed branch: | lp:~prysdieheer/ubuntu-za/menu-revisions2 |
Merge into: | lp:ubuntu-za |
Diff against target: |
407 lines (+190/-164) 6 files modified
conf.py (+24/-14) pages/get-involved.rst (+93/-0) pages/get-started.rst (+57/-0) pages/getting-involved.rst (+0/-93) pages/getting-started.rst (+0/-57) themes/ubuntuza/assets/css/theme.css (+16/-0) |
To merge this branch: | bzr merge lp:~prysdieheer/ubuntu-za/menu-revisions2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Needs Fixing | ||
Review via email: mp+255751@code.launchpad.net |
This proposal supersedes a proposal from 2015-04-08.
This proposal has been superseded by a proposal from 2015-04-09.
Commit message
Description of the change
Did the changes superfly asked for. Had to make a new branch, because I got some message I did not understand with the old one.
To post a comment you must log in.
- 28. By Ashton van Niekerk
-
Fixed the footer, still prefer it in the middle though.
Unmerged revisions
- 28. By Ashton van Niekerk
-
Fixed the footer, still prefer it in the middle though.
- 27. By Ashton van Niekerk
-
Changesd 'getting' to 'get' in the menu and titles.
- 26. By Ashton van Niekerk
-
Put the social links at both top and footer, and placed it in the conf file footer variable
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'conf.py' |
2 | --- conf.py 2015-03-02 19:37:34 +0000 |
3 | +++ conf.py 2015-04-09 19:48:34 +0000 |
4 | @@ -111,9 +111,8 @@ |
5 | |
6 | NAVIGATION_LINKS = { |
7 | DEFAULT_LANG: [ |
8 | - ('/index.html', 'Home'), |
9 | - ('/getting-started.html', 'Getting Started'), |
10 | - ('/getting-involved.html', 'Getting Involved'), |
11 | + ('/get-started.html', 'Get Started'), |
12 | + ('/get-involved.html', 'Get Involved'), |
13 | ('/irc.html', 'IRC Channel'), |
14 | ( |
15 | ( |
16 | @@ -124,17 +123,24 @@ |
17 | ('https://launchpad.net/~ubuntu-za', '<span class="fa fa-archive fa-fw"></span> Launchpad Site'), |
18 | ('https://trello.com/b/GKXXiBxU/ubuntu-south-africa-loco', '<span class="fa fa-trello fa-fw"></span> Project Management') |
19 | ), |
20 | - 'LoCo Links' |
21 | - ), |
22 | + 'Links' |
23 | + ), |
24 | ( |
25 | - ( |
26 | - ('https://twitter.com/ubuntuza', '<span class="fa fa-twitter fa-fw"></span> Twitter'), |
27 | - ('https://www.facebook.com/groups/ubuntuza/', '<span class="fa fa-facebook fa-fw"></span> Facebook'), |
28 | - ('https://plus.google.com/+Ubuntu-zaOrg', '<span class="fa fa-google-plus fa-fw"></span> Google+') |
29 | - ), |
30 | - 'Social Media' |
31 | - ), |
32 | - ('http://za.ubuntuforums.org/', 'Forums <span class="fa fa-external-link fa-fw"></span>') |
33 | + ( |
34 | + ('http://za.ubuntuforums.org/', '<span class="fa fa-comments-o fa-fw"></span> Forums'), |
35 | + ('https://askubuntu.com/','<span class="fa fa-question fa-fw"></span> Askubuntu'), |
36 | + ), |
37 | + 'Help' |
38 | + ), |
39 | + ( |
40 | + ( |
41 | + ('https://twitter.com/ubuntuza', '<span class="fa fa-twitter fa-fw" ></span>Twitter'), |
42 | + ('https://www.facebook.com/groups/ubuntuza/','<span class="fa fa-facebook fa-fw"></span> Facebook'), |
43 | + ('https://plus.google.com/+Ubuntu-zaOrg','<span class="fa fa-google-plus fa-fw"></span> Google+'), |
44 | + ), |
45 | + 'Social links' |
46 | + ) |
47 | + |
48 | ] |
49 | } |
50 | |
51 | @@ -489,7 +495,11 @@ |
52 | |
53 | # A small copyright notice for the page footer (in HTML). |
54 | # (translatable) |
55 | -CONTENT_FOOTER = 'Contents © {date} {author} - Powered by <a href="http://getnikola.com" rel="nofollow">Nikola</a> {license}' |
56 | +CONTENT_FOOTER = ''' |
57 | + <a href="https://twitter.com/ubuntuza" style="text-allign:right;" target="_blank"><span class="fa fa-twitter fa-fw" ></span>Twitter</a> | |
58 | + <a href="https://www.facebook.com/groups/ubuntuza/" target="_blank"><span class="fa fa-facebook fa-fw"></span> Facebook</a> | |
59 | + <a href="https://plus.google.com/+Ubuntu-zaOrg" target="_blank"><span class="fa fa-google-plus fa-fw"></span> Google+</a> |
60 | + <br> Contents © {date} {author} - Powered by <a href="http://getnikola.com" rel="nofollow">Nikola</a> {license}''' |
61 | |
62 | # Things that will be passed to CONTENT_FOOTER.format(). This is done |
63 | # for translatability, as dicts are not formattable. Nikola will |
64 | |
65 | === added file 'pages/get-involved.rst' |
66 | --- pages/get-involved.rst 1970-01-01 00:00:00 +0000 |
67 | +++ pages/get-involved.rst 2015-04-09 19:48:34 +0000 |
68 | @@ -0,0 +1,93 @@ |
69 | +.. title: Get Involved |
70 | +.. slug: get-involved |
71 | +.. date: 2014-12-18 20:58:59 UTC+02:00 |
72 | +.. tags: |
73 | +.. link: |
74 | +.. description: |
75 | +.. type: text |
76 | + |
77 | +Looking to get involved? Of course you are. That is why you are here. The Ubuntu-ZA Community has many needs as does the |
78 | +wider Ubuntu community. Locally, we need and would appreciate |
79 | + |
80 | +- Your ideas and enthusiasm in our `monthly meetings`_ |
81 | +- Your help troubleshooting bugs or issues sent on our `mailing list`_ (see below) |
82 | +- Your enthusiasm in spreading the word about Ubuntu |
83 | +- Your company on our `IRC </irc.html>`_! channel |
84 | + |
85 | + |
86 | +Mailing List |
87 | +------------ |
88 | +One of our primary ways of communicating is via our mailing list. To subscribe to the mailing list, enter your e-mail |
89 | +below and you'll receive a mail to confirm your subscription to the mailing list. If you just want to browse through the |
90 | +e-mails, take a look at the `mailing list archives <https://lists.ubuntu.com/archives/ubuntu-za/>`_. |
91 | + |
92 | +.. raw:: html |
93 | + |
94 | + <div class="row text-center"> |
95 | + <div class="col-md-3"> </div> |
96 | + <div class="col-md-6 well"> |
97 | + <p><strong>Subscribe to <code class="reverse">moc.utnubu.stsil@az-utnubu</code></strong></p> |
98 | + <form role="form" method="POST" action="https://lists.ubuntu.com/mailman/subscribe/ubuntu-za" class="form-inline"> |
99 | + <div class="form-group"> |
100 | + <label for="email" class="control-label">E-mail:</label> |
101 | + <input type="email" name="email" class="form-control" id="email" placeholder="test@example.com"> |
102 | + </div> |
103 | + <div class="form-group"> |
104 | + <button type="submit" class="btn btn-primary" name="email-button" value="Subscribe">Subscribe</button> |
105 | + </div> |
106 | + </form> |
107 | + </div> |
108 | + <div class="col-md-3"> </div> |
109 | + </div> |
110 | + |
111 | + |
112 | +IRC |
113 | +--- |
114 | +The Ubuntu-ZA Local Community prefers to hang out in IRC, where we can discuss Ubuntu, Linux, open source software, and |
115 | +a host of other things. Please join us in `IRC </irc.html>`_! |
116 | + |
117 | + |
118 | +.. raw:: html |
119 | + |
120 | + <div class="row"> |
121 | + <div class="col-md-3"> </div> |
122 | + <div class="col-md-6 well"> |
123 | + <p class="text-center"><strong>IRC client details</strong></p> |
124 | + <dl class="dl-horizontal"> |
125 | + <dt>Network:</dt> |
126 | + <dd>Freenode</dd> |
127 | + <dt>Server:</dt> |
128 | + <dd>chat.freenode.net</dd> |
129 | + <dt>Channel:</dt> |
130 | + <dd>#ubuntu-za</dd> |
131 | + </dl> |
132 | + </div> |
133 | + <div class="col-md-3"> </div> |
134 | + </div> |
135 | + |
136 | + |
137 | +Web Site |
138 | +-------- |
139 | +You can even be involved in our web site! `Branch it on Launchpad <https://code.launchpad.net/ubuntu-za>`_ and propose |
140 | +your changes. Check out our `Bazaar tutorial </bazaar-tutorial.html>`_ for how to get started using Bazaar and |
141 | +`Launchpad <https://launchpad.net>`_. |
142 | + |
143 | +Trello |
144 | +------ |
145 | +View our `trello page`_ to follow our projects. Trello is used to keep track of different projects and tasks (to-do list). Trello can also be used to make suggestions. You can contribute to the board by getting a `free trello account`_ and joining the team. Joining the team does not require you to be an official Ubuntu Member. |
146 | + |
147 | +International Ubuntu Community |
148 | +------------------------------ |
149 | +The greater `Ubuntu community`_ also has needs, many of which you may like to get involved in. |
150 | + |
151 | +Become an official Ubuntu Member |
152 | +-------------------------------- |
153 | +We help to build Ubuntu, the most popular Free Operating System out there, we do packaging, translation, quality assurance, marketing, support, writing, design, art... `Join us`_! |
154 | + |
155 | +.. _trello page: https://trello.com/b/GKXXiBxU/ubuntu-south-africa-loco |
156 | +.. _free trello account: https://trello.com/signup |
157 | +.. _Join us : https://wiki.ubuntu.com/Membership |
158 | +.. _Ubuntu community : https://wiki.ubuntu.com/ContributeToUbuntu |
159 | +.. _mailing list : https://lists.ubuntu.com/mailman/listinfo/ubuntu-za |
160 | +.. _monthly meetings : http://loco.ubuntu.com/teams/ubuntu-za/meetings/ |
161 | + |
162 | |
163 | === added file 'pages/get-started.rst' |
164 | --- pages/get-started.rst 1970-01-01 00:00:00 +0000 |
165 | +++ pages/get-started.rst 2015-04-09 19:48:34 +0000 |
166 | @@ -0,0 +1,57 @@ |
167 | +.. title: Get Started |
168 | +.. slug: get-started |
169 | +.. date: 2014-12-18 20:58:59 UTC+02:00 |
170 | +.. tags: |
171 | +.. link: |
172 | +.. description: |
173 | +.. type: text |
174 | + |
175 | +Getting started with Ubuntu_ has never been easier. Whether you are |
176 | +wanting to get a few more years of good use out of an older piece of |
177 | +hardware or are looking for a great secure and safe operating system to |
178 | +use as your day to day workhorse, Ubuntu_ can meet your needs. |
179 | + |
180 | +Getting started involves a few steps, namely: |
181 | + |
182 | +- Choose your distribution and download it |
183 | +- Burn the distribution to DVD or to a USB Thumb Drive |
184 | +- Boot your computer from the DVD or Thumb Drive and follow the on-screen instructions |
185 | + |
186 | +Choose your distribution |
187 | +------------------------ |
188 | + |
189 | +You may be wondering "What is a distribution?". Simply put, it is a compilation of different software and in particular, |
190 | +a different graphical interface and user experience. Many people have their views on the best distribution and interface, but |
191 | +at the end of the day, it comes down to your personal preference. Some distributions work best on more modern hardware, while |
192 | +others will run on outdated hardware. |
193 | + |
194 | +Ubuntu has a default Ubuntu distribution, however, many Ubuntu based distributions exist. Even Ubuntu is a distribution, |
195 | +being based on Debian_ . |
196 | + |
197 | +Choose the distribution_ that suits your needs and hardware and let us know `your choice </poll.html>`_! |
198 | + |
199 | +Burn a DVD or make a bootable flash drive |
200 | +----------------------------------------- |
201 | + |
202 | +Depending on your hardware, a DVD or usb flash drive may be used to install. |
203 | + |
204 | +Instructions on setting these up can be found in the links below. Remember, if you need help, just ask on |
205 | +our `IRC </irc.html>`_! channel. |
206 | + |
207 | +`General Installations`_ |
208 | + |
209 | +`Burning a DVD`_ |
210 | + |
211 | +`Making a Bootable USB Drive`_ |
212 | + |
213 | +Have fun with your new operating system |
214 | +--------------------------------------- |
215 | +Now that things are installed, start having fun. `Get involved </getting-involved.html>`_! in the community or just come and |
216 | +`say hello </irc.html>`_!. |
217 | + |
218 | +.. _Ubuntu : https://www.ubuntu.com |
219 | +.. _Debian : http://www.debian.org |
220 | +.. _distribution : http://www.ubuntu.com/about/about-ubuntu/flavours |
221 | +.. _Burning a DVD : https://help.ubuntu.com/community/BurningIsoHowto |
222 | +.. _General Installations : https://help.ubuntu.com/community/Installation |
223 | +.. _Making a Bootable USB Drive : https://help.ubuntu.com/community/Installation/FromUSBStick |
224 | |
225 | === removed file 'pages/getting-involved.rst' |
226 | --- pages/getting-involved.rst 2015-03-02 19:37:34 +0000 |
227 | +++ pages/getting-involved.rst 1970-01-01 00:00:00 +0000 |
228 | @@ -1,93 +0,0 @@ |
229 | -.. title: Getting Involved |
230 | -.. slug: getting-involved |
231 | -.. date: 2014-12-18 20:58:59 UTC+02:00 |
232 | -.. tags: |
233 | -.. link: |
234 | -.. description: |
235 | -.. type: text |
236 | - |
237 | -Looking to get involved? Of course you are. That is why you are here. The Ubuntu-ZA Community has many needs as does the |
238 | -wider Ubuntu community. Locally, we need and would appreciate |
239 | - |
240 | -- Your ideas and enthusiasm in our `monthly meetings`_ |
241 | -- Your help troubleshooting bugs or issues sent on our `mailing list`_ (see below) |
242 | -- Your enthusiasm in spreading the word about Ubuntu |
243 | -- Your company on our `IRC </irc.html>`_! channel |
244 | - |
245 | - |
246 | -Mailing List |
247 | ------------- |
248 | -One of our primary ways of communicating is via our mailing list. To subscribe to the mailing list, enter your e-mail |
249 | -below and you'll receive a mail to confirm your subscription to the mailing list. If you just want to browse through the |
250 | -e-mails, take a look at the `mailing list archives <https://lists.ubuntu.com/archives/ubuntu-za/>`_. |
251 | - |
252 | -.. raw:: html |
253 | - |
254 | - <div class="row text-center"> |
255 | - <div class="col-md-3"> </div> |
256 | - <div class="col-md-6 well"> |
257 | - <p><strong>Subscribe to <code class="reverse">moc.utnubu.stsil@az-utnubu</code></strong></p> |
258 | - <form role="form" method="POST" action="https://lists.ubuntu.com/mailman/subscribe/ubuntu-za" class="form-inline"> |
259 | - <div class="form-group"> |
260 | - <label for="email" class="control-label">E-mail:</label> |
261 | - <input type="email" name="email" class="form-control" id="email" placeholder="test@example.com"> |
262 | - </div> |
263 | - <div class="form-group"> |
264 | - <button type="submit" class="btn btn-primary" name="email-button" value="Subscribe">Subscribe</button> |
265 | - </div> |
266 | - </form> |
267 | - </div> |
268 | - <div class="col-md-3"> </div> |
269 | - </div> |
270 | - |
271 | - |
272 | -IRC |
273 | ---- |
274 | -The Ubuntu-ZA Local Community prefers to hang out in IRC, where we can discuss Ubuntu, Linux, open source software, and |
275 | -a host of other things. Please join us in `IRC </irc.html>`_! |
276 | - |
277 | - |
278 | -.. raw:: html |
279 | - |
280 | - <div class="row"> |
281 | - <div class="col-md-3"> </div> |
282 | - <div class="col-md-6 well"> |
283 | - <p class="text-center"><strong>IRC client details</strong></p> |
284 | - <dl class="dl-horizontal"> |
285 | - <dt>Network:</dt> |
286 | - <dd>Freenode</dd> |
287 | - <dt>Server:</dt> |
288 | - <dd>chat.freenode.net</dd> |
289 | - <dt>Channel:</dt> |
290 | - <dd>#ubuntu-za</dd> |
291 | - </dl> |
292 | - </div> |
293 | - <div class="col-md-3"> </div> |
294 | - </div> |
295 | - |
296 | - |
297 | -Web Site |
298 | --------- |
299 | -You can even be involved in our web site! `Branch it on Launchpad <https://code.launchpad.net/ubuntu-za>`_ and propose |
300 | -your changes. Check out our `Bazaar tutorial </bazaar-tutorial.html>`_ for how to get started using Bazaar and |
301 | -`Launchpad <https://launchpad.net>`_. |
302 | - |
303 | -Trello |
304 | ------- |
305 | -View our `trello page`_ to follow our projects. Trello is used to keep track of different projects and tasks (to-do list). Trello can also be used to make suggestions. You can contribute to the board by getting a `free trello account`_ and joining the team. Joining the team does not require you to be an official Ubuntu Member. |
306 | - |
307 | -International Ubuntu Community |
308 | ------------------------------- |
309 | -The greater `Ubuntu community`_ also has needs, many of which you may like to get involved in. |
310 | - |
311 | -Become an official Ubuntu Member |
312 | --------------------------------- |
313 | -We help to build Ubuntu, the most popular Free Operating System out there, we do packaging, translation, quality assurance, marketing, support, writing, design, art... `Join us`_! |
314 | - |
315 | -.. _trello page: https://trello.com/b/GKXXiBxU/ubuntu-south-africa-loco |
316 | -.. _free trello account: https://trello.com/signup |
317 | -.. _Join us : https://wiki.ubuntu.com/Membership |
318 | -.. _Ubuntu community : https://wiki.ubuntu.com/ContributeToUbuntu |
319 | -.. _mailing list : https://lists.ubuntu.com/mailman/listinfo/ubuntu-za |
320 | -.. _monthly meetings : http://loco.ubuntu.com/teams/ubuntu-za/meetings/ |
321 | - |
322 | |
323 | === removed file 'pages/getting-started.rst' |
324 | --- pages/getting-started.rst 2015-02-21 13:05:23 +0000 |
325 | +++ pages/getting-started.rst 1970-01-01 00:00:00 +0000 |
326 | @@ -1,57 +0,0 @@ |
327 | -.. title: Getting Started |
328 | -.. slug: getting-started |
329 | -.. date: 2014-12-18 20:58:59 UTC+02:00 |
330 | -.. tags: |
331 | -.. link: |
332 | -.. description: |
333 | -.. type: text |
334 | - |
335 | -Getting started with Ubuntu_ has never been easier. Whether you are |
336 | -wanting to get a few more years of good use out of an older piece of |
337 | -hardware or are looking for a great secure and safe operating system to |
338 | -use as your day to day workhorse, Ubuntu_ can meet your needs. |
339 | - |
340 | -Getting started involves a few steps, namely: |
341 | - |
342 | -- Choose your distribution and download it |
343 | -- Burn the distribution to DVD or to a USB Thumb Drive |
344 | -- Boot your computer from the DVD or Thumb Drive and follow the on-screen instructions |
345 | - |
346 | -Choose your distribution |
347 | ------------------------- |
348 | - |
349 | -You may be wondering "What is a distribution?". Simply put, it is a compilation of different software and in particular, |
350 | -a different graphical interface and user experience. Many people have their views on the best distribution and interface, but |
351 | -at the end of the day, it comes down to your personal preference. Some distributions work best on more modern hardware, while |
352 | -others will run on outdated hardware. |
353 | - |
354 | -Ubuntu has a default Ubuntu distribution, however, many Ubuntu based distributions exist. Even Ubuntu is a distribution, |
355 | -being based on Debian_ . |
356 | - |
357 | -Choose the distribution_ that suits your needs and hardware and let us know `your choice </poll.html>`_! |
358 | - |
359 | -Burn a DVD or make a bootable flash drive |
360 | ------------------------------------------ |
361 | - |
362 | -Depending on your hardware, a DVD or usb flash drive may be used to install. |
363 | - |
364 | -Instructions on setting these up can be found in the links below. Remember, if you need help, just ask on |
365 | -our `IRC </irc.html>`_! channel. |
366 | - |
367 | -`General Installations`_ |
368 | - |
369 | -`Burning a DVD`_ |
370 | - |
371 | -`Making a Bootable USB Drive`_ |
372 | - |
373 | -Have fun with your new operating system |
374 | ---------------------------------------- |
375 | -Now that things are installed, start having fun. `Get involved </getting-involved.html>`_! in the community or just come and |
376 | -`say hello </irc.html>`_!. |
377 | - |
378 | -.. _Ubuntu : https://www.ubuntu.com |
379 | -.. _Debian : http://www.debian.org |
380 | -.. _distribution : http://www.ubuntu.com/about/about-ubuntu/flavours |
381 | -.. _Burning a DVD : https://help.ubuntu.com/community/BurningIsoHowto |
382 | -.. _General Installations : https://help.ubuntu.com/community/Installation |
383 | -.. _Making a Bootable USB Drive : https://help.ubuntu.com/community/Installation/FromUSBStick |
384 | |
385 | === modified file 'themes/ubuntuza/assets/css/theme.css' |
386 | --- themes/ubuntuza/assets/css/theme.css 2015-02-05 09:06:22 +0000 |
387 | +++ themes/ubuntuza/assets/css/theme.css 2015-04-09 19:48:34 +0000 |
388 | @@ -99,3 +99,19 @@ |
389 | margin-right: 10px; |
390 | margin-left: 10px; |
391 | } |
392 | + |
393 | +/*Nav-menu fixes |
394 | +Uncomment if menu gets too big. |
395 | +90px for 3 lines. |
396 | +70px for 2 lines. |
397 | +*/ |
398 | +/* |
399 | +@media (max-width: 991px) and (min-width: 768px){ |
400 | + .storypage{padding-top: 70px !important;} |
401 | +} |
402 | +*/ |
403 | + |
404 | +/*Padding for cellphones*/ |
405 | +@media (max-width: 768px){ |
406 | + .storypage{padding-left: 5px !important;} |
407 | +} |
You're doing the footer wrong, and messing it up. It's already in a <p> tag, remove yours. Also, we're using HTML5, no need for / in your <br> tags. HTML != XML
CONTENT_FOOTER = ''' getnikola. com" rel="nofollow" >Nikola< /a> | /twitter. com/ubuntuza" style=" text-allign: right;" target= "_blank" ><span class="fa fa-twitter fa-fw" ></span>Twitter</a> | /www.facebook. com/groups/ ubuntuza/" target= "_blank" ><span class="fa fa-facebook fa-fw"></span> Facebook</a> | /plus.google. com/+Ubuntu- zaOrg" target= "_blank" ><span class="fa fa-google-plus fa-fw"></span> Google+</a>
Contents © {date} {author} - Powered by <a href="http://
<a href="https:/
<a href="https:/
<a href="https:/
| {license}'''