@ -78,29 +78,28 @@
<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><%= l(:lable_hot_course)%></strong></h3>
<h3><strong><%= l(:lable_hot_course)%></strong></h3>
<% if @school_id %>
<% school_course = find_miracle_course(10,7, @school_id) %>
<% else %>
<%school_course=[]%>
<% end %>
<% if (school_course.count == 0) %>
<span><%= render :partial => 'more_course', :locals => {:school_id => nil}%></span>
<% month_now = Time.now.strftime("%m").to_i %>
<% year_now = Time.new.strftime("%Y") %>
<!-- 3-8月份为查找春季课程，
<% (month_now >= 3 && month_now < 9) ? course_term = "春季学期" : course_term = "秋季学期" %>
<% @school_id.nil? ? cur_school_course = [] : cur_school_course = find_miracle_course(10,7,@school_id, year_now, course_term) %>
<% if cur_school_course.count == 0 %>
<span><%= render :partial => 'more_course', :locals => {:school_id => nil}%></span>
<div class="d-p-projectlist-box">
<div class="d-p-projectlist-box">
<ul class="d-p-projectlist">
<ul class="d-p-projectlist">
<% if User.current.logged? %>
<% if User.current.logged? %>
<li>
<li>
<%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_no_course)} %>
<%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_no_course)} %>
</li>
</li>
<%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9, @school_id)} %>
<% else %>
<%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(10, @school_id)} %>
<% end %>
<% end %>
<% User.current.logged? ? course_count = 9 : course_count = 10 %>
<%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(course_count, @school_id, year_now, course_term)} %>
</ul>
</ul>
</div>
</div>
<% else %>
<% else %>
<% if school_course.count < 9 %>
<% if cur_ school_course.count < 9 %>
<span>
<span>
<%= render :partial => 'more_course', :locals => {:school_id => nil}%>
<%= render :partial => 'more_course', :locals => {:school_id => nil}%>
</span>
</span>
@ -111,12 +110,12 @@
<% end %>
<% end %>
<div class="d-p-projectlist-box">
<div class="d-p-projectlist-box">
<ul class="d-p-projectlist">
<ul class="d-p-projectlist">
<%= render :partial => 'course_list', :locals => {:course_list => school_course} %>
<%= render :partial => 'course_list', :locals => {:course_list => cur_ school_course} %>
<% if school_course.count < 9 %>
<% if cur_ school_course.count < 9 %>
<li>
<li>
<%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_less_course)} %>
<%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_less_course)} %>
</li>
</li>
<%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9 - school_course.count, @school_id )} %>
<%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9-cur_school_course.count, @school_id, year_now, course_term )} %>
<% end %>
<% end %>
</ul>
</ul>
</div>
</div>
@ -136,19 +135,26 @@
<% find_new_forum_topics(10).each do |topic| %>
<% find_new_forum_topics(10).each do |topic| %>
<li class="message-brief-intro" style="min-height: 65px; line-height:2em; ">
<li class="message-brief-intro" style="min-height: 65px; line-height:2em; ">
<div style="display: inline-block; width: 100%;">
<div style="display: inline-block; width: 100%;">
<span class="memo_activity text_nowrap" style="color:gray; display: inline-block; margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">
<span class="memo_activity text_nowrap" title="<%= topic.subject%>"
<%= link_to '['+topic.forum.name + ']', forum_path(topic.forum), :class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray", :style => "font-size: 10pt !important;" %>
style="color:gray; display: inline-block; margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">
<%= link_to '['+topic.forum.name + ']', forum_path(topic.forum), :class => 'memo_Bar_title' %>
<%= link_to topic.subject, topic.event_url, :class => "gray", :style => "font-size: 10pt !important;" %>
</span>
</span>
<div class='memo_activity memo_attr'>
<div class='memo_activity memo_attr'>
<span class='memo_timestamp'>
<span class='memo_timestamp'>
<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
</span>
</span>
<span class="memo_author">
<span class="memo_author" title="<%= topic.author.login%>">
<%= l(:label_question_sponsor)%>：
<%= l(:label_question_sponsor)%>：
<%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
</span>
</span>
<span class="memo_last_person">
<span class="memo_last_person" title="<%= topic.last_reply.author.login unless (topic.last_reply.nil? || topic.last_reply.author.nil?)%>">
<%= l(:label_final_reply)%>：
<%= l(:label_final_reply)%>：
<% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %>
<%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%>
<% end %>
</span>
</span>
<span class="memo_reply">
<span class="memo_reply">
<%= l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>)
<%= l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>)
