Improved layouts of post and default, add _includes/footer.html, add Disqus comments, set atom.xml, display excerpt posts & Read more

Author: lgs

README.md

@@ -0,0 +1,10 @@
+<footer>
+  <div class="row">
+    <div class="span10">
+      <p class="Copyright 2011-2012">&copy; 2012 GitWatcher</p>
+    </div>
+    <!-- .span2 -->
+    <!-- %a.pull-right{:href => "http://flow.mixpanel.com/f/partner"} -->
+    <!-- %img{:alt => "Real Time Web Analytics", :src => "http://mixpanel.com/site_media/images/partner/badge_blue.png"} -->
+  </div>
+</footer>

_includes/footer.html

@@ -90,18 +90,6 @@
 
     <!-- Main content area -->
 
-    <!-- div class="container main-content-container">
-      <div class="row">
-        <div class="span2">
-          <img id="logo" src="/images/logo.png">
-        </div>
-
-        <div class="span10 main-content">
-            {{ content }}
-        </div>
-      </div>
-    </div -->
-
     <div class="container">
       <div class="content">
         <header class="page-header">
@@ -113,27 +101,25 @@ <h1>{{ site.title }}</h1>
           </div>
           <nav class="span3">
             <h3>Recent Posts</h3>
+            <hr />
             <div id="posts">
               {% for post in site.posts limit:10%}
                 <p><a href="/blog{{ post.url }}">{{ post.title }}</a></p>
               {% endfor %}
+              <hr>
+              <p>powered by <a href="https://github.com/mojombo/jekyll">jekyll</a></p>
             </div>
           </nav>
         </div>
       </div>
-      <footer>
-        <p>powered by <a href="https://github.com/mojombo/jekyll">jekyll</a></p>
-      </footer>
+      <hr />
+      {% include footer.html %}
     </div> 
 
   </div> 
 
   <!-- End Main content area -->
 
-  {% if site.github %}
-    <a href="http://github.com/{{ site.github.username }}"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>
-  {% endif %}
-
 </body>
 </html>
 

_layouts/default.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+comments: true
 ---
 <article>
   <header>
@@ -9,17 +10,40 @@ <h2>
     <h5><time>{{ page.date | date: '%B' }} {{ page.date | date: '%e' }}, {{ page.date | date: '%Y' }}</time></h5>
   </header>
 
-  {{ content }} 
+  <p /><br /><p />{{ content }}
 
+<div class="hero-unit">
   <nav id="related">
     <h3>Related Posts</h3>
     <ul class="posts">
       {% for post in site.related_posts limit:5 %}
-        <li><span>{{ post.date | date_to_string }}</span> - <a href="/blog{{ post.url }}">{{ post.title }}</a></li>
+        <p><li><span>{{ post.date | date_to_string }}</span> - <a href="/blog{{ post.url }}">{{ post.title }}</a></li></p>
       {% endfor %}
     </ul>
   </nav>
+</div>
 
+{% if page.comments %} 
+        <div id="disqus_thread"></div>
+        <script type="text/javascript">
+            /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+            var disqus_shortname = 'gitwatcher'; // required: replace example with your forum shortname
+            /*var disqus_developer = 1; // This turns developer mode on
+                                      // Make sure you remove this before you push this
+                                      // to your live site.
+
+            /* * * DON'T EDIT BELOW THIS LINE * * */
+            (function() {
+                var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+            })();
+        </script>
+        <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+        <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+{% endif %} 
+
+<!-- 
   {% if site.disqus %}
   <div id="comments">
     <h2>Comments</h2>
@@ -35,5 +59,7 @@ <h2>Comments</h2>
     <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript={{ site.disqus.id }}">comments powered by Disqus.</a></noscript>
     <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
   </div>
+  {% endif %}
+-->
+
 </article>
-{% endif %}

_layouts/post.html

@@ -4,23 +4,23 @@ layout: nil
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
 
- <title>BLOG_NAME</title>
- <link href="YOUR_URL/atom.xml" rel="self"/>
- <link href="YOUR_URL"/>
+ <title>GitWatcher Blog</title>
+ <link href="http://gitwatcher.com/blog/atom.xml" rel="self"/>
+ <link href="http://gitwatcher.com/blog"/>
  <updated>{{ site.time | date_to_xmlschema }}</updated>
- <id>BLOG_URL</id>
+ <id>http://gitwatcher.com/blog</id>
  <author>
-   <name>BLOG_NAME</name>
+   <name>Luca G. Soave</name>
  </author>
 
  {% for post in site.posts %}
  <entry>
    <title>{{ post.title }}</title>
-   <link href="YOUR_URL{{ post.url }}"/>
+   <link href="http://gitwatcher.com/blog{{ post.url }}"/>
    <updated>{{ post.date | date_to_xmlschema }}</updated>
    <id>BLOG_URL{{ post.id }}</id>
    <content type="html">{{ post.content | xml_escape }}</content>
  </entry>
  {% endfor %}
 
-</feed>
+</feed>