merge

diff --cc static/css/mock1.css
index 804f4160a66e45e4ecce5546e9962b409a3a8a0c,b728ad6b4773abe3acec919760db7cf3134d2bba..b991d4d9af1cbc2145f0c19bfae2a3048e0f50bf
--- 1/static/css/mock1.css
--- 2/static/css/mock1.css
+++ b/static/css/mock1.css
@@@ -176,14 -179,6 +176,14 @@@ p.art-link 
      margin-top: 0;
  }
  
-     line-height: 1.5em;
 +/* Article */
 +.art-full h1,
 +.art-full h2,
 +.art-full h3,
 +.art-full h4 {
++    ;
 +}
 +
  /* help */
  .hmain {
      display: flex;

diff --cc templates/base.html
index 63745bbbbd8daa18139a0c6245cc59b320e63178,8c9fca5e2abb8df57b36350519ea73ce5c4bfedb..f036c35a98153a394b53202653e6612fc82825d3
--- 1/templates/base.html
--- 2/templates/base.html
+++ b/templates/base.html
@@@ -18,120 -21,144 +18,106 @@@
          "_blank"><img alt="Private internet access" class="nlogo" src=
          "static/img/logos/PIALogo_black.svg"></a>
      </nav>
 -
 -
      <div class="container">
-         <div class="jumbotron">
-             <h2 class="child">Welcome to freenode, the new home of your
-             projects.</h2>
-             <div class="box-container">
-                 <a class="box" href="about"><i class=
-                 "fa fa-comment fa-4x"></i><br>
-                 Chat</a> <a class="box" href="help"><i class=
-                 "fa fa-question fa-4x"></i><br>
-                 FAQ</a> <a class="box" href="contribute"><i class=
-                 "fa fa-users fa-4x"></i><br>
-                 Register a group</a>
-             </div>
 -        {% block content %}{% endblock %}
 -    </div>
 -
 -
 -    <footer class="footer">
 -        <div class="footerchild">
 -            <h2>About freenode</h2>
 -
 -
 -            <ul>
 -                <li>
 -                    <a>Vision</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Mission</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Philosophy</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Policies</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Credits</a>
 -                </li>
 -            </ul>
--        </div>
-         <div class="main">
 -
 -
 -        <div class="footerchild">
 -            <h2>Using freenode</h2>
 -
 -
 -            <ul>
 -                <li>
 -                    <a>Connect</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Clients</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Webchat</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>SASL</a>
 -                </li>
 -            </ul>
 -        </div>
 -
 -
 -        <div class="footerchild">
 -            <h2>Groups/Projects</h2>
 -
 -
 -            <ul>
 -                <li>
 -                    <a>Group Management System</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Groups on freenode</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>How Groups Work</a>
 -                </li>
 -            </ul>
 -        </div>
 -
 -
 -        <div class="footerchild">
 -            <h2>Support freenode</h2>
 -
 -
 -            <ul>
 -                <li>
 -                    <a>Host a server</a>
 -                </li>
 -            </ul>
 +            {% block content %}{% endblock %}
          </div>
 -
 -        <div class="footerchild hdn">&nbsp;</div>
 -
 -
 -        <div class="footerchild">
 -            <h2>Social Media</h2>
 -
 -
 -            <ul>
 -                <li>
 -                    <a href="https://plus.google.com/104326727082310562426"
 -                    target="_blank"><i class="fa fa-google-plus"></i>
 -                    Google+</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a href="https://twitter.com/freenodestaff" target=
 -                    "_blank"><i class="fa fa-twitter"></i> Twitter</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a href="PIA" target="_blank"><img alt="PIA" height="14px"
 -                    src="static/img/logos/pia-robot-original.svg"> Private Internet
 -                    Access</a>
 -                </li>
 -            </ul>
 -        </div>
 -    </footer>
 -
 -
 -    <footer class="copyright">
 -        <a class="copyright" href=
 -        "https://creativecommons.org/licenses/by-nc-sa/4.0/" target=
 -        "_blank"><img alt="CC by-nc-sa" height="31px" src=
 -        "static/img/by-nc-sa.svg"></a>
 -
 -        <p>&copy; Copyright 2002-2016, freenode</p>
 -    </footer>
 +    </div>
 +    <div class="footers">
 +        <footer class="footer">
 +            <div class="footerchild">
 +                <h2>About freenode</h2>
 +                <ul>
 +                    <li>
 +                        <a>Vision</a>
 +                    </li>
 +                    <li>
 +                        <a>Mission</a>
 +                    </li>
 +                    <li>
 +                        <a>Philosophy</a>
 +                    </li>
 +                    <li>
 +                        <a>Policies</a>
 +                    </li>
 +                    <li>
 +                        <a>Credits</a>
 +                    </li>
 +                </ul>
 +            </div>
 +            <div class="footerchild">
 +                <h2>Using freenode</h2>
 +                <ul>
 +                    <li>
 +                        <a>Connect</a>
 +                    </li>
 +                    <li>
 +                        <a>Clients</a>
 +                    </li>
 +                    <li>
 +                        <a>Webchat</a>
 +                    </li>
 +                    <li>
 +                        <a>SASL</a>
 +                    </li>
 +                </ul>
 +            </div>
 +            <div class="footerchild">
 +                <h2>Groups/Projects</h2>
 +                <ul>
 +                    <li>
 +                        <a>Group Management System</a>
 +                    </li>
 +                    <li>
 +                        <a>Groups on freenode</a>
 +                    </li>
 +                    <li>
 +                        <a>How Groups Work</a>
 +                    </li>
 +                </ul>
 +            </div>
 +            <div class="footerchild">
 +                <h2>Support freenode</h2>
 +                <ul>
 +                    <li>
 +                        <a>Host a server</a>
 +                    </li>
 +                </ul>
 +            </div>
 +            <div class="footerchild hdn">
 +                &nbsp;
 +            </div>
 +            <div class="footerchild">
 +                <h2>Social Media</h2>
 +                <ul>
 +                    <li>
 +                        <a href="https://plus.google.com/104326727082310562426"
 +                        target="_blank"><i class="fa fa-google-plus"></i>
 +                        Google+</a>
 +                    </li>
 +                    <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="PIA" target="_blank"><img alt="PIA" height=
 +                        "14px" src="static/img/logos/pia-robot-original.svg">
 +                        Private Internet Access</a>
 +                    </li>
 +                </ul>
 +            </div>
 +        </footer>
 +        <footer class="copyright">
 +            <a class="copyright" href=
 +            "https://creativecommons.org/licenses/by-nc-sa/4.0/" target=
 +            "_blank"><img alt="CC by-nc-sa" src="static/img/by-nc-sa.svg"></a>
 +            <p>&copy; Copyright 2002-2016, freenode</p>
 +        </footer>
 +    </div>
  </body>
- </html>
+ </html>

diff --cc templates/index.html
index 0000000000000000000000000000000000000000,3e09360a989fb62d4299fc766f7958cd11d3a786..f131bcbb02a2b83540421c28e9db5f2661571ff7
mode 000000,100644..100644
--- /dev/null
--- 2/templates/index.html
+++ b/templates/index.html
@@@ -1,0 -1,25 +1,20 @@@
 -    <h2 class="child">Welcome to freenode, the new home of your projects.</h2>
 -
 -
+ {% extends "base.html" %}
+ {% set title = config.name %}
+ {% block content %}
+ <div class="jumbotron">
 -        <a class="box" href="about">
 -            <i class="fa fa-comment fa-4x"></i><br>Chat
 -        </a>
 -        <a class="box" href="help">
 -            <i class="fa fa-question fa-4x"></i><br>FAQ
 -        </a>
 -        <a class="box" href="contribute">
 -            <i class="fa fa-users fa-4x"></i><br>Register a group
 -        </a>
++    <h2 class="child">Welcome to freenode, the new home of your
++    projects.</h2>
+     <div class="box-container">
 -
 -
++        <a class="box" href="about"><i class=
++        "fa fa-comment fa-4x"></i><br>
++        Chat</a> <a class="box" href="help"><i class=
++        "fa fa-question fa-4x"></i><br>
++        FAQ</a> <a class="box" href="contribute"><i class=
++        "fa fa-users fa-4x"></i><br>
++        Register a group</a>
+     </div>
+ </div>
+ <div class="main">
+     {{ get_module("news").articles[-1].render() }}
+ </div>
+ {% endblock content %}