seperate site specific things from layout / atom

waynezhang · Nov 8, 2013 · b5cb70c · b5cb70c
1 parent 2c5d423
commit b5cb70c
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 14 deletions.
diff --git a/Rakefile b/Rakefile
@@ -21,7 +21,7 @@ end
 
 desc 'Start server'
 task :server => [:clean, :scss] do
-  `jekyll serve`
+  `jekyll serve -t`
 end
 
 desc 'Deploy with rake "depoly[comment]"'

diff --git a/_config.yml b/_config.yml
@@ -3,3 +3,28 @@ pygments: true
 permalink: /:year/:month/:day/:title.html
 name: "[shutter release]"
 markdown: rdiscount
+
+author: "wayne"
+atom-baseurl: "http://lhzhang.com"
+disqus: "gopherwood"
+
+navigations:
+  - title: Archive
+    class: icon-list-ul
+    href: /archive.html
+  - title: Tags
+    class: icon-tags
+    href: /tags.html
+  - title: About
+    class: icon-user
+    href: /about.html
+  - title: Gallery
+    class: icon-film
+    href: http://foto.lhzhang.com
+  - title: Blogroll
+    class: icon-link
+    href: /links.html
+  - title: Subscribe
+    class: icon-rss
+    href: /atom.xml
+
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -28,20 +28,18 @@
             <h1><a title="{{ site.name }}" class="" href="/">{{ site.name }}</a></h1>
           </div>
           <nav>
-            <span><a title="Archive" class="icon-list-ul" href="/archive.html"></a></span>
-            <span><a title="Tags" class="icon-tags" href="/tags.html"></a></span>
-            <span><a title="About" class="icon-user" href="/about.html"></a></span>
-            <span><a title="Gallery" class="icon-film" href="http://foto.lhzhang.com"></a></span>
-            <span><a title="Blogroll" class="icon-link" href="/links.html"></a></span>
-            <span><a title="Subscribe" class="icon-rss" href="/atom.xml"></a></span>
+            {% for nav in site.navigations %}
+            <span><a title="{{ nav.title }}" class="{{ nav.class }}" href="{{ nav.href }}"></a></span>
+            {% endfor %}
           </nav>
         </header>
         <div id="content">
         {{ content }}
         </div>
         <footer>
           <div>
-            &copy; 2006 ~ 2013 wayne | powered by jekyll | themed by <a href="http://lhzhang.com" title="sext vi">sext vi</a> | fork <a href="https://github.com/waynezhang/blog" title="fork me">me</a>
+            {% assign first_post = site.posts | last %}
+            &copy; {{ first_post.date | date: "%Y" }} ~ {{ site.time | date: "%Y" }} {{ site.author }} | powered by jekyll | themed by <a href="http://lhzhang.com" title="sext vi">sext vi</a> | fork <a href="https://github.com/waynezhang/blog" title="fork me">me</a>
           </div>
         </footer>
       </div> <!-- main -->

diff --git a/_layouts/post.html b/_layouts/post.html
@@ -27,7 +27,7 @@ <h2>{{ page.title }} </h2>
   <div id="disqus_thread"></div>
   <script type="text/javascript">
       /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-      var disqus_shortname = 'gopherwood'; // required: replace example with your forum shortname
+      var disqus_shortname = '{{ site.disqus }}'; // required: replace example with your forum shortname
       var disqus_identifier = '{{ page.guid }}';
 
       /* * * DON'T EDIT BELOW THIS LINE * * */

diff --git a/atom.xml b/atom.xml
@@ -5,10 +5,10 @@ layout: nil
 <feed xmlns="http://www.w3.org/2005/Atom">
 
  <title>{{ site.name }}</title>
- <link href="http://lhzhang.com/atom.xml" rel="self"/>
- <link href="http://lhzhang.com/"/>
+ <link href="{{ site.atom-baseurl }}/atom.xml" rel="self"/>
+ <link href="{{ site.atom-baseurl }}"/>
  <updated>{{ site.time | date_to_xmlschema }}</updated>
- <id>http://lhzhang.com/</id>
+ <id>{{ site.atom-baseurl }}</id>
  <author>
    <name>Linghua Zhang</name>
    <email>linghua.zhang@me.com</email>
@@ -17,9 +17,9 @@ layout: nil
  {% for post in site.posts limit:10 %}
  <entry>
    <title>{{ post.title | xml_escape }}</title>
-   <link href="http://lhzhang.com{{ post.url }}"/>
+   <link href="{{ site.atom-baseurl }}{{ post.url }}"/>
    <updated>{{ post.date | date_to_xmlschema }}</updated>
-   {% if post.guid %}<id>{{ post.guid }}</id>{% else %}<id>http://lhzhang.com{{ post.id }}</id>{% endif %}
+   {% if post.guid %}<id>{{ post.guid }}</id>{% else %}<id>{{ site.atom-baseurl }}{{ post.id }}</id>{% endif %}
    <content type="html">{{ post.content | xml_escape }}</content>
  </entry>
  {% endfor %}