SylorHuang
/
taskover
forked from jasder/taskover
0
0
Fork 0
Code Issues Pull Requests 2 Releases Wiki Activity

seperate header to individual file

This commit is contained in:
Kesin 2015-09-26 13:10:15 +08:00
parent 9412d8ec54
commit ad4e7a5e9f
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/plans_controller.rb
View File

@ -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

3
app/helpers/plans_helper.rb
View File

@ -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

17
app/views/layouts/_header.html.haml Normal file
View File

@ -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"} 注册

18
app/views/layouts/application.html.haml
View File

@ -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