1、课程跳到其他页面后没有分块

2、修改course_show界面
This commit is contained in:
sw 2015-03-18 18:03:17 +08:00
parent 423849ca84
commit d92ac2d909
3 changed files with 40 additions and 140 deletions

View File

@ -674,6 +674,7 @@ module CoursesHelper
link_to "<span class='pr_close'></span>#{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

View File

@ -1,143 +1,35 @@
<div class="project_r_h">
<h2 class="project_h2"><%= l(:label_activity)%></h2>
</div>
<% if @events_by_day != nil && @events_by_day.size >0 %>
<div class="content-title-top-avtive">
<p class="subtitle">
</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 valign="top" width="50">
<%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
</td>
<td>
<table width="580px" border="0" style="width: 100%;table-layout: fixed">
<tr>
<td colspan="2" valign="top" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
<strong>
<%= h(e.event_title) if @course.nil? || (e.course != nil && @course.id != e.course.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>
<%= 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%>
</td>
</tr>
<tr>
<td colspan="2" width="580px">
<p class="info-break">
<%= e.event_description %>
</p>
</td>
</tr>
<tr>
<td align="left">
<span class="font_lighter">
<%= l :label_activity_time %>
&nbsp;
<%= format_activity_day(day) %>
<%= format_time(e.event_datetime, false) %>
</span>
</td>
<% if e.event_type == "issue" %>
<td align="right">
<span>
<%= link_to l(:label_find_all_comments), issue_path(e.id) %>
</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 -%>
<% if (@events_pages.page == @events_pages.last_page) %>
<div class="font_description">
<table width="660">
<tr>
<td>
<%= image_tag(url_to_avatar(@user), :class => "avatar") %>
</td>
<td colspan="2">
<table width="580">
<tr>
<td>
<% if @canShowRealName %>
(<%= link_to_user(@user, @canShowRealName) %>)
<% else %>
<%= link_to_user(@user)%>
<% end %>
<%= l(:label_user_create_project) %>
<%= link_to @course.name %>
<strong> !</strong>
</td>
</tr>
<tr>
<td class="font_lighter" >
<%= l :label_create_time %>:
<%= format_time(@course.created_at) %>
</table>
</td>
</tr>
</table>
</div>
<% end %>
</div>
<%else%>
<div class="font_description">
<table width="660">
<tr>
<td>
<%= image_tag(url_to_avatar(@user), :class => "avatar") %>
</td>
<td colspan="2">
<table width="580">
<tr>
<td>
<% if @canShowRealName %>
(<%= link_to_user(@user, @canShowRealName) %>)
<% else %>
<%= link_to_user(@user)%>
<% end %>
<%= l(:label_user_create_project) %>
<%= link_to @course.name %>
<strong> !</strong>
</td>
</tr>
<tr>
<td class="font_lighter" style="float: right">
<%= l :label_create_time %>:
<%= format_time(@course.created_at) %>
</table>
</td>
</tr>
</table>
</div>
<% end %>
<div class="pagination">
<ul>
<%= pagination_links_full @events_pages %>
</ul>
</div>
<% 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| -%>
<div class="problem_main">
<a class="problem_pic fl">
<%= image_tag(url_to_avatar(e.event_author), :width => "42", :height => "42") %>
</a>
<div class="problem_txt fl mt5">
<a class="problem_name fl ">jacknudt</a>
<span class="fl"> 有了最新动态:</span>
<a class="problem_tit fl fb"> 附件: 2.2完成乘10运算的图灵机.mp4附件: 2.2完成乘10运算的图灵机.mp4附件: 2.2完成乘10运算的图灵机.mp4</a>
<br />
<p class="mt5">项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题
<br />
发布时间 2014-11-26 10:19
</p>
</div>
<div class="cl"></div>
</div><!--课程动态 end-->
<% end%>
<% end%>
<% end%>
<ul class="wlist" >
<li><a href="#">下一页</a></li>
<li><a href="#">...</a></li>
<li><a href="#">2</a></li>
<li class="wlist_select" ><a href="#">1</a></li>
<li><a href="#">上一页</a></li>
</ul>
<div class="cl"></div>

View File

@ -170,6 +170,13 @@
</div><!--项目标签 end-->
</div><!--LSide end-->
<div id="RSide" class="fl">
<%= render_flash_messages %>
<%= yield %>
<%= call_hook :view_layouts_base_content %>
</div>
<div style="clear:both;"></div>
</div><!--Content end-->
<div class="cl"></div>