From 32a2e7ae1ffc52cc181d53a2ef3b46cb363002e6 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 11 Mar 2015 11:38:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=20=E7=94=A8=E6=88=B7=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E6=A1=86=E5=A4=84=E4=BA=8E=E5=85=B3=E9=97=AD=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_feedback.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index 2444af68c..e21500576 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -62,7 +62,7 @@ $.fn.fix = function(options){ var defaults = { float : 'right', - minStatue : false, + minStatue : true, skin : 'blue', durationTime : 1000 } From aa2a41d36826366d8259a99f8a4616065bae1009 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 11 Mar 2015 11:55:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=20?= =?UTF-8?q?=E4=BB=8E=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E7=82=B9=E5=85=A5?= =?UTF-8?q?=E5=90=8E=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=98=BE=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/documents/show.html.erb | 75 +++++++++++++++++-------------- 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb index 5632c9d63..531f68a08 100644 --- a/app/views/documents/show.html.erb +++ b/app/views/documents/show.html.erb @@ -1,38 +1,45 @@
-

<%=h @document.title %>

+

<%= l(:project_module_documents) %>

-
+
+
+ <% 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 %> +
+

+ <%= h @document.title %> +

+

+ <%#=h @document.category.name %> +
+ <%= format_date @document.created_on %> +

+
+ <%= textilizable @document, :description, :attachments => @document.attachments %> +
-
-<% 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 %> -
- - -

<%#=h @document.category.name %>
-<%= format_date @document.created_on %>

-
-<%= textilizable @document, :description, :attachments => @document.attachments %> -
- -
-

<%= l(:label_attachment_plural) %>

-<%= link_to_attachments @document %> - -<% if authorize_for('documents', 'add_attachment') %> -

<%= link_to l(:label_attachment_new), {}, :onclick => "$('#add_attachment_form').show(); return false;", - :id => 'attach_files_link' %>

- <%= form_tag({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %> -
-

<%= render :partial => 'attachments/form' %>

-
- <%= submit_tag l(:button_add) %> - <% end %> -<% end %> - -<% html_title @document.title -%> +
+

<%= l(:label_attachment_plural) %>

+ <%= link_to_attachments @document %> + + <% if authorize_for('documents', 'add_attachment') %> +

+ <%= link_to l(:label_attachment_new), {}, :onclick => "$('#add_attachment_form').show(); return false;", + :id => 'attach_files_link' %> +

+ <%= form_tag({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %> +
+

+ <%= render :partial => 'attachments/form' %> +

+
+ <%= submit_tag l(:button_add) %> + <% end %> + <% end %> + + <% html_title @document.title -%>
From cbfb72bd5bd45170dcbf6c21d0a259589b68adbf Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 11 Mar 2015 14:32:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/new.html.erb | 2 +- app/views/layouts/base_projects.html.erb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/files/new.html.erb b/app/views/files/new.html.erb index be9bcd722..efdc35dcd 100644 --- a/app/views/files/new.html.erb +++ b/app/views/files/new.html.erb @@ -1,5 +1,5 @@
-

<%=l(:label_attachment_new)%>

+

<%= l(:label_course_file) %>

<%= error_messages_for 'attachment' %> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 9b4c22b75..6456b0090 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -112,11 +112,11 @@
<% if @project.project_type == 0 %> <%= l(:label_project_grade)%> : - <%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects', - :action => 'show_projects_score', - :remote => true, - :id => @project.id }, - :style => "color: #EC6300;")%> + <%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects', + :action => 'show_projects_score', + :remote => true, + :id => @project.id }, + :style => "color: #EC6300;") %> <% end %>