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 14:08:48 +08:00
parent dc92e821a3 e90da9d812
commit 4ea7d5ed57
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/organizations/_org_left_subfield_list.html.erb
View File

@ -107,7 +107,7 @@
<%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
<% end %>
<% end %>
<% if User.current.logged? and User.current.admin_of_org?(organization) %>
<% if User.current.logged? and User.current.admin_of_org?(organization) && field.field_type != "Comptec" %>
<%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %>
<% end %>
</div>

6
app/views/organizations/_org_teachers_list.html.erb
View File

@ -14,17 +14,17 @@
<span class="f12 fontGrey2"><%= org_teacher.technical_title %></span></div>
<% end %>
<div class="teacher-social-block">
<div class="block-num"><%= @org_count %></div>
<div class="block-num"><%= org_teacher.courses.count %></div>
<div class="block-title">课程数</div>
</div>
<div class="block-slice"></div>
<div class="teacher-social-block">
<div class="block-num"><%#= org_student_course_count(org_teacher) %>500</div>
<div class="block-num"><%= org_teacher.my_students %>500</div>
<div class="block-title">学生数</div>
</div>
<div class="block-slice"></div>
<div class="teacher-social-block">
<div class="block-num"><%#= org_teacher_resource_count(org_teacher) %></div>
<div class="block-num"><%= org_teacher_resource_count(org_teacher) %></div>
<div class="block-title">资源数</div>
</div>
</div>

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

@ -14,7 +14,9 @@
<!--<option value="2">学生数</option>-->
<!--<option value="3">资源数</option>-->
<!--</select>-->
<div class="teacher-search-type fr">名师列表</div>
<div class="sn-font-grey fr">
<%= link_to "名师列表", teachers_organization_path(@organization), :class => "fontGrey" %>
</div>
<div class="cl"></div>
</div>
<div id="org_teachers_list">