From 297b3c42b1d699439c64ea41e522d8b2205ae573 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 20 Mar 2015 18:02:33 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E6=8F=92=E5=85=A5=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E6=A0=B7=E5=BC=8F=E4=BC=9A=E8=A2=AB=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=A6=86=E7=9B=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/plugins/table/table.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js index 4033b6ae3..634e9b7fc 100644 --- a/public/assets/kindeditor/plugins/table/table.js +++ b/public/assets/kindeditor/plugins/table/table.js @@ -245,6 +245,10 @@ KindEditor.plugin('table', function(K) { if (bgColor !== '') { style += 'background-color:' + bgColor + ';'; } + if (border !== ''){ + style += 'border:'+border+'px solid;'; + } + var html = '
' + (K.IE ? ' ' : ' ') + ' | ';
+ html += '' + (K.IE ? ' ' : ' ') + ' | ';
}
html += '';
}
From 90bce764092970077b112ee1e3437bc3489a5d12 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 26 Mar 2015 15:23:34 +0800
Subject: [PATCH 02/24] =?UTF-8?q?=E7=A7=81=E6=9C=89=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E7=9A=84=E8=B5=84=E6=BA=90=E6=95=B0=EF=BC=8C=E5=8F=AA=E8=A6=81?=
=?UTF-8?q?=E4=B8=8D=E6=98=AF=E6=9C=AC=E4=BA=BA=E4=BC=A0=E7=9A=84=EF=BC=8C?=
=?UTF-8?q?=E9=83=BD=E7=9C=8B=E4=B8=8D=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/helpers/files_helper.rb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index 9eff409ff..884ebc2eb 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -87,7 +87,10 @@ module FilesHelper
def visable_attachemnts attachments
result = []
attachments.each do |attachment|
- if attachment.is_public? || (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)))|| attachment.author_id == User.current.id
+ if attachment.is_public? ||
+ (attachment.container_type == "Project" && User.current.member_of?(attachment.project)) ||
+ (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)))||
+ attachment.author_id == User.current.id
result << attachment
end
end
From d1d40e1867ba515d1949a113a9a55f9ee7d60516 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 26 Mar 2015 15:38:23 +0800
Subject: [PATCH 03/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?=
=?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E7=9A=84id=EF=BC=8C=E5=9C=A8?=
=?UTF-8?q?=E8=AE=BA=E5=9D=9B=E6=A8=A1=E5=9D=97=E9=87=8C=EF=BC=8C=E8=87=AA?=
=?UTF-8?q?=E5=8A=A8=E7=94=9F=E6=88=90=E7=9A=84id=E4=BC=9A=E5=92=8C?=
=?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8kindeditor=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E7=9A=84id=E5=86=B2=E7=AA=81=EF=BC=9A=E9=83=BD=E5=8F=ABmemo=5F?=
=?UTF-8?q?content?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/layouts/_base_feedback.html.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index d964b788f..6a0e79673 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -167,7 +167,7 @@ function cookieget(n)
<% get_memo %>
<%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %>
<%= f.text_area :subject, :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
- <%= f.hidden_field :content, :required => true , :value => l(:label_feedback_value) %>
+ <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
<%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
<%= l(:label_submit)%>
<% end %>
From 19b41c684fb74a80a780ecffc933de0810d40c3c Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 26 Mar 2015 15:39:47 +0800
Subject: [PATCH 04/24] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E5=9C=A8?=
=?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AE=BA=E5=9D=9B=E5=92=8C=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E8=AE=BA=E5=9D=9B=E7=9A=84=E6=97=B6?=
=?UTF-8?q?=E5=80=99=EF=BC=8C=E6=9C=89=E6=89=80=E5=8C=BA=E5=88=AB=EF=BC=8C?=
=?UTF-8?q?=E9=81=BF=E5=85=8D=E5=9C=A8=E4=BB=A3=E7=A0=81=E9=87=8C=E7=94=A8?=
=?UTF-8?q?=E5=88=86=E6=94=AF=E5=88=A4=E6=96=AD=EF=BC=8C=E5=B0=B1=E7=94=A8?=
=?UTF-8?q?=E4=BA=86=E4=B8=A4=E4=B8=AA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/forums/_form_create_mode.html.erb | 51 +++++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 app/views/forums/_form_create_mode.html.erb
diff --git a/app/views/forums/_form_create_mode.html.erb b/app/views/forums/_form_create_mode.html.erb
new file mode 100644
index 000000000..63162c7a0
--- /dev/null
+++ b/app/views/forums/_form_create_mode.html.erb
@@ -0,0 +1,51 @@
+
+
+
+