From 5e7c35d9b341db5264d156ed301c28c57979a477 Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Mon, 31 Mar 2014 16:06:15 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stylesheets/admin/dashboard.css.scss      |  3 +
 app/assets/stylesheets/admin/posts.css.scss   | 61 +++----------------
 app/controllers/admin/dashboard_controller.rb |  7 +++
 app/controllers/admin/posts_controller.rb     |  3 +
 app/controllers/application_controller.rb     |  4 ++
 app/helpers/admin/posts_helper.rb             |  2 -
 app/views/admin/dashboard/index.html.slim     | 20 ++++++
 app/views/admin/posts/_form.html.slim         | 38 +++++++-----
 app/views/admin/posts/new.html.slim           |  6 +-
 app/views/layouts/admin.html.slim             | 38 ++++++++++++
 config/routes.rb                              |  2 +-
 .../admin/dashboard_controller_spec.rb        | 12 ++++
 12 files changed, 124 insertions(+), 72 deletions(-)
 create mode 100644 app/assets/stylesheets/admin/dashboard.css.scss
 create mode 100644 app/controllers/admin/dashboard_controller.rb
 delete mode 100644 app/helpers/admin/posts_helper.rb
 create mode 100644 app/views/admin/dashboard/index.html.slim
 create mode 100644 app/views/layouts/admin.html.slim
 create mode 100644 spec/controllers/admin/dashboard_controller_spec.rb

diff --git a/app/assets/stylesheets/admin/dashboard.css.scss b/app/assets/stylesheets/admin/dashboard.css.scss
new file mode 100644
index 0000000..f8b22f9
--- /dev/null
+++ b/app/assets/stylesheets/admin/dashboard.css.scss
@@ -0,0 +1,3 @@
+.dash-title {
+  padding-top: 2rem;
+}
diff --git a/app/assets/stylesheets/admin/posts.css.scss b/app/assets/stylesheets/admin/posts.css.scss
index 51192ad..81e3cbd 100644
--- a/app/assets/stylesheets/admin/posts.css.scss
+++ b/app/assets/stylesheets/admin/posts.css.scss
@@ -1,57 +1,12 @@
-// Place all the styles related to the admin/posts controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
+.admin-posts-field {
 
-#post_content {
-  width: 800px;
-  height: 390px;
-}
+  #post_content {
+    min-height: 20rem;
+  }
 
-div.submit {
-  display: block;
-  line-height: 40px;
-  width: 805px;
-  background-color: #CCC;
-  padding-left: 16px;
-  font-size: 20px;
-}
+  #upload_photo {
+    float: right;
+    margin-top: 2rem;
+  }
 
-ul.tab {
-  margin: 10px 0 10px 0;
-  overflow: hidden;
-  li {
-    float: left;
-    padding: 5px 5px;
-    border: 1px solid #CCC;
-    cursor: pointer;
-  }
-  li.active {
-    border-bottom: none;
-    border-top: 1px solid #CCC;
-  }
-  li:not(.active) {
-    border-top: none;
-    border-top-right-radius: none;
-    border-top-left-radius: none;
-  }
-  li#content {
-    border-top-left-radius: 10px;
-    border-right: none;
-  }
-  li#preview {
-    border-right-bottom-radius: 10px;
-    border-top-right-radius: 10px;
-  }
-}
-
-div.preview {
-  width: 800px;
-  min-height: 396px;
-  border: 1px solid #CCC;
-  padding: 5px 5px;
-  display: none;
-}
-
-#upload_photo {
-  float: right;
 }
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
new file mode 100644
index 0000000..640c0b2
--- /dev/null
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -0,0 +1,7 @@
+class Admin::DashboardController < ApplicationController
+  layout 'layouts/admin'
+  before_action :authericate_user!
+
+  def index
+  end
+end
diff --git a/app/controllers/admin/posts_controller.rb b/app/controllers/admin/posts_controller.rb
index cba746e..5ea4fd2 100644
--- a/app/controllers/admin/posts_controller.rb
+++ b/app/controllers/admin/posts_controller.rb
@@ -1,4 +1,7 @@
 class Admin::PostsController < ApplicationController
+  layout 'layouts/admin'
+  before_action :authericate_user!
+
   def new
     @post = Post.new
   end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 80844fb..b93b985 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -10,4 +10,8 @@ class ApplicationController < ActionController::Base
   def format_date(time)
     time.strftime("%Y.%m.%d")
   end
+
+  protected
+  def authericate_user!
+  end
 end
diff --git a/app/helpers/admin/posts_helper.rb b/app/helpers/admin/posts_helper.rb
deleted file mode 100644
index e9158b2..0000000
--- a/app/helpers/admin/posts_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module Admin::PostsHelper
-end
diff --git a/app/views/admin/dashboard/index.html.slim b/app/views/admin/dashboard/index.html.slim
new file mode 100644
index 0000000..1c4f240
--- /dev/null
+++ b/app/views/admin/dashboard/index.html.slim
@@ -0,0 +1,20 @@
+.row
+  .small-12.columns
+    h2.dash-title 统计信息
+    hr
+    table width="100%"
+      thead
+        tr
+          th 条目
+          th 数据
+      tbody
+        tr
+          td 总博客数
+          td 1000
+        tr
+          td 总评论数
+          td 1000
+        tr
+          td 总浏览量
+          td 1000
+
diff --git a/app/views/admin/posts/_form.html.slim b/app/views/admin/posts/_form.html.slim
index 6ca3291..c8bea4c 100644
--- a/app/views/admin/posts/_form.html.slim
+++ b/app/views/admin/posts/_form.html.slim
@@ -1,14 +1,24 @@
-= 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
+.admin-posts-field
+  = simple_form_for(@post, :url=> admin_posts_path(@post)) do |f|
+    .row
+      .large-6.columns
+        = f.input :title, label: '标题'
+    .row
+      .small-6.large-3.columns
+        = f.input :type, :as=>:select, :collection=> [ Post::TECH, Post::LIFE, Post::CREATOR ], label: '类别'
+    .row
+      .small-12.large-6.columns
+        = f.simple_fields_for :label do |p|
+          = p.input :name, label: '标签'
+    dl.tabs data-tab=""
+      dd.active
+        a href="#" 正文
+      dd
+        a href="#" 预览
+      = link_to t(:upload_photo), "#", :id=>'upload_photo'
+    input[type="file" style="display: none;"]
+    = f.input :content, :as=> :text, :label=>false
+    .preview.wikistyle
+    .row
+      .small-12.large-6.columns.posts-button
+        = f.button :submit, '提交', class: 'button'
diff --git a/app/views/admin/posts/new.html.slim b/app/views/admin/posts/new.html.slim
index f8b33f2..81ff60a 100644
--- a/app/views/admin/posts/new.html.slim
+++ b/app/views/admin/posts/new.html.slim
@@ -1,2 +1,4 @@
-h3 #{t('new_post')}
-= render 'form'
+.row
+  .small-12.columns
+    h3 #{t('new_post')}
+    = render 'form'
diff --git a/app/views/layouts/admin.html.slim b/app/views/layouts/admin.html.slim
new file mode 100644
index 0000000..b9f256b
--- /dev/null
+++ b/app/views/layouts/admin.html.slim
@@ -0,0 +1,38 @@
+html
+  head
+    meta charset="utf-8" 
+    meta name="viewport" content="width=device-width, initial-scale=1.0"
+    title Admin Page for WinDy's Blog
+    = stylesheet_link_tag    "application"
+    = javascript_include_tag "vendor/modernizr"
+    = javascript_include_tag "application"
+    = csrf_meta_tags
+  body
+    nav.top-bar data-topbar=""
+      ul.title-area
+        li.name
+          h1
+            a href="#" Admin for WinDy
+        li.toggle-topbar.menu-icon
+          a href="#" Menu
+      section.top-bar-section
+        ul.left
+          li
+            = link_to '创建新博客', new_admin_post_path
+          li
+            a href="#" 管理博客
+    = yield
+    = render "layouts/footer"
+
+
+
+    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/config/routes.rb b/config/routes.rb
index 5772c96..fef43d1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -20,8 +20,8 @@ WBlog::Application.routes.draw do
         post :preview
       end
     end
+    root to: 'dashboard#index'
   end
   get '/about' => 'home#index'
-  get '/admin' => 'admin/posts#new'
   get '/:type' => 'archives#index'
 end
diff --git a/spec/controllers/admin/dashboard_controller_spec.rb b/spec/controllers/admin/dashboard_controller_spec.rb
new file mode 100644
index 0000000..22a6cad
--- /dev/null
+++ b/spec/controllers/admin/dashboard_controller_spec.rb
@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Admin::DashboardController do
+
+  describe "GET 'index'" do
+    it "returns http success" do
+      get 'index'
+      response.should be_success
+    end
+  end
+
+end

From da330610b223f2901f546a11d4b1af76b86f1c0d Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Mon, 31 Mar 2014 17:24:46 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=8D=9A=E5=AE=A2?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/javascripts/admin/posts.js.coffee  | 21 --------
 app/assets/javascripts/angularjs.js.coffee    |  3 +-
 .../angularjs/admin_posts.js.coffee           | 13 +++++
 app/assets/stylesheets/admin/posts.css.scss   | 14 +++++
 app/controllers/admin/posts_controller.rb     |  5 +-
 app/models/post.rb                            |  6 ++-
 app/views/admin/posts/_form.html.slim         | 52 ++++++++++---------
 app/views/admin/posts/new.html.slim           |  5 +-
 app/views/layouts/admin.html.slim             |  3 +-
 .../admin/posts_controller_spec.rb            |  8 +--
 10 files changed, 69 insertions(+), 61 deletions(-)
 create mode 100644 app/assets/javascripts/angularjs/admin_posts.js.coffee

diff --git a/app/assets/javascripts/admin/posts.js.coffee b/app/assets/javascripts/admin/posts.js.coffee
index 1199dc7..d4162ca 100644
--- a/app/assets/javascripts/admin/posts.js.coffee
+++ b/app/assets/javascripts/admin/posts.js.coffee
@@ -4,27 +4,6 @@
 #
 
 $(document).ready ->
-  
-  preview = $('.preview')
-  content = $('#post_content')
-
-  $('#content').click ->
-    preview.hide()
-    content.show()
-    $(this).addClass('active')
-    $('#preview').removeClass('active')
-    false
-
-  $('#preview').click ->
-    content.hide()
-    $(this).addClass('active')
-    $('#content').removeClass('active')
-    preview.html('Loading...')
-    preview.show()
-    $.post $(this).attr('url'), text: content.val(), (data)->
-      preview.html(data)
-    false
-    
   $('a#upload_photo').click ->
     $('input[type=file]').show().focus().click().hide()
     false
diff --git a/app/assets/javascripts/angularjs.js.coffee b/app/assets/javascripts/angularjs.js.coffee
index 5631e76..4118e69 100644
--- a/app/assets/javascripts/angularjs.js.coffee
+++ b/app/assets/javascripts/angularjs.js.coffee
@@ -1,10 +1,11 @@
 #= require angular
 #= require angular-cookies
 #= require angular-resource
+#= require angular-sanitize
 #= require_self
 #= require_tree ./angularjs
 
-@app = angular.module('app', ['ngCookies'])
+@app = angular.module('app', ['ngCookies', 'ngSanitize'])
 
 @app.config(["$httpProvider", (provider) ->
     provider.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content')
diff --git a/app/assets/javascripts/angularjs/admin_posts.js.coffee b/app/assets/javascripts/angularjs/admin_posts.js.coffee
new file mode 100644
index 0000000..c0144bc
--- /dev/null
+++ b/app/assets/javascripts/angularjs/admin_posts.js.coffee
@@ -0,0 +1,13 @@
+@app.controller 'AdminPostsController', ($scope, $http, $location, $timeout, $cookies, $sce)->
+
+  $scope.body_active = true
+
+  $scope.changeToBody = ->
+    $scope.body_active = true
+
+  $scope.changeToPreview = ->
+    $scope.body_active = false
+    $scope.previewHTML = '加载中...'
+    $http.post '/admin/posts/preview', { content: $scope.content }
+    .success (res)->
+      $scope.previewHTML = res
diff --git a/app/assets/stylesheets/admin/posts.css.scss b/app/assets/stylesheets/admin/posts.css.scss
index 81e3cbd..86e8ad8 100644
--- a/app/assets/stylesheets/admin/posts.css.scss
+++ b/app/assets/stylesheets/admin/posts.css.scss
@@ -1,9 +1,23 @@
 .admin-posts-field {
+  margin-top: 1rem;
+
+  .blog-title {
+    border-bottom: 1px solid #DDDDDD;
+    padding-bottom: 1rem;
+    margin-bottom: 2rem;
+  }
 
   #post_content {
     min-height: 20rem;
   }
 
+  .preview {
+    min-height: 20rem;
+    border: 1px solid #DDDDDD;
+    margin-bottom: 1.275rem;
+    padding: 0.275rem 0.5rem;
+  }
+
   #upload_photo {
     float: right;
     margin-top: 2rem;
diff --git a/app/controllers/admin/posts_controller.rb b/app/controllers/admin/posts_controller.rb
index 5ea4fd2..fb3ef08 100644
--- a/app/controllers/admin/posts_controller.rb
+++ b/app/controllers/admin/posts_controller.rb
@@ -30,10 +30,7 @@ class Admin::PostsController < ApplicationController
   end
 
   def preview
-    text = params.permit(:text)[:text] || ""
-    rd = Redcarpet::Render::HTML.new(:hard_wrap=>true)
-    md = Redcarpet::Markdown.new(rd, :autolink=>true)
-    render :text => md.render(text)
+    render :text => Post.render_html(params[:content] || "")
   end
   
   def post_params
diff --git a/app/models/post.rb b/app/models/post.rb
index 7195042..9004ab9 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -23,9 +23,13 @@ class Post
   validates :type, :presence=>true, :inclusion => { :in => [ TECH, LIFE, CREATOR ] }
 
   def content_html
+    self.render_html(self.content)
+  end
+
+  def self.render_html(content)
     rd = CodeHTML.new
     md = Redcarpet::Markdown.new(rd, autolink: true, fenced_code_blocks: true)
-    md.render(self.content)
+    md.render(content)
   end
 
   def visited
diff --git a/app/views/admin/posts/_form.html.slim b/app/views/admin/posts/_form.html.slim
index c8bea4c..febb588 100644
--- a/app/views/admin/posts/_form.html.slim
+++ b/app/views/admin/posts/_form.html.slim
@@ -1,24 +1,28 @@
-.admin-posts-field
-  = simple_form_for(@post, :url=> admin_posts_path(@post)) do |f|
-    .row
-      .large-6.columns
-        = f.input :title, label: '标题'
-    .row
-      .small-6.large-3.columns
-        = f.input :type, :as=>:select, :collection=> [ Post::TECH, Post::LIFE, Post::CREATOR ], label: '类别'
-    .row
-      .small-12.large-6.columns
-        = f.simple_fields_for :label do |p|
-          = p.input :name, label: '标签'
-    dl.tabs data-tab=""
-      dd.active
-        a href="#" 正文
-      dd
-        a href="#" 预览
-      = link_to t(:upload_photo), "#", :id=>'upload_photo'
-    input[type="file" style="display: none;"]
-    = f.input :content, :as=> :text, :label=>false
-    .preview.wikistyle
-    .row
-      .small-12.large-6.columns.posts-button
-        = f.button :submit, '提交', class: 'button'
+= simple_form_for(@post, :url=> admin_posts_path(@post)) do |f|
+  .row
+    .large-6.columns
+      = f.input :title, label: '标题', "ng-model"=>"title"
+  .row
+    .small-6.large-3.columns
+      = f.input :type, :as=>:select, :collection=> [ Post::TECH, Post::LIFE, Post::CREATOR ], label: '类别', "ng-model"=>"type"
+  .row
+    .small-12.large-6.columns
+      = f.simple_fields_for :label do |p|
+        = p.input :name, label: '标签', "ng-model" => "labels"
+  / tabs and upload file field
+  dl.tabs
+    dd ng-class="{ active: body_active }"
+      a href="" ng-click="changeToBody()" 正文
+    dd ng-class="{ active: !body_active }"
+      a href="#" ng-click="changeToPreview()" 预览
+    = link_to t(:upload_photo), "#", :id=>'upload_photo'
+  input[type="file" style="display: none;"]
+
+  .content-field ng-show="body_active" ng-model= 'content'
+    = f.input :content, :as=> :text, :label => false, input_html: { "ng-model" => "content" }
+
+  .preview.markdown ng-hide="body_active" ng-bind-html=" previewHTML "
+
+  .row
+    .small-12.large-6.columns.posts-button
+      = f.button :submit, '提交', class: 'button'
diff --git a/app/views/admin/posts/new.html.slim b/app/views/admin/posts/new.html.slim
index 81ff60a..044b860 100644
--- a/app/views/admin/posts/new.html.slim
+++ b/app/views/admin/posts/new.html.slim
@@ -1,4 +1,5 @@
 .row
   .small-12.columns
-    h3 #{t('new_post')}
-    = render 'form'
+    .admin-posts-field ng-controller="AdminPostsController"
+      h3.blog-title #{t('new_post')}
+      = render 'form'
diff --git a/app/views/layouts/admin.html.slim b/app/views/layouts/admin.html.slim
index b9f256b..9874b88 100644
--- a/app/views/layouts/admin.html.slim
+++ b/app/views/layouts/admin.html.slim
@@ -21,7 +21,8 @@ html
             = link_to '创建新博客', new_admin_post_path
           li
             a href="#" 管理博客
-    = yield
+    .admin-main-field ng-app="app"
+      = yield
     = render "layouts/footer"
 
 
diff --git a/spec/controllers/admin/posts_controller_spec.rb b/spec/controllers/admin/posts_controller_spec.rb
index 5ac2f06..2322316 100644
--- a/spec/controllers/admin/posts_controller_spec.rb
+++ b/spec/controllers/admin/posts_controller_spec.rb
@@ -4,13 +4,7 @@ describe Admin::PostsController do
   it "preview should return ok" do
     post :preview
     response.body.should == ""
-    post :preview, text: '123'
+    post :preview, content: '123'
     response.body.should == "<p>123</p>\n"
-    post :preview, text: <<-EOF
-```ruby
-puts 'hello world'
-```
-EOF
-    response.body.should == "<p><code>ruby<br>\nputs &#39;hello world&#39;<br>\n</code></p>\n"
   end
 end

From 41cf8b5e3ac0e203c8d004db6805bf80c55b2644 Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Mon, 31 Mar 2014 22:12:39 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=9A=E5=AE=A2?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E7=9A=84=E4=B8=8B=E5=88=92=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/markdown.css.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/markdown.css.scss b/app/assets/stylesheets/markdown.css.scss
index cfbae1e..af12b23 100644
--- a/app/assets/stylesheets/markdown.css.scss
+++ b/app/assets/stylesheets/markdown.css.scss
@@ -16,7 +16,8 @@
   }
 
   h1, h2, h3, h4, h5, h6 {
-    border-bottom: 1px solid #F7F7F7;
+    border-bottom: 1px solid #EEEEEE;
+    margin-bottom: 1rem;
   }
 
   pre {

From 9bd33674f609ff6679c7d0fc7722aada7d77ce09 Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Mon, 31 Mar 2014 22:13:58 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=8D=9A=E5=AE=A2?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |  1 +
 app/controllers/admin/posts_controller.rb     | 48 +++++++++++++++----
 app/models/label.rb                           |  2 +-
 app/models/post.rb                            |  8 ++--
 app/views/admin/posts/_form.html.slim         | 14 +++---
 app/views/layouts/admin.html.slim             |  5 ++
 .../admin/posts_controller_spec.rb            | 33 +++++++++++++
 spec/factories/labels.rb                      |  5 ++
 8 files changed, 96 insertions(+), 20 deletions(-)
 create mode 100644 spec/factories/labels.rb

diff --git a/Gemfile b/Gemfile
index 043dda9..aeb1253 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,5 +42,6 @@ end
 group :test, :development do
   gem "rspec-rails", ">= 2.8.1"
   gem 'pry-rails'
+  gem 'pry-nav'
   gem 'factory_girl_rails'
 end
diff --git a/app/controllers/admin/posts_controller.rb b/app/controllers/admin/posts_controller.rb
index fb3ef08..25d1f70 100644
--- a/app/controllers/admin/posts_controller.rb
+++ b/app/controllers/admin/posts_controller.rb
@@ -7,33 +7,63 @@ class Admin::PostsController < ApplicationController
   end
 
   def edit
+    @post = Post.find( params[:id] )
   end
 
   def destroy
+    @post = Post.find( params[:id] )
+    if @post.destroy
+      render :json=> { success: true }
+    else
+      render :json=> { success: false }
+    end
   end
 
   def index
   end
 
   def create
-    @post = Post.new( post_params )
+    labels = params.delete(:labels).to_s
+    @post = Post.new( params.permit(:title, :content, :type) )
+
+    labels.split(",").each do |name|
+      label = Label.find_or_initialize_by(name: name.strip)
+      label.save!
+      @post.labels << label
+    end
+
+    #binding.pry
+
     if @post.save
-      flash[:notice] = "success!"
-      redirect_to root_path
+      flash[:notice] = '创建博客成功'
+      redirect_to admin_root_path
     else
-      flash[:alert] = "fail!"
-      render :action=>:new
+      flash[:error] = '创建失败'
+      render :new
     end
   end
 
   def update
+    @post = Post.find( params[:id] )
+
+    labels = params.delete(:labels).to_s
+    #clear labels
+    @post.labels = []
+
+    labels.split(",").each do |name|
+      label = Label.find_or_initialize_by(name: name.strip)
+      label.save!
+      @post.labels << label
+    end
+
+    if @post.update( params.permit(:title, :content, :type) )
+      render :json=> { success: true }
+    else
+      render :json=> { success: false }
+    end
   end
 
   def preview
     render :text => Post.render_html(params[:content] || "")
   end
-  
-  def post_params
-    params.require(:post).permit(:title, :content, :type)
-  end
 end
diff --git a/app/models/label.rb b/app/models/label.rb
index 30be414..1d8ce48 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -4,6 +4,6 @@ class Label
 
   field :name, :type => String
 
-  has_and_belongs_to_many :post
+  has_and_belongs_to_many :posts
   validates :name, presence: true
 end
diff --git a/app/models/post.rb b/app/models/post.rb
index 9004ab9..1a15a6b 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -23,7 +23,7 @@ class Post
   validates :type, :presence=>true, :inclusion => { :in => [ TECH, LIFE, CREATOR ] }
 
   def content_html
-    self.render_html(self.content)
+    self.class.render_html(self.content)
   end
 
   def self.render_html(content)
@@ -39,12 +39,12 @@ class Post
   end
 
   def sub_content
-    HTML_Truncator.truncate(content_html,100)
+    HTML_Truncator.truncate(content_html,30)
   end
 
-  def labels_content
+  def labels_content( need_blank=false )
     content = self.labels.collect { |label| label.name }.join(", ")
-    content = '无' if content.blank?
+    content = '无' if content.blank? and !need_blank
     content
   end
 
diff --git a/app/views/admin/posts/_form.html.slim b/app/views/admin/posts/_form.html.slim
index febb588..faadef2 100644
--- a/app/views/admin/posts/_form.html.slim
+++ b/app/views/admin/posts/_form.html.slim
@@ -1,14 +1,16 @@
-= simple_form_for(@post, :url=> admin_posts_path(@post)) do |f|
+- url = @post.new_record? ? admin_posts_path : admin_post_path(@post)
+= simple_form_for(@post, url: url, html: {novalidate: '' }) do |f|
   .row
     .large-6.columns
-      = f.input :title, label: '标题', "ng-model"=>"title"
+      = f.input :title, label: '标题', "ng-model"=>"title", input_html: { name: 'title' }
   .row
     .small-6.large-3.columns
-      = f.input :type, :as=>:select, :collection=> [ Post::TECH, Post::LIFE, Post::CREATOR ], label: '类别', "ng-model"=>"type"
+      = f.input :type, :as=>:select, :collection=> [ Post::TECH, Post::LIFE, Post::CREATOR ], label: '类别', "ng-model"=>"type", input_html: { name: 'type' }
   .row
     .small-12.large-6.columns
       = f.simple_fields_for :label do |p|
-        = p.input :name, label: '标签', "ng-model" => "labels"
+        = label_tag :labels, '标签'
+        = text_field_tag :labels, @post.labels_content(true)
   / tabs and upload file field
   dl.tabs
     dd ng-class="{ active: body_active }"
@@ -19,10 +21,10 @@
   input[type="file" style="display: none;"]
 
   .content-field ng-show="body_active" ng-model= 'content'
-    = f.input :content, :as=> :text, :label => false, input_html: { "ng-model" => "content" }
+    = f.input :content, :as=> :text, :label => false, input_html: { name: 'content', "value"=>"#{@post.content}", "ng-model"=>'content', "ng-init"=>"content='#{@post.content}'" }
 
   .preview.markdown ng-hide="body_active" ng-bind-html=" previewHTML "
 
   .row
     .small-12.large-6.columns.posts-button
-      = f.button :submit, '提交', class: 'button'
+      button 提交
diff --git a/app/views/layouts/admin.html.slim b/app/views/layouts/admin.html.slim
index 9874b88..a65b8f3 100644
--- a/app/views/layouts/admin.html.slim
+++ b/app/views/layouts/admin.html.slim
@@ -21,6 +21,11 @@ html
             = link_to '创建新博客', new_admin_post_path
           li
             a href="#" 管理博客
+    - flash.each do |name, msg|
+      - if msg.is_a?(String)
+        div class=("alert-box #{name == :notice ? "success" : "alert"}") data-alert=""
+          = content_tag :div, msg
+          a.close href="#"  &times;
     .admin-main-field ng-app="app"
       = yield
     = render "layouts/footer"
diff --git a/spec/controllers/admin/posts_controller_spec.rb b/spec/controllers/admin/posts_controller_spec.rb
index 2322316..aff92db 100644
--- a/spec/controllers/admin/posts_controller_spec.rb
+++ b/spec/controllers/admin/posts_controller_spec.rb
@@ -7,4 +7,37 @@ describe Admin::PostsController do
     post :preview, content: '123'
     response.body.should == "<p>123</p>\n"
   end
+
+  it "update" do
+    post = create(:post)
+
+    patch 'update', id: post.id, labels: 'think, go '
+    expect(post.reload.labels.size).to eq(2)
+  end
+
+
+  it "destroy" do
+    post = create(:post)
+    label = create(:label)
+    post.labels << label
+    post.save!
+    expect(label.posts.size).to eq(1)
+
+    delete 'destroy', id: post.id
+    expect( Post.all.size ).to eq(0)
+    expect( label.reload.posts.size ).to eq(0)
+  end
+
+  it "create" do
+    post_params = attributes_for(:post)
+    post 'create', post_params.merge( labels: 'think, go ' )
+    
+    post = Post.first
+    expect( post.labels.size ).to eq(2)
+  end
+
+  it "create fail and see labels_content" do
+    post 'create', labels: 'think, go '
+    expect( assigns(:post).labels_content ).to eq('think, go')
+  end
 end
diff --git a/spec/factories/labels.rb b/spec/factories/labels.rb
new file mode 100644
index 0000000..9766101
--- /dev/null
+++ b/spec/factories/labels.rb
@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :label do
+    name 'label'
+  end
+end

From e6fcc62d39c2b6966b12dd890b8463d2cdc3ce03 Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Mon, 31 Mar 2014 22:45:41 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E9=80=89=E5=8F=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../javascripts/angularjs/admin_posts.js.coffee       |  3 +++
 app/assets/stylesheets/admin/posts.css.scss           |  5 +++++
 app/views/admin/posts/_form.html.slim                 | 11 ++++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/angularjs/admin_posts.js.coffee b/app/assets/javascripts/angularjs/admin_posts.js.coffee
index c0144bc..69bde9a 100644
--- a/app/assets/javascripts/angularjs/admin_posts.js.coffee
+++ b/app/assets/javascripts/angularjs/admin_posts.js.coffee
@@ -11,3 +11,6 @@
     $http.post '/admin/posts/preview', { content: $scope.content }
     .success (res)->
       $scope.previewHTML = res
+
+  $scope.addTag = (e)->
+    $scope.labels += ", #{$(e.target).text()}"
diff --git a/app/assets/stylesheets/admin/posts.css.scss b/app/assets/stylesheets/admin/posts.css.scss
index 86e8ad8..745c2fa 100644
--- a/app/assets/stylesheets/admin/posts.css.scss
+++ b/app/assets/stylesheets/admin/posts.css.scss
@@ -18,6 +18,11 @@
     padding: 0.275rem 0.5rem;
   }
 
+  .tag {
+    display: inline-block;
+    margin: 0 0.5rem;
+  }
+
   #upload_photo {
     float: right;
     margin-top: 2rem;
diff --git a/app/views/admin/posts/_form.html.slim b/app/views/admin/posts/_form.html.slim
index faadef2..24a3927 100644
--- a/app/views/admin/posts/_form.html.slim
+++ b/app/views/admin/posts/_form.html.slim
@@ -10,7 +10,16 @@
     .small-12.large-6.columns
       = f.simple_fields_for :label do |p|
         = label_tag :labels, '标签'
-        = text_field_tag :labels, @post.labels_content(true)
+        = text_field_tag :labels, @post.labels_content(true), "ng-model"=>"labels", "ng-init" => "labels= '#{@post.labels_content(true)}'"
+
+  .row
+    .small-12.columns
+      p
+        | 已有标签:
+        span
+          - Label.all.each do |label|
+            a.tag href="#" ng-click="addTag($event)" #{label.name}
+          
   / tabs and upload file field
   dl.tabs
     dd ng-class="{ active: body_active }"

From 0252887a0fa2f1c1b5e29f8f53c942070abe0bc8 Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Mon, 31 Mar 2014 23:11:40 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=AD=A3like=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E7=9A=84=E5=8D=9A=E5=AE=A2=E6=97=B6=E4=BA=92=E7=9B=B8=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../javascripts/angularjs/likes.js.coffee     | 25 +++++++++++++------
 app/controllers/likes_controller.rb           |  9 +++++++
 app/views/blogs/_post.html.slim               |  4 +--
 config/routes.rb                              |  6 ++++-
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/angularjs/likes.js.coffee b/app/assets/javascripts/angularjs/likes.js.coffee
index 38f5e43..78d1fda 100644
--- a/app/assets/javascripts/angularjs/likes.js.coffee
+++ b/app/assets/javascripts/angularjs/likes.js.coffee
@@ -1,28 +1,37 @@
 @app.controller 'LikesController', ($scope, $http, $location, $cookies)->
   url = $location.absUrl() + "/likes"
 
-  $scope.count = 0
-
-  $scope.get_count = ->
-    $http.get url
-    .success (res)->
-      $scope.count = res.count
-
-  $scope.get_count()
+  $http.get url
+  .success (res)->
+    $scope.count = res.count
   
   $scope.like = $cookies.like
 
+  if $scope.like
+    $http
+      url: $location.absUrl() + "/likes/#{$scope.like}/is_liked"
+      method: 'GET'
+    .success (res)->
+      if  res == 'true'
+        $scope.is_liked = true
+      else
+        $scope.is_liked = false
+  else
+    $scope.is_liked = false
+
   $scope.submit = ->
     $http.post url
     .success (res)->
       if res.success
         $scope.like = $cookies.like = res.id
         $scope.count = res.count
+        $scope.is_liked = true
 
   $scope.cancel = ->
     $http.delete url + "/" + $scope.like
     .success (res)->
       $scope.count = res.count
+    $scope.is_liked = false
     # anyway, clear cookie
     delete $cookies["like"]
     $scope.like = null
diff --git a/app/controllers/likes_controller.rb b/app/controllers/likes_controller.rb
index e36a2ac..32b9f99 100644
--- a/app/controllers/likes_controller.rb
+++ b/app/controllers/likes_controller.rb
@@ -6,6 +6,15 @@ class LikesController < ApplicationController
     render :json=> { success: true, count: post.liked_count }
   end
 
+  def is_liked
+    post = Post.find( params[:blog_id] )
+    if post.likes.where(id: params[:id]).first
+      render text: true
+    else
+      render text: false
+    end
+  end
+
   def create
     post = Post.find( params[:blog_id] )
     like = Like.new
diff --git a/app/views/blogs/_post.html.slim b/app/views/blogs/_post.html.slim
index 010c5e9..b68193d 100644
--- a/app/views/blogs/_post.html.slim
+++ b/app/views/blogs/_post.html.slim
@@ -13,9 +13,9 @@ p.ptag
   | 发表于:
   span #{format_date(post.created_at)}
 p ng-controller="LikesController"
-  button.like-button ng-show="! like " ng-click="submit()"
+  button.like-button ng-show="! is_liked " ng-click="submit()"
     |{{ count }}
     span Like
-  button.like-button ng-show=" like " ng-click="cancel()" 
+  button.like-button ng-show=" is_liked " ng-click="cancel()" 
     |{{ count }}
     span Liked
diff --git a/config/routes.rb b/config/routes.rb
index fef43d1..45f79a6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,7 +6,11 @@ WBlog::Application.routes.draw do
       get :rss
     end
     resources :comments, only: [:index, :create]
-    resources :likes, only: [:index, :create, :destroy]
+    resources :likes, only: [:index, :create, :destroy] do
+      member do
+        get :is_liked
+      end
+    end
   end
 
 

From a857ea6dad982ae7fd651e2e3a467760d71e52eb Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Mon, 31 Mar 2014 23:41:58 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=8D=9A=E5=AE=A2?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8E=E6=95=B0=E6=8D=AE=E6=94=B6=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../angularjs/admin_posts.js.coffee           |  6 ++++-
 app/controllers/admin/dashboard_controller.rb |  3 +++
 app/controllers/admin/posts_controller.rb     | 15 ++++++++-----
 app/views/admin/dashboard/index.html.slim     |  6 ++---
 app/views/admin/posts/edit.html.slim          |  5 +++++
 app/views/admin/posts/index.html.slim         | 22 +++++++++++++++++++
 app/views/layouts/admin.html.slim             |  4 ++--
 7 files changed, 49 insertions(+), 12 deletions(-)
 create mode 100644 app/views/admin/posts/edit.html.slim
 create mode 100644 app/views/admin/posts/index.html.slim

diff --git a/app/assets/javascripts/angularjs/admin_posts.js.coffee b/app/assets/javascripts/angularjs/admin_posts.js.coffee
index 69bde9a..ec2dc01 100644
--- a/app/assets/javascripts/angularjs/admin_posts.js.coffee
+++ b/app/assets/javascripts/angularjs/admin_posts.js.coffee
@@ -13,4 +13,8 @@
       $scope.previewHTML = res
 
   $scope.addTag = (e)->
-    $scope.labels += ", #{$(e.target).text()}"
+    new_labels= $(e.target).text()
+    if $scope.labels
+      $scope.labels += ", #{new_labels}"
+    else
+      $scope.labels = new_labels
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index 640c0b2..9baa8e3 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -3,5 +3,8 @@ class Admin::DashboardController < ApplicationController
   before_action :authericate_user!
 
   def index
+    @posts_count = Post.all.size
+    @comments_count = Comment.all.size
+    @visited_count = Post.all.inject(0) { |res, p| res + p.visited_count }
   end
 end
diff --git a/app/controllers/admin/posts_controller.rb b/app/controllers/admin/posts_controller.rb
index 25d1f70..8187e7c 100644
--- a/app/controllers/admin/posts_controller.rb
+++ b/app/controllers/admin/posts_controller.rb
@@ -13,13 +13,16 @@ class Admin::PostsController < ApplicationController
   def destroy
     @post = Post.find( params[:id] )
     if @post.destroy
-      render :json=> { success: true }
+      flash[:notice] = '删除博客成功'
+      redirect_to admin_posts_path
     else
-      render :json=> { success: false }
+      flash[:error] = '删除博客失败'
+      redirect_to admin_posts_path
     end
   end
 
   def index
+    @posts = Post.all
   end
 
   def create
@@ -32,8 +35,6 @@ class Admin::PostsController < ApplicationController
       @post.labels << label
     end
 
-    #binding.pry
-
     if @post.save
       flash[:notice] = '创建博客成功'
       redirect_to admin_root_path
@@ -57,9 +58,11 @@ class Admin::PostsController < ApplicationController
     end
 
     if @post.update( params.permit(:title, :content, :type) )
-      render :json=> { success: true }
+      flash[:notice] = '更新博客成功'
+      redirect_to admin_posts_path
     else
-      render :json=> { success: false }
+      flash[:error] = '更新博客失败'
+      render :edit
     end
   end
 
diff --git a/app/views/admin/dashboard/index.html.slim b/app/views/admin/dashboard/index.html.slim
index 1c4f240..b8241ce 100644
--- a/app/views/admin/dashboard/index.html.slim
+++ b/app/views/admin/dashboard/index.html.slim
@@ -10,11 +10,11 @@
       tbody
         tr
           td 总博客数
-          td 1000
+          td #{@posts_count}
         tr
           td 总评论数
-          td 1000
+          td #{@comments_count}
         tr
           td 总浏览量
-          td 1000
+          td #{@visited_count}
 
diff --git a/app/views/admin/posts/edit.html.slim b/app/views/admin/posts/edit.html.slim
new file mode 100644
index 0000000..ae30140
--- /dev/null
+++ b/app/views/admin/posts/edit.html.slim
@@ -0,0 +1,5 @@
+.row
+  .small-12.columns
+    .admin-posts-field ng-controller="AdminPostsController"
+      h3.blog-title 修改博客
+      = render 'form'
diff --git a/app/views/admin/posts/index.html.slim b/app/views/admin/posts/index.html.slim
new file mode 100644
index 0000000..c61619c
--- /dev/null
+++ b/app/views/admin/posts/index.html.slim
@@ -0,0 +1,22 @@
+.row.admin-posts-field
+  .small-12.columns
+    h3.blog-title 博客管理
+    table width="100%"
+      thead
+        tr
+          th 标题
+          th 概要
+          th 操作
+      tbody
+        - @posts.each do |post|
+          tr
+            td 科学
+            td
+              span 技术
+              span 分类
+              span 喜欢数
+              span 浏览数
+            td
+              = link_to '编辑', edit_admin_post_path(post)
+              = link_to '删除', admin_post_path(post), method: 'DELETE', confirm: '确认删除?'
+
diff --git a/app/views/layouts/admin.html.slim b/app/views/layouts/admin.html.slim
index a65b8f3..c73fca3 100644
--- a/app/views/layouts/admin.html.slim
+++ b/app/views/layouts/admin.html.slim
@@ -12,7 +12,7 @@ html
       ul.title-area
         li.name
           h1
-            a href="#" Admin for WinDy
+            = link_to 'Dashboard For WinDy', admin_root_path
         li.toggle-topbar.menu-icon
           a href="#" Menu
       section.top-bar-section
@@ -20,7 +20,7 @@ html
           li
             = link_to '创建新博客', new_admin_post_path
           li
-            a href="#" 管理博客
+            = link_to '管理博客', admin_posts_path
     - flash.each do |name, msg|
       - if msg.is_a?(String)
         div class=("alert-box #{name == :notice ? "success" : "alert"}") data-alert=""

From 8db612ae0a61f55b9aed1905c12ae43f48e49962 Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Mon, 31 Mar 2014 23:44:45 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=9A=84css=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/admin/posts.css.scss | 4 ++++
 app/views/admin/posts/index.html.slim       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/admin/posts.css.scss b/app/assets/stylesheets/admin/posts.css.scss
index 745c2fa..ca991cb 100644
--- a/app/assets/stylesheets/admin/posts.css.scss
+++ b/app/assets/stylesheets/admin/posts.css.scss
@@ -29,3 +29,7 @@
   }
 
 }
+
+.edit-post-link {
+  margin-right: 1rem;
+}
diff --git a/app/views/admin/posts/index.html.slim b/app/views/admin/posts/index.html.slim
index c61619c..5e23a6b 100644
--- a/app/views/admin/posts/index.html.slim
+++ b/app/views/admin/posts/index.html.slim
@@ -17,6 +17,6 @@
               span 喜欢数
               span 浏览数
             td
-              = link_to '编辑', edit_admin_post_path(post)
+              = link_to '编辑', edit_admin_post_path(post), class: 'edit-post-link'
               = link_to '删除', admin_post_path(post), method: 'DELETE', confirm: '确认删除?'
 

From e5ba083bc9e36d7b2f6cdd13f7bb35ebc617e367 Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Mon, 31 Mar 2014 23:53:09 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/admin/posts.css.scss |  7 +++++++
 app/controllers/admin/posts_controller.rb   |  2 +-
 app/views/admin/posts/index.html.slim       | 19 +++++++++++++------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/admin/posts.css.scss b/app/assets/stylesheets/admin/posts.css.scss
index ca991cb..44f9a96 100644
--- a/app/assets/stylesheets/admin/posts.css.scss
+++ b/app/assets/stylesheets/admin/posts.css.scss
@@ -33,3 +33,10 @@
 .edit-post-link {
   margin-right: 1rem;
 }
+
+.admin-post-summary-field {
+  i {
+    margin-right: 0.385rem;
+    margin-left: 0.5rem;
+  }
+}
diff --git a/app/controllers/admin/posts_controller.rb b/app/controllers/admin/posts_controller.rb
index 8187e7c..84e6ace 100644
--- a/app/controllers/admin/posts_controller.rb
+++ b/app/controllers/admin/posts_controller.rb
@@ -22,7 +22,7 @@ class Admin::PostsController < ApplicationController
   end
 
   def index
-    @posts = Post.all
+    @posts = Post.desc(:created_at)
   end
 
   def create
diff --git a/app/views/admin/posts/index.html.slim b/app/views/admin/posts/index.html.slim
index 5e23a6b..0ceb9c8 100644
--- a/app/views/admin/posts/index.html.slim
+++ b/app/views/admin/posts/index.html.slim
@@ -10,12 +10,19 @@
       tbody
         - @posts.each do |post|
           tr
-            td 科学
-            td
-              span 技术
-              span 分类
-              span 喜欢数
-              span 浏览数
+            td 
+              = link_to post.title, blog_path(post)
+            td.admin-post-summary-field
+              i.fi-calendar
+              span #{format_time(post.created_at)}
+              i.fi-list
+              span #{ post.type }
+              i.fi-pricetag-multiple
+              span #{ post.labels_content }
+              i.fi-torsos
+              span #{ post.visited_count }
+              i.fi-heart
+              span #{ post.liked_count }
             td
               = link_to '编辑', edit_admin_post_path(post), class: 'edit-post-link'
               = link_to '删除', admin_post_path(post), method: 'DELETE', confirm: '确认删除?'

From 6267b9d465e11a17b765ea88edc0bcf8a8e7138e Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Mon, 31 Mar 2014 23:56:19 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=8E=E8=BF=94=E5=9B=9E=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/blogs_controller.rb | 1 +
 app/views/layouts/admin.html.slim   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb
index a6fd08c..f59e43a 100644
--- a/app/controllers/blogs_controller.rb
+++ b/app/controllers/blogs_controller.rb
@@ -13,6 +13,7 @@ class BlogsController < ApplicationController
 
   def show
     @post = Post.find(params[:id])
+    @post.visited
     @prev = Post.where(:created_at.lt => @post.created_at).desc(:created_at).where(:id.ne => @post.id).first
     @next = Post.where(:created_at.gt => @post.created_at).asc(:created_at).where(:id.ne => @post.id).first
     @comments = @post.comments
diff --git a/app/views/layouts/admin.html.slim b/app/views/layouts/admin.html.slim
index c73fca3..12e5db3 100644
--- a/app/views/layouts/admin.html.slim
+++ b/app/views/layouts/admin.html.slim
@@ -21,6 +21,9 @@ html
             = link_to '创建新博客', new_admin_post_path
           li
             = link_to '管理博客', admin_posts_path
+        ul.right
+          li
+            = link_to '返回首页', root_path
     - flash.each do |name, msg|
       - if msg.is_a?(String)
         div class=("alert-box #{name == :notice ? "success" : "alert"}") data-alert=""

From 293b5bb63bfe43bad4c7dcbda091b0df42895af9 Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Tue, 1 Apr 2014 00:04:46 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore |  3 +++
 Gemfile    | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 01887c4..035c922 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@
 /public/uploads/*
 
 *.lock
+
+# Ignore application configuration
+/config/application.yml
diff --git a/Gemfile b/Gemfile
index aeb1253..213b897 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,17 +13,18 @@ gem 'jquery-rails'
 gem 'foundation-rails', '~> 5.2.1'
 gem 'foundation-icons-sass-rails'
 
-gem "mongoid"
-gem "mongoid-pagination"
-gem "redcarpet"
-gem "rouge"
+gem 'mongoid'
+gem 'mongoid-pagination'
+gem 'redcarpet'
+gem 'rouge'
 gem 'slim-rails'
-gem "simple_form"
-gem "mini_magick"
+gem 'simple_form'
+gem 'mini_magick'
 gem 'carrierwave-mongoid'
 gem 'html_truncator'
 gem 'nokogiri'
 gem 'angularjs-rails'
+gem 'figaro'
 
 group :development do
   gem 'quiet_assets'