From d33cbbb699a484687dd147cb49b01005b0e5e6b4 Mon Sep 17 00:00:00 2001 From: miss <994230062@qq.com> Date: Mon, 25 Sep 2017 16:49:35 +0800 Subject: [PATCH] =?UTF-8?q?issue=E5=88=97=E8=A1=A8=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 2 +- app/views/files/_course_list.html.erb | 18 +++++++++++++++--- app/views/layouts/base_shixun.html.erb | 4 +++- app/views/messages/edit.html.erb | 4 ++-- app/views/shixuns/_add_collaborators.html.erb | 6 +++--- .../shixuns/_statistics_student_list.html.erb | 9 ++++----- app/views/users/user_fanslist.html.erb | 2 +- app/views/users/user_watchlist.html.erb | 2 +- public/stylesheets/css/edu-common.css | 2 +- 9 files changed, 31 insertions(+), 18 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index d11285bc7..3a7072c3d 100644 --- a/app/controllers/shixuns_controller.rb +++ b/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 diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index c1836895b..67c6a458d 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -1,3 +1,10 @@ + <% 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 @@
<%= file.filename %>是私有资源
<% end %> <% end %> +
+
+ +
+
+
- <% else %>
<%= render :partial => "welcome/no_data" %> diff --git a/app/views/layouts/base_shixun.html.erb b/app/views/layouts/base_shixun.html.erb index 8c9fa67de..345153daf 100644 --- a/app/views/layouts/base_shixun.html.erb +++ b/app/views/layouts/base_shixun.html.erb @@ -39,7 +39,9 @@ <% end %>
  • ">合作者
    • -
  • ">学员统计
    • + <% if @shixun.shixun_status == "已发布" %> +
  • ">学员统计
    • + <% end %> <% if User.current.manager_of_shixun?(@shixun) %>
  • ">配置
    • <% end %> diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb index 3ce62e7ff..c6d984662 100644 --- a/app/views/messages/edit.html.erb +++ b/app/views/messages/edit.html.erb @@ -20,11 +20,11 @@ <%= link_to @course.name, course_path(@course), :title => "班级" %> > <%= link_to "讨论区列表", course_boards_path(@course) %>

    -
    +

    编辑帖子

    -
    +
    <%= 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 %> diff --git a/app/views/shixuns/_add_collaborators.html.erb b/app/views/shixuns/_add_collaborators.html.erb index 84ae4b521..03a01b843 100644 --- a/app/views/shixuns/_add_collaborators.html.erb +++ b/app/views/shixuns/_add_collaborators.html.erb @@ -7,14 +7,14 @@
    <%= form_tag url_for(shixun_members_added_shixun_path(@shixun)), :remote => true, :method => :post, :id => 'add_collaborators_form' do |f| %> -
    -
    +
    +
    -
      +
        <%#= render :partial => 'courses/settings/search_not_teachers_list' %>
    diff --git a/app/views/shixuns/_statistics_student_list.html.erb b/app/views/shixuns/_statistics_student_list.html.erb index 02340d7f0..f04743070 100644 --- a/app/views/shixuns/_statistics_student_list.html.erb +++ b/app/views/shixuns/_statistics_student_list.html.erb @@ -16,15 +16,14 @@ <% @statistics.each do |statistics| %> - - <%= 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 => ""%> - + <%= link_to statistics.owner.try(:show_name), user_path(statistics.owner), :class => "panel-table-name hide fl color-grey" %> <%= format_time(statistics.created_at) %> 开启 - -
    + +
    diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb index edc5bb134..45d3a81a4 100644 --- a/app/views/users/user_fanslist.html.erb +++ b/app/views/users/user_fanslist.html.erb @@ -13,7 +13,7 @@ <%= str %>的粉丝 <%= @user_fanlist_count %> -
    +
    <%= render :partial => "user_watcher_or_fans_list", :locals => {:users => @user_fanlist, :user_count => @user_fanlist_count, :user_pages => @fans_pages} %>
    diff --git a/app/views/users/user_watchlist.html.erb b/app/views/users/user_watchlist.html.erb index 26ddf5bab..64cfeecef 100644 --- a/app/views/users/user_watchlist.html.erb +++ b/app/views/users/user_watchlist.html.erb @@ -13,7 +13,7 @@ <%= str %>的粉丝 <%= @user_fanlist_count %> -
    +
    <%= render :partial => "user_watcher_or_fans_list", :locals => {:users => @user_watchlist, :user_count => @user_watchlist_count, :user_pages => @watchlist_pages} %>
    diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index 9d0f98b32..be4283974 100644 --- a/public/stylesheets/css/edu-common.css +++ b/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; }