From b6b479f6f9c0d63c3cd8de5e7177250891cf8bc3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 20 Mar 2015 11:37:56 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=8C=BF=E8=AF=84=E6=97=B6=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=202=E3=80=81=E5=A2=9E=E5=8A=A0js=E8=B0=83=E7=94=A8=E6=98=AF?=
 =?UTF-8?q?=E7=AD=89=E5=BE=85=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb           |  6 +++---
 app/views/bids/_alert_anonyoms.html.erb | 10 ----------
 app/views/courses/homework.html.erb     | 22 ++++++++++++----------
 app/views/layouts/base_courses.html.erb | 11 ++++++++---
 public/javascripts/course.js            |  5 +++++
 public/stylesheets/public.css           | 25 +++++++++++++++++++++++++
 6 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 6c2543db7..62879f010 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -698,11 +698,11 @@ module CoursesHelper
       case bid.comment_status
         when 0
           # <a href="#" class="fr mr10 work_edit">关闭匿评</a>
-          link_to '启动匿评',  alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_start_anonymous_comment", remote: true, disable_with: '加载中...'
+          link_to '启动匿评',  alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
         when 1
-          link_to '关闭匿评', alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true
+          link_to '关闭匿评', alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
         when 2
-          # <a href="#" style="background:#8e8e8e;">匿评结束</a>
+          "<span class='fr mr10 pr_join_span '>匿评结束</span>".html_safe
       end
     end
   end
diff --git a/app/views/bids/_alert_anonyoms.html.erb b/app/views/bids/_alert_anonyoms.html.erb
index f26487126..f0bec4d30 100644
--- a/app/views/bids/_alert_anonyoms.html.erb
+++ b/app/views/bids/_alert_anonyoms.html.erb
@@ -3,16 +3,6 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>开启匿评功能</title>
   <style>
-      body{ font-size:12px; font-family:"微软雅黑","宋体"; background:#fff; font-style:normal;}
-      div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,textarea{ margin:0; padding:0;}
-      div,img,tr,td,textarea{ border:0;}
-      table,tr,td{border:0; cellspacing:0; cellpadding:0;}
-      ul,li{ list-style-type:none}
-      .cl{ clear:both; overflow:hidden; }
-      a{ text-decoration:none; }
-      a:hover{ text-decoration:underline;}
-
-
       /* 匿名评分弹框 */
       .anonymos{width:480px;height:180px;position:fixed;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
       .ni_con { width:425px; margin:25px 30px;}
diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb
index c87548a5e..8d79c9607 100644
--- a/app/views/courses/homework.html.erb
+++ b/app/views/courses/homework.html.erb
@@ -17,21 +17,23 @@
         <%= link_to(bid.name, course_for_bid_path(bid), :class => 'problem_tit fl fb c_dblue') %>
         <div class="cl mb5"></div>
         <p class="fl ">已提交的作业 ( <%= link_to bid.homeworks.count, course_for_bid_path(bid.id), :class => 'c_red'%> )</p>
-        <a href="#" class="fr mr10 work_edit">关闭匿评</a>
-        <a href="courses_hworkedit.html" class="fr mr10 work_edit">编辑</a>
+        <% if @is_teacher%>
+            <%= bid_anonymous_comment(bid)%>
+            <%= link_to(l(:button_edit),edit_bid_path(:course_id =>@course.id, :bid_id => bid.id), :class => "fr mr10 work_edit") %>
+        <% end %>
         <div class="cl"></div>
-        <p  id="news_description" class="news_description mt5">项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题<br /> 创建时间 ：  2014-11-26 10:19</p>
-        <div class="news_foot" onclick="show_more_msg02();">展开更多信息 <span class="g-arr-down"><img src="images/jiantou.jpg" width="12" height="6" /></span></div>
+        <p  id="bid_description_<%= bid.id%>" class="news_description mt5">
+          <%= textilizable bid, :description %>
+          <br /> 创建时间 ：  <%= format_time bid.created_on%></p>
+        <div class="news_foot" onclick="bid_show_more_des(<%= bid.id%>);">展开更多信息
+          <span class="g-arr-down"><img src="/images/jiantou.jpg" width="12" height="6" /></span>
+        </div>
       </div>
       <div class="cl"></div>
     </div>
 <% end%>
 
-<ul class="wlist" >
-  <li><a href="#">下一页</a></li>
-  <li><a href="#">...</a></li>
-  <li><a href="#">2</a></li>
-  <li class="wlist_select" ><a href="#">1</a></li>
-  <li><a href="#">上一页</a></li>
+<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
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 5dd5f4444..ab70ca8b6 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -129,9 +129,7 @@
           <%= link_to( "+#{l(:label_course_news_new)}", course_news_index_path(@course), :class => 'subnav_green c_white') if is_teacher %>
         </div>
         <div class="subNav">
-          <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %>
-          <%= link_to "(#{@course.attachments.count})", course_files_path(@course), :class => "subnav_num c_orange" %>
-          <%= link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white') if is_teacher %>
+          <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %><%= link_to "(#{@course.attachments.count})", course_files_path(@course), :class => "subnav_num c_orange" %><%= link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white') if is_teacher %>
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
@@ -185,6 +183,13 @@
   <div class="cl"></div>
 </div><!--Container end-->
 <%= render :partial => 'layouts/new_feedback' %>
+<div id="ajax-indicator" style="display:none;">
+  <span>
+    <%= l(:label_loading) %>
+  </span>
+</div>
+<div id="ajax-modal" style="display:none;"></div>
+<%= call_hook :view_layouts_base_body_bottom %>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index e359c91f6..651013973 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -25,6 +25,11 @@ function show_more_msg()
     $("#course_description").toggleClass("course_description_none");
 }
 
+function bid_show_more_des(id)
+{
+    $("#bid_description_" + id).toggleClass("news_description_none");
+}
+
 $(document).ready(function () {
     $("#RSide").css("min-height",$("#LSide").height()-30);
 });
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 70dc8e846..502015dd5 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -180,3 +180,28 @@ html{ overflow-x:hidden;}
 .show_btn {background-position:-119px 0;}
 .msgserver a {color:#15bccf; }
 .msgserver a:hover { text-decoration:underline; }
+
+/***** Ajax indicator ******/
+#ajax-indicator {
+    position: absolute; /* fixed not supported by IE */
+    background-color:#eee;
+    border: 1px solid #bbb;
+    top:35%;
+    left:40%;
+    width:20%;
+    font-weight:bold;
+    text-align:center;
+    padding:0.6em;
+    z-index:100000;
+    opacity: 0.5;
+}
+
+html>body #ajax-indicator { position: fixed; }
+
+#ajax-indicator span {
+    background-position: 0% 40%;
+    background-repeat: no-repeat;
+    background-image: url(../images/loading.gif);
+    padding-left: 26px;
+    vertical-align: bottom;
+}