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

app/controllers/files_controller.rb

@@ -21,6 +21,7 @@ class FilesController < ApplicationController
 
   menu_item :files
   before_filter :auth_login1, :only => [:index]
+  before_filter :logged_user_by_apptoken,:only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
   before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search]
 

app/services/courses_service.rb

@@ -382,7 +382,7 @@ class CoursesService
       end
       latest_bid_message = messages.first
       unless latest_bid_message.nil?
-        latest_course_dynamics << {:type => 2,:time => latest_bid_message.created_on,:message => '最近更新了留言'}#l(:label_recently_updated_message,:locale => current_user.language.nil? ? 'zh':current_user.language)}
+        latest_course_dynamics << {:type => 4,:time => latest_bid_message.created_on,:message => '最近更新了作业'}#l(:label_recently_updated_message,:locale => current_user.language.nil? ? 'zh':current_user.language)}
       end
       #每个作业中学生最后提交的作业
       homeworks = []

app/views/admin/mobile_version.html.erb

@@ -36,7 +36,7 @@
     <% end %>
   </tbody>
 </table>
-<% if @versions.first.attachments.any?%>
+<% if !@versions.first.nil? && @versions.first.attachments.any?%>
     <% options = {:author => true, :deletable => true } %>
     <%= render :partial => 'attachments/links', :locals => {:attachments => @versions.first.attachments, :options => options, :is_float => true} %>
 <% end %>

app/views/documents/index.html.erb

@@ -28,7 +28,7 @@
 </div>
 
 <% if @grouped.empty? %>
-    <p class="nodata">
+    <p class="nodata" style="margin-top: 30px;">
       <%= l(:label_no_data) %>
     </p>
 <% end %>

app/views/documents/show.html.erb

@@ -1,38 +1,45 @@
 <div class="project_r_h">
-  <h2 class="project_h2"><%=h @document.title %></h2>
+	<h2 class="project_h2"><%= l(:project_module_documents) %></h2>
 </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">
-<% 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><em><%#=h @document.category.name %><br />
-<%= format_date @document.created_on %></em></p>
-<div class="wiki">
-<%= textilizable @document, :description, :attachments => @document.attachments %>
-</div>
-
-<div style="border-top:solid 1px #C6E9F1;"></div>
-<h3><%= l(:label_attachment_plural) %></h3>
-<%= link_to_attachments @document %>
-
-<% 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 style="border-top:solid 1px #C6E9F1;"></div>
+	<h3><%= l(:label_attachment_plural) %></h3>
+	<%= link_to_attachments @document %>
+
+	<% 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>

app/views/files/new.html.erb

@@ -1,5 +1,5 @@
 <div class="project_r_h">
-  <h2 class="project_h2"><%=l(:label_attachment_new)%></h2>
+  <h2 class="project_h2"><%= l(:label_course_file) %></h2>
 </div>
 
 <%= error_messages_for 'attachment' %>
@@ -8,11 +8,10 @@
 
 <% if @versions.any? %>
 <p><label for="version_id"><%=l(:field_version)%></label>
-<%= select_tag "version_id", content_tag('option', '') +
-                             options_from_collection_for_select(@versions, "id", "name") %></p>
+	<%= select_tag "version_id", content_tag('option', '') + options_from_collection_for_select(@versions, "id", "name") %></p>
 <% end %>
 
-<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
+<p><label><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form' %></p>
 </div>
 <%= submit_tag l(:button_add) %>
 <% end %>

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
         }

app/views/layouts/base_projects.html.erb

@@ -112,11 +112,11 @@
 									<div class="pr_info_score">
 										<% 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 %>
 									</div>
 									<div class="pr_info_foot">