issue列表的修改

app/controllers/shixuns_controller.rb

@@ -16,7 +16,7 @@ class ShixunsController < ApplicationController
 
 
   def statistics_students
-    @statistics = @shixun.myshixuns.order("created_at desc")
+    @statistics = @shixun.myshixuns.where("").order("created_at desc")
     @statistics_count =  @statistics.count
     @limit = 10
     @is_remote = true

app/views/files/_course_list.html.erb

@@ -1,3 +1,10 @@
+<style>
+    .wlist_select a {
+        background-color:#FC7033;
+        color: #fff!important;
+        border: 1px solid #FC7033;
+    }
+</style>
 <% if curse_attachments.count != 0 %>
     <% curse_attachments.each do |file| %>
         <% if file.is_public? || User.current.member_of_course?(course) || User.current.admin? %>
@@ -8,10 +15,15 @@
             <div class="re_con_box"><span class='fr mr10 pr_join_span '><%= file.filename %>是私有资源</span></div>
         <% end %>
     <% end %>
+    <div style="text-align:center;margin-top:20px;margin-bottom:20px;" >
+      <div class="pages_right_min" style="width:auto; display:inline-block;">
+        <ul  id="homework_pository_ref_pages">
+          <%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
 
-    <ul class="wlist">
-      <%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true%>
-    </ul>
 <% else %>
     <div class="mt10 user_bg_shadow" style="background-color: #fff;padding-bottom: 10px; margin-left: 7px;">
       <%= render :partial => "welcome/no_data" %>

app/views/layouts/base_shixun.html.erb

@@ -39,7 +39,9 @@
             </li>
         <% end %>
         <li><a href="<%= collaborators_shixun_path(@shixun) %>" class="<%= params[:action] == "collaborators" ? "active" : "" %>">合作者</a></li>
-        <li><a href="<%= statistics_students_shixun_path(@shixun) %>"class="<%= params[:action] == "statistics_students" ? "active" : "" %>">学员统计</a></li>
+        <% if @shixun.shixun_status == "已发布" %>
+            <li><a href="<%= statistics_students_shixun_path(@shixun) %>"class="<%= params[:action] == "statistics_students" ? "active" : "" %>">学员统计</a></li>
+        <% end %>
         <% if User.current.manager_of_shixun?(@shixun) %>
                 <li><a href="<%= settings_shixun_path(@shixun) %>"  class="<%= params[:action] == "settings" ? "active" : "" %>">配置</a></li>
         <% end %>

app/views/messages/edit.html.erb

@@ -20,11 +20,11 @@
         <%= link_to @course.name, course_path(@course), :title => "班级" %> &gt; <%= link_to "讨论区列表", course_boards_path(@course) %>
       </p>
 
-      <div class="edu-con-top">
+      <div class="edu-con-top box_bg_shandow bor-grey-e">
         <p class="ml15 color-grey">编辑帖子</p>
       </div>
 
-      <div class="panel-content-box clearfix mt15">
+      <div class="panel-content-box clearfix mt15 box_bg_shandow bor-grey-e">
         <%= form_for @message, :url => update_board_message_path(@message.board_id, @message), :html => {:id => 'message-form'} do |f| %>
             <%= render :partial => "form_course", :locals => {:f => f} %>
         <% end %>

app/views/shixuns/_add_collaborators.html.erb

@@ -7,14 +7,14 @@
   <div class="task_popup_con">
     <div class="newupload_conbox clearfix">
       <%= form_tag url_for(shixun_members_added_shixun_path(@shixun)), :remote => true, :method => :post, :id => 'add_collaborators_form' do |f| %>
-          <div class="left fl" style="width:530px;">
-            <div class="mb10 edu-position" style="width:530px;">
+          <div class="left fl" style="width:560px;">
+            <div class="mb10 edu-position" style="width:560px;">
               <input type="hidden" value="<%= @shixun.identifier %>" id="shixun_collaborators_id">
               <input class="task-form-100 task-height-40 panel-box-sizing" id="search_not_collaborators" placeholder="输入用户的真实姓名进行搜索" type="text">
               <a href="javascript:void(0);" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a>
             </div>
             <div class="clearfix mb15">
-              <ul class="upload_select_box fl" style="overflow-y:auto;width:510px;" id="search_not_teachers_list">
+              <ul class="upload_select_box fl" style="overflow-y:auto;width:540px;" id="search_not_teachers_list">
                 <%#= render :partial => 'courses/settings/search_not_teachers_list' %>
               </ul>
             </div>

app/views/shixuns/_statistics_student_list.html.erb

@@ -16,15 +16,14 @@
           <% @statistics.each do |statistics| %>
               <tr>
                 <td class="" style="display: flex;align-items: center;justify-content: center;">
-                  <!--<img class="picture" src="/images/../images/bigdata/bigdata-logo.png" alt="头像" style="width:36px;height:36px;border-radius:18px;">-->
-                  <%= link_to image_tag(url_to_avatar(statistics.owner), :width => "36", :height => "36",  :alt => "头像"), user_path(statistics.owner), :target => '_blank', :class => "", :style => "border-radius:18px;"%>
+                  <%= link_to image_tag(url_to_avatar(statistics.owner), :width => "36", :height => "36",  :alt => "头像", :style => "border-radius:18px;padding-top:15px;"), user_path(statistics.owner), :target => '_blank', :class => ""%>
                 </td>
-                <td >
+                <td style = "padding-left:50px;width:150px">
                   <%= link_to statistics.owner.try(:show_name), user_path(statistics.owner), :class => "panel-table-name hide fl color-grey" %>
                 </td>
                 <td><%= format_time(statistics.created_at) %> 开启</td>
-                <td>
-                  <div style="padding:10px 0;background:#fff;" class="fl mt5">
+                <td style = "padding-left:100px;width:550px">
+                  <div style="padding:10px 0;" class="fl mt5">
                     <div class="panel-slider-bg  ">
                       <span class="panel-slider-inner03 " style = "width:<%= statistics.current_stage*100.to_f / statistics.games.count %>%"></span>
                     </div>

app/views/users/user_fanslist.html.erb

@@ -13,7 +13,7 @@
           <a href="<%= user_fanslist_user_path(@user) %>" class="font-16 tab_type" id="user_fans_count"><%= str %>的粉丝 <%= @user_fanlist_count %></a>
         </li>
       </ul>
-      <div id="edu-tab-con-1" class="box_bg_shandow">
+      <div id="edu-tab-con-1" class="box_bg_shandow" style = "padding-top:18px;">
         <div class="clearfix " id="user_fans_list">
           <%= render :partial => "user_watcher_or_fans_list", :locals => {:users => @user_fanlist, :user_count => @user_fanlist_count, :user_pages => @fans_pages} %>
         </div>

app/views/users/user_watchlist.html.erb

@@ -13,7 +13,7 @@
           <a href="<%= user_fanslist_user_path(@user) %>" class="font-16 tab_type" id="user_fans_count"><%= str %>的粉丝 <%= @user_fanlist_count %></a>
         </li>
       </ul>
-      <div id="edu-tab-con-1" class="box_bg_shandow  mh650">
+      <div id="edu-tab-con-1" class="box_bg_shandow  mh650" style = "padding-top:18px;">
         <div class="clearfix" id="user_watch_list">
           <%= render :partial => "user_watcher_or_fans_list", :locals => {:users => @user_watchlist, :user_count => @user_watchlist_count, :user_pages => @watchlist_pages} %>
         </div>

public/stylesheets/css/edu-common.css

@@ -328,7 +328,7 @@ html>body #ajax-indicator { position: fixed; }
     background-image: url(/images/loading.gif);
     padding-left: 26px;
     vertical-align: bottom;
-    z-index:999;
+    z-index:100000;
 }