diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 071ad2d2b..03fd4ba84 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -674,6 +674,7 @@ module CoursesHelper link_to "#{desc}".html_safe, linkPath, :remote => true, :method => :post, :id => id, :confirm => l(:label_course_closed_tips, :desc => desc), :class => "pr_join_a" end + #加入课程、退出课程按钮 def join_in_course_header(course, user, options=[]) if user.logged? joined = user.member_of_course? course diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 9c91908d2..fef53d618 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -1,143 +1,35 @@ +
+

<%= l(:label_activity)%>

+
<% if @events_by_day != nil && @events_by_day.size >0 %> -
-

-

- - <% @events_by_day.keys.sort.reverse.each do |day| %> -
- <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%> -
- - - - - -
- <%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %> - - - - - - - - - - - <% if e.event_type == "issue" %> - - <% end %> - -
- - <%= h(e.event_title) if @course.nil? || (e.course != nil && @course.id != e.course.id) %> - - - <% if @canShowRealName %> - <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> - (<%= link_to_user(e.event_author, @canShowRealName) if e.respond_to?(:event_author) %>) - <% else %> - <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> - <% end %> - <%= l(:label_new_activity) %> - - <%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url%> -
-

- <%= e.event_description %> -

-
- - <%= l :label_activity_time %> - ：  - <%= format_activity_day(day) %> - <%= format_time(e.event_datetime, false) %> - - - - <%= link_to l(:label_find_all_comments), issue_path(e.id) %> - - - <%= l(:label_comments_count, :count => e.journals.count) %> - -
-
-
- <% end %> -
- <% end -%> - <% if (@events_pages.page == @events_pages.last_page) %> -
- - - - - -
- <%= image_tag(url_to_avatar(@user), :class => "avatar") %> - - - - - - -
- <% if @canShowRealName %> - (<%= link_to_user(@user, @canShowRealName) %>) - <% else %> - <%= link_to_user(@user)%> - <% end %> - - <%= l(:label_user_create_project) %> - <%= link_to @course.name %> - ! -
- <%= l :label_create_time %>: - <%= format_time(@course.created_at) %> -
-
-
- <% end %> -
- <%else%> -
- - - - - -
- <%= image_tag(url_to_avatar(@user), :class => "avatar") %> - - - - - - -
- <% if @canShowRealName %> - (<%= link_to_user(@user, @canShowRealName) %>) - <% else %> - <%= link_to_user(@user)%> - <% end %> - <%= l(:label_user_create_project) %> - <%= link_to @course.name %> - ! -
- <%= l :label_create_time %>: - <%= format_time(@course.created_at) %> -
-
-
-<% end %> - - - -<% html_title(l(:label_course_overview)) -%> - + <% @events_by_day.keys.sort.reverse.each do |day| %> + <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%> +
+ + <%= image_tag(url_to_avatar(e.event_author), :width => "42", :height => "42") %> + +
+ jacknudt + 有了最新动态： + 附件: 2.2完成乘10运算的图灵机.mp4附件: 2.2完成乘10运算的图灵机.mp4附件: 2.2完成乘10运算的图灵机.mp4 +
+

项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题 +
+ 发布时间 ： 2014-11-26 10:19 +

+
+
+
+ <% end%> + <% end%> +<% end%> + +
\ 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 d0fbe6ccd..3193acd04 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -170,6 +170,13 @@ +
+ <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
+ +