Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/layouts/base_courses.html.erb

@@ -133,7 +133,7 @@
         <div class="subNav">
           <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{@course.boards.first ? @course.boards.first.topics.count : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %>
-          <%= link_to( "+#{l(:label_message_new)}", course_boards_path(@course, :flag => true), :class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %>
+          <%= link_to( "+#{l(:label_message_new)}", new_board_message_path(@course.boards.first), :class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %>
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %>

app/views/messages/_course_show.html.erb

@@ -28,11 +28,6 @@
       添加于<%= format_time(@topic.created_on) %>
     </p>
   </div>
-  <%= link_to(
-              l(:button_edit),
-              {:action => 'edit', :id => @topic},
-              :class => 'talk_edit fr'
-      ) if @message.course_editable_by?(User.current) %>
   <%= link_to(
               l(:button_delete),
               {:action => 'destroy', :id => @topic},
@@ -40,6 +35,11 @@
               :data => {:confirm => l(:text_are_you_sure)},
               :class => 'talk_edit fr'
       ) if @message.course_destroyable_by?(User.current) %>
+  <%= link_to(
+              l(:button_edit),
+              {:action => 'edit', :id => @topic},
+              :class => 'talk_edit fr'
+      ) if @message.course_editable_by?(User.current) %>
   <div class="cl"></div>
   <div class="talk_info mb10 upload_img break_word"><%= @topic.content.html_safe %></div>
   <div class="talk_info mb10"><%= link_to_attachments_course @topic, :author => false %></div>
@@ -105,6 +105,7 @@
       <%= 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),"javascript:void(0)",:onclick => 'course_board_submit_message_replay();' ,:class => "blue_btn fl c_white" ,:style=>"margin-left: 50px;"%>
+          <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fl c_white"  %>
       <% end %>
     </div>
 <% end %>

app/views/messages/_form_course.html.erb

@@ -1,15 +1,16 @@
 <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
 <%= error_messages_for 'message' %>
 <% replying ||= false %>
-<% extra_option = replying ? { readonly: true} : { maxlength: 200 } %>
+<% extra_option = replying ? { hidden: "hidden"} : { maxlength: 200 } %>
 
 <li>
-  <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
+  <div style="display:<%= replying ? 'none' : 'block'%>;" class="fl"><label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label></div>
   <% if replying %>
-      <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585" }.merge(extra_option) %>
+      <div style="display: none;"><%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585 fl" }.merge(extra_option) %></div>
   <% else %>
       <%= f.text_field :subject, { size: 60, id: "message_subject", onkeyup: "regexSubject();",:class=>"talk_input w585" }.merge(extra_option) %>
   <% end %>
+  <div class="cl"></div>
   <p id="subject_span" class="ml55"></p>
 </li>
 <li class="ml60 mb5">
@@ -26,7 +27,7 @@
   <div class="cl"></div>
 </li>
 <li>
-  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
+  <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
   <label class="fl" >
     <span class="c_red">*</span>&nbsp;
     <%= l(:field_description) %>&nbsp;&nbsp;：

public/javascripts/course.js

@@ -266,6 +266,13 @@ function course_board_submit_message_replay()
         $("#message_form").submit();
     }
 }
+
+function course_board_canel_message_replay()
+{
+    $("#reply").hide(200);
+    $("#message_quote").html("");
+}
+
 function MessageReplayVevify() {
     var content = message_content_editor.html();//$.trim($("#message_content").val());
     if (content.length == 0) {

public/stylesheets/courses.css

@@ -561,7 +561,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 .Replybox{ float:left; width:495px; margin-left:5px;}
 .talk_nextpage{ border:none; width:410px; margin:0 auto;}
 .newtalk { margin-top:8px; margin-right:8px;}
-.talk_new{ border-bottom:1px dashed #d9d9d9; padding-bottom:10px;}
+/*.talk_new{ border-bottom:1px dashed #d9d9d9; padding-bottom:10px;}*/
 #about_newtalk{ display:none;}