aboutsummaryrefslogtreecommitdiff
path: root/source/_layouts
diff options
context:
space:
mode:
Diffstat (limited to 'source/_layouts')
-rw-r--r--source/_layouts/default.haml24
-rw-r--r--source/_layouts/post.haml26
2 files changed, 16 insertions, 34 deletions
diff --git a/source/_layouts/default.haml b/source/_layouts/default.haml
index 08ff6565..a3f4431e 100644
--- a/source/_layouts/default.haml
+++ b/source/_layouts/default.haml
@@ -1,5 +1,6 @@
---
-blog_title: My Blog
+blog_title: My Octopress Blog
+root_url:
---
!!! 1.1 Transitional
@@ -7,22 +8,29 @@ blog_title: My Blog
%head
%title= page.title
- if page.respond_to? :description
- %meta{:name=>"description", :content=>page.description}/
+ %meta(name="description" content="#{page.description}")/
- if page.respond_to? :keywords
- %meta{:name=>"keywords", :content=>page.keywords}/
- %link(href="/stylesheets/screen.css" rel="stylesheet" media="screen projection" type="text/css")
- %link(href="/blog/atom.xml" rel="alternate" title="Brandon Mathis - Design Enthusiast" type="application/atom+xml")
+ %meta(name="keywords" content="#{page.keywords}")/
+ %link(href="#{page.root_url}/stylesheets/screen.css" rel="stylesheet" media="screen projection" type="text/css")
+ %link(href="#{page.root_url}/atom.xml" rel="alternate" title="##{page.blog_title}" type="application/atom+xml")
%body
#header
.page_width
%a.title(href="/")=page.blog_title
%ul#header_nav.nav
%li.alpha
- %a(href="/archives") Archives
+ %a(href="#{page.root_url}/archives") Archives
%li.omega
- %a(href="/atom.xml") Subscribe
+ %a(href="#{page.root_url}/atom.xml") Subscribe
#page
.page_width
- = content
+ - if page.respond_to? :date
+ %h2= page.title
+ = content
+ %p.pubdate
+ Published:
+ =page.date.strftime("%d %b, %Y")
+ - else
+ = content
#footer
.page_width Footer \ No newline at end of file
diff --git a/source/_layouts/post.haml b/source/_layouts/post.haml
deleted file mode 100644
index aafa881d..00000000
--- a/source/_layouts/post.haml
+++ /dev/null
@@ -1,26 +0,0 @@
-!!! 1.1 Transitional
-%html(xmlns="http://www.w3.org/1999/xhtml" xml:lang="en")
- %head
- %title= page.title
- - if page.respond_to? :description
- %meta{:name=>"description", :content=>page.description}/
- - if page.respond_to? :keywords
- %meta{:name=>"keywords", :content=>page.keywords}/
- %link(href="/stylesheets/screen.css" rel="stylesheet" media="screen projection" type="text/css")
- %link(href="/blog/atom.xml" rel="alternate" title="Brandon Mathis - Design Enthusiast" type="application/atom+xml")
- %body
- #header
- .page_width
- %a.title(href="/")My Blog
- %ul#header_nav.nav
- %li.alpha
- %a(href="/") Home
- #page
- .page_width
- %h2= rp(page.title)
- = content
- %p.pubdate
- Published:
- =page.date.strftime("%d %b, %Y")
- #footer
- .page_width Footer \ No newline at end of file