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] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=BC=95=E7=94=A8=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=202=E3=80=81=E5=9B=9E=E5=A4=8D=E6=97=B6=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=A1=86=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=BE=97=E7=84=A6=E7=82=B9?=
 =?UTF-8?q?=203=E3=80=81=E5=BC=95=E7=94=A8=E6=A0=B7=E5=BC=8F=204=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E5=9B=9E=E5=A4=8D=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E5=87=BA=E7=8E=B0=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=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 = "<blockquote>#{@message.content.html_safe}</blockquote>".html_safe
+    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @message.author)} <br/>#{@message.content.html_safe}</blockquote>".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 @@
-<script type="text/javascript">
-    function submitCoursesBoard()
-    {
-        if(regexSubject()&&regexContent()){$("#message-form").submit();}
-    }
-</script>
 <div id="add-message" class="add_frame" style="display:none;">
   <% if User.current.logged? %>
       <h3>
-        <%= link_to h(@board.name), course_board_path(@course, @board) %> &#187;
+        <%= link_to h(@board.name), course_board_path(@course, @board) %>
         <%= l(:label_message_new) %>
       </h3>
       <div class="add_frame_header" >
@@ -16,9 +10,8 @@
       <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => false, :id => 'message-form'} do |f| %>
           <%= render :partial => 'messages/form_course', :locals => {:f => f} %>
           <p>
-            <!--<input type="button" onclick="submitCoursesBoard();" class = "ButtonColor m3p10 h30" value="<%#= l(:button_submit)%>">-->
-           <a href="#" onclick="submitCoursesBoard();"class="ButtonColor m3p10"><%= l(:button_submit)%></a>
-            <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;' ,:class => 'ButtonColor m3p10'  %>
+           <a href="javascript:void(0)" onclick="submitCoursesBoard();"class="ButtonColor m3p10"><%= l(:button_submit)%></a>
+            <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => '$("#add-message").hide(); return false;' ,:class => 'ButtonColor m3p10'  %>
           </p>
       <% end %>
       <div id="preview" class="wiki"></div>
@@ -39,7 +32,11 @@
     </div>
 <% end %>
 <div class="talk_top ml15">
-  <p class="fl"><%= l(:label_totle) %><span><%= @topic_count %></span><%= l(:label_course_momes_count) %></p>
+  <p class="fl">
+    <%= l(:label_totle) %>
+    <span><%= @topic_count %></span>
+    <%= l(:label_course_momes_count) %>
+  </p>
   <%= link_to l(:label_message_new),
               new_board_message_path(@board),
               :class => 'problem_new_btn fl c_dorange' if User.current.logged? %>
@@ -52,7 +49,7 @@
           <div class="talk_txt fl">
             <%= 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? %>
-              <a href="#" class="talk_up fl c_red">置顶</a>
+              <a href="javascript:void(0)" class="talk_up fr c_red">置顶</a>
             <% end %>
             <br/>
             <p>由<%= link_to topic.author,user_path(topic.author),:class => "problem_name" %>添加于<%= format_time(topic.created_on) %></p>
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 @@
-<script type="text/javascript">
-//   var flag = false;
-//   jQuery(document).ready(function($) {
-//        transpotUrl('#content');
-//    });
-//    function submit_message_replay()
-//    {
-//        regexContent();//onkeyup传给kindeditor用不上了，所以只能放在这里
-//        if(flag)
-//        {
-//            message_content_editor.sync();//提交内容之前要sync，不然服务器端取不到值
-//            $("#message_form").submit();
-//        }
-//    }
-//    function regexContent()
-//    {
-//        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").css('color','#ff0000');
-//            flag =  false;
-//        }
-//        else
-//        {
-//            $("#message_content_span").text("<%= l(:label_field_correct) %>");
-//            $("#message_content_span").css('color','#008000');
-//            flag = true;
-//        }
-//    }
-</script>
 <div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_board) %></h2>
+  <h2 class="project_h2">
+    <%= l(:label_board) %>
+  </h2>
 </div>
 <div class="problem_main">
-  <div class="ping_dispic"><%= link_to image_tag(url_to_avatar(@topic.author),:width => '46',:height => '46'), user_path(@topic.author) %></div>
-  <div class="talk_txt fl">
-    <p class="problem_tit fl fb" ><%= link_to @topic.subject, course_boards_path(@topic.course),title: @topic.subject.to_s %></p>
-    <br/>
-    <p>由<%= link_to_user_header @topic.author,false,:class=> 'problem_name' %> 添加于<%= format_time(@topic.created_on) %></p>
+  <div class="ping_dispic">
+    <%= link_to image_tag(url_to_avatar(@topic.author),:width => '46',:height => '46'), user_path(@topic.author) %>
+  </div>
+  <div class="talk_txt fl">
+    <p class="problem_tit fl fb" >
+      <%= link_to @topic.subject, course_boards_path(@topic.course),title: @topic.subject.to_s %>
+    </p>
+    <br/>
+    <p>
+      由<%= link_to_user_header @topic.author,false,:class=> 'problem_name' %>
+      添加于<%= format_time(@topic.created_on) %>
+    </p>
   </div>
-  <!-- <a class="talk_edit fr">删除</a><a class="talk_edit fr">编辑</a><a class="talk_edit fr">置顶</a> -->
-  <%#= 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) %>
   <div class="cl"></div>
-  <div class="talk_info mb10"><%= textAreailizable(@topic, :content) %></div>
+  <div class="talk_info mb10"><%= @topic.content.html_safe %></div>
   <div class="talk_info mb10"><%= link_to_attachments_course @topic, :author => false %></div>
   <!-- <a href="#" class=" link_file ml60">附件：爱覅俄方if.zip(27.5kB)</a>-->
   <div class="cl"></div>
   <% 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 @@
     <div id="reply" style="display:none;">
       <%= 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 %>
-      <div id="preview" class="wiki"></div>
     </div>
 <% end %>
+<div class="cl"></div>
 <ul class="wlist">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
 </ul>
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 @@
 </li>
 <li>
   <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
-  <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
+  <label class="fl" >
+    <span class="c_red">*</span>&nbsp;
+    <%= l(:field_description) %>&nbsp;&nbsp;：
+  </label>
   <%= 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');
+}
+