update banner year and clean up config file

SeaGL · Jun 28, 2016 · 5845659 · 5845659
1 parent 7d14840
commit 5845659
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,2 +1,5 @@
 source 'https://rubygems.org'
+
 gem 'github-pages'
+gem 'kramdown'
+gem 'jekyll-paginate'
diff --git a/_config.yml b/_config.yml
@@ -1,14 +1,15 @@
 safe:           true
 lsi:            false
-pygments:       true
 timezone:       America/Los_Angeles
 markdown:       kramdown
 highlighter:    rouge
+gems:           [jekyll-paginate]
 
 paginate:       10
-paginate_path:  "news/page:num"
+paginate_path:  news/page:num
 
 name:           Seattle GNU Linux Conference
+short_name:     SeaGL
 description:    Seattle GNU Linux Conference
 url:            http://seagl.org
 
@@ -19,22 +20,18 @@ custom:
     dates:  November 11th and 12th
     location: Seattle Central College
     url:
-        survey:
-            cpf:            http://survey.seagl.org/index.php/935137/lang-en
         irc:
-            network:        http://freenode.net/using_the_network.shtml
-            channel:        http://webchat.freenode.net?randomnick=1&channels=%23seagl
+            network:        https://freenode.net/kb/answer/chat
+            channel:        https://webchat.freenode.net?randomnick=1&channels=%23seagl
         mailing_list:
             seagl_announce: https://groups.google.com/forum/#!forum/seagl_announce
             seagl_organize: https://groups.google.com/forum/#!forum/seagl_organize
-        location:           http://seattlecentral.edu
+        location:           https://seattlecentral.edu
         prospectus:         /sponsors/SeaGL_Exhibitor_Sponsor_Prospectus_2016.pdf
     a:
-        survey:
-            cpf:            <a href="http://survey.seagl.org/index.php/935137/lang-en">submit your presentation</a>
         irc:
-            network:        <a href="http://freenode.net/using_the_network.shtml">Freenode</a>
-            channel:        <a href="http://webchat.freenode.net?randomnick=1&channels=%23seagl">#seagl</a>
+            network:        <a href="https://freenode.net/kb/answer/chat">Freenode</a>
+            channel:        <a href="https://webchat.freenode.net?randomnick=1&channels=%23seagl">#seagl</a>
         email:
             participate:    <a href="mailto:%70%61%72%74%69%63%69%70%61%74%65%40%73%65%61%67%6c%2e%6f%72%67">&#x0070;&#x0061;&#x0072;&#x0074;&#x0069;&#x0063;&#x0069;&#x0070;&#x0061;&#x0074;&#x0065;&#x0040;&#x0073;&#x0065;&#x0061;&#x0067;&#x006c;&#x002e;&#x006f;&#x0072;&#x0067;</a>
             press:          <a href="mailto:%70%72%65%73%73%40%73%65%61%67%6c%2e%6f%72%67">&#x0070;&#x0072;&#x0065;&#x0073;&#x0073;&#x0040;&#x0073;&#x0065;&#x0061;&#x0067;&#x006c;&#x002e;&#x006f;&#x0072;&#x0067;</a>
@@ -48,7 +45,7 @@ custom:
         mailing_list:
             seagl_announce: <a href="https://groups.google.com/forum/#!forum/seagl_announce">announcement mailing list</a>
             seagl_organize: <a href="https://groups.google.com/forum/#!forum/seagl_organize">seagl_organize</a>
-        location:           <a href="http://seattlecentral.edu">Seattle Central College</a>
+        location:           <a href="https://seattlecentral.edu">Seattle Central College</a>
         donate:             <a href="https://www.coinbase.com/checkouts/0369f11bd23988462937832f2bbff8d5">Donate Bitcoins</a>
 
 sass:

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -2,15 +2,16 @@
       <div class="well" id="policy-content">
         <img src="/img/seagl-cropped.svg" class="pull-left" alt="Logo" width="306" height="200">
         <p>SeaGL is dedicated to a harassment-free conference experience for
-        everyone. <br class="hidden-sm">Our code of conduct can be found 
+        everyone. <br class="hidden-sm">Our code of conduct can be found
         <a href="/code_of_conduct.html">here</a></p>
       </div>
       <footer>
         <ul id="footer-nav" role="navigation" class="list-inline">
           <li>Published with <a href="http://pages.github.com">GitHub Pages</a></li>
-          <li><a href="https://www.facebook.com/SeattleGnuLinuxConference">Facebook</a></li>
-          <li><a href="https://plus.google.com/105971622418115358467">Google+</a></li>
-          <li><a href="https://twitter.com/seagl">Twitter</a></li>
+          <li>{{ site.custom.a.social.twitter }}</li>
+          <li>{{ site.custom.a.social.facebook }}</li>
+          <li>{{ site.custom.a.social.youtube }}</li>
+          <li>{{ site.custom.a.social.googleplus }}</li>
         </ul>
       </footer>
     </div>

diff --git a/_includes/header.html b/_includes/header.html
@@ -52,7 +52,7 @@
   </head>
   <body id="{{ page.body_id }}">
     <div class="reg-ribbon">
-      <a href="https://osem.seagl.org/">Register for SeaGL 2015</a>
+      <a href="https://osem.seagl.org/">Register for {{ site.short_name }} {{ site.custom.year }}</a>
     </div>
     {% include menu.html %}
     <div class="container" id="main-content">

diff --git a/index.html b/index.html
@@ -47,7 +47,7 @@ <h2>About</h2>
         </p>
     </div>
   </div>
-    
+
   <div class="row">
     <div class="col-md-4">
       <h2>Contact</h2>