Merge branch 'master' into page-placeholders

diff --git a/content/pages/credits.md b/content/pages/credits.md
new file mode 100644 (file)
index 0000000..bd0f8e3
--- /dev/null
+++ b/content/pages/credits.md
@@ -0,0 +1,4 @@
+Title: New policies
+Slug: about
+---
+{% extends soon.html %}

diff --git a/content/pages/eir.md b/content/pages/eir.md
new file mode 100644 (file)
index 0000000..058f414
--- /dev/null
+++ b/content/pages/eir.md
@@ -0,0 +1,4 @@
+Title: eir
+Slug: eir utility bot
+---
+{% extends soon.html %}

diff --git a/content/pages/mission.md b/content/pages/mission.md
new file mode 100644 (file)
index 0000000..3c9399d
--- /dev/null
+++ b/content/pages/mission.md
@@ -0,0 +1,4 @@
+Title: Mission
+Slug: mission
+---
+{% extends soon.html %}
\ No newline at end of file

diff --git a/content/pages/philosophy.md b/content/pages/philosophy.md
new file mode 100644 (file)
index 0000000..31ac93f
--- /dev/null
+++ b/content/pages/philosophy.md
@@ -0,0 +1,4 @@
+Title: Philosophy
+Slug: philosophy
+---
+{% extends soon.html %}
\ No newline at end of file

diff --git a/content/pages/policies.md b/content/pages/policies.md
new file mode 100644 (file)
index 0000000..844a310
--- /dev/null
+++ b/content/pages/policies.md
@@ -0,0 +1,4 @@
+Title: Policies
+Slug: policies
+---
+{% extends soon.html %}
\ No newline at end of file

diff --git a/content/pages/post1.md b/content/pages/post1.md
deleted file mode 100644 (file)
index ad50c31..0000000
--- a/content/pages/post1.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Title: New policies
-Slug: about
----
-This will be a very fancy about freenode page, currnetly it,'s a placeholder tough

diff --git a/content/pages/soon.md b/content/pages/soon.md
new file mode 100644 (file)
index 0000000..dd4c7ca
--- /dev/null
+++ b/content/pages/soon.md
@@ -0,0 +1,4 @@
+Title: Coming Soon
+Slug: soon
+---
+{% extends soon.html %}
\ No newline at end of file

diff --git a/content/pages/vision.md b/content/pages/vision.md
new file mode 100644 (file)
index 0000000..21d6755
--- /dev/null
+++ b/content/pages/vision.md
@@ -0,0 +1,4 @@
+Title: Vision
+Slug: vision
+---
+{% extends soon.html %}
\ No newline at end of file

diff --git a/templates/footer.html b/templates/footer.html
index 95673ec78dfbb8171380127fbdcd7aaddb4e7caf..44f90ac5520c77040077786820005c2f453ad327 100644 (file)
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -3,19 +3,19 @@
         <h2>About freenode</h2>
         <ul>
             <li>
-                <a>Vision</a>
+                <a href="{{ url_for("pages/vision") }}">Vision</a>
             </li>
             <li>
-                <a>Mission</a>
+                <a href="{{ url_for("pages/mission") }}">Mission</a>
             </li>
             <li>
-                <a>Philosophy</a>
+                <a href="{{ url_for("pages/philosophy") }}">Philosophy</a>
             </li>
             <li>
-                <a>Policies</a>
+                <a href="{{ url_for("pages/policies") }}">Policies</a>
             </li>
             <li>
-                <a>Credits</a>
+                <a href="{{ url_for("pages/credits") }}">Credits</a>
             </li>
         </ul>
     </div>
@@ -23,16 +23,16 @@
         <h2>Using freenode</h2>
         <ul>
             <li>
-                <a>Connect</a>
+                <a href="{{ url_for("faq/chat") }}">Connect</a>
             </li>
             <li>
-                <a>Clients</a>
+                <a href="{{ url_for("faq/clients") }}">Clients</a>
             </li>
             <li>
-                <a>Webchat</a>
+                <a href="https://webchat.freenode.net/">Webchat</a>
             </li>
             <li>
-                <a>SASL</a>
+                <a href="{{ url_for("faq/sasl") }}">SASL</a>
             </li>
         </ul>
     </div>
@@ -40,13 +40,13 @@
         <h2>Groups/Projects</h2>
         <ul>
             <li>
-                <a>Group Management System</a>
+                <a href="{{ url_for("pages/soon") }}">Group Management System</a>
             </li>
             <li>
-                <a>Groups on freenode</a>
+                <a href="{{ url_for("pages/soon") }}">Groups on freenode</a>
             </li>
             <li>
-                <a>How Groups Work</a>
+                <a href="{{ url_for("faq/groups") }}">How Groups Work</a>
             </li>
         </ul>
     </div>
@@ -54,7 +54,7 @@
         <h2>Support freenode</h2>
         <ul>
             <li>
-                <a>Host a server</a>
+                <a href="{{ url_for("faq/host") }}">Host a server</a>
             </li>
         </ul>
     </div>
@@ -94,5 +94,5 @@
     <a class="copyright" href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target= "_blank">
         <img alt="CC by-nc-sa" src="{{ url_for("static/img/by-nc-sa.svg") }}">
     </a>
-    <p>&copy; 2002-2016, freenode</p>
+    <p>&copy; 1998-2016, freenode</p>
 </footer>

diff --git a/templates/index.html b/templates/index.html
index 68e068cee3213ac1eff7d1fe180e0fe067fcebf5..190a2893f44b3ffea351082c6db0d1412c5eb1c2 100644 (file)
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,17 +4,17 @@
 <div class="jumbotron">
     <h2 class="child">Welcome to freenode&thinsp;—&thinsp;supporting free and open source communities since 1998</h2>
     <div class="box-container">
-        <a class="box" href="about">
+        <a class="box" href="href="{{ url_for("pages/vision") }}"">
             <i class="fa fa-comment fa-4x"></i>
             <div>Chat</div>
         </a>
-        <a class="box" href="contribute">
+        <a class="box" href="href="{{ url_for("pages/soon") }}"">
             <i class="fa fa-users fa-4x"></i>
             <div>Register a group</div>
         </a>
         <a class="box" href="help">
             <i class="fa fa-question fa-4x"></i>
-            <div>FAQ</div>
+            <div href="{{ url_for("faq") }}">FAQ</div>
         </a>
     </div>
 </div>

diff --git a/templates/soon.html b/templates/soon.html
new file mode 100644 (file)
index 0000000..69c91fa
--- /dev/null
+++ b/templates/soon.html
@@ -0,0 +1,8 @@
+{% block content %}
+<div class="main">
+    <p><b class="art">Coming Soon</b></p>
+    <p class="art-ingress">
+        Sorry, this page doesn't exist yet. But dont worry, we're on it.
+    </p>
+</div>
+{% endblock %}
\ No newline at end of file