<%= link_to h(topic.subject.truncate(40,ommision:'...')), board_message_path(@board, topic),title: topic.subject.to_s,:class => "problem_tit fl fb c_dblue" %>
<% if topic.sticky? %>
-
由<%= link_to topic.author,user_path(topic.author),:class => "problem_name" %>添加于<%= format_time(topic.created_on) %>
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index d47157e61..c99c41fb9 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -1,47 +1,22 @@
-
-
<%= link_to image_tag(url_to_avatar(@topic.author),:width => '46',:height => '46'), user_path(@topic.author) %>
+
+ <%= link_to image_tag(url_to_avatar(@topic.author),:width => '46',:height => '46'), user_path(@topic.author) %>
+
-
<%= link_to @topic.subject, course_boards_path(@topic.course),title: @topic.subject.to_s %>
+
+ <%= link_to @topic.subject, course_boards_path(@topic.course),title: @topic.subject.to_s %>
+
-
由<%= link_to_user_header @topic.author,false,:class=> 'problem_name' %> 添加于<%= format_time(@topic.created_on) %>
+
+ 由<%= link_to_user_header @topic.author,false,:class=> 'problem_name' %>
+ 添加于<%= format_time(@topic.created_on) %>
+
-
- <%#= watcher_link(@topic, User.current) %>
-
<%= link_to(
l(:button_edit),
{:action => 'edit', :id => @topic},
@@ -55,12 +30,12 @@
:class => 'talk_edit fr'
) if @message.course_destroyable_by?(User.current) %>
-
<%= textAreailizable(@topic, :content) %>
+
<%= @topic.content.html_safe %>
<%= link_to_attachments_course @topic, :author => false %>
<% if User.current.logged? %>
- <%= toggle_link l(:button_reply), "reply", :focus => 'message_content',:class => 'talk_edit fr' %>
+ <%= toggle_link l(:button_reply), "reply", :focus => 'message_subject',:class => 'talk_edit fr' %>
<% else %>
<%= link_to l(:button_reply), signin_path,:class => 'talk_edit fr' %>
<% end %>
@@ -118,11 +93,11 @@
<%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
<%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
- <%= link_to l(:button_submit),"#",:onclick => 'course_board_submit_message_replay();' ,:class => "blue_btn fl c_white" ,:style=>"margin-left: 50px;"%>
+ <%= link_to l(:button_submit),"javascript:void(0)",:onclick => 'course_board_submit_message_replay();' ,:class => "blue_btn fl c_white" ,:style=>"margin-left: 50px;"%>
<% end %>
-
<% end %>
+
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
diff --git a/app/views/messages/_form_course.html.erb b/app/views/messages/_form_course.html.erb
index dc350bcb3..f4f8126fe 100644
--- a/app/views/messages/_form_course.html.erb
+++ b/app/views/messages/_form_course.html.erb
@@ -27,7 +27,10 @@
-
+
<%= text_area :quote,:quote,:style => 'display:none' %>
<%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
<% if replying %>
diff --git a/app/views/messages/quote.js.erb b/app/views/messages/quote.js.erb
index 3d8fe7237..157e20764 100644
--- a/app/views/messages/quote.js.erb
+++ b/app/views/messages/quote.js.erb
@@ -1,7 +1,7 @@
$('#message_subject').val("<%= raw escape_javascript(@subject) %>");
$('#message_quote').html("<%= raw escape_javascript(@temp.content.html_safe) %>");
//$('#message_content').val("<#%= raw escape_javascript(@content) %>");
-$('#quote_quote').html("<%= raw escape_javascript(@content) %>");
+$('#quote_quote').html("<%= raw escape_javascript(@temp.content.html_safe) %>");
showAndScrollTo("reply", "message_content");
$('#message_content').scrollTop = $('#message_content').scrollHeight - $('#message_content').clientHeight;
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index fcb72ee78..2b3ee1f18 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -232,12 +232,12 @@ function course_board_submit_message_replay()
function MessageReplayVevify() {
var content = message_content_editor.html();//$.trim($("#message_content").val());
if (content.length == 0) {
- $("#message_content_span").text("<%= l(:label_reply_empty) %>");
+ $("#message_content_span").text("回复不能为空");
$("#message_content_span").css('color', '#ff0000');
return false;
}
else {
- $("#message_content_span").text("<%= l(:label_field_correct) %>");
+ $("#message_content_span").text("填写正确");
$("#message_content_span").css('color', '#008000');
return true;
}
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index fa9e9787c..00d4e445f 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -451,6 +451,23 @@ a.link_file_board{ background:url(../images/pic_file.png) 0 3px no-repeat !impor
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);
}
+blockquote {
+ /* font-style: italic; */
+ border-left: 1px solid #e0e0e0;
+ border-right: 1px solid #e0e0e0;
+ border-top: 1px solid #e0e0e0;
+ border-bottom: 1px solid #e0e0e0;
+ padding-left: 0.6em;
+ padding-top: 0.6em;
+ padding-right: 0.6em;
+ padding-bottom: 0.6em;
+ margin-left: 1.4em;
+ margin-right: 0.4em;
+ border-radius: 4px;
+ font-family: "Microsoft YaHei";
+ background: url('../images/requirements/reference.jpg');
+}
+