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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
z9hang 2015-03-11 14:52:36 +08:00
parent 14fe487835 cbfb72bd5b
commit c552a22fb2
4 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
app/views/documents/show.html.erb
View File

@ -1,38 +1,45 @@
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2"><%=h @document.title %></h2> <h2 class="project_h2"><%= l(:project_module_documents) %></h2>
</div> </div>
<div class="frame-wiki"> <div class="frame-wiki">
<div class="contextual">
<% if User.current.allowed_to?(:edit_documents, @project) %>
<%= link_to l(:button_edit), edit_document_path(@document), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
<% end %>
<% if User.current.allowed_to?(:delete_documents, @project) %>
<%= delete_link document_path(@document) %>
<% end %>
</div>
<p style="padding-top: 5px">
<%= h @document.title %>
</p>
<p>
<em><%#=h @document.category.name %>
<br />
<%= format_date @document.created_on %></em>
</p>
<div class="wiki">
<%= textilizable @document, :description, :attachments => @document.attachments %>
</div>
<div class="contextual"> <div style="border-top:solid 1px #C6E9F1;"></div>
<% if User.current.allowed_to?(:edit_documents, @project) %> <h3><%= l(:label_attachment_plural) %></h3>
<%= link_to l(:button_edit), edit_document_path(@document), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %> <%= link_to_attachments @document %>
<% end %>
<% if User.current.allowed_to?(:delete_documents, @project) %> <% if authorize_for('documents', 'add_attachment') %>
<%= delete_link document_path(@document) %> <p>
<% end %> <%= link_to l(:label_attachment_new), {}, :onclick => "$('#add_attachment_form').show(); return false;",
</div> :id => 'attach_files_link' %>
</p>
<%= form_tag({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
<p><em><%#=h @document.category.name %><br /> <div class="box">
<%= format_date @document.created_on %></em></p> <p>
<div class="wiki"> <%= render :partial => 'attachments/form' %>
<%= textilizable @document, :description, :attachments => @document.attachments %> </p>
</div> </div>
<%= submit_tag l(:button_add) %>
<div style="border-top:solid 1px #C6E9F1;"></div> <% end %>
<h3><%= l(:label_attachment_plural) %></h3> <% end %>
<%= link_to_attachments @document %>
<% html_title @document.title -%>
<% if authorize_for('documents', 'add_attachment') %>
<p><%= link_to l(:label_attachment_new), {}, :onclick => "$('#add_attachment_form').show(); return false;",
:id => 'attach_files_link' %></p>
<%= form_tag({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
<div class="box">
<p><%= render :partial => 'attachments/form' %></p>
</div>
<%= submit_tag l(:button_add) %>
<% end %>
<% end %>
<% html_title @document.title -%>
</div> </div>

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

@ -1,5 +1,5 @@
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2"><%=l(:label_attachment_new)%></h2> <h2 class="project_h2"><%= l(:label_course_file) %></h2>
</div> </div>
<%= error_messages_for 'attachment' %> <%= error_messages_for 'attachment' %>

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

@ -62,7 +62,7 @@
$.fn.fix = function(options){ $.fn.fix = function(options){
var defaults = { var defaults = {
float : 'right', float : 'right',
minStatue : false, minStatue : true,
skin : 'blue', skin : 'blue',
durationTime : 1000 durationTime : 1000
} }

10
app/views/layouts/base_projects.html.erb
View File

@ -112,11 +112,11 @@
<div class="pr_info_score"> <div class="pr_info_score">
<% if @project.project_type == 0 %> <% if @project.project_type == 0 %>
<%= l(:label_project_grade)%> : <%= l(:label_project_grade)%> :
<%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects', <%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects',
:action => 'show_projects_score', :action => 'show_projects_score',
:remote => true, :remote => true,
:id => @project.id }, :id => @project.id },
:style => "color: #EC6300;")%> :style => "color: #EC6300;") %>
<% end %> <% end %>
</div> </div>
<div class="pr_info_foot"> <div class="pr_info_foot">