From c18d1d9585793c60df7babe98cc35eacf1786742 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Fri, 22 May 2015 11:09:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E5=8C=BF=E5=90=8D?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=96=B0=E5=B8=96=E3=80=8B=E3=80=8A=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=97=B6=E5=87=BA=E7=8E=B0=E8=B7=B3=E8=BD=AC=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E3=80=8B=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb  |  2 +-
 app/views/boards/_course_show.html.erb  | 72 ++++++++++++++++++++-----
 app/views/boards/_edit.html.erb         |  4 +-
 app/views/boards/_form_course.html.erb  |  2 +-
 app/views/boards/_form_project.html.erb |  2 +-
 app/views/boards/_project_show.html.erb | 31 ++++++-----
 public/javascripts/course.js            |  2 +
 7 files changed, 85 insertions(+), 30 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 619f91245..e33eb8d75 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -193,7 +193,7 @@ class MessagesController < ApplicationController
       else
         redirect_to board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id))
       end
-    elsif request.get?
+    elsif request.get? || request.post?
       if params[:is_board]
         if @project
           redirect_to project_boards_path(@project)
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 766340c1b..cf3cd6ec5 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -10,7 +10,9 @@
     <% end %>
 
   </h2>
-  <a href="javascript:void(0)" class="green_btn fr newtalk " onclick="show_newtalk();"><%= l(:label_message_new) %></a>
+  <% if User.current.logged? %>
+    <a href="javascript:void(0)" class="green_btn fr newtalk " onclick="show_newtalk();"><%= l(:label_message_new) %></a>
+  <% end %>
   <div class="cl"></div>
 </div>
 <!-- 发布新帖部分 -->
@@ -40,7 +42,7 @@
 
               <p  class="talkmain_tit fl fb break_word">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
               <% if topic.course_editable_by?(User.current) %>
-                  <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');"  style="color: #426e9a;float: right;
+                  <a href="javascript:"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');"  style="color: #426e9a;float: right;
                           margin-right: 10px;"><%= l(:button_edit) %></a>
               <% end %>
 
@@ -70,7 +72,7 @@
 
 
               <p style="display: none" id="project_show_<%= topic.id%>">
-                <a id="expend_more_information<%= topic.id%>"  href="javascript:(0)"  style="color: #0781b4;"    onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</a>
+                <a id="expend_more_information<%= topic.id%>"  href="javascript:void(0)"  style="color: #0781b4;"    onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</a>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
                 </span>
@@ -81,7 +83,9 @@
               <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
 
             </div>
-            <%= toggle_link l(:button_reply), "reply" + topic.id.to_s, :focus => 'message_content',:class => ' c_dblue fr' %>
+            <% if User.current.logged? %>
+                <%= toggle_link l(:button_reply), "reply" + topic.id.to_s, :focus => "about_newtalk#{topic.id}",:class => ' c_dblue fr' %>
+            <% end %>
 
             <div class="cl"></div>
 
@@ -98,11 +102,11 @@
                 <em class="talkWrapArrow"></em>
                 <div class="cl"></div>
                 <div class="talkConIpt ml15 mb10" style="display: none" id="reply<%= topic.id %>" name="container_board">
-                  <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message_form' + topic.id.to_s} do |f| %>
+                  <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message_form' + topic.id.to_s, :name=>'message-form'} do |f| %>
 
-                      <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
+                      <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
                       <%= toggle_link l(:button_cancel), "reply" + topic.id.to_s, :focus => 'message_content',:class => 'grey_btn fr ml10' %>
-                      <a href="javascript:(0)" name="submitbtn" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
+                      <a href="javascript:void(0)" name="submitbtn" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
                   <% end %>
                   <div class="cl"></div>
                 </div>
@@ -139,6 +143,15 @@
                                         :title => l(:button_delete),
                                         :class => ' c_dblue fr'
                                 ) if message.course_destroyable_by?(User.current) %>
+                            <%= link_to(
+                                        l(:button_reply),
+                                        {:controller => 'messages', :action => 'quote',  :id => message.id, :board_id => message.board_id, :is_board => 'true'},
+                                        :remote => true,
+                                        :method => 'get',
+                                        :focus => "about_newtalk#{topic.id}",
+                                        :class => ' c_dblue fr',
+                                        :style => 'margin-right: 10px;',
+                                        :title => l(:button_quote)) if !topic.locked? && authorize_for('messages', 'reply') %>
                           </div>
                           <div class="cl"></div>
 
@@ -168,6 +181,15 @@
                                         :title => l(:button_delete),
                                         :class => ' c_dblue fr'
                                 ) if message.course_destroyable_by?(User.current) %>
+                            <%= link_to(
+                                        l(:button_reply),
+                                        {:controller => 'messages', :action => 'quote',  :id => message.id, :board_id => message.board_id, :is_board => 'true'},
+                                        :remote => true,
+                                        :method => 'get',
+                                        :focus => "about_newtalk#{topic.id}",
+                                        :class => ' c_dblue fr',
+                                        :style => 'margin-right: 10px;',
+                                        :title => l(:button_quote)) if !topic.locked? && authorize_for('messages', 'reply') %>
                           </div>
                           <div class="cl"></div>
 
@@ -176,7 +198,7 @@
                   </ul>
                 </div>
                 <%if replies_all.first %>
-                    <div class="talkWrapMsg"><a class=" ml258" href="javascript:(0)" id="showgithelp<%= topic.id%>" value="show_help" onclick ="showhelpAndScrollToMessage('talkWrapMsg<%= topic.id %>','#showgithelp<%= topic.id%>','<%=topic.replies_count%>'); " class="c_dblue lh23">展开回复(<%= topic.replies_count.to_s%>)</a></div>
+                    <div class="talkWrapMsg"><a class=" ml258" href="javascript:" id="showgithelp<%= topic.id%>"  style="color: #0781b4;"   value="show_help" onclick ="showhelpAndScrollToMessage('talkWrapMsg<%= topic.id %>','#showgithelp<%= topic.id%>','<%=topic.replies_count%>'); " class="c_dblue lh23">展开回复(<%= topic.replies_count.to_s%>)</a></div>
                 <% end %>
             <% end %>
           </div>
@@ -196,6 +218,7 @@
 <% content_for :header_tags do %>
     <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@course}: #{@board}") %>
 <% end %>
+</div>
 <script type="text/javascript">
     //submitProjectsBoard()
     KindEditor.ready(function(K){
@@ -203,6 +226,7 @@
             var container=$(this);
 
             var textarea= $("textarea[aa='content']",container);
+            var message = $("p[aa='message_show']", container);
             var editor = K.create(textarea, {
                 resizeType : 1,
                 allowPreviewEmoticons : false,
@@ -214,13 +238,35 @@
             $("a[name='submitbtn']",container).click(function(){
                 textarea[0].value = editor.html();
                 var id = textarea[0].id.toString().substr(15);
+                var subject = document.getElementById("message_subject");
+                if(subject.value == "RE: ") {
+                    if (textarea[0].value.length == 0) {
+
+                        message[0].text("描述不能为空");
+                        message[0].css('color', '#ff0000');
 
-                if(this.parentNode.name == 'message-form') {
-                    this.parentNode.submit();
+                    }
+                    else {
+
+                        message[0].text("填写正确");
+                        message[0].css('color', '#008000');
+                        this.parentNode.submit();
+                    }
                 }
-                else
-                    this.parentNode.parentNode.submit();
-            });
+                else {
+                    if (regexContent(id) && regexSubject(id)) {
+                        if (this.parentNode.name.toString() == 'message-form') {
+                            this.parentNode.submit();
+                        }
+                        else {
+
+                            this.parentNode.parentNode.submit();
+
+                        }
+                    }
+                }
+
+              });
 
         });
     });
diff --git a/app/views/boards/_edit.html.erb b/app/views/boards/_edit.html.erb
index 5907e083b..fb5adc1d6 100644
--- a/app/views/boards/_edit.html.erb
+++ b/app/views/boards/_edit.html.erb
@@ -25,13 +25,13 @@
           <%= form_for topic, {
                                        :as => :message,
                                        :url => {:controller => 'messages',:action => 'edit', :is_board => 'true',:id => topic.id, :board_id => topic.board_id},
-                                       :html => {:multipart => true,
+                                       :html => {:multipart => true, :name=>'message-form',
                                                  :id => 'message-form' + topic.id.to_s,
                                                  :method => :post}
                                } do |f| %>
               <%= render :partial => 'form_course',
                          :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
-              <a href="javascript:void(0)" onclick="submitProjectsBoard('<%= topic.id%>');"class="blue_btn fl c_white"><%= l(:button_submit)%></a>
+              <a href="javascript:void(0)"  name='submitbtn' class="blue_btn fl c_white"><%= l(:button_submit)%></a>
               <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" class="blue_btn grey_btn fl c_white"><%= l(:button_cancel) %></a>
 
         <% end %>
diff --git a/app/views/boards/_form_course.html.erb b/app/views/boards/_form_course.html.erb
index 1f832cfa6..de5928923 100644
--- a/app/views/boards/_form_course.html.erb
+++ b/app/views/boards/_form_course.html.erb
@@ -68,7 +68,7 @@
     <% end %>
   </div>
   <div class="cl"></div>
-  <p id="message_content_span<%= f.object.id%>"  class="ml55"></p>
+  <p id="message_content_span<%= f.object.id%>"  aa="message_show"  class="ml55"></p>
 </li>
 <div class="cl"></div>
 <li>
diff --git a/app/views/boards/_form_project.html.erb b/app/views/boards/_form_project.html.erb
index f2ebe1eaa..2ab36c774 100644
--- a/app/views/boards/_form_project.html.erb
+++ b/app/views/boards/_form_project.html.erb
@@ -81,7 +81,7 @@
   <% end %>
   </div>
   <div class="cl"></div>
-  <p id="message_content_span<%= f.object.id%>"  class="ml55"></p>
+  <p id="message_content_span<%= f.object.id%>" aa="message_show" class="ml55"></p>
 </li>
 <div class="cl"></div>
 <li>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 48598f412..86c50897b 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -7,7 +7,9 @@
     <% end %>
 
   </h2>
-  <a href="javascript:void(0)" class="green_btn fr newtalk " onclick="show_newtalk();"><%= l(:label_message_new) %></a>
+  <% if User.current.logged? %>
+      <a href="javascript:void" class="green_btn fr newtalk " onclick="show_newtalk();"><%= l(:label_message_new) %></a>
+  <% end %>
   <div class="cl"></div>
 </div>
 
@@ -70,7 +72,7 @@
 
 
               <p style="display: none" id="project_show_<%= topic.id%>">
-                <a  id="expend_more_information<%= topic.id%>" style="color: #0781b4;"   href="javascript:(0)"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</a>
+                <a  id="expend_more_information<%= topic.id%>" style="color: #0781b4;"   href="javascript:void(0)"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</a>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
                 </span>
@@ -82,8 +84,9 @@
               <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
 
             </div>
-            <%= toggle_link l(:button_reply), "reply" + topic.id.to_s, :focus => "about_newtalk#{topic.id}",:class => ' c_dblue fr' %>
-
+            <% if User.current.logged? %>
+                <%= toggle_link l(:button_reply), "reply" + topic.id.to_s, :focus => "about_newtalk#{topic.id}",:class => ' c_dblue fr' %>
+            <% end %>
                 <div class="cl"></div>
 
 
@@ -104,7 +107,7 @@
 
                       <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
                       <%= toggle_link l(:button_cancel), "reply" + topic.id.to_s, :focus => 'message_content',:class => 'grey_btn fr ml10' %>
-                      <a href="javascript:(0)" name="submitbtn" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
+                      <a href="javascript:void(0)" name="submitbtn" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
 
 
                   <% end %>
@@ -144,7 +147,7 @@
                                         :class => ' c_dblue fr'
                                 ) if message.course_destroyable_by?(User.current) %>
                             <%= link_to(
-                                        l(:button_quote),
+                                        l(:button_reply),
                                         {:controller => 'messages', :action => 'quote',  :id => message.id, :board_id => message.board_id, :is_board => 'true'},
                                         :class => ' c_dblue fr',
                                         :style => 'margin-right: 10px;',
@@ -184,7 +187,7 @@
                                   :class => ' c_dblue fr'
                           ) if message.course_destroyable_by?(User.current) %>
                       <%= link_to(
-                                  l(:button_quote),
+                                  l(:button_reply),
                                   {:controller => 'messages', :action => 'quote',  :id => message.id, :board_id => message.board_id, :is_board => 'true'},
                                   :remote => true,
                                   :method => 'get',
@@ -200,7 +203,7 @@
                     </ul>
                 </div>
                <%if replies_all.first %>
-                <div class="talkWrapMsg"><a class=" c_blue ml258"   href="javascript:(0)"  style="color: #0781b4;"   id="showgithelp<%= topic.id%>" value="show_help" onclick ="showhelpAndScrollToMessage('talkWrapMsg<%= topic.id %>','#showgithelp<%= topic.id%>','<%=topic.replies_count%>'); " class="c_dblue lh23">展开回复(<%= topic.replies_count.to_s%>)</a></div>
+                <div class="talkWrapMsg"><a class=" c_blue ml258"   href="javascript:void(0)"  style="color: #0781b4;"   id="showgithelp<%= topic.id%>" value="show_help" onclick ="showhelpAndScrollToMessage('talkWrapMsg<%= topic.id %>','#showgithelp<%= topic.id%>','<%=topic.replies_count%>'); " class="c_dblue lh23">展开回复(<%= topic.replies_count.to_s%>)</a></div>
                <% end %>
            <% end %>
         </div>
@@ -256,12 +259,16 @@
             $("a[name='submitbtn']",container).click(function(){
                 textarea[0].value = editor.html();
                 var id = textarea[0].id.toString().substr(15);
+                if(regexContent(id) && regexSubject(id)) {
+                    if (this.parentNode.name.toString() == 'message-form') {
+                        this.parentNode.submit();
+                    }
+                    else {
+
+                        this.parentNode.parentNode.submit();
 
-                if(this.parentNode.name == 'message-form') {
-                    this.parentNode.submit();
+                    }
                 }
-                else
-                    this.parentNode.parentNode.submit();
             });
 
         });
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 025b51ee1..ce330170c 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -168,9 +168,11 @@ function regexSubject(id) {
     return false;
 }
 function regexContent(id) {
+
     var contentid = "#message_content" + id;
     var message = "#message_content_span"+ id;
     var content = $.trim($(contentid).val());
+
     if (content.length == 0) {
         $(message).text("描述不能为空");
         $(message).css('color', '#ff0000');