From f470988f4ff978cba790a9939df225d84ec3085a Mon Sep 17 00:00:00 2001
From: Juuso Lapinlampi <wub@partyvan.eu>
Date: Thu, 22 Oct 2015 05:47:57 +0000
Subject: pages: Move nav.swig includes from jumbotron to bottom

nav.swig includes were inconsistently at either bottom of the page or
inside the jumbotron. For FAQ, the navigation was also nested
incorrectly inside the <article> element, which means the navigation
incorrectly assumed to be in-article navigation (table of contents).

The intention is to have these nav.swig (site-wide navigation) includes
outside of <article> scope. Future improvement is desired to have all
pages like other.swig and tools.swig to have <article> elements.
---
 pages/faq.swig   | 2 +-
 pages/tools.swig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pages')

diff --git a/pages/faq.swig b/pages/faq.swig
index 190800a..08950c6 100644
--- a/pages/faq.swig
+++ b/pages/faq.swig
@@ -28,7 +28,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 <article>
 	<div class="jumbotron">
 		<h1><abbr title="Frequently asked questions">FAQ</abbr></h1>
-		{% include "nav.swig" %}
 	</div>
 	<h2>What is Pantsu.cat?</h2>
 	<p><span role="definition"><dfn>Pantsu.cat</dfn> is a simple to use free file hosting service.</span> It lets you share your photos, documents, music, videos and more with others online.</p>
@@ -47,4 +46,5 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 	<h2>I have a question...</h2>
 	<p>Send us an email at <a href="mailto:contact@pantsu.cat">contact@pantsu.cat</a> and let's talk!</p>
 </article>
+{% include "nav.swig" %}
 {% endblock %}
diff --git a/pages/tools.swig b/pages/tools.swig
index dd078c6..e20cde8 100644
--- a/pages/tools.swig
+++ b/pages/tools.swig
@@ -27,7 +27,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 {% block body %}
 <div class="jumbotron">
 <h1>Pomf Tools</h1>
-{% include "nav.swig" %}
 </div>
 <section>
 	<h2>pomfload</h2>
@@ -75,4 +74,5 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 		<dd><a href="https://twitter.com/4vail">https://twitter.com/4vail</a></dd>
 	</dl>
 </section>
+{% include "nav.swig" %}
 {% endblock %}
-- 
cgit v1.2.3