Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
011d161f8f
|
|
@ -141,27 +141,26 @@ module WelcomeHelper
|
||||||
Course.active.visible.
|
Course.active.visible.
|
||||||
joins(:memberships).
|
joins(:memberships).
|
||||||
group('members.course_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
|
else
|
||||||
if school_id.nil?
|
if school_id.nil?
|
||||||
Course.active.visible.
|
Course.active.visible.
|
||||||
joins(:memberships).
|
joins(:memberships).
|
||||||
where("#{Course.table_name}.school_id = ?", User.current.user_extensions.school.id).
|
where("#{Course.table_name}.school_id = ?", User.current.user_extensions.school.id).
|
||||||
group('members.course_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
|
else
|
||||||
if school_id == "0"
|
if school_id == "0"
|
||||||
Course.active.visible.
|
Course.active.visible.
|
||||||
joins(:memberships).
|
joins(:memberships).
|
||||||
group('members.course_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
|
else
|
||||||
Course.active.visible.
|
Course.active.visible.
|
||||||
joins(:memberships).
|
joins(:memberships).
|
||||||
where("#{Course.table_name}.school_id = ?", school_id).
|
where("#{Course.table_name}.school_id = ?", school_id).
|
||||||
group('members.course_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
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,91 +1,77 @@
|
||||||
<% if @events_by_day.size >0 %>
|
<% if @events_by_day.size >0 %>
|
||||||
<div class="content-title-top-avtive">
|
<div class="content-title-top-avtive">
|
||||||
<!-- <h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3> -->
|
<p class="subtitle">
|
||||||
<p class="subtitle">
|
<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
|
||||||
<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
|
</p>
|
||||||
</p>
|
|
||||||
|
|
||||||
<% @events_by_day.keys.sort.reverse.each do |day| %>
|
|
||||||
<div>
|
|
||||||
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
|
|
||||||
<div>
|
|
||||||
<table class="underline-evreycontent" style="font-size: 14px;">
|
|
||||||
<tr>
|
|
||||||
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%></td>
|
|
||||||
<td>
|
|
||||||
<table width="580px" border="0">
|
|
||||||
<tr>
|
|
||||||
<td colspan="2" valign="top">
|
|
||||||
<strong> <%= h(e.project) if @project.nil? || @project.id != e.project.id %></strong>
|
|
||||||
<span class="font_lighter">
|
|
||||||
<% 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) %> </span>
|
<% @events_by_day.keys.sort.reverse.each do |day| %>
|
||||||
|
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
|
||||||
<%= 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 %>
|
<div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;">
|
||||||
</td>
|
<div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
|
||||||
</tr>
|
<%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%>
|
||||||
<tr>
|
</div>
|
||||||
<td colspan="2" width="580px" >
|
<div class="activity-content" style="padding:5px 5px 5px 70px;">
|
||||||
<p class="info-break">
|
<strong> <%= h(e.project) if @project.nil? || @project.id != e.project.id %></strong>
|
||||||
<%= h(truncate(strip_tags(e.event_description).gsub(/ /,' '), length: 30, omission:'...')) %>
|
<span class="activity-title font_lighter">
|
||||||
</p></td>
|
<% if @canShowRealName %>
|
||||||
</tr>
|
<%= 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) %>)
|
||||||
<tr>
|
<% else %>
|
||||||
<td align="left"><span class="font_lighter"> <%= l :label_activity_time %>： <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span></td>
|
<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
|
||||||
<% if e.event_type == "issue" %>
|
<% end %>
|
||||||
<td align="right"><span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count)%></span></td>
|
|
||||||
<% end %>
|
|
||||||
</tr>
|
|
||||||
</table></td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<% end -%>
|
<%= l(:label_new_activity) %>
|
||||||
|
</span>
|
||||||
|
<%= 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 %>
|
||||||
|
|
||||||
|
<div class="activity_description info-break" style="font-size: 13px;">
|
||||||
</div>
|
<%= h(truncate(strip_tags(e.event_description).gsub(/ /,' '), length: 30, omission:'...')) %>
|
||||||
<%end%>
|
</div>
|
||||||
|
<div class="activity_status" style="position:relative; padding-top: 3px;">
|
||||||
|
<span class="font_lighter"> <%= l :label_activity_time %>： <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span>
|
||||||
|
<% if e.event_type == "issue" %>
|
||||||
|
<div class="" style="display:inline-block;position:absolute; right:2%;">
|
||||||
|
<span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count)%></span>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="font_description">
|
<% end %>
|
||||||
<table width="660">
|
<% end -%>
|
||||||
<tr>
|
<% if(@events_pages.page == @events_pages.last_page) %>
|
||||||
<td><%= image_tag(url_to_avatar(@user), :class => "avatar") %></td>
|
<div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;">
|
||||||
<td colspan="2">
|
<div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
|
||||||
<table width="580">
|
<%= image_tag(url_to_avatar(@user), :class => "avatar") %>
|
||||||
<tr>
|
</div>
|
||||||
<td >
|
<div class="activity-content" style="padding:5px 5px 5px 70px;">
|
||||||
<%
|
<span class="activity-title font_lighter">
|
||||||
#判断是否显示真名
|
<% if @canShowRealName %>
|
||||||
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 %>(<%= link_to (h @user.try(:realname)), user_path(@user) if @user %>)
|
<%= link_to (h @user.try(:name)), user_path(@user) if @user %>
|
||||||
<% else %>
|
<% end %>
|
||||||
<%= link_to (h @user.try(:name)), user_path(@user) if @user %>
|
<%#= l(:label_new_activity) %>
|
||||||
<% end %>
|
</span>
|
||||||
<%= l(:label_user_create_project) %> <%= link_to @project.name %><strong> !</strong></td>
|
<%= l(:label_user_create_project) %> <%= link_to @project.name %><strong> !</strong>
|
||||||
</tr>
|
<div class="activity_description info-break" style="font-size: 13px;">
|
||||||
<tr>
|
</div>
|
||||||
<td class="font_lighter" style="float: right"><%= l :label_update_time %>: <%= format_time(@project.created_on) %>
|
<div class="activity_status" style="position:relative; padding-top: 3px;">
|
||||||
</table></td>
|
<span class="font_lighter"><%= l :label_activity_time %>: <%= format_time(@project.created_on) %></span>
|
||||||
</tr>
|
</div>
|
||||||
</table>
|
</div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
<%end%>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="pagination">
|
<div class="pagination">
|
||||||
<ul>
|
<ul>
|
||||||
<%= pagination_links_full @events_pages%>
|
<%= pagination_links_full @events_pages%>
|
||||||
|
<% #binding.pry %>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@
|
||||||
<div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
|
<div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
|
||||||
<h3><strong>新开课程</strong></h3>
|
<h3><strong>新开课程</strong></h3>
|
||||||
<% if @school_id %>
|
<% if @school_id %>
|
||||||
<% school_course = find_miracle_course(10, 7, @school_id) %>
|
<% school_course = find_miracle_course(10,7, @school_id) %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%school_course=[]%>
|
<%school_course=[]%>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
@ -138,6 +138,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
<ul class="d-p-projectlist">
|
<ul class="d-p-projectlist">
|
||||||
<% school_course.map do |course| %>
|
<% school_course.map do |course| %>
|
||||||
|
<% if course.school%>
|
||||||
<li class='<%= cycle("odd", "even") %>' title=<%= course.description.to_s %>>
|
<li class='<%= cycle("odd", "even") %>' title=<%= course.description.to_s %>>
|
||||||
<div class='avatar'>
|
<div class='avatar'>
|
||||||
<%= image_tag(get_course_avatar(course), :class => "avatar-4") %>
|
<%= image_tag(get_course_avatar(course), :class => "avatar-4") %>
|
||||||
|
|
@ -167,6 +168,7 @@
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
<%end%>
|
||||||
<% end; reset_cycle %>
|
<% end; reset_cycle %>
|
||||||
<% if school_course.count < 9 %>
|
<% if school_course.count < 9 %>
|
||||||
<li>
|
<li>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue