Merge branch 'no_blog_display_error_fix'

This commit is contained in:
yafeilee 2014-04-05 01:22:57 +08:00
commit 7c9ddc5f36
2 changed files with 18 additions and 11 deletions

View File

@ -5,17 +5,24 @@
| 首页
.row
.small-12.large-8.columns
= render partial: 'post_head', locals: { post: @newest }
.content.markdown
== @newest.sub_content
- unless @newest
h2.blog-title 这里还没有博客
p
| 这里还没有博客, 请访问
= link_to '管理页面', new_admin_post_path
| 来创建第一篇博客
- else
= render partial: 'post_head', locals: { post: @newest }
.content.markdown
== @newest.sub_content
= link_to "阅读全文 >>", blog_path(@newest)
p.published-at 发表于 #{format_date(@newest.created_at)}
= link_to "阅读全文 >>", blog_path(@newest)
p.published-at 发表于 #{format_date(@newest.created_at)}
h4.recent-title RECENT
ul.recent-content
- @recent.each do |re|
li = link_to "#{re.title}",blog_path(re)
h4.recent-title RECENT
ul.recent-content
- @recent.each do |re|
li = link_to "#{re.title}",blog_path(re)
.large-3.columns.large-offset-1.self-introduce.self-introduce-index ng-controller='AboutController'
h4 WELCOME

View File

@ -3,9 +3,9 @@ xml.instruct!
xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
xml.channel do
xml.title "windy's blog"
xml.title ENV['SITE_NAME']
xml.link url_for :only_path => false, :controller => 'blogs'
xml.description "windy's blogs here"
xml.description ENV['INTRODUCE'].presence || ENV['SITE_NAME']
@posts.each do |post|
xml.item do