From de5dd08b5599b96aa5d574c9bffd82075a76737f Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 29 Aug 2015 17:03:31 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E8=B7=B3=E5=88=B0=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c233ed6b..a6554075f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -563,7 +563,7 @@ class ApplicationController < ActionController::Base uri = URI.parse(back_url) # do not redirect user to another host or to the login or register page if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)}) - back_url = back_url.gsub(%r{\/users\/(\d+)},"/users/"+default.id.to_s) + back_url = back_url.gsub(%r{\/users\/(\d+)},"/users/"+default.id.to_s) if default.is_a?(:User) redirect_to(back_url) return end From f81bab63197a4c6ba6d406c1ced7ce1a0110067b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 29 Aug 2015 17:19:03 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_courses_jours.html.erb | 2 +- app/views/layouts/_logined_header.html.erb | 2 +- app/views/users/user_newfeedback.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb index cedc05f4b..12d79fc33 100644 --- a/app/views/courses/_courses_jours.html.erb +++ b/app/views/courses/_courses_jours.html.erb @@ -8,7 +8,7 @@ div.ke-toolbar .ke-outline{border:none;} div.respond-form .reply_btn{margin-left:565px;margin-top:5px;} - div.recall_con{width:570px;} + div.recall_con{width:630px;} div.recall_con .reply_btn{margin-left:525px;margin-top:5px;} <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index ace881194..18953d22d 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -56,7 +56,7 @@ <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %> " id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索"/> - + <% end %>