diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 1004a49ad..4ff5a48e4 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -141,27 +141,26 @@ module WelcomeHelper Course.active.visible. joins(:memberships). group('members.course_id'). - reorder("courses.time DESC, COUNT(members.course_id) DESC").take sum - + reorder("courses.created_at DESC, COUNT(members.course_id) DESC").take sum else if school_id.nil? Course.active.visible. joins(:memberships). where("#{Course.table_name}.school_id = ?", User.current.user_extensions.school.id). group('members.course_id'). - reorder("courses.time DESC, COUNT(members.course_id) DESC").take sum + reorder("courses.created_at DESC, COUNT(members.course_id) DESC").take sum else if school_id == "0" Course.active.visible. joins(:memberships). group('members.course_id'). - reorder("courses.time DESC, COUNT(members.course_id) DESC").take sum + reorder("courses.created_at DESC, COUNT(members.course_id) DESC").take sum else Course.active.visible. joins(:memberships). where("#{Course.table_name}.school_id = ?", school_id). group('members.course_id'). - reorder("courses.time DESC, COUNT(members.course_id) DESC").take sum + reorder("courses.created_at DESC, COUNT(members.course_id) DESC").take sum end end end diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index b4f767a5c..04fb4eb7c 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -1,91 +1,77 @@ <% if @events_by_day.size >0 %> -
- -

- <%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %> -

- - <% @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.project) if @project.nil? || @project.id != e.project.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_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %> +

- <%= l(:label_new_activity) %> - - <%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %> -
-

- <%= h(truncate(strip_tags(e.event_description).gsub(/ /,' '), length: 30, omission:'...')) %> -

<%= l :label_activity_time %>：  <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %> <%= link_to l(:label_find_all_comments), issue_path(e) %> <%= l(:label_comments_count, :count => e.journals.count)%>
-
- - <% end %> -
+ <% @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")%> +
+
+ <%= h(e.project) if @project.nil? || @project.id != e.project.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 %> - <% end -%> - + <%= l(:label_new_activity) %> + + <%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %> - -
- <%end%> +
+ <%= h(truncate(strip_tags(e.event_description).gsub(/ /,' '), length: 30, omission:'...')) %> +
+
+ <%= l :label_activity_time %>：  <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %> + <% if e.event_type == "issue" %> +
+ <%= link_to l(:label_find_all_comments), issue_path(e) %> <%= l(:label_comments_count, :count => e.journals.count)%> +
+ <% end %> +
+
+
-
- - - - - -
<%= image_tag(url_to_avatar(@user), :class => "avatar") %> - - - - - -
- <% - #判断是否显示真名 - if @canShowRealName - %> - <%= link_to (h @user.try(:name)), user_path(@user) if @user %>(<%= link_to (h @user.try(:realname)), user_path(@user) if @user %>) - <% else %> - <%= link_to (h @user.try(:name)), user_path(@user) if @user %> - <% end %> - <%= l(:label_user_create_project) %> <%= link_to @project.name %> !
<%= l :label_update_time %>: <%= format_time(@project.created_on) %> -
+ <% end %> + <% end -%> + <% if(@events_pages.page == @events_pages.last_page) %> +
+
+ <%= image_tag(url_to_avatar(@user), :class => "avatar") %> +
+
+ + <% if @canShowRealName %> + <%= link_to (h @user.try(:name)), user_path(@user) if @user %>(<%= link_to (h @user.try(:realname)), user_path(@user) if @user %>) + <% else %> + <%= link_to (h @user.try(:name)), user_path(@user) if @user %> + <% end %> + <%#= l(:label_new_activity) %> + + <%= l(:label_user_create_project) %> <%= link_to @project.name %> ! +
+
+
+ <%= l :label_activity_time %>: <%= format_time(@project.created_on) %> +
+
+
+ <% end %>
+<%end%> + diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index e79cc12cf..624bd01d6 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -73,7 +73,7 @@

新开课程

<% if @school_id %> - <% school_course = find_miracle_course(10, 7, @school_id) %> + <% school_course = find_miracle_course(10,7, @school_id) %> <% else %> <%school_course=[]%> <% end %> @@ -138,6 +138,7 @@