From af107d861b96f548884c33fd4d4cd5e7255420c4 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 13 May 2015 16:44:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B0=86=E4=B8=8B=E8=BD=BD=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=94=BE=E5=88=B0=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 1 +
 app/controllers/users_controller.rb   | 1 -
 app/views/courses/show.html.erb       | 3 ++-
 app/views/users/show.html.erb         | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index a1e547a84..1d1212bf1 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -5,6 +5,7 @@ class CoursesController < ApplicationController
   helper :activities
   helper :members
   helper :words
+  helper :attachments
 
   before_filter :auth_login1, :only => [:show, :feedback]
   menu_item :overview
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ccf382006..2a10af260 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -15,7 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class UsersController < ApplicationController
-  helper :attachments
 
   layout :setting_layout
   #Added by young
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index 1d2c42457..c46ee2d03 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -21,6 +21,7 @@
                   <br />
                   <%= l :label_activity_time %> ：  <%= format_activity_day(day) %>&nbsp;<%= format_time(e.event_datetime, false) %>
                 </p>
+                <%= link_to_attachments_course(e) %>
               </div>
               <div class="cl"></div>
             </div><!--课程动态 end-->
@@ -49,4 +50,4 @@
 <ul class="wlist">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
 </ul>
-<div class="cl"></div>
\ No newline at end of file
+<div class="cl"></div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 484a79ea2..fe36b2cd1 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -432,7 +432,6 @@
                           <td colspan="2" width="580" class="upload_img">
                             <p class="font_description">
                               <%= textAreailizable act, :description %>
-                                <%= link_to_attachments_course e.act %>
                             </p>
                           </td>
                         </tr>

From f53691ceedc8d635d0fe44c7d9e61781fa5fefb3 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 13 May 2015 17:13:22 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E6=98=AFNews?=
 =?UTF-8?q?=E7=9A=84=E9=99=84=E4=BB=B6=E6=98=BE=E7=A4=BA=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index c46ee2d03..2a818b892 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -21,7 +21,7 @@
                   <br />
                   <%= l :label_activity_time %> ：  <%= format_activity_day(day) %>&nbsp;<%= format_time(e.event_datetime, false) %>
                 </p>
-                <%= link_to_attachments_course(e) %>
+                <%= link_to_attachments_course(e) if e.is_a?(News) %>
               </div>
               <div class="cl"></div>
             </div><!--课程动态 end-->

From bd77ad9ac14e8643ecfa6cd82d86fd5d5df15700 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Wed, 13 May 2015 17:25:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B1=95=E5=BC=80=E3=80=82=E6=94=B6?=
 =?UTF-8?q?=E8=B5=B7=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_show.html.erb  | 21 +++++++++++++--------
 app/views/boards/_project_show.html.erb | 21 ++++++++++++++-------
 app/views/boards/show.html.erb          |  9 ++++++++-
 public/stylesheets/leftside.css         |  1 +
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index ce3dd2091..5dde6c460 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -58,18 +58,23 @@
 
               <div class="cl"></div>
 
-              <p  id="contentmessage<%=topic.id %>" class="project_board_content break_word">
-                <%= topic.content %>
-              </p>
-              <% if topic.content.size > 300 %>
-                  <p>
-                    <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
+              <script>
+                  $(function(){if($("#contentmessage<%=topic.id %>").height()>55){$("#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 %>
+                </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>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
                 </span>
 
-                  </p>
-              <% end %>
+              </p>
               <%= link_to_attachments_course topic, :author => false %>
 
               <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index a20bed3fd..8a9ffd990 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -32,6 +32,7 @@
   <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;">
             <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
             <div class="talkmain_txt fl mt5">
@@ -57,19 +58,24 @@
                   <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
               <% end %>
               <div class="cl"></div>
+              <script>
+                  $(function(){if($("#contentmessage<%=topic.id %>").height()>55){$("#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 %>
+                </div>
+              </div>
 
-               <p  id="contentmessage<%=topic.id %>" class="project_board_content break_word">
-                 <%= topic.content %>
-               </p>
-              <% if topic.content.size > 300 %>
-              <p>
-                <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
+
+              <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>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
                 </span>
 
               </p>
-               <% end %>
+
             <%= link_to_attachments_course topic, :author => false %>
 
               <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
@@ -177,6 +183,7 @@
                <% end %>
            <% end %>
         </div>
+
        <% end %>
   <% else %>
       <p class="nodata"><%= l(:label_no_data) %></p>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 9faf07b9a..2e736bdf7 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -24,7 +24,14 @@
 
 <script type="text/javascript">//侧导航
 
-
+window.onload = function () {
+    $("p[aa='bb']").each(function() {
+        alert((this.offsetHeight == '55'));
+        if(this.offsetHeight == '55') {
+            this.next.style.dispaly="block";
+        }
+    })
+}
 
 function show_newtalk()
 {
diff --git a/public/stylesheets/leftside.css b/public/stylesheets/leftside.css
index 6020903d3..c7905fb80 100644
--- a/public/stylesheets/leftside.css
+++ b/public/stylesheets/leftside.css
@@ -45,6 +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;}
 .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;}