Merge remote-tracking branch 'origin/szzh' 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,8 +1,7 @@
 <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="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) %>
@@ -11,10 +10,14 @@
 			<%= delete_link document_path(@document) %>
 		<% end %>
 	</div>
-
+	<p style="padding-top: 5px">
-
+		<%= h @document.title %>
-<p><em><%#=h @document.category.name %><br />
+	</p>
-<%= format_date @document.created_on %></em></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>
@@ -24,11 +27,15 @@
 	<%= link_to_attachments @document %>
 
 	<% if authorize_for('documents', 'add_attachment') %>
-<p><%= link_to l(:label_attachment_new), {}, :onclick => "$('#add_attachment_form').show(); return false;",
+	<p>
-                                             :id => 'attach_files_link' %></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>
+		<p>
+			<%= render :partial => 'attachments/form' %>
+		</p>
 	</div>
 	<%= submit_tag l(:button_add) %>
 	<% end %>

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,8 +8,7 @@
 
 <% if @versions.any? %>
 <p><label for="version_id"><%=l(:field_version)%></label>
-<%= select_tag "version_id", content_tag('option', '') +
+	<%= select_tag "version_id", content_tag('option', '') + options_from_collection_for_select(@versions, "id", "name") %></p>
-                             options_from_collection_for_select(@versions, "id", "name") %></p>
 <% end %>
 
 <p><label><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form' %></p>

app/views/issues/_newissue_index.html.erb

@@ -2,7 +2,7 @@
   <h2 class="project_h2">问题跟踪</h2>
 </div>
 <div class="problem_top">
-  <% if @project.enabled_modules.where("name = 'issue_tracking'").count > 0 %>
+  <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
       <span>
         <% if User.current.member_of?(@project) %>
             <%= link_to l(:label_issue_new), {:controller => 'issues', :action => 'new', :copy_from => nil}, :param => :project_id, :caption => :label_issue_new,

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

@@ -137,6 +137,7 @@
 										<div class="subNav">
 											<%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
 										</div>
+                                          <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
                                             <div class="subNav">
                                                 <%= link_to l(:label_issue_tracking), project_issues_path(@project), :style => "color:#3CA5C6" %><span  class="subnav_num">(<%= @project.issues.count %>)</span>
                                                 <span>
@@ -144,6 +145,8 @@
                                                     <%= link_to "+发布问题", new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %></span>
                                                   <% end %>
                                             </div>
+                                          <% end%>
+                                      <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
 										<div class="subNav">
 											<%= link_to "讨论区", project_boards_path(@project), :style => "color:#3CA5C6" %>
 											<span  class="subnav_num">(<%= @project.boards.first.topics.count %>)</span>
@@ -151,12 +154,16 @@
 											    <%= link_to "+发贴", project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
+                                      <% end%>
+                                      <% unless @project.enabled_modules.where("name = 'files'").empty? %>
 										<div class="subNav">
 											<%= link_to l(:label_course_file), project_files_path(@project), :style => "color:#3CA5C6" %><span  class="subnav_num">(<%= @project.attachments.count  %>)</span>
                                             <% if User.current.logged? &&  User.current.member_of?(@project) %>
                                                 <%= link_to "+上传资源", new_project_file_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
+                                      <% end%>
+                                      <% unless @project.enabled_modules.where("name = 'repository'").empty? %>
 										<div class="subNav">
 											<%= link_to l(:field_user_active_changeset), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
 											<span  class="subnav_num">(<%= @project.repositories.count %>)</span>
@@ -164,6 +171,7 @@
 											    <%= link_to "+创建版本库",  new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
                                             <% end %>
 										</div>
+                                      <% end %>
 
 										<div class="subNav subNav_jiantou"><%= l(:label_more) %></div>
 										<ul class="navContent" style="padding-left: 0px">

app/views/projects/_tools_expand.html.erb

@@ -4,27 +4,41 @@
     <% end %>
 </li>
 <li>
+  <% unless @project.enabled_modules.where("name = 'news'").empty? %>
     <%= link_to l(:field_user_active_news), project_news_index_path(@project) %>
+  <% end%>
 </li>
 <li>
+  <% unless @project.enabled_modules.where("name = 'wiki'").empty? %>
 	<%= link_to l(:project_module_wiki), project_wiki_path(@project) %>
+  <% end %>
 </li>
 <li>
+  <% unless @project.enabled_modules.where("name = 'code_review'").empty? %>
 	<%= link_to l(:project_module_code_review), {controller: 'code_review', action: 'index', id: @project.id} %>
+  <% end %>
 </li>
 <li>
+  <% unless @project.enabled_modules.where("name = 'calendar'").empty? %>
 	<%= link_to l(:project_module_calendar),project_calendar_path(@project) %>
+  <% end %>
 </li>
 <li>
+  <% unless @project.enabled_modules.where("name = 'gantt'").empty? %>
 	<%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
+  <% end %>
 </li>
 <li>
+  <% unless @project.enabled_modules.where("name = 'documents'").empty? %>
 	<%= link_to l(:project_module_documents), project_documents_path(@project) %>
+  <% end %>
 </li>
 <li>
 	<%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%>
 </li>
 <li>
+  <% unless @project.enabled_modules.where("name = 'dts'").empty? %>
 	<%= link_to l(:label_module_share) ,share_show_path(@project) %>
+  <% end %>
 </li>
 

config/locales/en.yml

@@ -384,9 +384,7 @@ en:
   # steam the student
   label_current_group: Current group
   # DTS Test tool
-  project_module_dts: DTS Test tool
   label_module_share: DTS Test tool
-  field_dts_test: DTS Test tool
   # Feedback module
   label_technical_support: Support ：
   label_feedback: Feedback

config/locales/zh.yml

@@ -522,7 +522,7 @@ zh:
   project_module_time_tracking: 时间跟踪
   project_module_news: 新闻
   project_module_documents: 文档
-  project_module_files: 作品下载
+  project_module_files: 资源库
   project_module_attachments: 资源
   project_module_wiki: Wiki
   project_module_repository: 版本库
@@ -530,7 +530,6 @@ zh:
   project_module_calendar: 日历
   project_module_gantt: 甘特图
   project_module_course: 课程
-  project_module_dts: DTS测试工具
   label_module_share: DTS测试工具
   project_module_code_review: 代码审查
   label_user: 用户
@@ -1965,8 +1964,6 @@ zh:
   label_course_brief_introduction: 课程简介
   field_teacher_name: 教 师
 
-  field_dts_test: DTS测试工具
-
   label_newbie_faq: '新手指引 & 问答'
   label_hot_project: '热门项目'
   label_borad_project: 项目讨论区