- <%= textAreailizable bid, :description %>
+ <%= bid.description.html_safe %>
-
- <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-
-
+ <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+
<%= link_to image_tag(url_to_avatar(@news.author),:width => 42,:height => 42), user_path(@news.author), :class => "problem_pic fl" %>
-
@@ -97,13 +46,17 @@
<%=h @news.title %>
- <%#= watcher_link(@news, User.current) %> ++ <%=h @news.title %> +
<%= link_to(l(:button_edit), edit_news_path(@news), :class => 'talk_edit fr', @@ -86,7 +31,11 @@ :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @course) %> <%= delete_link(news_path(@news),:class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %> -<%= textAreailizable(@news, :description) %>
<%= l(:label_create_time) %> ： <%= format_time(@news.created_on) %>
+ <%= l(:label_create_time) %> ： <%= format_time(@news.created_on) %>
+ <%= @news.description.html_safe %>
+
+ <%= l(:label_create_time) %> ： <%= format_time(@news.created_on) %> +
<%= link_to_attachments_course @news %>
+ <%= l(:label_create_time) %> ： <%= format_time(@news.created_on) %> +
<%= l(:label_comment_add) %>
<%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form") do %> -
+
@@ -116,12 +69,16 @@
<%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
<%= kindeditor_tag :comment, '',:height=>'100',:editor_id =>'comment_editor', :placeholder=>"最多250个字"%>
- <%= l(:label_cancel_with_space) %> - <%= l(:label_comment_with_space) %> + + <%= l(:label_cancel_with_space) %> + + + <%= l(:label_comment_with_space) %> +
<% end %><%= link_to image_tag(url_to_avatar(comment.author),:width => 42,:height => 42), user_path(comment.author)%>
- <%= link_to_user_header(comment.author,false,:class => 'c_blue fb fl mb10 ') if comment.respond_to?(:author) %><%= format_time(comment.created_on) %>
+ <%= link_to_user_header(comment.author,false,:class => 'c_blue fb fl mb10 ') if comment.respond_to?(:author) %>
+
+ <%= format_time(comment.created_on) %>
+
-
- <%= textAreailizable(comment.comments) %>
+<%= comment.comments.html_safe %>
<%= link_to_if_authorized_course image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
- :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
+
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 64b8898f4..fcb72ee78 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -158,7 +158,7 @@ function regexTitle()
{
$("#title_notice_span").text("标题不能为空");
$("#title_notice_span").css('color','#ff0000');
- $("#title_notice_span").focus();
+ $("#news_title").focus();
return false;
}
else if(name.length <= 60)
@@ -171,7 +171,7 @@ function regexTitle()
{
$("#title_notice_span").text("标题超过60个字符");
$("#title_notice_span").css('color','#ff0000');
- $("#title_notice_span").focus();
+ $("#news_title").focus();
return false;
}
}
@@ -214,6 +214,12 @@ function submitFocus(obj)
$(obj).focus();
}
+function submitComment()
+{
+ comment_editor.sync();
+ $("#add_comment_form").submit();
+}
+
/////////////////////////////////////////////////课程讨论区
function course_board_submit_message_replay()
{
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index b9202279c..fa9e9787c 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -175,7 +175,7 @@ a:hover.work_edit{color: #fff; background: #64bdd9;}
.wzan a{ display: block;}
a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;}
a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
-.msg_box{ width:670px; height:200px; border-bottom:1px dashed #CCC; padding-top:10px;}
+.msg_box{ width:670px; height:205px; border-bottom:1px dashed #CCC; padding-top:10px;}
.msg_box h4{ }
.msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666; font-size:12px; }
/*.msg_box a{ float:right; display:block; width:50px; height:22px; background:#15bccf; padding-top:3px; color:#fff; margin-left:10px; text-align:center; margin-top:5px; }*/
From c5b55042d4cf8de882482ec9bfd51bfffac6c6a1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 8 Apr 2015 17:25:52 +0800
Subject: [PATCH 21/28] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E8=AF=BE?=
=?UTF-8?q?=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=BC=95=E7=94=A8=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=202=E3=80=81=E5=9B=9E=E5=A4=8D=E6=97=B6=E5=9B=9E?=
=?UTF-8?q?=E5=A4=8D=E6=A1=86=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=BE=97=E7=84=A6?=
=?UTF-8?q?=E7=82=B9=203=E3=80=81=E5=BC=95=E7=94=A8=E6=A0=B7=E5=BC=8F=204?=
=?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E5=9B=9E=E5=A4=8D?=
=?UTF-8?q?=E6=97=B6=E4=B8=8B=E9=9D=A2=E5=87=BA=E7=8E=B0=E7=9A=84=E6=8F=90?=
=?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/messages_controller.rb | 2 +-
app/helpers/application_helper.rb | 2 +-
app/views/boards/_course_show.html.erb | 21 ++++----
app/views/messages/_course_show.html.erb | 63 +++++++-----------------
app/views/messages/_form_course.html.erb | 5 +-
app/views/messages/quote.js.erb | 2 +-
public/javascripts/course.js | 4 +-
public/stylesheets/courses.css | 17 +++++++
8 files changed, 54 insertions(+), 62 deletions(-)
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 455981d9c..436418430 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -192,7 +192,7 @@ class MessagesController < ApplicationController
@content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
@temp = Message.new
- @temp.content = "
+ <%= link_to_if_authorized_course image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
+ :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
#{@message.content.html_safe}".html_safe + @temp.content = "
#{ll(Setting.default_language, :text_user_wrote, @message.author)}".html_safe end def preview diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c94108dc1..f36e4b397 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -303,7 +303,7 @@ module ApplicationHelper onclick = "$('##{id}').slideToggle(); " onclick << (options[:focus] ? "$('##{options[:focus]}').focus(); " : "this.blur(); ") onclick << "return false;" - link_to(name, "#", :onclick => onclick,:class => options[:class]) + link_to(name, "javascript:void(0)", :onclick => onclick,:class => options[:class]) end def image_to_function(name, function, html_options = {}) diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index c27546e85..ed2c20448 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -1,13 +1,7 @@ -
#{@message.content.html_safe}