From fdd03ad58a13e16ef8c69d1f40f8964ae7f49a05 Mon Sep 17 00:00:00 2001 From: yafeilee Date: Fri, 28 Mar 2014 22:55:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20erb=20to=20slim?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 1 + app/assets/stylesheets/blogs.css.scss | 6 ---- app/views/admin/posts/_form.html.erb | 15 --------- app/views/admin/posts/_form.html.slim | 14 ++++++++ app/views/admin/posts/create.html.erb | 2 -- app/views/admin/posts/destroy.html.erb | 2 -- app/views/admin/posts/edit.html.erb | 2 -- app/views/admin/posts/index.html.erb | 2 -- app/views/admin/posts/new.html.erb | 2 -- app/views/admin/posts/new.html.slim | 2 ++ app/views/admin/posts/update.html.erb | 2 -- app/views/blogs/_post.html.erb | 13 ------- app/views/blogs/_post.html.slim | 11 ++++++ app/views/blogs/index.html.erb | 16 --------- app/views/blogs/index.html.slim | 12 +++++++ app/views/blogs/show.html.erb | 17 ---------- app/views/blogs/show.html.slim | 2 ++ app/views/common/_slide.html.erb | 12 ------- app/views/common/_slide.html.slim | 8 +++++ app/views/layouts/application.html.erb | 45 ------------------------- app/views/layouts/application.html.slim | 45 +++++++++++++++++++++++++ app/views/photos/create.html.erb | 2 -- config/locales/en.yml | 14 ++++++++ 23 files changed, 109 insertions(+), 138 deletions(-) delete mode 100644 app/views/admin/posts/_form.html.erb create mode 100644 app/views/admin/posts/_form.html.slim delete mode 100644 app/views/admin/posts/create.html.erb delete mode 100644 app/views/admin/posts/destroy.html.erb delete mode 100644 app/views/admin/posts/edit.html.erb delete mode 100644 app/views/admin/posts/index.html.erb delete mode 100644 app/views/admin/posts/new.html.erb create mode 100644 app/views/admin/posts/new.html.slim delete mode 100644 app/views/admin/posts/update.html.erb delete mode 100644 app/views/blogs/_post.html.erb create mode 100644 app/views/blogs/_post.html.slim delete mode 100644 app/views/blogs/index.html.erb create mode 100644 app/views/blogs/index.html.slim delete mode 100644 app/views/blogs/show.html.erb create mode 100644 app/views/blogs/show.html.slim delete mode 100644 app/views/common/_slide.html.erb create mode 100644 app/views/common/_slide.html.slim delete mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/application.html.slim delete mode 100644 app/views/photos/create.html.erb diff --git a/Gemfile b/Gemfile index 0357e01..baffeac 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,7 @@ gem "mongoid" gem "mongoid-pagination" gem "bson_ext" gem "redcarpet" +gem 'slim-rails' gem "simple_form" gem "mini_magick" gem 'carrierwave-mongoid' diff --git a/app/assets/stylesheets/blogs.css.scss b/app/assets/stylesheets/blogs.css.scss index 9073898..36de951 100644 --- a/app/assets/stylesheets/blogs.css.scss +++ b/app/assets/stylesheets/blogs.css.scss @@ -49,12 +49,6 @@ div.bottom { width: 679px; } -div#disqus_thread { - margin: 20px 20px 0 0; - border-top: 1px solid #CCC; - padding-top: 20px; -} - div.has_new, div.has_old { padding-right: 1em; a { diff --git a/app/views/admin/posts/_form.html.erb b/app/views/admin/posts/_form.html.erb deleted file mode 100644 index ebfb424..0000000 --- a/app/views/admin/posts/_form.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -<%= simple_form_for(@post, :url=> admin_posts_path(@post)) do |f| %> - <%= f.input :title %> - - <%= link_to t(:upload_photo), "#", :id=>'upload_photo' %> - - <%= f.input :content, :as=> :text, :label=>false %> -
- <%= f.input :type, :as=>:select, :collection=> [ Post::TECH, Post::LIFE, Post::CREATOR ], :include_blank=>false %> -
- <%= f.submit %> -
-<% end %> diff --git a/app/views/admin/posts/_form.html.slim b/app/views/admin/posts/_form.html.slim new file mode 100644 index 0000000..6ca3291 --- /dev/null +++ b/app/views/admin/posts/_form.html.slim @@ -0,0 +1,14 @@ += simple_form_for(@post, :url=> admin_posts_path(@post)) do |f| + = f.input :title + ul.tab + li#content.active + | content + li#preview url=preview_admin_posts_path + | preview + = link_to t(:upload_photo), "#", :id=>'upload_photo' + input[type="file" style="display: none;"] + = f.input :content, :as=> :text, :label=>false + .preview.wikistyle + = f.input :type, :as=>:select, :collection=> [ Post::TECH, Post::LIFE, Post::CREATOR ], :include_blank=>false + .submit + = f.submit diff --git a/app/views/admin/posts/create.html.erb b/app/views/admin/posts/create.html.erb deleted file mode 100644 index 90a97c7..0000000 --- a/app/views/admin/posts/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Admin::Posts#create

-

Find me in app/views/admin/posts/create.html.erb

diff --git a/app/views/admin/posts/destroy.html.erb b/app/views/admin/posts/destroy.html.erb deleted file mode 100644 index 8b3697f..0000000 --- a/app/views/admin/posts/destroy.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Admin::Posts#destroy

-

Find me in app/views/admin/posts/destroy.html.erb

diff --git a/app/views/admin/posts/edit.html.erb b/app/views/admin/posts/edit.html.erb deleted file mode 100644 index 6542d2b..0000000 --- a/app/views/admin/posts/edit.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Admin::Posts#edit

-

Find me in app/views/admin/posts/edit.html.erb

diff --git a/app/views/admin/posts/index.html.erb b/app/views/admin/posts/index.html.erb deleted file mode 100644 index cc91617..0000000 --- a/app/views/admin/posts/index.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Admin::Posts#index

-

Find me in app/views/admin/posts/index.html.erb

diff --git a/app/views/admin/posts/new.html.erb b/app/views/admin/posts/new.html.erb deleted file mode 100644 index 4513013..0000000 --- a/app/views/admin/posts/new.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

新建博客

-<%= render "form" %> diff --git a/app/views/admin/posts/new.html.slim b/app/views/admin/posts/new.html.slim new file mode 100644 index 0000000..f8b33f2 --- /dev/null +++ b/app/views/admin/posts/new.html.slim @@ -0,0 +1,2 @@ +h3 #{t('new_post')} += render 'form' diff --git a/app/views/admin/posts/update.html.erb b/app/views/admin/posts/update.html.erb deleted file mode 100644 index 5f637fc..0000000 --- a/app/views/admin/posts/update.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Admin::Posts#update

-

Find me in app/views/admin/posts/update.html.erb

diff --git a/app/views/blogs/_post.html.erb b/app/views/blogs/_post.html.erb deleted file mode 100644 index 6b4c023..0000000 --- a/app/views/blogs/_post.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -
-

<%= link_to (post.title + " >>").html_safe, blog_path(post) %>

-
<%= post.content_html.html_safe %>
-
- <%= t(:announce_at) %> - <%= format_time(post.created_at) %> | - <%= "浏览数 " + post.visited.to_s %> | - <%= link_to t('comment'), blog_path(post) + "#disqus_thread" %> | -
'})">
- -
-
-
diff --git a/app/views/blogs/_post.html.slim b/app/views/blogs/_post.html.slim new file mode 100644 index 0000000..5fdd4d0 --- /dev/null +++ b/app/views/blogs/_post.html.slim @@ -0,0 +1,11 @@ +.blog + h2 + = link_to post.title, blog_path(post) + .content.wikistyle + = post.content_html.html_safe + .cc + = t(:announce_at) + = format_time(post.created_at) + | | + = t(:visited_count) + post.visited.to_s +.bottom diff --git a/app/views/blogs/index.html.erb b/app/views/blogs/index.html.erb deleted file mode 100644 index de0adff..0000000 --- a/app/views/blogs/index.html.erb +++ /dev/null @@ -1,16 +0,0 @@ -
- <% if @posts.size == 0 %> - - <% else %> - <%= render :partial=> "post", :collection=> @posts %> - <% end %> - <% if @has_old %> -
- <% end %> - - <% if @has_new %> -
- <% end %> - -
- diff --git a/app/views/blogs/index.html.slim b/app/views/blogs/index.html.slim new file mode 100644 index 0000000..a432bbe --- /dev/null +++ b/app/views/blogs/index.html.slim @@ -0,0 +1,12 @@ +.blogs + - if @posts.size == 0 + .nocontent + = t(:nocontent) + - else + = render :partial=> "post", :collection=> @posts + - if @has_old + .has_old + a.pagination href="#" data-page="#{@page + 1}" #{t(:prev)} + - if @has_new + .has_new + a.pagination href="#" data-page="#{@page - 1}" #{t(:next)} diff --git a/app/views/blogs/show.html.erb b/app/views/blogs/show.html.erb deleted file mode 100644 index f28ab6b..0000000 --- a/app/views/blogs/show.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -
- <%= render :partial=> "post", :locals=> { :post=> @post } %> -
- -
- - -
diff --git a/app/views/blogs/show.html.slim b/app/views/blogs/show.html.slim new file mode 100644 index 0000000..3ca4b9d --- /dev/null +++ b/app/views/blogs/show.html.slim @@ -0,0 +1,2 @@ +.blogs + = render :partial=> "post", :locals=> { :post=> @post } diff --git a/app/views/common/_slide.html.erb b/app/views/common/_slide.html.erb deleted file mode 100644 index b2dc4ee..0000000 --- a/app/views/common/_slide.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -
- -
-
-
-
- diff --git a/app/views/common/_slide.html.slim b/app/views/common/_slide.html.slim new file mode 100644 index 0000000..74f9d6c --- /dev/null +++ b/app/views/common/_slide.html.slim @@ -0,0 +1,8 @@ +.slide + .subscribe + .subscribe_descrip + = t('rss_description') + = link_to(image_tag('rss.png'), rss_blogs_path) + .broadcast + .comment + .recommend diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index aaefff8..0000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,45 +0,0 @@ - - - - WinDy's Blog - <%= stylesheet_link_tag "application", :media => "all" %> - <%= javascript_include_tag "application" %> - <%= yield :js %> - <%= csrf_meta_tags %> - - - - -
-
- - WinDy的个人中心 - 记录人生经历 - 技术 生活 And 创业 - 关于我 -
-
-
- <%= yield %> - <%= render "common/slide" %> -
- - - - - diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim new file mode 100644 index 0000000..b8b0aa1 --- /dev/null +++ b/app/views/layouts/application.html.slim @@ -0,0 +1,45 @@ +html + head + title WinDy's Blog + = stylesheet_link_tag "application", :media => "all" + = javascript_include_tag "application" + = yield :js + = csrf_meta_tags + body + .head + .container + ul.nav + li + a#home href="/" + = t('head.home') + strong Home + li + a#tech href="/tech" + = t('head.tech') + strong Tech + li + a#life href="/life" + = t('head.life') + strong Life + li + a#creator href="creator" + = t('head.creator') + strong Creator + strong.descrip + = t('head_description') + a#about href="/about" + = t('heade.about_me') + .container + = yield + = render "common/slide" + + javascript: + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-32883596-1']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); diff --git a/app/views/photos/create.html.erb b/app/views/photos/create.html.erb deleted file mode 100644 index 266a501..0000000 --- a/app/views/photos/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Photos#create

-

Find me in app/views/photos/create.html.erb

diff --git a/config/locales/en.yml b/config/locales/en.yml index 7e343e5..aaaf375 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2,3 +2,17 @@ en: upload_photo: "上传图片" comment: "查看评论" announce_at: "发表在 " + visited_count: "浏览数 " + nocontent: "没有更多内容" + prev: '← 更早博客' + next: '更新博客 →' + new_post: '新建博客' + rss_description: '如果你想关注我的每一篇文章,推荐进行订阅, 将右面的链接复制到你的阅读器里吧.' + head_description: 'WinDy的个人中心 - 记录人生经历 - 技术 生活 And 创业' + + head: + home: '首页' + tech: '技术' + life: '生活' + creator: '创业' + about_me: '关于我'