From ad4e7a5e9fad7d8fd8172d73ba8010bee912a255 Mon Sep 17 00:00:00 2001
From: Kesin <kaixuanguiqu@gmail.com>
Date: Sat, 26 Sep 2015 13:10:15 +0800
Subject: [PATCH] seperate header to individual file

---
 app/controllers/plans_controller.rb     |  4 ++--
 app/helpers/plans_helper.rb             |  3 ++-
 app/views/layouts/_header.html.haml     | 17 +++++++++++++++++
 app/views/layouts/application.html.haml | 18 +-----------------
 4 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 app/views/layouts/_header.html.haml

diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index abee415..cb74c3f 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -42,7 +42,7 @@ class PlansController < ApplicationController
   def update
     respond_to do |format|
       if @plan.update(plan_params)
-        format.html { redirect_to @plan, notice: 'Plan was successfully updated.' }
+        format.html { redirect_to root_url, notice: 'Plan was successfully updated.' }
         format.json { render :show, status: :ok, location: @plan }
       else
         format.html { render :edit }
@@ -56,7 +56,7 @@ class PlansController < ApplicationController
   def destroy
     @plan.destroy
     respond_to do |format|
-      format.html { redirect_to plans_url, notice: 'Plan was successfully destroyed.' }
+      format.html { redirect_to root_url, notice: 'Plan was successfully destroyed.' }
       format.json { head :no_content }
     end
   end
diff --git a/app/helpers/plans_helper.rb b/app/helpers/plans_helper.rb
index 5b0636c..fcb9382 100644
--- a/app/helpers/plans_helper.rb
+++ b/app/helpers/plans_helper.rb
@@ -2,9 +2,10 @@ module PlansHelper
 
   # default color_tag
   # TODO: User can create different color_tag to choose
+
   def color_tag_class(color_tag)
     color_id = color_tag.to_i - 1
-    color_arr = ['gray','blue','green','red','yellow','qing'] # add expect 'gray' at the begin to advoid problem
+    color_arr = ['gray','blue','green','red','yellow','qing']
     "bs-callout-#{color_arr[color_id]}"
   end
 
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
new file mode 100644
index 0000000..b9fa6cf
--- /dev/null
+++ b/app/views/layouts/_header.html.haml
@@ -0,0 +1,17 @@
+.navbar.navbar-default.navbar-static-top
+  .container
+    .navbar-header
+      %button.navbar-toggle.collapsed{"aria-controls" => "navbar", "aria-expanded" => "false", "data-target" => "#navbar", "data-toggle" => "collapse", :type => "button"}
+        %span.sr-only Toggle navigation
+        %span.icon-bar
+        %span.icon-bar
+        %span.icon-bar
+      %a.navbar-brand{:href => "/"} Taskile
+    #navbar.navbar-collapse.collapse{"aria-expanded" => "false", :style => "height: 1px;"}
+      %form.navbar-form.navbar-right
+        .form-group
+          %input.form-control{:placeholder => "Email", :type => "text"}
+        .form-group
+          %input.form-control{:placeholder => "Password", :type => "password"}
+        %button.btn.btn-success{:type => "submit"} 登录
+        %button.btn.btn-default{:type => "submit"} 注册
\ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index ea94c95..6dc8ace 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -28,23 +28,7 @@
     = favicon_link_tag 'favicon.ico', :rel => 'shortcut icon'
     = javascript_include_tag "application"
   %body
-    .navbar.navbar-default.navbar-static-top
-      .container
-        .navbar-header
-          %button.navbar-toggle.collapsed{"aria-controls" => "navbar", "aria-expanded" => "false", "data-target" => "#navbar", "data-toggle" => "collapse", :type => "button"}
-            %span.sr-only Toggle navigation
-            %span.icon-bar
-            %span.icon-bar
-            %span.icon-bar
-          %a.navbar-brand{:href => "/"} Taskile
-        #navbar.navbar-collapse.collapse{"aria-expanded" => "false", :style => "height: 1px;"}
-          %form.navbar-form.navbar-right
-            .form-group
-              %input.form-control{:placeholder => "Email", :type => "text"}
-            .form-group
-              %input.form-control{:placeholder => "Password", :type => "password"}
-            %button.btn.btn-success{:type => "submit"} 登录
-            %button.btn.btn-default{:type => "submit"} 注册
+    = render "layouts/header"
     .container
       = bootstrap_flash
       = yield