Merge branch 'templates'

Conflicts:
	index_mock1.html
	static/css/mock1.css
	static/css/style.css

diff --cc index_mock1.html
index 236f08e267c455539890e1994c9acc1de576154f,78d24ca8f88ea4a2225e5d94a1ba919cb1e0004c..39b42a513f267d8ef8317689a5bac0eff48d82c5
--- 1/index_mock1.html
--- 2/index_mock1.html
+++ b/index_mock1.html
@@@ -39,182 -33,169 +33,170 @@@
                  Register a group</a>
              </div>
          </div>
- 
- 
          <div class="main">
              <div class="art">
-                 <p class="heading"><b class="art">Some News</b>&nbsp;<span class="art-date">2016-02-19 by christel</span></p>
- 
-                 <p class="art-ingress">Fancy news article's ingress text here.
-                 Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-                 Phasellus placerat ultricies euismod. Maecenas dolor mauris,
-                 posuere mollis eros vel, auctor rhoncus quam...</p>
- 
- 
-                 <p class="art-link"><a href="">Read More</a>
-                 </p>
-             </div>
- 
- 
-             <div class="art">
-                 <p><b class="art">Another News</b>
- 
- 
-                 <span class="art-date">2016-01-19 by christel</span></p>
- 
- 
-                 <p class="art-ingress">Some other news article's ingress here.
-                 Phasellus nec erat rhoncus, pretium orci eget, ullamcorper
-                 ipsum. Fusce sit amet felis a augue sodales commodo id eget
-                 justo. Phasellus id nisl nec elit porta pellentesque in egestas
-                 nibh. Vivamus mollis ligula lectus, in mollis nibh pharetra
-                 vitae...</p>
 +
- 
-                 <p class="art-link"><a href="">Read More</a>
-                 </p>
-             </div>
+     <p><b class="art">Recent Events and Future Changes</b>&nbsp;
+     <span class="art-date">2016-02-19 by spb</span></p>
+     <p class="art-full">One of the several problems that’s become obvious in recent times is that we  have too many policies, they’re often not consistent with each other, and we’ve spent too much time and effort wondering whether something, which is obviously the right thing to do, fits with our published policy. With that in mind, the following stripped-back set of policies will apply in future, with the intention that we can set out a simple set of baselines and apply common sense on top of them.
+ <h3>Nickname ownership</h3>
+ 
+ Nicknames are allocated on a first-come, first-served basis, to the first person
+ who registers the name with NickServ. However, we expect users to act in good
+ faith and reserve the right to remove a nickname registration where we believe
+ that this has not been the case.
+ 
+ <b>Nickname and account registrations expire ten weeks after they are last used.
+ For nicknames, ‘used’ means that you were using the nickname while logged in to
+ the account which owns it. For accounts, ‘used’ means that you logged in to the
+ account, regardless of the nickname you used to do so. Nicknames which are the
+ primary account name only expire when the entire account is expired.</b>
+ 
+ In some cases, such as for very old accounts, we may, at our discretion, extend
+ the expiry time of a nickname or account. We will not normally do this beyond 15
+ weeks past the last use.
+ 
+ Some nicknames and accounts, including but not limited to some of those owned by
+ current or former network staff, do not expire at all. These accounts can be
+ identified by the ‘Hold’ flag in their NickServ info output.
+ 
+ Nicknames and accounts which are expired will not automatically be dropped.
+ Please contact network staff if you would like to take over an expired nickname.
+ 
+ <h3>Channel ownership</h3>
+ 
+ Channels on freenode fall into one of two categories. Primary channels, which
+ begin with a single # character, are reserved for on-topic projects. If you’d
+ like to take over one of these channels, then you’ll need to be associated in
+ some way with the project in question. Topical, or ‘about’ channels, begin with
+ two # characters, and these are allocated on a first-come, first-served basis to
+ the first person who registers it with ChanServ. As with nicknames, however, we
+ reserve the right to remove or alter registrations where we believe they have
+ not been made in good faith.
+ 
+ Primary channels do not expire with inactivity, though they can be claimed at
+ any time by a representative of an on-topic project with the appropriate name.
+ Topical channels expire after 60 days in which no user on the access list for
+ the channel has joined it.
+ 
+ <h3>On-topic Use</h3>
+ 
+ freenode’s primary goal is to encourage and foster the development and use of
+ free and open source software projects and other peer-directed communities
+ producing broadly licensed creative output. Any project falling under this broad
+ description is likely to be considered on-topic for the purposes of primary
+ channel naming and other project services which we may provide, but individual
+ decisions may be made at the discretion of staff.
+ 
+ <h3>Off-topic Use</h3>
+ 
+ We expect all users of the network, whether affiliated with a project or not, to
+ act in good faith and in accordance with both their local laws and those
+ applicable where freenode operates. Use of freenode and its facilities is a
+ privilege, not a right, and may be withdrawn where we believe that this has not been the case.</p>
+     <p class="art-links">
+     <a href="{{ previous }}" class="art-link">Previous</a>
+     <a href="{{ previous }}" class="art-link">Next</a>
+     </p>
+ </div>
          </div>
      </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="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="img/by-nc-sa.svg"></a>
- 
-         <p>&copy; Copyright 2002-2016, freenode</p>
-     </footer>
+         <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 static/css/mock1.css
index b728ad6b4773abe3acec919760db7cf3134d2bba,2bdfaae17a1464732160f93383ccecf087f7a24d..78830bd461466ecbdb21d81220997654fb7bcb30
--- 1/css/mock1.css
--- 2/static/css/mock1.css
+++ b/static/css/mock1.css
@@@ -118,9 -114,8 +113,9 @@@ a 
      color: var(--text-color);
      margin-bottom: 5px;
      flex-basis: 30%;
 +   /* border: 1px solid rgba(var(--border-color), 0.39); */
      background-color: #fff;
-     border-radius:  var(--box-round);
+     border-radius: var(--box-round);
      -webkit-border-radius: var(--box-round);
      -moz-border-radius: var(--box-round);
  }

diff --cc static/css/style.css
index bd4ed3345036f68d7220e329a4322c20199de156,8284e645640ac67c846e5ddc2b2f1af97bdda7fb..bdbd4a8c9374f43e23db4518a3a25cb39bc86e01
--- 1/css/style.css
--- 2/static/css/style.css
+++ b/static/css/style.css
@@@ -326,12 -326,72 +327,70 @@@ a.hchild:active 
    .footerchild {
      width: 100%;
    }
+ 
+   .footerchild ul li:last-child {
+     margin-bottom: .5em;
+   }
+ 
+   .hdn {
+     display: none;
+   }
  }
  
 -.footer h2,
 -.footer h3 {
 -  margin-left: 10px;
 -  margin-right: 10px;
 +.footerchild ul li:last-child {
 +  margin-bottom: .5em;
  }
  
- .hdn {
-   display: none;
- }
+ .copyright {
+   display: -webkit-box;
+   display: -webkit-flex;
+   display: -ms-flexbox;
+   display: flex;
+   -webkit-flex-wrap: nowrap;
+   -ms-flex-wrap: nowrap;
+   flex-wrap: nowrap;
+   -webkit-box-pack: justify;
+   -webkit-justify-content: space-between;
+   -ms-flex-pack: justify;
+   justify-content: space-between;
+   -webkit-box-align: center;
+   -webkit-align-items: center;
+   -ms-flex-align: center;
+   align-items: center;
+   background: rgba(170,178,171,.5);
+   height: 3vh;
+   color: rgba(0,0,0,.8);
+ }
+ 
+ a.copyright {
+   background: rgba(170,178,171,.5);
+   margin-bottom: 0;
+   margin-top: 0;
+   margin-left: .5em;
+   margin-right: .5em;
+   width: auto;
+   height: auto;
+ }
+ 
+ .copyright a img {
+   height: 3vh;
+   width: auto;
+ }
+ 
+ .copyright p {
+   margin-bottom: 0;
+   margin-top: 0;
+   margin-left: .5em;
+   margin-right: .5em;
+   text-align: right;
+ }
+ 
+ @media all and (max-width: 500px) {
+   .copyright {
+     height: 5vh;
+   }
+ 
+   .copyright a img {
+     height: 5vh;
+   }
 -}
++}