jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou

This commit is contained in:
Tim 2016-05-13 11:30:08 +08:00
parent 61470c9bd4 457bac0b9d
commit 21a56509fc
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/base_org2.html.erb
View File

@ -157,6 +157,8 @@
<%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %>
<% elsif field.status.to_i == 8 %>
<%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %>
<% elsif field.status.to_i == 23 %>
<%= render :partial => 'organizations/org_subfield_rightM2', :locals => {:field => field} %>
<% end %>
<% end %>
</div>

24
app/views/organizations/_org_subfield_rightM2.html.erb Normal file
View File

@ -0,0 +1,24 @@
<div class="sn-teacher-wrap" style="display:<%= field.hide == 0?'block':'none' %>;">
<h2 class="h2-title sn-mb5">名师风采<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
<div class="sn-teacher-list"><a href="javascript:void(0);" target="_blank"><img src="images/avatar_default.png" width="60" height="60" style="display:block;" class="sn-fl" /></a>
<div class="sn-teacher-info"><a href="javascript:void(0);" class="sn-teacher-name sn-hidden" target=" title="张晓华" _blank">张晓华</a><span class="sn-teacher-unit sn-hidden" title="国防科学技术大学">国防科学技术大学</span> </div>
<div class="sn-teacher-social"><span>博客 8</span><span class="sn-ml20">课程 2</span><span class="sn-ml20">学生 218</span> </div>
<div class="sn-cl"></div>
</div>
<div class="sn-teacher-list"><a href="javascript:void(0);" target="_blank"><img src="images/avatar_default.png" width="60" height="60" style="display:block;" class="sn-fl" /></a>
<div class="sn-teacher-info"><a href="javascript:void(0);" class="sn-teacher-name sn-hidden" target=" title="张晓华" _blank">张晓华</a><span class="sn-teacher-unit sn-hidden" title="国防科学技术大学">国防科学技术大学</span></div><div class="sn-teacher-social"><span>博客 8</span><span class="sn-ml20">课程 2</span><span class="sn-ml20">学生 218</span> </div>
<div class="sn-cl"></div>
</div>
<div class="sn-teacher-list"><a href="javascript:void(0);" target="_blank"><img src="images/avatar_default.png" width="60" height="60" style="display:block;" class="sn-fl" /></a>
<div class="sn-teacher-info"><a href="javascript:void(0);" class="sn-teacher-name sn-hidden" target=" title="张晓华" _blank">张晓华</a><span class="sn-teacher-unit sn-hidden" title="国防科学技术大学">国防科学技术大学</span></div><div class="sn-teacher-social"><span>博客 8</span><span class="sn-ml20">课程 2</span><span class="sn-ml20">学生 218</span> </div>
<div class="sn-cl"></div>
</div>
<div class="sn-teacher-list"><a href="javascript:void(0);" target="_blank"><img src="images/avatar_default.png" width="60" height="60" style="display:block;" class="sn-fl" /></a>
<div class="sn-teacher-info"><a href="javascript:void(0);" class="sn-teacher-name sn-hidden" target=" title="张晓华" _blank">张晓华</a><span class="sn-teacher-unit sn-hidden" title="国防科学技术大学">国防科学技术大学</span></div><div class="sn-teacher-social"><span>博客 8</span><span class="sn-ml20">课程 2</span><span class="sn-ml20">学生 218</span> </div>
<div class="sn-cl"></div>
</div>
<div class="sn-teacher-list sn-border-none"><a href="javascript:void(0);" target="_blank"><img src="images/avatar_default.png" width="60" height="60" style="display:block;" class="sn-fl" /></a>
<div class="sn-teacher-info"><a href="javascript:void(0);" class="sn-teacher-name sn-hidden" target=" title="张晓华" _blank">张晓华</a><span class="sn-teacher-unit sn-hidden" title="国防科学技术大学">国防科学技术大学</span></div><div class="sn-teacher-social"><span>博客 8</span><span class="sn-ml20">课程 2</span><span class="sn-ml20">学生 218</span> </div>
<div class="sn-cl"></div>
</div>
</div>

11
app/views/organizations/teachers.html.erb
View File

@ -9,11 +9,12 @@
<!--<a href="javascript:" class="f_l" onclick="$('#search_student').submit();">搜索</a>-->
<!--<input type="text" placeholder="搜索" class="teacher-list-search fl" />-->
<!--<a href="javascript:void(0);" class="teacher-search-icon fl"></a>-->
<select id="teacher_type_select" class="teacher-search-type fr" onclick="chooseTeacherType('<%= @organization.id %>');">
<option value="1">课程数</option>
<option value="2">学生数</option>
<option value="3">资源数</option>
</select>
<!--<select id="teacher_type_select" class="teacher-search-type fr" onclick="chooseTeacherType('<%#= @organization.id %>');">-->
<!--<option value="1">课程数</option>-->
<!--<option value="2">学生数</option>-->
<!--<option value="3">资源数</option>-->
<!--</select>-->
<div class="teacher-search-type fr">名师列表</div>
<div class="cl"></div>
</div>
<div id="org_teachers_list">