Merge lp:~prysdieheer/ubuntu-za/menu-revisions2 into lp:ubuntu-za

[Ashton van Niekerk]

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.

[Raoul Snyman (raoul-snyman)]

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 = '''
Contents &copy; {date} {author} - Powered by <a href="http://getnikola.com" rel="nofollow">Nikola</a> |
<a href="https://twitter.com/ubuntuza" style="text-allign:right;" target="_blank"><span class="fa fa-twitter fa-fw" ></span>Twitter</a> |
<a href="https://www.facebook.com/groups/ubuntuza/" target="_blank"><span class="fa fa-facebook fa-fw"></span> Facebook</a> |
<a href="https://plus.google.com/+Ubuntu-zaOrg" target="_blank"><span class="fa fa-google-plus fa-fw"></span> Google+</a>
| {license}'''

review: Needs Fixing

[Raoul Snyman (raoul-snyman)]

If you need to add extra padding for cellphones and stuff, it's usually indicative that you're doing something wrong. You might just need to use a <div class="row"> and some <div class="col-xs-12"> inside.

review: Needs Information

[Raoul Snyman (raoul-snyman)]

You need to use the row and column classes.

review: Needs Fixing

Unmerged revisions

28. By Ashton van Niekerk on 2015-04-09

Fixed the footer, still prefer it in the middle though.

27. By Ashton van Niekerk on 2015-04-09

Changesd 'getting' to 'get' in the menu and titles.

26. By Ashton van Niekerk on 2015-04-08

Put the social links at both top and footer, and placed it in the conf file footer variable

=== modified file 'conf.py'
--- conf.py	2015-03-02 19:37:34 +0000
+++ conf.py	2015-04-09 19:49:48 +0000
@@ -111,9 +111,8 @@
 
 NAVIGATION_LINKS = {
     DEFAULT_LANG: [
-        ('/index.html', 'Home'),
-        ('/getting-started.html', 'Getting Started'),
-        ('/getting-involved.html', 'Getting Involved'),
+        ('/get-started.html', 'Get Started'),
+        ('/get-involved.html', 'Get Involved'),
         ('/irc.html', 'IRC Channel'),
         (
             (
@@ -124,17 +123,24 @@
 		('https://launchpad.net/~ubuntu-za', '<span class="fa fa-archive fa-fw"></span> Launchpad Site'),
 		('https://trello.com/b/GKXXiBxU/ubuntu-south-africa-loco', '<span class="fa fa-trello fa-fw"></span> Project Management')
             ),
-            'LoCo Links'
-        ),
+            'Links'
+        ),	     
         (
-            (
-                ('https://twitter.com/ubuntuza', '<span class="fa fa-twitter fa-fw"></span> Twitter'),
-                ('https://www.facebook.com/groups/ubuntuza/', '<span class="fa fa-facebook fa-fw"></span> Facebook'),
-                ('https://plus.google.com/+Ubuntu-zaOrg', '<span class="fa fa-google-plus fa-fw"></span> Google+')
-            ),
-            'Social Media'
-        ),
-        ('http://za.ubuntuforums.org/', 'Forums <span class="fa fa-external-link fa-fw"></span>')
+	    (
+	    	('http://za.ubuntuforums.org/', '<span class="fa fa-comments-o fa-fw"></span> Forums'),
+	    	('https://askubuntu.com/','<span class="fa fa-question  fa-fw"></span> Askubuntu'),
+	    ),
+	    'Help'
+	),
+	(
+	    (
+	    	('https://twitter.com/ubuntuza', '<span class="fa fa-twitter fa-fw" ></span>Twitter'),
+	    	('https://www.facebook.com/groups/ubuntuza/','<span class="fa fa-facebook fa-fw"></span> Facebook'),
+		('https://plus.google.com/+Ubuntu-zaOrg','<span class="fa fa-google-plus fa-fw"></span> Google+'),
+	    ),
+	    'Social links'
+	)
+
     ]
 }
 
@@ -489,7 +495,11 @@
 
 # A small copyright notice for the page footer (in HTML).
 # (translatable)
-CONTENT_FOOTER = 'Contents &copy; {date} {author} - Powered by <a href="http://getnikola.com" rel="nofollow">Nikola</a> {license}'
+CONTENT_FOOTER = '''
+		<a href="https://twitter.com/ubuntuza" style="text-allign:right;" target="_blank"><span class="fa fa-twitter fa-fw" ></span>Twitter</a> | 
+		<a href="https://www.facebook.com/groups/ubuntuza/" target="_blank"><span class="fa fa-facebook fa-fw"></span> Facebook</a> | 
+		<a href="https://plus.google.com/+Ubuntu-zaOrg" target="_blank"><span class="fa fa-google-plus fa-fw"></span> Google+</a>
+		<br> Contents &copy; {date} {author} - Powered by <a href="http://getnikola.com" rel="nofollow">Nikola</a> {license}'''
 
 # Things that will be passed to CONTENT_FOOTER.format().  This is done
 # for translatability, as dicts are not formattable.  Nikola will

=== added file 'pages/get-involved.rst'
--- pages/get-involved.rst	1970-01-01 00:00:00 +0000
+++ pages/get-involved.rst	2015-04-09 19:49:48 +0000
@@ -0,0 +1,93 @@
+.. title: Get Involved
+.. slug: get-involved
+.. date: 2014-12-18 20:58:59 UTC+02:00
+.. tags: 
+.. link: 
+.. description: 
+.. type: text
+
+Looking to get involved? Of course you are. That is why you are here. The Ubuntu-ZA Community has many needs as does the
+wider Ubuntu community. Locally, we need and would appreciate
+
+- Your ideas and enthusiasm in our `monthly meetings`_
+- Your help troubleshooting bugs or issues sent on our `mailing list`_ (see below)
+- Your enthusiasm in spreading the word about Ubuntu
+- Your company on our `IRC </irc.html>`_! channel
+
+
+Mailing List
+------------
+One of our primary ways of communicating is via our mailing list. To subscribe to the mailing list, enter your e-mail
+below and you'll receive a mail to confirm your subscription to the mailing list. If you just want to browse through the
+e-mails, take a look at the `mailing list archives <https://lists.ubuntu.com/archives/ubuntu-za/>`_.
+
+.. raw:: html
+
+    <div class="row text-center">
+        <div class="col-md-3">&nbsp;</div>
+        <div class="col-md-6 well">
+            <p><strong>Subscribe to <code class="reverse">moc.utnubu.stsil@az-utnubu</code></strong></p>
+            <form role="form" method="POST" action="https://lists.ubuntu.com/mailman/subscribe/ubuntu-za" class="form-inline">
+                <div class="form-group">
+                    <label for="email" class="control-label">E-mail:</label>
+                    <input type="email" name="email" class="form-control" id="email" placeholder="[e-mail]">
+                </div>
+                <div class="form-group">
+                    <button type="submit" class="btn btn-primary" name="email-button" value="Subscribe">Subscribe</button>
+                </div>
+            </form>
+        </div>
+        <div class="col-md-3">&nbsp;</div>
+    </div>
+    
+    
+IRC
+---
+The Ubuntu-ZA Local Community prefers to hang out in IRC, where we can discuss Ubuntu, Linux, open source software, and
+a host of other things. Please join us in `IRC </irc.html>`_!
+
+
+.. raw:: html
+
+    <div class="row">
+        <div class="col-md-3">&nbsp;</div>
+        <div class="col-md-6 well">
+            <p class="text-center"><strong>IRC client details</strong></p>
+            <dl class="dl-horizontal">
+                <dt>Network:</dt>
+                <dd>Freenode</dd>
+                <dt>Server:</dt>
+                <dd>chat.freenode.net</dd>
+                <dt>Channel:</dt>
+                <dd>#ubuntu-za</dd>
+            </dl>
+        </div>
+        <div class="col-md-3">&nbsp;</div>
+    </div>
+
+
+Web Site
+--------
+You can even be involved in our web site! `Branch it on Launchpad <https://code.launchpad.net/ubuntu-za>`_ and propose
+your changes. Check out our `Bazaar tutorial </bazaar-tutorial.html>`_ for how to get started using Bazaar and 
+`Launchpad <https://launchpad.net>`_.
+
+Trello
+------
+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. 
+    
+International Ubuntu Community
+------------------------------
+The greater `Ubuntu community`_ also has needs, many of which you may like to get involved in.
+   
+Become an official Ubuntu Member
+--------------------------------
+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`_!
+
+.. _trello page: https://trello.com/b/GKXXiBxU/ubuntu-south-africa-loco
+.. _free trello account: https://trello.com/signup
+.. _Join us : https://wiki.ubuntu.com/Membership
+.. _Ubuntu community : https://wiki.ubuntu.com/ContributeToUbuntu
+.. _mailing list : https://lists.ubuntu.com/mailman/listinfo/ubuntu-za
+.. _monthly meetings : http://loco.ubuntu.com/teams/ubuntu-za/meetings/
+

=== added file 'pages/get-started.rst'
--- pages/get-started.rst	1970-01-01 00:00:00 +0000
+++ pages/get-started.rst	2015-04-09 19:49:48 +0000
@@ -0,0 +1,57 @@
+.. title: Get Started
+.. slug: get-started
+.. date: 2014-12-18 20:58:59 UTC+02:00
+.. tags: 
+.. link: 
+.. description: 
+.. type: text
+
+Getting started with Ubuntu_ has never been easier.  Whether you are 
+wanting to get a few more years of good use out of an older piece of 
+hardware or are looking for a great secure and safe operating system to 
+use as your day to day workhorse, Ubuntu_ can meet your needs.
+
+Getting started involves a few steps, namely:
+
+-	Choose your distribution and download it
+-	Burn the distribution to DVD or to a USB Thumb Drive
+-	Boot your computer from the DVD or Thumb Drive and follow the on-screen instructions
+    
+Choose your distribution
+------------------------
+
+You may be wondering "What is a distribution?".  Simply put, it is a compilation of different software and in particular,
+a different graphical interface and user experience.  Many people have their views on the best distribution and interface, but
+at the end of the day, it comes down to your personal preference.  Some distributions work best on more modern hardware, while
+others will run on outdated hardware.
+
+Ubuntu has a default Ubuntu distribution, however, many Ubuntu based distributions exist.  Even Ubuntu is a distribution, 
+being based on Debian_ . 
+
+Choose the distribution_ that suits your needs and hardware and let us know `your choice </poll.html>`_!
+    
+Burn a DVD or make a bootable flash drive
+-----------------------------------------
+
+Depending on your hardware, a DVD or usb flash drive may be used to install.
+
+Instructions on setting these up can be found in the links below.  Remember, if you need help, just ask on
+our `IRC </irc.html>`_! channel.
+
+`General Installations`_
+
+`Burning a DVD`_
+
+`Making a Bootable USB Drive`_
+
+Have fun with your new operating system
+---------------------------------------
+Now that things are installed, start having fun.  `Get involved </getting-involved.html>`_! in the community or just come and
+`say hello </irc.html>`_!.
+    
+.. _Ubuntu : https://www.ubuntu.com
+.. _Debian : http://www.debian.org
+.. _distribution : http://www.ubuntu.com/about/about-ubuntu/flavours
+.. _Burning a DVD : https://help.ubuntu.com/community/BurningIsoHowto
+.. _General Installations : https://help.ubuntu.com/community/Installation
+.. _Making a Bootable USB Drive : https://help.ubuntu.com/community/Installation/FromUSBStick

=== removed file 'pages/getting-involved.rst'
--- pages/getting-involved.rst	2015-03-02 19:37:34 +0000
+++ pages/getting-involved.rst	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-.. title: Getting Involved
-.. slug: getting-involved
-.. date: 2014-12-18 20:58:59 UTC+02:00
-.. tags: 
-.. link: 
-.. description: 
-.. type: text
-
-Looking to get involved? Of course you are. That is why you are here. The Ubuntu-ZA Community has many needs as does the
-wider Ubuntu community. Locally, we need and would appreciate
-
-- Your ideas and enthusiasm in our `monthly meetings`_
-- Your help troubleshooting bugs or issues sent on our `mailing list`_ (see below)
-- Your enthusiasm in spreading the word about Ubuntu
-- Your company on our `IRC </irc.html>`_! channel
-
-
-Mailing List
-------------
-One of our primary ways of communicating is via our mailing list. To subscribe to the mailing list, enter your e-mail
-below and you'll receive a mail to confirm your subscription to the mailing list. If you just want to browse through the
-e-mails, take a look at the `mailing list archives <https://lists.ubuntu.com/archives/ubuntu-za/>`_.
-
-.. raw:: html
-
-    <div class="row text-center">
-        <div class="col-md-3">&nbsp;</div>
-        <div class="col-md-6 well">
-            <p><strong>Subscribe to <code class="reverse">moc.utnubu.stsil@az-utnubu</code></strong></p>
-            <form role="form" method="POST" action="https://lists.ubuntu.com/mailman/subscribe/ubuntu-za" class="form-inline">
-                <div class="form-group">
-                    <label for="email" class="control-label">E-mail:</label>
-                    <input type="email" name="email" class="form-control" id="email" placeholder="[e-mail]">
-                </div>
-                <div class="form-group">
-                    <button type="submit" class="btn btn-primary" name="email-button" value="Subscribe">Subscribe</button>
-                </div>
-            </form>
-        </div>
-        <div class="col-md-3">&nbsp;</div>
-    </div>
-    
-    
-IRC
----
-The Ubuntu-ZA Local Community prefers to hang out in IRC, where we can discuss Ubuntu, Linux, open source software, and
-a host of other things. Please join us in `IRC </irc.html>`_!
-
-
-.. raw:: html
-
-    <div class="row">
-        <div class="col-md-3">&nbsp;</div>
-        <div class="col-md-6 well">
-            <p class="text-center"><strong>IRC client details</strong></p>
-            <dl class="dl-horizontal">
-                <dt>Network:</dt>
-                <dd>Freenode</dd>
-                <dt>Server:</dt>
-                <dd>chat.freenode.net</dd>
-                <dt>Channel:</dt>
-                <dd>#ubuntu-za</dd>
-            </dl>
-        </div>
-        <div class="col-md-3">&nbsp;</div>
-    </div>
-
-
-Web Site
---------
-You can even be involved in our web site! `Branch it on Launchpad <https://code.launchpad.net/ubuntu-za>`_ and propose
-your changes. Check out our `Bazaar tutorial </bazaar-tutorial.html>`_ for how to get started using Bazaar and 
-`Launchpad <https://launchpad.net>`_.
-
-Trello
-------
-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. 
-    
-International Ubuntu Community
-------------------------------
-The greater `Ubuntu community`_ also has needs, many of which you may like to get involved in.
-   
-Become an official Ubuntu Member
---------------------------------
-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`_!
-
-.. _trello page: https://trello.com/b/GKXXiBxU/ubuntu-south-africa-loco
-.. _free trello account: https://trello.com/signup
-.. _Join us : https://wiki.ubuntu.com/Membership
-.. _Ubuntu community : https://wiki.ubuntu.com/ContributeToUbuntu
-.. _mailing list : https://lists.ubuntu.com/mailman/listinfo/ubuntu-za
-.. _monthly meetings : http://loco.ubuntu.com/teams/ubuntu-za/meetings/
-

=== removed file 'pages/getting-started.rst'
--- pages/getting-started.rst	2015-02-21 13:05:23 +0000
+++ pages/getting-started.rst	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-.. title: Getting Started
-.. slug: getting-started
-.. date: 2014-12-18 20:58:59 UTC+02:00
-.. tags: 
-.. link: 
-.. description: 
-.. type: text
-
-Getting started with Ubuntu_ has never been easier.  Whether you are 
-wanting to get a few more years of good use out of an older piece of 
-hardware or are looking for a great secure and safe operating system to 
-use as your day to day workhorse, Ubuntu_ can meet your needs.
-
-Getting started involves a few steps, namely:
-
--	Choose your distribution and download it
--	Burn the distribution to DVD or to a USB Thumb Drive
--	Boot your computer from the DVD or Thumb Drive and follow the on-screen instructions
-    
-Choose your distribution
-------------------------
-
-You may be wondering "What is a distribution?".  Simply put, it is a compilation of different software and in particular,
-a different graphical interface and user experience.  Many people have their views on the best distribution and interface, but
-at the end of the day, it comes down to your personal preference.  Some distributions work best on more modern hardware, while
-others will run on outdated hardware.
-
-Ubuntu has a default Ubuntu distribution, however, many Ubuntu based distributions exist.  Even Ubuntu is a distribution, 
-being based on Debian_ . 
-
-Choose the distribution_ that suits your needs and hardware and let us know `your choice </poll.html>`_!
-    
-Burn a DVD or make a bootable flash drive
------------------------------------------
-
-Depending on your hardware, a DVD or usb flash drive may be used to install.
-
-Instructions on setting these up can be found in the links below.  Remember, if you need help, just ask on
-our `IRC </irc.html>`_! channel.
-
-`General Installations`_
-
-`Burning a DVD`_
-
-`Making a Bootable USB Drive`_
-
-Have fun with your new operating system
----------------------------------------
-Now that things are installed, start having fun.  `Get involved </getting-involved.html>`_! in the community or just come and
-`say hello </irc.html>`_!.
-    
-.. _Ubuntu : https://www.ubuntu.com
-.. _Debian : http://www.debian.org
-.. _distribution : http://www.ubuntu.com/about/about-ubuntu/flavours
-.. _Burning a DVD : https://help.ubuntu.com/community/BurningIsoHowto
-.. _General Installations : https://help.ubuntu.com/community/Installation
-.. _Making a Bootable USB Drive : https://help.ubuntu.com/community/Installation/FromUSBStick

=== modified file 'themes/ubuntuza/assets/css/theme.css'
--- themes/ubuntuza/assets/css/theme.css	2015-02-05 09:06:22 +0000
+++ themes/ubuntuza/assets/css/theme.css	2015-04-09 19:49:48 +0000
@@ -99,3 +99,19 @@
     margin-right: 10px;
     margin-left: 10px;
 }
+
+/*Nav-menu fixes
+Uncomment if menu gets too big.
+90px for 3 lines.
+70px for 2 lines.
+*/
+/*
+@media (max-width: 991px) and (min-width: 768px){
+  .storypage{padding-top: 70px !important;}
+}
+*/
+
+/*Padding for cellphones*/
+@media (max-width: 768px){
+  .storypage{padding-left: 5px !important;}
+}