move various metadata things to the config

diff --git a/config.yml b/config.yml
index 99167d97e9811041d92a0aa64019788b6657a14f..f0b1e0b9af53d22dd5bc12e2ac8423d93f759df2 100644 (file)
--- a/config.yml
+++ b/config.yml
@@ -1,4 +1,17 @@
 name: freenode
+COPYRIGHT: "© 2016, freenode"
+DESCRIPTION: "freenode IRC network"
+GITHUB_URL: "https://github.com/freenode/web-7.0"
+SOCIAL:
+  - name: Google+
+    icon: google-plus
+    link: 'https://plus.google.com/104326727082310562426'
+  - name: Twitter
+    icon: twitter
+    link: 'https://twitter.com/freenodestaff'
+  - name: Facebook
+    icon: facebook
+    link: 'https://www.facebook.com/freenode-366911233325305/'
 theme: templates
 output: out
 content-root: content

diff --git a/templates/base.html b/templates/base.html
index 1d805bd781079b5a027d3425db3cb80be61464c0..b64e4aeb5508d0b4dd90bf5f194004da0fdd69f2 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -6,7 +6,7 @@
     <meta content="width=device-width, initial-scale=1" name="viewport">
     <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
     <meta name="theme-color" content="#292f2f">
-    <meta name="description" content="freenode IRC network">
+    <meta name="description" content="{{ config.DESCRIPTION }}">
     <link rel="icon" href="{{ url_for("static/img/logos/coloured-alphabg-sq-120.png") }}">
     <title>{% block title %}{{ title }} - {{ config.name }}{% endblock %}</title>
     <link href="{{ url_for("static/css/open-sans.css") }}" rel="stylesheet">

diff --git a/templates/footer.html b/templates/footer.html
index 44f90ac5520c77040077786820005c2f453ad327..34c9850af106c89ff4834c5e6703f8e1bbd295b3 100644 (file)
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -62,28 +62,19 @@
         <div class="footer-push">
         <h2>Social Media</h2>
         <ul>
+            {%- for link in config.SOCIAL %}
             <li>
-                <a href="https://plus.google.com/104326727082310562426"
-                target="_blank"><i class="fa fa-google-plus"></i>
-                Google+</a>
+                <a href="{{ link.link }}" target="_blank">
+                    <i class="fa fa-{{ link.icon }} fa-fw"></i> {{ link.name }}</a>
             </li>
+            {%- endfor %}
             <li>
-                <a href="https://twitter.com/freenodestaff" target=
-                "_blank"><i class="fa fa-twitter"></i> Twitter</a>
-            </li>
-            <li>
-                <a href=
-                "https://www.facebook.com/freenode-366911233325305/"
-                target="_blank"><i class="fa fa-facebook"></i>
-                Facebook</a>
-            </li>
-            <li>
-                <a href="{{ url_for("archive") }}"><i class="fa fa-rss"></i>
+                <a href="{{ url_for("archive") }}"><i class="fa fa-rss fa-fw"></i>
                 News Archive</a>
             </li>
             <li>
                 <a href="https://www.privateinternetaccess.com/" target="_blank"><img alt="PIA" height=
-                "14px" src="{{ url_for("static/img/logos/pia-robot-original.svg") }}">
+                "14px" class="fa-fw" src="{{ url_for("static/img/logos/pia-robot-original.svg") }}">
                 Private Internet Access</a>
             </li>
         </ul>
@@ -91,8 +82,15 @@
     </div>
 </footer>
 <footer class="copyright">
+    <div>
+    {%- if config.GITHUB_URL is defined %}
+    <a class="footer-link" href="{{ config.GITHUB_URL }}"><i class="fa fa-github fa-lg"></i></a>&nbsp;
+    {% endif -%}
     <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; 1998-2016, freenode</p>
+    </div>
+    <div>
+        {{ config.COPYRIGHT|safe }}
+    </div>
 </footer>