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

Merge branch 'develop' into szzh

This commit is contained in:
sw 2015-09-25 16:57:54 +08:00
parent 3d91786fe2 9b5a362e24
commit 4e7d9f4f72
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/views/attachments/file.html.erb
View File

@ -1,9 +1,14 @@
<h3><%=h @attachment.filename %></h3>
<div id="wrapper">
<div id="wrapper2">
<div id="wrapper3">
<div id="main" class="nosidebar">
<div id="content_">
<h3><%=h @attachment.filename %></h3>
<div class="attachments">
<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
<div class="attachments">
<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
<span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
<span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp
<span class="size">
<% if @attachment!=nil &&(@attachment.container_type == 'Document' || @attachment.container_type == 'WikiPage') &&
@ -15,12 +20,19 @@
}, :class => 'icon icon-add') %>
<% end %>
</span></p>
</div>
&nbsp;
<%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
</div>
&nbsp;
<%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
<% html_title @attachment.filename %>
<% html_title @attachment.filename %>
<% content_for :header_tags do -%>
<% content_for :header_tags do -%>
<%= stylesheet_link_tag "scm" -%>
<% end -%>
<% end -%>
<div style="clear:both;"></div>
</div>
</div>
</div>
</div>
</div>

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

@ -1,5 +1,5 @@
<%# course_model %>
<% teacher_num = teacherCount(@course) %>
<% teacher_num = searchTeacherAndAssistant(@course).count %>
<% student_num = studentCount(@course) %>
<% course_file_num = visable_attachemnts_incourse(@course).count%>
<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>