From 752fe93d724334c76ec08c4100700d90219006ff Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 18 Aug 2015 11:47:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7he?= =?UTF-8?q?ader=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- app/views/layouts/_logined_header.html.erb | 44 + app/views/layouts/_unlogin_header.html.erb | 40 + app/views/layouts/new_base_user.html.erb | 249 +-- app/views/users/show.html.erb | 209 +- public/images/menu_setting.png | Bin 0 -> 1130 bytes public/images/nav_logo.png | Bin 0 -> 3585 bytes public/javascripts/bootstrap.js | 2363 ++++++++++++++++++++ 8 files changed, 2648 insertions(+), 259 deletions(-) create mode 100644 app/views/layouts/_logined_header.html.erb create mode 100644 app/views/layouts/_unlogin_header.html.erb create mode 100644 public/images/menu_setting.png create mode 100644 public/images/nav_logo.png create mode 100644 public/javascripts/bootstrap.js diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 969d2d366..058cf971f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -534,7 +534,7 @@ class UsersController < ApplicationController end def show - render :layout=>'base_users_new' + render :layout=>'new_base_user' end def show_old diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb new file mode 100644 index 000000000..955ab5610 --- /dev/null +++ b/app/views/layouts/_logined_header.html.erb @@ -0,0 +1,44 @@ +
\ No newline at end of file diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb new file mode 100644 index 000000000..ac322f07f --- /dev/null +++ b/app/views/layouts/_unlogin_header.html.erb @@ -0,0 +1,40 @@ + \ No newline at end of file diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 6b4550721..e8a92a397 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -1,12 +1,19 @@ - -