修改《编辑器还原》《提示信息的添加》

Signed-off-by: alan <547533434@qq.com>

app/views/boards/_course_new.html.erb

@@ -3,7 +3,7 @@
     <%= render :partial => 'form_course', :locals => {:f => f,  :topic => @message} %>
     <li>
       <a href="javascript:void(0)"  onclick="show_newtalk();" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
-      <a href="javascript:;" name="submitbtn" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
+      <a href="javascript:(0);" name="submitbtn" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
       <div class="cl"></div>
     </li>
 <% end %>

app/views/boards/_course_show.html.erb

@@ -10,19 +10,17 @@
     <% end %>
 
   </h2>
-  <% 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>
 <!-- 发布新帖部分 -->
 <div class="cl"></div>
 <div class=" talklist_box" >
-  <div class="talk_new ml15 mb10"  name="container_board" id="about_newtalk" style="display:<%= !@flag.nil? && @flag=='true' ? 'block' : 'none' %>;" >
+<div class="talk_new ml15 mb10"  name="container_board" id="about_newtalk" style="display:<%= !@flag.nil? && @flag=='true' ? 'block' : 'none' %>;" >
   <ul>
     <%= render :partial => 'course_new' %>
   </ul>
-  </div><!--talknew end-->
+</div><!--talknew end-->
 
 <% if !User.current.logged?%>
     <div style="font-size: 14px;margin:20px;">
@@ -31,8 +29,8 @@
       <hr/>
     </div>
 <% end %>
-  <p class="c_dark mb5">讨论区共有<span class="c_orange"><%= @topic_count %></span>个帖子</p>
-  <% if @topics.any? %>
+<p class="c_dark mb5">讨论区共有<span class="c_orange"><%= @topic_count %></span>个帖子</p>
+<% if @topics.any? %>
     <% @topics.each do |topic| %>
         <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;" id="topic<%= topic.id %>">
           <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
@@ -42,7 +40,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:"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');"  style="color: #426e9a;float: right;
+                <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');"  style="color: #426e9a;float: right;
                         margin-right: 10px;"><%= l(:button_edit) %></a>
             <% end %>
 
@@ -83,9 +81,7 @@
             <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
 
           </div>
-            <% if User.current.logged? %>
-                <%= toggle_link l(:button_reply), "reply" + topic.id.to_s, :focus => "about_newtalk#{topic.id}",:class => ' c_dblue fr' %>
-            <% end %>
+          <%= toggle_link l(:button_reply), "reply" + topic.id.to_s, :focus => 'message_content',:class => ' c_dblue fr' %>
 
           <div class="cl"></div>
 
@@ -104,7 +100,7 @@
               <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, :name=>'message-form'} do |f| %>
 
-                      <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
+                    <%= 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:void(0)" name="submitbtn" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
                 <% end %>
@@ -143,15 +139,6 @@
                                       :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>
 
@@ -181,15 +168,6 @@
                                       :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>
 
@@ -198,19 +176,19 @@
                 </ul>
               </div>
               <%if replies_all.first %>
-                    <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>
+                  <div class="talkWrapMsg"><a class=" ml258" href="javascript:void(0)" id="showgithelp<%= topic.id%>" value="show_help" onclick ="showhelpAndScrollToMessage('talkWrapMsg<%= topic.id %>','#showgithelp<%= topic.id%>','<%=topic.replies_count%>'); " class="c_dblue lh23"  style="color: #0781b4;" >展开回复(<%= topic.replies_count.to_s%>)</a></div>
               <% end %>
           <% end %>
         </div>
     <% end %>
-  <% else %>
+<% else %>
     <p class="nodata"><%= l(:label_no_data) %></p>
-  <% end %>
+<% end %>
 <ul class="wlist">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
 </ul>
 <%# other_formats_links do |f| %>
-    <%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+<%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
 <%# end %>
 
 <% html_title @board.name %>
@@ -224,48 +202,51 @@
     KindEditor.ready(function(K){
         $("div[name='container_board']").each(function(){
             var container=$(this);
-
+            var messege = $("p[aa='message_show']",container);
+            var subject = $("input[aa='subject']",container);
             var textarea= $("textarea[aa='content']",container);
-            var message = $("p[aa='message_show']", container);
+            var form = $("form",container);
             var editor = K.create(textarea, {
                 resizeType : 1,
                 allowPreviewEmoticons : false,
                 allowImageUpload : false,
                 width:"89%",
-                items : ['emoticons']
+                items : []
             });
+//            form.submit(function(){
+//                alert(textarea.html());
+//            });
+//            $("a[name='submitbtn']",container).click(function(){
+//                form.submit();
+//            });
 
             $("a[name='submitbtn']",container).click(function(){
-                textarea[0].value = editor.html();
+                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(subject.val() == "RE: ") {
 
+                    if (editor.html() == "") {
+                        messege.html("回复内容不能为空") ;
+                        messege.css('color', '#ff0000');
+                        messege.show();
                     }
                     else {
-
-                        message[0].text("填写正确");
-                        message[0].css('color', '#008000');
+                        messege.html("填写正确");
+                        messege.css('color', '#008000');
+                        messege.show();
                         this.parentNode.submit();
                     }
                 }
                 else {
-                    if (regexContent(id) && regexSubject(id)) {
-                        if (this.parentNode.name.toString() == 'message-form') {
+                    if(regexContent(id) && regexSubject(id)) {
+                        if (this.parentNode.name == 'message-form') {
                             this.parentNode.submit();
                         }
-                        else {
-
+                        else
                             this.parentNode.parentNode.submit();
-
                     }
                 }
-                }
-
             });
 
         });

app/views/boards/_form_course.html.erb

@@ -5,17 +5,17 @@
     <li style="display: none">
       <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
-      <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585" }.merge(extra_option) %>
+      <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585", :aa=>"subject" }.merge(extra_option) %>
 
 
-      <p id="subject_span<%= topic.id%>" class="ml55"></p>
+      <p id="subject_span<%= f.object.id%>" class="ml55"></p>
     </li>
 <% else %>
-    <li>
+    <li >
       <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
 
-      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}", onkeyup: "regexSubject('#{f.object.id}');",:class=>"talk_input w585" }.merge(extra_option) %>
+      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}", onkeyup: "regexSubject('#{f.object.id}');",:class=>"talk_input w585", :aa=>"subject" }.merge(extra_option) %>
 
       <p id="subject_span<%= f.object.id%>" class="ml55"></p>
     </li>

app/views/boards/_form_project.html.erb

@@ -18,7 +18,7 @@
 <li style="display: none">
   <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
-      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}",:class=>"talk_input w585" }.merge(extra_option) %>
+      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}",:class=>"talk_input w585", :aa=>'subject' }.merge(extra_option) %>
 
 
   <p id="subject_span<%= f.object.id%>" class="ml55"></p>
@@ -28,7 +28,7 @@
       <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
 
-      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}", onkeyup: "regexSubject('#{f.object.id}');",:class=>"talk_input w585" }.merge(extra_option) %>
+      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}", onkeyup: "regexSubject('#{f.object.id}');",:class=>"talk_input w585", :aa=>'subject' }.merge(extra_option) %>
 
       <p id="subject_span<%= f.object.id%>" class="ml55"></p>
     </li>

app/views/boards/_project_new_topic.html.erb

@@ -4,7 +4,7 @@
     <li>
       <a href="javascript:void(0)"  onclick="show_newtalk();" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
 
-      <a href="javascript:;" name="submitbtn" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
+      <a href="javascript:void(0)" name="submitbtn" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
       <div class="cl"></div>
     </li>
 <% end %>

app/views/boards/_project_show.html.erb

@@ -8,7 +8,7 @@
 
   </h2>
   <% if User.current.logged? %>
-      <a href="javascript:void" class="green_btn fr newtalk " onclick="show_newtalk();"><%= l(:label_message_new) %></a>
+      <a href="javascript:void(0)" class="green_btn fr newtalk " onclick="show_newtalk();"><%= l(:label_message_new) %></a>
   <% end %>
   <div class="cl"></div>
 </div>
@@ -246,28 +246,32 @@
     KindEditor.ready(function(K){
         $("div[name='container_board']").each(function(){
             var container=$(this);
-
+            var form =$("form", container);
+            var messege = $("p[aa='message_show']",container);
             var textarea= $("textarea[aa='content']",container);
             var editor = K.create(textarea, {
                 resizeType : 1,
                 allowPreviewEmoticons : false,
                 allowImageUpload : false,
                 width:"89%",
-                items : ['emoticons']
+                items : []
             });
 
             $("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();
+
+
+                if (editor.html() == "") {
+
+                    messege.html("回复内容不能为空") ;
+                    messege.css('color', '#ff0000');
+                    messege.show();
                 }
                 else {
-
-                        this.parentNode.parentNode.submit();
-
-                    }
+                    messege.html("填写正确");
+                    messege.css('color', '#008000');
+                    messege.show();
+                    form.submit();
                 }
             });
 

public/javascripts/project.js

@@ -77,7 +77,24 @@ function show_more_reply(contentid, id2, id3) {
         information.attr("style", "color:#0781b4;");
     }
 }
-
+function show_more_reply1(contentid, id2, id3) {
+    $(contentid).toggleClass("course_description_none");
+    var information = $(id2);
+    var arrow = $(id3);
+    var val = information.attr("value");
+    if (val == "show_more") {
+        $(id2).text("[收起]");
+        information.attr("value", "hide_more");
+        information.attr("style", "color:#3ca5c6");
+        arrow.attr("src", "/images/jiantouup.jpg")
+    }
+    else {
+        $(id2).text("[展开]");
+        information.attr("value", "show_more");
+        arrow.attr("src", "/images/jiantou.jpg")
+        information.attr("style", "color:#0781b4;");
+    }
+}
 //项目版本库git帮助文档显示
 function showhelpAndScrollTo(id) {
     $('#' + id).toggle();

public/stylesheets/leftside.css

@@ -46,6 +46,7 @@ a:hover.subnav_green{ background:#14ad5a;}
 .project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d; line-height:1.9;}
 .course_description{max-height: 112px;overflow:hidden; word-break: break-all;word-wrap: break-word;}
 .project_board_content{overflow: hidden;max-height: 182px;word-break: break-all;word-wrap: break-word;}
+.project_board_content1{overflow: hidden;max-height: 72px;word-break: break-all;word-wrap: break-word;}
 .course_description_none{max-height: none;}
 .lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;display: none;}
 .lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}

public/stylesheets/pleft.css

@@ -50,6 +50,7 @@ a:hover.subnav_green{ background:#14ad5a;}
 .project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d; line-height:1.9;}
 .course_description{max-height: 112px;overflow:hidden; word-break: break-all;word-wrap: break-word;}
 .project_board_content{overflow: hidden;max-height: 182px;word-break: break-all;word-wrap: break-word;}
+.project_board_content1{overflow: hidden;max-height: 72px;word-break: break-all;word-wrap: break-word;}
 .course_description_none{max-height: none;}
 .lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;display: none;}
 .lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}