From 5ad2d22f98d893ed22a30fa07a3ef287d30b4c3e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 18 Dec 2014 09:58:16 +0800 Subject: [PATCH] =?UTF-8?q?#1724=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=A8=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E6=9C=892=E4=B8=AA=E9=80=80=E5=87=BA=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E7=9A=84=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_form.html.erb | 47 +++++++++++++++-------- app/views/users/_my_joinedcourse.html.erb | 16 ++++---- app/views/users/user_courses.html.erb | 1 - 3 files changed, 38 insertions(+), 26 deletions(-) diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb index 6784faf89..02ba782ec 100644 --- a/app/views/users/_course_form.html.erb +++ b/app/views/users/_course_form.html.erb @@ -4,31 +4,40 @@
  • - +
    <%= image_tag(url_to_avatar(membership.course), :class => 'avatar') %> + <%= image_tag(url_to_avatar(membership.course), :class => 'avatar') %> + + ( + + <%= link_to (membership.course.news.count), {:controller => 'news', :action => 'index', :course_id => membership.course.id} %> + ) + + diff --git a/app/views/users/_my_joinedcourse.html.erb b/app/views/users/_my_joinedcourse.html.erb index 74be37b55..8314974d3 100644 --- a/app/views/users/_my_joinedcourse.html.erb +++ b/app/views/users/_my_joinedcourse.html.erb @@ -1,15 +1,15 @@
    <% if @memberships.empty? %> <% if @user != User.current %> -

    - <%= l(:label_project_course_un) %> -

    +

    + <%= l(:label_project_course_un) %> +

    <% else %> -

    - - <%= l(:label_project_cousre_studentun) %><%= link_to"#{l(:label_course_join_student)}",{:controller=>'courses',:action=>'index'}, :class => 'icon icon-add' %> - <%= link_to "#{l(:label_course_new)}", {:controller => 'courses', :action => 'new'}, :class => 'icon icon-add' %> -

    +

    + <%= l(:label_project_cousre_studentun) %> + <%= link_to"#{l(:label_course_join_student)}",{:controller=>'courses',:action=>'index'}, :class => 'icon icon-add' %> + <%= link_to "#{l(:label_course_new)}", {:controller => 'courses', :action => 'new'}, :class => 'icon icon-add' %> +

    <% end %> <% else %>
    diff --git a/app/views/users/user_courses.html.erb b/app/views/users/user_courses.html.erb index 16f6414d9..6e0a1ca17 100644 --- a/app/views/users/user_courses.html.erb +++ b/app/views/users/user_courses.html.erb @@ -9,7 +9,6 @@ $("content-title-top p:first").find("a").attr("target", "_blank"); $("#content .content_frame [color=#666666]").find("a").removeAttr("target"); $('#content .content-title-top table[width=580] td:first span:eq(1)').find("a:first").removeAttr("target"); - });
    - <%= link_to_course(membership.course) %> + + <%= link_to_course(membership.course) %> + <%= render :partial => 'courses/set_course_time', :locals => {:course => membership.course} %> - <% if User.current == @user %> - <% (membership.roles).each do |role| %> - <% unless (role == Role.find(9) || role == Role.find(3)) %> - <%= join_in_course(membership.course, User.current) %> - <% end %> - <% end %> - <% else %> + <% if (User.current == @user && (!@user.allowed_to?(:as_teacher,membership.course)))%> + <%= join_in_course(membership.course, User.current) %> <% end %> +      <%= l(:label_x_base_courses_member, :count => membership.course.members.count) %> - (<%= "#{membership.course.members.count}" %>)   + (<%= "#{membership.course.members.count}" %>) +    <%= l(:label_homework) %> - (<%= link_to (membership.course.homeworks.count), {:controller => 'courses', :action => 'homework', :id => membership.course.id} %>) + ( + + <%= link_to (membership.course.homeworks.count), {:controller => 'courses', :action => 'homework', :id => membership.course.id} %> + + )    <%= l(:label_course_news) %> - (<%= link_to (membership.course.news.count), {:controller => 'news', :action => 'index', :course_id => membership.course.id} %>) -
    @@ -42,10 +51,14 @@ <% @course = Course.find_by_extra(membership.course.extra) %> <% unless (@course.nil? || @course.teacher.nil? || @course.teacher.name.nil?) %> - <%= l(:label_main_teacher) %> - : <%= link_to(@course.teacher.realname, user_path(@course.teacher)) %> - <%= l(:label_course_term) %> - : <%= @course.time %><%= @course.term %> + + <%= l(:label_main_teacher) %> + : <%= link_to(@course.teacher.realname, user_path(@course.teacher)) %> + + + <%= l(:label_course_term) %> + : <%= @course.time %><%= @course.term %> + <% end %>