Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
This commit is contained in:
commit
4cdef4a22b
|
@ -59,7 +59,7 @@
|
||||||
<div class="sy_con_l fl mb15">
|
<div class="sy_con_l fl mb15">
|
||||||
<%= yield %>
|
<%= yield %>
|
||||||
</div><!--sy_con_l end-->
|
</div><!--sy_con_l end-->
|
||||||
<div class="sy_con_r fr ">
|
<div class="sy_con_r fr mb10">
|
||||||
<div class="sy_right_box" id="syllabus_base_info">
|
<div class="sy_right_box" id="syllabus_base_info">
|
||||||
<%= render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus} %>
|
<%= render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus} %>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue