From 3dca2185beba966e81ba5df66c92eeb6176d4f63 Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 16 Sep 2014 08:56:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E9=80=9A=E5=91=8A?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=AF=BC=E8=88=AA=E6=A0=8F?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E3=80=82=E5=8E=9F=E5=9B=A0=E6=9C=AA=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0layout=EF=BC=8C=E8=A7=A3=E5=86=B3=EF=BC=9A=E5=8A=A0?= =?UTF-8?q?=E4=B8=8Alayout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/contest_notification_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/contest_notification_controller.rb b/app/controllers/contest_notification_controller.rb index 8c6e51bd5..461b62457 100644 --- a/app/controllers/contest_notification_controller.rb +++ b/app/controllers/contest_notification_controller.rb @@ -1,4 +1,5 @@ class ContestNotificationController < ApplicationController + layout 'contest_base' def show @notification = ContestNotification.find(params[:id]) end From ffa4ec193ebaba698ee6a0f99608ffdfd8a90d57 Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 16 Sep 2014 09:22:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E6=9F=A5=E7=9C=8B=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=BC=E8=88=AA=E6=A0=8F=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E5=9B=A0=EF=BC=9A=E4=B8=BA=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?layout=EF=BC=8C=E8=A7=A3=E5=86=B3=EF=BC=9A=E5=8A=A0=E4=B8=8Alay?= =?UTF-8?q?out?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/journals_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index 28505a047..77ee9d648 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -54,6 +54,11 @@ class JournalsController < ApplicationController end (render_404; return false) unless @issue && @detail @diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value) + respond_to do |format| + format.html { + render :layout => 'project_base' + } + end end def new From 8cc14546f89d2af0dba81270e88fd59001c286bd Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 16 Sep 2014 10:27:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=B5=84=E6=BA=90=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E4=B9=9F=E5=8F=AF=E4=BB=A5=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E7=A7=81?= =?UTF-8?q?=E6=9C=89=E6=A0=87=E7=AD=BE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attachments_controller.rb | 2 +- app/helpers/projects_helper.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 4525176ac..62bef8fb1 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -361,7 +361,7 @@ private def login_without_softapplication referer = request.headers['Referer'] - require_login unless referer =~ /softapplication/ + require_login unless referer =~ /softapplication/ || referer =~ /memos/ end def renderTag diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index dfacff864..47f33f34a 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -181,7 +181,7 @@ module ProjectsHelper # unless project.is_public == 1 if project.is_public != 1 - s = "#{l(:lable_private)}".html_safe + s = "#{l(:label_private)}".html_safe else s = "".html_safe end @@ -197,7 +197,7 @@ module ProjectsHelper if !project.is_public # end longjun - s = "#{l(:lable_private)}".html_safe + s = "#{l(:label_private)}".html_safe else s = "".html_safe end From ed81275d17b0f605e540ddb88b0e45a414e4d3f1 Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 16 Sep 2014 10:50:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?#1256=EF=BC=8C=E7=BC=96=E8=BE=91=E5=B8=96?= =?UTF-8?q?=E5=AD=90=E7=9A=84=E6=8C=89=E9=92=AE=E6=98=AF=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E8=80=8C=E5=BC=95=E7=94=A8=E5=92=8C=E5=88=A0=E9=99=A4=E9=83=BD?= =?UTF-8?q?=E6=98=AF=E6=96=87=E5=AD=97=EF=BC=8C=E5=B0=86=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=B9=9F=E6=94=B9=E4=B8=BA=E6=96=87=E5=AD=97=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/show.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 9b68e80fc..577c3ff7f 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -23,7 +23,8 @@ )if !@memo.locked? && User.current.logged? %> <%= link_to( - image_tag('edit.png'), + #image_tag('edit.png'), + l(:button_edit), {:action => 'edit', :id => @memo}, :method => 'get', :title => l(:button_edit)