From 57804a118de3259a88ed1be82d38686581943568 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 10 Jun 2015 16:37:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=B1=95=E5=BC=80=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_common/index.html.erb | 6 +++---
 config/locales/commons/zh.yml            | 2 +-
 public/javascripts/course.js             | 9 +++++++++
 public/stylesheets/courses.css           | 4 ----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 1e8189ddb..3208bb969 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -41,9 +41,9 @@
             <%= homework.description.html_safe %>
           </div>
         </div>
-        <div class="news_foot c_red" id="bid_show_more_des_button<%= homework.id%>" onclick="bid_show_more_des(<%= homework.id%>);" style="cursor:pointer;display: none;">
-          <%= l(:button_more)%>...
-          <span class="g-arr-down"></span>
+
+        <div class="news_foot currentDd" id="bid_show_more_des_button<%= homework.id%>" onclick="bid_show_more_des(<%= homework.id%>);" style="cursor:pointer;display: none;">
+          [展开]
         </div>
 
         <div class="cl"></div>
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index a023bc8cb..f83d3810c 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -219,7 +219,7 @@ zh:
   label_submit: 提交
   button_project_tags_add: 增加  
   button_download: 下载
-  button_more: "更多»"
+  button_more: "更多"
   button_delete: 删除
   button_unfollow: 取消关注
   button_follow: 关注
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 4c0cae670..8f9ed74eb 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -357,6 +357,15 @@ function news_show_more_des(id)
 function bid_show_more_des(id)
 {
     $("#bid_description_" + id).toggleClass("news_description_none");
+    if($("#bid_description_" + id).hasClass("news_description_none"))
+    {
+        $("#bid_show_more_des_button" + id).html("[收起]");
+    }
+    else
+    {
+        $("#bid_show_more_des_button" + id).html("[展开]");
+    }
+
 }
 
 //课程作业结束时间倒计时
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index edb70075b..e577bde66 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -30,10 +30,6 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .box_h3{ color:#15bccf; text-align:center; font-size:16px;}
 .box_p{ color:#404040; margin-bottom:5px;}
 .fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;}
-/*.icon_addm{ background:url(../images/img_floatbox.png) 0 -33px no-repeat; width:16px; height:16px; display:block;  margin:5px 0 0 5px;}*/
-/*.icon_addm:hover{background:url(../images/img_floatbox.png) 0 -61px no-repeat; }*/
-/*.icon_removem{ background:url(../images/img_floatbox.png) -22px -33px  no-repeat;width:16px; height:16px; display:block;  margin:5px 0 0 5px}*/
-/*.icon_removem:hover{background:url(../images/img_floatbox.png) -22px -61px  no-repeat;}*/
 a.btn_free{ background:#ff5722; display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;}
 a:hover.btn_free{ background:#d63502;}
 /*成员邀请*/