Merge branch 'guange_dev' into szzh
This commit is contained in:
commit
c0e1eb85a1
|
@ -21,7 +21,7 @@
|
||||||
<br />
|
<br />
|
||||||
<%= l :label_activity_time %> : <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %>
|
<%= l :label_activity_time %> : <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %>
|
||||||
</p>
|
</p>
|
||||||
<%= link_to_attachments_course(e) %>
|
<%= link_to_attachments_course(e) if e.is_a?(News) %>
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div><!--课程动态 end-->
|
</div><!--课程动态 end-->
|
||||||
|
|
Loading…
Reference in New Issue