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

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

This commit is contained in:
cxt 2016-09-02 18:19:43 +08:00
parent 22e914eec2 7b6657a3e6
commit c794c6197d
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/files/_course_file.html.erb
View File

@ -124,12 +124,14 @@
</div> </div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<% if !User.current.member_of_course?(@course) && show_attachment_tip(@course.id, "Course") %>
<div class="resource_tip_box fontGrey2"> <div class="resource_tip_box fontGrey2">
<em></em> <em></em>
<span></span> <span></span>
<p class="mb5">私有资源：<br/>仅对本班级成员可见</p> <p class="mb5">私有资源：<br/>仅对本班级成员可见</p>
<p>公共资源：<br/>对所有用户可见</p> <p>公共资源：<br/>对所有用户可见</p>
</div> </div>
<% end %>
</div> </div>
<div id="course_list"> <div id="course_list">
<%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %> <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %>

3
app/views/files/_tip_attachment_count.html.erb
View File

@ -1,4 +1,5 @@
共有&nbsp;<span id="attachment_count"><%= @tip_all_attachments %></span>&nbsp;个资源 共有&nbsp;<span id="attachment_count"><%= @tip_all_attachments %></span>&nbsp;个资源
<% if @tip_all_private_attachments != 0 %>
<span id="attachment_count_public" class="fontGrey2 ml10" style="font-weight: normal;">公共资源：<%= @tip_all_public_attachments %>个</span> <span id="attachment_count_public" class="fontGrey2 ml10" style="font-weight: normal;">公共资源：<%= @tip_all_public_attachments %>个</span>
<% if @project %> <% if @project %>
<% if !User.current.member_of?(@project) && params[:tag_name] %> <% if !User.current.member_of?(@project) && params[:tag_name] %>
@ -13,3 +14,5 @@
<span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：<%= @tip_all_private_attachments %>个</span> <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：<%= @tip_all_private_attachments %>个</span>
<% end %> <% end %>
<% end %> <% end %>
<% end %>