diff --git a/app/views/courses/_course_activity_content.html.erb b/app/views/courses/_course_activity_content.html.erb index 7e49d2868..e35a70644 100644 --- a/app/views/courses/_course_activity_content.html.erb +++ b/app/views/courses/_course_activity_content.html.erb @@ -1,15 +1,86 @@ -
-
- <%= get_acts_list_type @type %> +
+
+
+ <%= get_acts_list_type @type %> +
+ <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %> +
+ <% if false %> +
  • + <%= link_to '成员管理', members_course_path(@course),:class => "color-orange03" %> + <% apply_count = CourseMessage.where(:course_id => @course.id,:course_message_type => 'JoinCourseRequest', :status => 0).count %> + <% if apply_count > 0 %> + <%= apply_count %> + <% end %> +
    • + <% end %> +
    + + 新建 +
      +
    • + <%= link_to '普通作业'.html_safe, new_homework_common_path(:course => @course.id, :homework_type => 1),:class => "color-grey" %> +
      • +
    • + <%= link_to '实训作业'.html_safe, shixuns_homework_common_index_path(:course => @course.id),:class => "color-grey", :remote => true %> +
      • +
    • + 资源 +
      • +
    • + <% course_board = @course.boards.where("parent_id is NULL").first %> + <%= link_to '帖子'.html_safe, new_board_message_path(:board_id => course_board.id),:class => "color-grey" %> +
      • +
    +
    +
    + <% end %>
    -
    +
    <%= link_to "全部", {:controller => "courses", :action => "show", :type => nil}, :remote => true, :class =>"edu-filter-cir-grey mr15 font-12 #{@type.nil? ? 'active' : ''} fl"%> <%= link_to "普通作业", {:controller => "courses", :action => "show", :type => "common_homework"}, :remote => true, :class =>"edu-filter-cir-grey mr15 font-12 #{@type == 'common_homework' ? 'active' : ''} fl"%> <%= link_to "实训作业", {:controller => "courses", :action => "show", :type => "shixun_homework"}, :remote => true, :class =>"edu-filter-cir-grey mr15 font-12 #{@type == 'shixun_homework' ? 'active' : ''} fl"%> <%= link_to "资源", {:controller => "courses", :action => "show", :type => "attachment"}, :remote => true, :class =>"edu-filter-cir-grey mr15 font-12 #{@type == 'attachment' ? 'active' : ''} fl"%> <%= link_to "讨论", {:controller => "courses", :action => "show", :type => "message"}, :remote => true, :class =>"edu-filter-cir-grey mr15 font-12 #{@type == 'message' ? 'active' : ''} fl"%> + <%= link_to "成员管理", {:controller => "courses", :action => "show", :type => "message"}, :remote => true, :class =>"edu-filter-cir-grey mr15 font-12 #{@type == 'message' ? 'active' : ''} fl"%>
    - +<% if false %> + +
    +
    +
    + 0 +
    +
    +
    + 蔡世申请加入课堂 + 待处理 + 已处理 + 同意 + 拒绝 +
    +
    + 蔡世 + TO + 成员管理 +
    +
    提交时间:2017-09-28 15:44
    +
    + 胡莎莎 已同意 已拒绝 + 处理时间:2017-09-28 15:44 +
    +
    +
    +
    +
    +<% end %> <%= render :partial => 'courses/course_activity', :locals => {:course_activities => @course_activities,:page => 0,:type => @type} %> - + diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 4d7fc2d04..3f232cffd 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -8,20 +8,22 @@
    - <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %> -
      -
    • <%= link_to '成员管理', members_course_path(@course),:class => "color-orange03" %> - <% apply_count = CourseMessage.where(:course_id => @course.id,:course_message_type => 'JoinCourseRequest', :status => 0).count %> - <% if apply_count > 0 %> - <%= apply_count %> - <% end %> -
      • -
    • <%= link_to '+ 发布普通作业'.html_safe, new_homework_common_path(:course => @course.id, :homework_type => 1),:class => "color-orange03" %>
      • -
    • <%= link_to '+ 发布实训作业'.html_safe, shixuns_homework_common_index_path(:course => @course.id),:class => "color-orange03", :remote => true %>
      • -
    • + 发布资源
      • - <% course_board = @course.boards.where("parent_id is NULL").first %> -
    • <%= link_to '+ 发布帖子'.html_safe, new_board_message_path(:board_id => course_board.id),:class => "color-orange03" %>
      • -
    + <% if false %> + <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %> +
      +
    • <%= link_to '成员管理', members_course_path(@course),:class => "color-orange03" %> + <% apply_count = CourseMessage.where(:course_id => @course.id,:course_message_type => 'JoinCourseRequest', :status => 0).count %> + <% if apply_count > 0 %> + <%= apply_count %> + <% end %> +
      • +
    • <%= link_to '+ 发布普通作业'.html_safe, new_homework_common_path(:course => @course.id, :homework_type => 1),:class => "color-orange03" %>
      • +
    • <%= link_to '+ 发布实训作业'.html_safe, shixuns_homework_common_index_path(:course => @course.id),:class => "color-orange03", :remote => true %>
      • +
    • + 发布资源
      • + <% course_board = @course.boards.where("parent_id is NULL").first %> +
    • <%= link_to '+ 发布帖子'.html_safe, new_board_message_path(:board_id => course_board.id),:class => "color-orange03" %>
      • +
    + <% end %> <% end %>
    <%= render :partial => 'courses/course_activity_content', :locals => {:course_activities => @course_activities} %> diff --git a/app/views/shixuns/_add_collaborators.html.erb b/app/views/shixuns/_add_collaborators.html.erb index 03a01b843..dee603ae0 100644 --- a/app/views/shixuns/_add_collaborators.html.erb +++ b/app/views/shixuns/_add_collaborators.html.erb @@ -13,6 +13,15 @@
    +

    + + +

      <%#= render :partial => 'courses/settings/search_not_teachers_list' %> diff --git a/app/views/shixuns/_add_collaborators_list.html.erb b/app/views/shixuns/_add_collaborators_list.html.erb index d50ea2a2a..e219ceb7a 100644 --- a/app/views/shixuns/_add_collaborators_list.html.erb +++ b/app/views/shixuns/_add_collaborators_list.html.erb @@ -6,10 +6,11 @@ + <%= user.show_real_name %> + <%= user.login %> + <%= user.identity %> + <%= user.user_extensions.school ? user.user_extensions.school.name : "" %> + <% end %> <% end %> diff --git a/app/views/student_work/_shixun_work_show.html.erb b/app/views/student_work/_shixun_work_show.html.erb index 588a489c9..20d266e12 100644 --- a/app/views/student_work/_shixun_work_show.html.erb +++ b/app/views/student_work/_shixun_work_show.html.erb @@ -6,7 +6,7 @@

      - <%= link_to @shixun.owner.try(:show_real_name), user_path(@shixun.owner), :class => "link-name-dark fl", :target => "_blank" %> + <%= link_to @shixun.owner.try(:show_real_name), user_path(@shixun.owner), :class => "color-grey3 fl", :target => "_blank" %> / <%= link_to @shixun.name, shixun_path(@shixun), :class => "edu-info-dark fl", :target => "_blank" %>

      diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index bcb78ea34..62635f16b 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -235,8 +235,12 @@ a:hover.link-name-dark{ color:#5faee3;} .edu-txt-w280{ width:280px; display: block;} .edu-txt-w320{ width:320px; display: block;} .edu-txt-w200{ width:200px; display: block;} -a.edu-txt-w140,.edu-txt-w140{ width:141px; display: inline-block;} -a.edu-txt-w100,.edu-txt-w100{ width:100px; display: inline-block;} +a.edu-txt-w190,.edu-txt-w190{ width:190px; display: inline-block;text-align: center} +a.edu-txt-w160,.edu-txt-w160{ width:160px; display: inline-block;text-align: center} +a.edu-txt-w140,.edu-txt-w140{ width:141px; display: inline-block;text-align: center} +a.edu-txt-w130,.edu-txt-w130{ width:130px; display: inline-block;text-align: center} +a.edu-txt-w120,.edu-txt-w120{ width:120px; display: inline-block;text-align: center} +a.edu-txt-w100,.edu-txt-w100{ width:100px; display: inline-block;text-align: center} .edu-txt-w50{ width:50px;} .edu-w245{ width: 245px; } .overellipsis{overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} diff --git a/public/stylesheets/css/edu-public.css b/public/stylesheets/css/edu-public.css index dda1482b1..d179b2a74 100644 --- a/public/stylesheets/css/edu-public.css +++ b/public/stylesheets/css/edu-public.css @@ -57,7 +57,7 @@ $colors: #fff, #0072B5, #2C3E50; .edu-dropdown-menu{ background-color:#fff; text-align: center; border-radius:3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:absolute; top:25px; left:0px; z-index: 999; display:none;} .edu-dropdown-menu li{ height:30px; line-height:30px; display: block; padding:0 15px; text-align: left;} .edu-dropdown-menu li label{ cursor: pointer;} -.edu-dropdown-menu li:hover{ color: #5faee3!important;} +.edu-dropdown-menu li:hover{ color: #FF7500!important;} /*.edu-dropdown:hover .edu-dropdown-menu{ display: block;}*/ .animate{ -webkit-transition: all .3s; -moz-transition: all .3s; -ms-transition: all .3s; -ms-transition: all .3s; transition: all .3s; backface-visibility:hidden; -webkit-backface-visibility:hidden; /* Chrome and Safari */ -moz-backface-visibility:hidden; /* Firefox */ -ms-backface-visibility:hidden; /* Internet Explorer */} diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css index 7052dd715..dadcc6cf0 100644 --- a/public/stylesheets/css/structure.css +++ b/public/stylesheets/css/structure.css @@ -535,10 +535,8 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex .flex-cell_homepage:hover{ background-color:#3b94d6;} .feedback_error p{display: inline;} -.activities_btn{border: 1px solid #FF7500;} -.activities_btn li{flex: 1;height: 50px;line-height: 50px;float: left;text-align: center;border-right: 1px solid #FF7500;} -.activities_btn li:last-child{border: none;} -.activities_btn li:hover{color:#fff!important;background: #FF7500;} -.activities_btn li:hover .color-orange03{color: #fff!important;} -.activities_btn li .edu-cir-orange{color: #fff!important;} -.activities_btn li:hover .edu-cir-orange{background: #fff;color: #FF7500!important;} \ No newline at end of file +.activities_btn .activities_item,.activities_btn div{float: left;text-align: center;border-radius: 4px;border: 1px solid #FF7500;padding: 1px 16px;} +.activities_btn .activities_item:hover{color:#fff!important;background: #FF7500;} +.activities_btn .activities_item:hover .color-orange03{color: #fff!important;} +.activities_btn .activities_item .edu-cir-orange{color: #fff!important;} +.activities_btn .activities_item:hover .edu-cir-orange{background: #fff;color: #FF7500!important;} \ No newline at end of file