From a0ca31780ebfda02d476c00fccc5e63532bbb04d Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Thu, 21 May 2015 16:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E3=80=8B=E3=80=8A=E8=B5=84=E6=BA=90=E5=8C=BA?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=94=99=E8=AF=AF=E3=80=8B=E3=80=8A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=9B=9E=E5=B8=96=E5=9B=9E=E5=A4=8D=E3=80=8B=E3=80=8A?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=BE=91=E5=99=A8=E3=80=8B=20?=
 =?UTF-8?q?=E3=80=8A=E5=B1=95=E5=BC=80=EF=BC=8C=E6=94=B6=E8=B5=B7=EF=BC=8C?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E5=9B=9E=E5=A4=8D=EF=BC=8C=E6=94=B6=E8=B5=B7?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=20=E7=9A=84=E6=A0=B7=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=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/boards_controller.rb    |  8 ++--
 app/views/boards/_course_new.html.erb   |  2 +-
 app/views/boards/_course_show.html.erb  | 45 +++++++++++++++----
 app/views/boards/_edit.html.erb         |  4 +-
 app/views/boards/_form_course.html.erb  | 33 +++++++++++---
 app/views/boards/_form_project.html.erb |  6 +--
 app/views/boards/_project_show.html.erb | 55 ++++++++++++-----------
 app/views/boards/show.html.erb          |  3 +-
 app/views/stores/index.html.erb         | 21 ++++++++-
 public/javascripts/course.js            | 58 ++++++++++++-------------
 public/javascripts/project.js           |  4 ++
 public/stylesheets/leftside.css         |  2 +-
 public/stylesheets/pleft.css            |  2 +-
 13 files changed, 159 insertions(+), 84 deletions(-)

diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 4a27f02ff..db5bded55 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -80,19 +80,19 @@ class BoardsController < ApplicationController
         if @project
           @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
           @topics =  @board.topics.
-              reorder("#{Message.table_name}.sticky DESC").
+              reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
               includes(:last_reply).
               limit(@topic_pages.per_page).
               offset(@topic_pages.offset).
-              order("last_replies_messages.created_on desc").
+
               preload(:author, {:last_reply => :author}).
               all
         elsif @course
-          board_topics =  @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC").
+          board_topics =  @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
               includes(:last_reply).
               # limit(@topic_pages.per_page).
               # offset(@topic_pages.offset).
-              order("last_replies_messages.created_on desc").
+
               preload(:author, {:last_reply => :author}).
               all : []
           @topics = paginateHelper board_topics,10
diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb
index a380ad67f..aaf6d66e5 100644
--- a/app/views/boards/_course_new.html.erb
+++ b/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="#" onclick="submitProjectsBoard('<%= @message.id %>')" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
+      <a href="javascript:;" name="submitbtn" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
       <div class="cl"></div>
     </li>
 <% end %>
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 2a078553c..766340c1b 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -16,7 +16,7 @@
 <!-- 发布新帖部分 -->
 <div class="cl"></div>
 <div class=" talklist_box" >
-  <div class="talk_new ml15 mb10" 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>
@@ -40,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:void(0)"  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 %>
 
@@ -59,7 +59,7 @@
               <div class="cl"></div>
 
               <script>
-                  $(function(){if($("#contentmessage<%=topic.id %>").height()>55){$("#project_show_<%= topic.id%>").show();}});
+                  $(function(){if($("#contentmessage<%=topic.id %>").height()>182){$("#project_show_<%= topic.id%>").show();}});
               </script>
               <div  class="project_board_content break_word" id="content_<%=topic.id%>">
                 <div id="contentmessage<%=topic.id %>" class="upload_img">
@@ -70,7 +70,7 @@
 
 
               <p style="display: none" id="project_show_<%= topic.id%>">
-                <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
+                <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>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
                 </span>
@@ -87,7 +87,7 @@
 
 
           </div><!--讨论主类容 end-->
-          <div class="talk_new ml15 mb10" id="about_newtalk<%=topic.id%>"  style="display: none">
+          <div class="talk_new ml15 mb10"  id="about_newtalk<%=topic.id%>"  style="display: none">
             <ul>
               <%= render :partial => 'edit',locals:  {:topic => topic} %>
             </ul>
@@ -97,12 +97,12 @@
             <% if !topic.locked? && authorize_for('messages', 'reply') %>
                 <em class="talkWrapArrow"></em>
                 <div class="cl"></div>
-                <div class="talkConIpt ml15 mb10" style="display: none" id="reply<%= topic.id %>">
+                <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| %>
 
                       <%= 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="#" onclick="$('#message_form<%= topic.id%>').submit();" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
+                      <a href="javascript:(0)" name="submitbtn" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
                   <% end %>
                   <div class="cl"></div>
                 </div>
@@ -176,7 +176,7 @@
                   </ul>
                 </div>
                 <%if replies_all.first %>
-                    <div class="talkWrapMsg"><a class=" ml258"  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:(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>
                 <% end %>
             <% end %>
           </div>
@@ -196,3 +196,32 @@
 <% content_for :header_tags do %>
     <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@course}: #{@board}") %>
 <% end %>
+<script type="text/javascript">
+    //submitProjectsBoard()
+    KindEditor.ready(function(K){
+        $("div[name='container_board']").each(function(){
+            var container=$(this);
+
+            var textarea= $("textarea[aa='content']",container);
+            var editor = K.create(textarea, {
+                resizeType : 1,
+                allowPreviewEmoticons : false,
+                allowImageUpload : false,
+                width:"89%",
+                items : ['emoticons']
+            });
+
+            $("a[name='submitbtn']",container).click(function(){
+                textarea[0].value = editor.html();
+                var id = textarea[0].id.toString().substr(15);
+
+                if(this.parentNode.name == 'message-form') {
+                    this.parentNode.submit();
+                }
+                else
+                    this.parentNode.parentNode.submit();
+            });
+
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/boards/_edit.html.erb b/app/views/boards/_edit.html.erb
index 98008d33e..5907e083b 100644
--- a/app/views/boards/_edit.html.erb
+++ b/app/views/boards/_edit.html.erb
@@ -2,7 +2,7 @@
     <% if topic.project %>
     <%#= board_breadcrumb(@message) %>
       <!--<h3><%#= avatar(@topic.author, :size => "24") %><span style = "width:100%;word-break:break-all;word-wrap: break-word;"><%#=h @topic.subject %></span></h3>-->
-      <div class="talk_new ml15" name='containerxxoo'>
+      <div class="talk_new ml15" name='container_board'>
         <ul>
             <%= form_for topic, { :as => :message,
                              :url => {:controller => 'messages',:action => 'edit', :is_board => 'true',:id => topic.id, :board_id => topic.board_id},
@@ -20,7 +20,7 @@
       <% end %>
 <% elsif topic.course %>
     <%#= course_board_breadcrumb(@message) %>
-      <div class="talk_new ml15">
+      <div class="talk_new ml15"  name='container_board'>
         <ul>
           <%= form_for topic, {
                                        :as => :message,
diff --git a/app/views/boards/_form_course.html.erb b/app/views/boards/_form_course.html.erb
index 945f58c22..1f832cfa6 100644
--- a/app/views/boards/_form_course.html.erb
+++ b/app/views/boards/_form_course.html.erb
@@ -39,11 +39,34 @@
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
   <%= text_area :quote,:quote,:style => 'display:none' %>
-  <% if replying%>
-      <%= f.text_area :content, :class => 'talk_text fl', :id => "message_content#{f.object.id}", :onkeyup => "regexContent('#{f.object.id}');", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)", :style=>"width: 575px;" %>
-  <% else %>
-      <%= f.text_area :content, :class => 'talk_text fl', :id => "message_content#{f.object.id}", :onkeyup => "regexContent('#{f.object.id}');", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
-  <% end %>
+  <div class="content">
+    <% if replying%>
+
+        <%= f.text_area :content,
+                        :width => '89%',
+                        :height => 300,
+                        :id => "message_content#{f.object.id}",
+                        :aa => 'content',
+                        :onkeyup => "regexContent('#{f.object.id}');",
+                        :class => 'talk_text fl',
+                        :placeholder => "最多3000个汉字(或6000个英文字符)",
+                        :maxlength => 5000 %>
+
+    <% else %>
+        <%= f.text_area :content,
+                        :width => '90%',
+                        :height => 300,
+                        :class => 'talk_text fl',
+                        :editor_id => "message_content#{f.object.id}_edit",
+                        :id => "message_content#{f.object.id}",
+                        :onkeyup => "regexContent('#{f.object.id}');",
+                        :class => 'talk_text fl',
+                        :aa => 'content',
+                        :placeholder => "最多3000个汉字(或6000个英文字符)",
+                        :maxlength => 5000 %>
+
+    <% end %>
+  </div>
   <div class="cl"></div>
   <p id="message_content_span<%= f.object.id%>"  class="ml55"></p>
 </li>
diff --git a/app/views/boards/_form_project.html.erb b/app/views/boards/_form_project.html.erb
index b219c466d..f2ebe1eaa 100644
--- a/app/views/boards/_form_project.html.erb
+++ b/app/views/boards/_form_project.html.erb
@@ -51,7 +51,7 @@
   <% unless replying %>
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
-  <%= f.text_area :quote,:quote,:style => 'display:none' %>
+  <%= text_area :quote,:quote,:style => 'display:none' %>
   <div class="content">
   <% if replying%>
 
@@ -59,7 +59,7 @@
                        :width => '89%',
                        :height => 300,
                         :id => "message_content#{f.object.id}",
-                                        :name => 'content',
+                                        :aa => 'content',
                                         :onkeyup => "regexContent('#{f.object.id}');",
                                         :class => 'talk_text fl',
                                         :placeholder => "最多3000个汉字(或6000个英文字符)",
@@ -74,7 +74,7 @@
                         :id => "message_content#{f.object.id}",
                                         :onkeyup => "regexContent('#{f.object.id}');",
                                         :class => 'talk_text fl',
-                                        :name => 'content',
+                                        :aa => 'content',
                                         :placeholder => "最多3000个汉字(或6000个英文字符)",
                                         :maxlength => 5000 %>
 
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 9a10d123d..48598f412 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -22,7 +22,7 @@
 <!-- 发布新帖部分 -->
 <div class="cl"></div>
 <div class=" talklist_box" >
-  <div class="talk_new ml15 mb10" name="containerxxoo" 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 => 'project_new_topic' %>
     </ul>
@@ -60,17 +60,17 @@
               <% end %>
               <div class="cl"></div>
               <script>
-                  $(function(){if($("#contentmessage<%=topic.id %>").height()>55){$("#project_show_<%= topic.id%>").show();}});
+                  $(function(){if($("#contentmessage<%=topic.id %>").height()>182){$("#project_show_<%= topic.id%>").show();}});
               </script>
               <div  class="project_board_content break_word" id="content_<%=topic.id%>">
                 <div id="contentmessage<%=topic.id %>" class="upload_img">
-                  <%= topic.content %>
+                  <%= topic.content.html_safe %>
                 </div>
               </div>
 
 
               <p style="display: none" id="project_show_<%= topic.id%>">
-                <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
+                <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>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
                 </span>
@@ -99,7 +99,7 @@
             <% if !topic.locked? && authorize_for('messages', 'reply') %>
                 <em class="talkWrapArrow"></em>
                 <div class="cl"></div>
-                <div class="talkConIpt ml15 mb10" style="display: none" name="containerxxoo" id="reply<%= topic.id %>">
+                <div class="talkConIpt ml15 mb10" style="display: none" name="container_board" id="reply<%= topic.id %>">
                   <%= 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} %>
@@ -200,7 +200,7 @@
                     </ul>
                 </div>
                <%if replies_all.first %>
-                <div class="talkWrapMsg"><a class=" c_blue ml258"  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:(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>
@@ -238,33 +238,32 @@
     }
 
 </script>
-
 <script type="text/javascript">
     //submitProjectsBoard()
     KindEditor.ready(function(K){
-        $("div[name='containerxxoo']").each(function(){
+        $("div[name='container_board']").each(function(){
             var container=$(this);
 
-                var textarea= $("textarea[name='content']",container);
-                var editor = K.create(textarea, {
-                    resizeType : 1,
-                    allowPreviewEmoticons : false,
-                    allowImageUpload : false,
-                    width:"89%",
-                    items : ['emoticons']
-                });
-
-                $("a[name='submitbtn']",container).click(function(){
-                    textarea[0].value = editor.html();
-                    var id = textarea[0].id.toString().substr(15);
-
-                   if(this.parentNode.name == 'message-form') {
-                        this.parentNode.submit();
-                   }
-                   else
-                        this.parentNode.parentNode.submit();
-                });
+            var textarea= $("textarea[aa='content']",container);
+            var editor = K.create(textarea, {
+                resizeType : 1,
+                allowPreviewEmoticons : false,
+                allowImageUpload : false,
+                width:"89%",
+                items : ['emoticons']
+            });
+
+            $("a[name='submitbtn']",container).click(function(){
+                textarea[0].value = editor.html();
+                var id = textarea[0].id.toString().substr(15);
+
+                if(this.parentNode.name == 'message-form') {
+                    this.parentNode.submit();
+                }
+                else
+                    this.parentNode.parentNode.submit();
+            });
 
         });
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 16f2998ce..ed49f0adb 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -59,7 +59,7 @@ function show_newtalk()
 function show_newtalk1(id)
 {
     $(id).toggle();
-
+    $(id).focus();
 
     
 }
@@ -67,6 +67,7 @@ function show_newtalk1(id)
 
 
 </script>
+
 <% if @project %>
     <%= render :partial => 'project_show', locals: {project: @project} %>
 <% elsif @course %>
diff --git a/app/views/stores/index.html.erb b/app/views/stores/index.html.erb
index e6f795722..89405b8ab 100644
--- a/app/views/stores/index.html.erb
+++ b/app/views/stores/index.html.erb
@@ -24,10 +24,12 @@
 		</div>
 
 		<div class="table1">
+          <% if @str_arr.shift == @str_arr[2]%>
 		<% k.each do |c1|%>
 			<div class="table_row1 <%= cycle 'odd', 'even' %>">
 				<div class="filename table_cell1 filename1" >
-					<%= link_to c1.filename, (attachFromUrl c1), {:title => c1.filename, :target => "_blank"} %>
+
+                  <%= link_to_attachment c1, {:download => true}%>
 				</div>
 				<div  class="table_cell1 filedown1">
 					<%= c1.downloads %>
@@ -37,6 +39,23 @@
 				</div>
 			</div>
 		<% end -%>
+        <%else%>
+              <% k.each do |c1|%>
+                  <div class="table_row1 <%= cycle 'odd', 'even' %>">
+                    <div class="filename table_cell1 filename1" >
+                      <%= link_to c1.filename, (attachFromUrl c1), {:title => c1.filename, :target => "_blank"} %>
+
+                    </div>
+                    <div  class="table_cell1 filedown1">
+                      <%= c1.downloads %>
+                    </div>
+                    <div class="table_cell1 downicon1 filename download_icon" >
+                      <%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>
+                    </div>
+                  </div>
+              <% end -%>
+
+        <% end %>
 		</div>
 
 	</div>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 227048ef6..025b51ee1 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -546,40 +546,40 @@ function search_tag_attachment(url,tag_name,q,course_id,sort)
 // 课程讨论区
 function showhelpAndScrollToMessage(id, id1, count) {
     $('#' + id).toggle();
-    if(cookieget("repositories_visiable") == "true")
-    {
-        cookiesave("repositories_visiable", false,'','','');
+    if (cookieget("repositories_visiable") == "true") {
+        cookiesave("repositories_visiable", false, '', '', '');
     }
-    else
-    {
-        cookiesave("repositories_visiable", true,'','','');
+    else {
+        cookiesave("repositories_visiable", true, '', '', '');
     }
     var information = $(id1);
     var val = information.attr("value");
-    if(val=="show_help")
-    {
-        $(id1).text("收起回复(" + count + ")" );
+    if (val == "show_help") {
+        $(id1).text("收起回复(" + count + ")");
         information.attr("value", "hide_help");
+        information.attr("style", "color:#3ca5c6");
     }
-    else
-    {
+    else {
         $(id1).text("展开回复(" + count + ")");
         information.attr("value", "show_help");
-    }
-}
-function show_more_reply(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");
-        arrow.attr("src", "/images/jiantouup.jpg")
-    }
-    else {
-        $(id2).text("[展开]");
-        information.attr("value", "show_more");
-        arrow.attr("src", "/images/jiantou.jpg")
-    }
-}
\ No newline at end of file
+        information.attr("style", "color:#0781b4;");
+    }
+}
+    function show_more_reply(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;");
+        }
+    }
\ No newline at end of file
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index 481755410..3611fe380 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -67,12 +67,14 @@ function show_more_reply(contentid, id2, id3) {
     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;");
     }
 }
 
@@ -116,11 +118,13 @@ function showhelpAndScrollToMessage(id, id1, count) {
     {
         $(id1).text("收起回复(" + count + ")" );
         information.attr("value", "hide_help");
+        information.attr("style", "color:#3ca5c6");
     }
     else
     {
         $(id1).text("展开回复(" + count + ")");
         information.attr("value", "show_help");
+        information.attr("style", "color:#0781b4;");
     }
 }
 
diff --git a/public/stylesheets/leftside.css b/public/stylesheets/leftside.css
index c7905fb80..53d382f20 100644
--- a/public/stylesheets/leftside.css
+++ b/public/stylesheets/leftside.css
@@ -45,7 +45,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: 55px;word-break: break-all;word-wrap: break-word;}
+.project_board_content{overflow: hidden;max-height: 182px;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;}
diff --git a/public/stylesheets/pleft.css b/public/stylesheets/pleft.css
index 6554db7ec..a8d4409e3 100644
--- a/public/stylesheets/pleft.css
+++ b/public/stylesheets/pleft.css
@@ -49,7 +49,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: 55px;word-break: break-all;word-wrap: break-word;}
+.project_board_content{overflow: hidden;max-height: 182px;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;}