From f340941e3ec952c8791f65880c69fb8be689780f Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 28 Sep 2015 13:35:59 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=EF=BC=88=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=EF=BC=89=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AD=98=E5=9C=A8html=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_forums.html.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index ec19b5b97..1d2151b75 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -154,10 +154,9 @@
回答：<%= @forum.memo_count %> 帖子：<%=@forum.topic_count%>
-
<%= @forum.description%> +
<%= @forum.description.html_safe%> <%if @forum.creator.id == User.current.id%> - <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%> <%end%> From f5a6d5d3497c345e7e7f13963955d74355edd086 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 28 Sep 2015 14:09:27 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9A=84=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=8A=A8=E6=80=81=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_homework.html.erb | 32 ++++++++++++++++------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index afd2f142b..8798002c9 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -1,3 +1,4 @@ +<% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
@@ -45,18 +46,29 @@
<%= activity.description.html_safe %>
- + <% end%>
-
\ No newline at end of file From e298f738ed897fb534f41f4dc255d61ca0188148 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 28 Sep 2015 14:10:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9A=84=E8=BF=87=E6=BB=A4=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 17539fb6b..4fd8d99d2 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -98,7 +98,7 @@ a.homepagePostTypeForum {background:url(../images/homepage_icon.png) -10px -310p a.homepagePostTypeQuiz {background:url(../images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;} a.homepagePostTypeQuestion {background:url(../images/homepage_icon.png) -10px -273px no-repeat; padding-left:23px;} a.homepagePostTypeMine {background:url(../images/homepage_icon.png) -187px -277px no-repeat; padding-left:23px;} -a.homepagePostTypeAll {background:url(../images/homepage_icon.png) -185px -308px no-repeat; padding-left:23px;} +a.homepagePostTypeAll {background:url(../images/homepage_icon.png) -189px -308px no-repeat; padding-left:23px;} a.postTypeGrey {color:#888888;} a.postTypeGrey:hover {color:#269ac9;} .homepagePostBrief {width:710px; margin:0px auto; position:relative;} From 5e0ae3a6bb1d46407a64fc927edb355eca0f54cc Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 28 Sep 2015 14:11:46 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B4=B4=E5=90=A7?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=8C=A1=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_forums.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index 1d2151b75..52309912e 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -21,7 +21,7 @@ function edit_desc(){ if(<%=@forum.creator.id == User.current.id%>) { desc = $("#forum_desc_span").html(); - $("#forum_desc_span").html(""); + $("#forum_desc_span").html(""); $("#forum_desc_input").focus(); } } From 4e7b0c5bdfa713e2261331394b938a523f9eb298 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 28 Sep 2015 14:20:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=B0=BD=E5=8F=AF=E8=83=BD=E7=9A=84=E6=98=BE=E7=A4=BA=E5=AE=8C?= =?UTF-8?q?=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/_attachments_links.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/memos/_attachments_links.html.erb b/app/views/memos/_attachments_links.html.erb index 15473e6e7..967bc0883 100644 --- a/app/views/memos/_attachments_links.html.erb +++ b/app/views/memos/_attachments_links.html.erb @@ -20,7 +20,7 @@
<% else %> - <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 32 -%> + <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 80 -%> (<%= number_to_human_size attachment.filesize , :precision => 0 %>) <% if options[:deletable] %> <%#= link_to image_tag('delete.png'), attachment_path(attachment), From 41a6b8ab0614ed0c467d336de0111f8be589de70 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 28 Sep 2015 14:35:55 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=B0=BD=E5=8F=AF=E8=83=BD=E7=9A=84=E6=98=BE=E7=A4=BA=E5=AE=8C?= =?UTF-8?q?=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/_attachments_links.html.erb | 34 ++------------------- app/views/memos/show.html.erb | 2 +- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/app/views/memos/_attachments_links.html.erb b/app/views/memos/_attachments_links.html.erb index 967bc0883..ca0f41d16 100644 --- a/app/views/memos/_attachments_links.html.erb +++ b/app/views/memos/_attachments_links.html.erb @@ -1,4 +1,4 @@ -
+
<% for attachment in attachments %> @@ -20,43 +20,13 @@
<% else %> - <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 80 -%> + <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 45 -%> (<%= number_to_human_size attachment.filesize , :precision => 0 %>) <% if options[:deletable] %> - <%#= link_to image_tag('delete.png'), attachment_path(attachment), - :data => {:confirm => l(:text_are_you_sure)}, - :method => :delete, - :class => 'delete', - #:remote => true, - #:id => "attachments_" + attachment.id.to_s, - :title => l(:button_delete) %> <% end %>
<% end %> - - <%# if attachment.is_text? %> - <%#= link_to image_tag('magnifier.png'), - :controller => 'attachments', - :action => 'show', - :id => attachment, - :filename => attachment.filename%> - <%# end %> - - - - - - - - - - - <%#= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %> - - - - <% end %> <% if defined?(thumbnails) && thumbnails %> <% images = attachments.select(&:thumbnailable?) %> diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 1e2f0f25b..550c7a4fe 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -69,7 +69,7 @@ <%= @memo.content.html_safe%>
-
+
<% if @memo.attachments.any?%> <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %> <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>