From 720c75478a1912f3779ab62103a4f534efe617df Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 10 Jul 2014 10:15:20 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8F=AF=E4=BC=A0=E9=9D=9E=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/avatar/_avatar_form.html.erb |  3 +++
 config/configuration.yml               |  1 +
 config/locales/zh.yml                  |  1 +
 lib/redmine/configuration.rb           |  3 ++-
 public/javascripts/avatars.js          | 26 +++++++++++++++++++++++++-
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/app/views/avatar/_avatar_form.html.erb b/app/views/avatar/_avatar_form.html.erb
index 272397c62..a880f32aa 100644
--- a/app/views/avatar/_avatar_form.html.erb
+++ b/app/views/avatar/_avatar_form.html.erb
@@ -45,6 +45,7 @@
 <a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
 	<span><%= l(:button_upload_photo) %></span>
 </a>
+  <!--         :accept => 'image/png,image/gif,image/jpeg', -->
 <span class="add_avatar" style="margin-left: -55px;width: 70px">
 	<%= file_field_tag 'avatar[image]',
       	:id => nil,
@@ -57,6 +58,8 @@
         	:max_file_size => Setting.attachment_max_size.to_i.kilobytes,
         	:max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
         	:max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+            :file_type => Redmine::Configuration['pic_types'].to_s,
+            :type_support_message => l(:error_pic_type),
         	:upload_path => upload_avatar_path(:format => 'js'),
         	:description_placeholder => nil ,# l(:label_optional_description)
         	:source_type => source.class.to_s,
diff --git a/config/configuration.yml b/config/configuration.yml
index a98ea3391..4bdd279aa 100644
--- a/config/configuration.yml
+++ b/config/configuration.yml
@@ -199,6 +199,7 @@ default:
 
   # Maximum number of simultaneous AJAX uploads
   #max_concurrent_ajax_uploads: 2
+  #pic_types: "bmp,jpeg,jpg,png,gif"
 
 # specific configuration options for production environment
 # that overrides the default ones
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 1b3774d65..716889bbc 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1217,6 +1217,7 @@ zh:
   button_export: 导出
   label_export_options: "%{export_format} 导出选项"
   error_attachment_too_big: 该文件无法上传。超过文件大小限制 (%{max_size})
+  error_pic_type: "仅支持如下图片格式："
   notice_failed_to_save_time_entries: "无法保存下列所选取的 %{total} 个项目中的 %{count} 工时： %{ids}。"
   label_x_issues:
     zero:  0 问题
diff --git a/lib/redmine/configuration.rb b/lib/redmine/configuration.rb
index 6723b777e..ba8e91294 100644
--- a/lib/redmine/configuration.rb
+++ b/lib/redmine/configuration.rb
@@ -21,7 +21,8 @@ module Redmine
     # Configuration default values
     @defaults = {
       'email_delivery' => nil,
-      'max_concurrent_ajax_uploads' => 2
+      'max_concurrent_ajax_uploads' => 2,
+      'pic_types' => "bmp,jpeg,jpg,png,gif"
     }
 
     @config = nil
diff --git a/public/javascripts/avatars.js b/public/javascripts/avatars.js
index 24bc1ee1c..db9a2255e 100644
--- a/public/javascripts/avatars.js
+++ b/public/javascripts/avatars.js
@@ -140,10 +140,34 @@ function uploadAndAttachFiles(files, inputEl) {
   if (sizeExceeded) {
     window.alert(maxFileSizeExceeded);
   } else {
-    $.each(files, function() {addFile(inputEl, this, true);});
+      uploadAndTypeFiles(files,inputEl);
+    //$.each(files, function() {addFile(inputEl, this, true);});
   }
 }
 
+function uploadAndTypeFiles(files, inputEl) {
+
+    var enableType = $(inputEl).data('file-type');
+    var typeSupportrdMessage = $(inputEl).data('type-support-message');
+    if (enableType == null || enableType.trim() == "")
+    {
+        $.each(files, function() {addFile(inputEl, this, true);});
+        return;
+    }
+    var typeSupported = false;
+     $.each(files, function() {
+        var a = this.name.split('.');
+         var type = a[a.length-1];
+         var rs = enableType.indexOf(type);
+         if(rs >= 0) {typeSupported = true }
+     });
+    if (typeSupported) {
+        $.each(files, function() {addFile(inputEl, this, true);});
+    } else {
+        window.alert(typeSupportrdMessage + enableType);
+    }
+}
+
 function handleFileDropEvent(e) {
 
   $(this).removeClass('fileover');

From b4dd8409eb57b17bce852226dcabaeceb8361a38 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 10 Jul 2014 17:38:04 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=89=98=E7=AE=A1=E5=B9=B3=E5=8F=B0=E9=A6=96=E9=A1=B5=E5=AE=9A?=
 =?UTF-8?q?=E5=88=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb           | 30 +++++++++++++++++++
 app/controllers/welcome_controller.rb         |  2 +-
 app/helpers/application_helper.rb             |  7 ++++-
 app/models/first_page.rb                      |  3 ++
 app/views/admin/first_page_made.html.erb      | 28 +++++++++++++++++
 app/views/users/_score_new_index.html.erb     |  6 ++--
 app/views/users/_show_new_score.html.erb      | 12 ++++----
 app/views/users/_user_score.html.erb          |  2 +-
 app/views/users/show_new_score.html.erb       | 12 ++++----
 app/views/welcome/index.html.erb              | 12 ++++++--
 config/locales/zh.yml                         |  5 ++++
 config/routes.rb                              |  1 +
 .../20140710071720_create_first_pages.rb      | 17 +++++++++++
 db/schema.rb                                  | 10 ++++++-
 lib/redmine.rb                                |  1 +
 test/fixtures/first_pages.yml                 | 11 +++++++
 test/unit/first_page_test.rb                  |  7 +++++
 17 files changed, 144 insertions(+), 22 deletions(-)
 create mode 100644 app/models/first_page.rb
 create mode 100644 app/views/admin/first_page_made.html.erb
 create mode 100644 db/migrate/20140710071720_create_first_pages.rb
 create mode 100644 test/fixtures/first_pages.yml
 create mode 100644 test/unit/first_page_test.rb

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 2a3ce15d8..152fb059e 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -234,4 +234,34 @@ class AdminController < ApplicationController
       format.api
     end
   end
+
+  #首页定制
+  def first_page_made
+    if request.get?
+      @first_page = FirstPage.all.first
+    elsif request.post?
+      @first_page = FirstPage.all.first
+      @first_page.web_title = params[:web_title]
+      @first_page.description = params[:description]
+      @first_page.title = params[:title]
+      if @first_page.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_update)
+            redirect_to admin_first_page_made_path
+          }
+          format.api  { render_api_ok }
+        end
+      else
+        respond_to do |format|
+          format.html {
+            first_page_made
+            render :action => 'first_page_made'
+          }
+          format.api  { render_validation_errors(@first_page) }
+        end
+      end
+    end
+
+  end
 end
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index bf18332df..0920d2e42 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -21,7 +21,7 @@ class WelcomeController < ApplicationController
   before_filter :entry_select, :only => [:index]
  
   def index
-
+    @first_page = FirstPage.all.first
   end
 
   def robots
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c9dc4fa26..3f873a64d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -625,10 +625,15 @@ module ApplicationHelper
   end
 
   def html_title(*args)
+    first_page = FirstPage.all.first
     if args.empty?
       title = @html_title || []
       title << @project.name if @project
-      title << Setting.app_title unless Setting.app_title == title.last
+      if first_page.nil? || first_page.web_title.nil?
+        title << Setting.app_title unless Setting.app_title == title.last
+      else
+        title << first_page.web_title unless  first_page.web_title == title.last
+      end
       title.select {|t| !t.blank? }.join(' - ')
     else
       @html_title ||= []
diff --git a/app/models/first_page.rb b/app/models/first_page.rb
new file mode 100644
index 000000000..8d8bbcff6
--- /dev/null
+++ b/app/models/first_page.rb
@@ -0,0 +1,3 @@
+class FirstPage < ActiveRecord::Base
+  attr_accessible :description, :title, :web_title
+end
diff --git a/app/views/admin/first_page_made.html.erb b/app/views/admin/first_page_made.html.erb
new file mode 100644
index 000000000..9e863d813
--- /dev/null
+++ b/app/views/admin/first_page_made.html.erb
@@ -0,0 +1,28 @@
+<h3><%=l(:label_first_page_made)%></h3>
+
+<%= form_tag(:controller => 'admin', :action => 'first_page_made') do %>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
+     </p>
+    <div style="margin-left: 82px;">
+        <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@first_page} %>
+    </div>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='web_title'><%= l(:label_web_title) %>:</label>
+    <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+      </p>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
+      <%= text_field_tag 'title', params[:label_site_title], :value => @first_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+      </p>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
+      <%= text_area_tag 'description',@first_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+      <%= submit_tag l(:button_save), :class => "small", :name => nil %>
+<% end %>
+<div>
+
+
+
+</div>
\ No newline at end of file
diff --git a/app/views/users/_score_new_index.html.erb b/app/views/users/_score_new_index.html.erb
index 43687aa78..0f5d96a45 100644
--- a/app/views/users/_score_new_index.html.erb
+++ b/app/views/users/_score_new_index.html.erb
@@ -28,7 +28,7 @@
 <div> = <%= l(:label_user_score_of_collaboration) %> + <%= l(:label_user_score_of_influence) %> +
   <%= l(:label_user_score_of_skill)%> + <%= l(:label_user_score_of_active) %></div>
 <!-- <div>&nbsp;&nbsp;&nbsp;+ <%= l(:label_user_score_of_influence) %></div> -->
-<div> = <%= format("%.2f" ,@user.user_score_attr.collaboration.nil? ? 0:@user.user_score_attr.collaboration).to_f %> +  <%= format("%.2f" , @user.user_score_attr.influence.nil? ? 0:@user.user_score_attr.influence ).to_f %>
-   + <%= format("%.2f" , @user.user_score_attr.skill.nil? ? 0:@user.user_score_attr.skill).to_f %> + <%= format("%.2f" , @user.user_score_attr.active.nil? ? 0:@user.user_score_attr.active).to_f %></div>
-<div> = <%= format("%.2f" ,@user.user_score_attr.total_score.nil? ? 0:@user.user_score_attr.total_score).to_f %></div>
+<div> = <%= format("%.2f" ,@user.user_score_attr.collaboration.nil? ? 0:@user.user_score_attr.collaboration).to_i %> +  <%= format("%.2f" , @user.user_score_attr.influence.nil? ? 0:@user.user_score_attr.influence ).to_i %>
+   + <%= format("%.2f" , @user.user_score_attr.skill.nil? ? 0:@user.user_score_attr.skill).to_i %> + <%= format("%.2f" , @user.user_score_attr.active.nil? ? 0:@user.user_score_attr.active).to_i %></div>
+<div> = <%= format("%.2f" ,@user.user_score_attr.total_score.nil? ? 0:@user.user_score_attr.total_score).to_i %></div>
 <!-- end -->
diff --git a/app/views/users/_show_new_score.html.erb b/app/views/users/_show_new_score.html.erb
index c5f15694e..fddca46ac 100644
--- a/app/views/users/_show_new_score.html.erb
+++ b/app/views/users/_show_new_score.html.erb
@@ -38,7 +38,7 @@
       <td>
         <table>
           <tr class="info_font"><td><%= l(:label_user_score) %></td></tr>
-          <tr class="buttons_for_score" style="margin-top:30px;margin-left:144px"><td><span style="color:#ec6300"><%= format("%.2f" , @user.user_score_attr.total_score).to_f %></span></td></tr>
+          <tr class="buttons_for_score" style="margin-top:30px;margin-left:144px"><td><span style="color:#ec6300"><%= format("%.2f" , @user.user_score_attr.total_score).to_i %></span></td></tr>
         </table>
       </td>
     </tr>
@@ -49,23 +49,23 @@
   <table style="border-bottom: solid 0px #80a6d2;" width="100%">
     <tr>
       <%= link_to l(:label_user_score) , {:controller => 'users', :action => 'score_new_index', :remote => true} %> :
-      <%= format("%.2f" , @user.user_score_attr.total_score).to_f %>
+      <%= format("%.2f" , @user.user_score_attr.total_score).to_i %>
     </tr><br>
     <tr>
       <%= link_to l(:label_user_score_of_collaboration), {:controller => 'users',:action => 'topic_new_score_index', :remote => true} %> :
-      <%= format("%.2f" , @user.user_score_attr.collaboration.nil? ? 0:@user.user_score_attr.collaboration).to_f %>
+      <%= format("%.2f" , @user.user_score_attr.collaboration.nil? ? 0:@user.user_score_attr.collaboration).to_i %>
     </tr><br>
     <tr>
       <%= link_to l(:label_user_score_of_influence), {:controller => 'users',:action => 'project_new_score_index', :remote => true} %> :
-      <%= format("%.2f" ,  @user.user_score_attr.influence.nil? ? 0:@user.user_score_attr.influence).to_f %>
+      <%= format("%.2f" ,  @user.user_score_attr.influence.nil? ? 0:@user.user_score_attr.influence).to_i %>
     </tr><br>
     <tr>
       <%= link_to l(:label_user_score_of_skill), {:controller => 'users',:action => 'activity_new_score_index', :remote => true} %> :
-      <%= format("%.2f" , @user.user_score_attr.skill.nil? ? 0:@user.user_score_attr.skill).to_f %>
+      <%= format("%.2f" , @user.user_score_attr.skill.nil? ? 0:@user.user_score_attr.skill).to_i %>
     </tr><br>
     <tr>
       <%= link_to l(:label_user_score_of_active), {:controller => 'users',:action => 'influence_new_score_index', :remote => true} %> ：
-      <%= format("%.2f" , @user.user_score_attr.active.nil? ? 0:@user.user_score_attr.active).to_f %>
+      <%= format("%.2f" , @user.user_score_attr.active.nil? ? 0:@user.user_score_attr.active).to_i %>
     </tr><br>
   </table>
 
diff --git a/app/views/users/_user_score.html.erb b/app/views/users/_user_score.html.erb
index d047c11d0..53f05a2dd 100644
--- a/app/views/users/_user_score.html.erb
+++ b/app/views/users/_user_score.html.erb
@@ -1,5 +1,5 @@
 <%= l(:label_user_grade)%>:
-<%= link_to(format("%.2f" , user.user_score_attr.total_score).to_f, {:controller => 'users',
+<%= link_to(format("%.2f" , user.user_score_attr.total_score).to_i, {:controller => 'users',
                                                                       :action => 'show_new_score',
                                                                       :remote => true,
                                                                       :id => user.id
diff --git a/app/views/users/show_new_score.html.erb b/app/views/users/show_new_score.html.erb
index 07e82fd5f..0efae940c 100644
--- a/app/views/users/show_new_score.html.erb
+++ b/app/views/users/show_new_score.html.erb
@@ -53,7 +53,7 @@
       <td>
         <table>
           <tr class="info_font"><td><%= l(:label_user_score) %></td></tr>
-          <tr class="buttons_for_score" style="margin-top:30px;margin-left:144px"><td><span style="color:#ec6300"><%= format("%.2f" , @user.user_score_attr.total_score).to_f %></span></td></tr>
+          <tr class="buttons_for_score" style="margin-top:30px;margin-left:144px"><td><span style="color:#ec6300"><%= format("%.2f" , @user.user_score_attr.total_score).to_i %></span></td></tr>
         </table>
       </td>
     </tr>
@@ -64,23 +64,23 @@
   <table style="border-bottom: solid 0px #80a6d2;" width="100%">
     <tr>
       <%= l(:label_user_score) %> :
-      <%= format("%.2f" , @user.user_score_attr.total_score).to_f %>
+      <%= format("%.2f" , @user.user_score_attr.total_score).to_i %>
     </tr><br>
     <tr>
       <%=  l(:label_user_score_of_collaboration) %> :
-      <%= format("%.2f" , @user.user_score_attr.collaboration.nil? ? 0:@user.user_score_attr.collaboration).to_f %>
+      <%= format("%.2f" , @user.user_score_attr.collaboration.nil? ? 0:@user.user_score_attr.collaboration).to_i %>
     </tr><br>
     <tr>
       <%=  l(:label_user_score_of_influence) %> :
-      <%= format("%.2f" ,  @user.user_score_attr.influence.nil? ? 0:@user.user_score_attr.influence).to_f %>
+      <%= format("%.2f" ,  @user.user_score_attr.influence.nil? ? 0:@user.user_score_attr.influence).to_i %>
     </tr><br>
     <tr>
       <%=  l(:label_user_score_of_skill) %> :
-      <%= format("%.2f" , @user.user_score_attr.skill.nil? ? 0:@user.user_score_attr.skill).to_f %>
+      <%= format("%.2f" , @user.user_score_attr.skill.nil? ? 0:@user.user_score_attr.skill).to_i %>
     </tr><br>
     <tr>
       <%=  l(:label_user_score_of_active) %> ：
-      <%= format("%.2f" , @user.user_score_attr.active.nil? ? 0:@user.user_score_attr.active).to_f %>
+      <%= format("%.2f" , @user.user_score_attr.active.nil? ? 0:@user.user_score_attr.active).to_i %>
     </tr><br>
   </table>
 
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 345f47739..ffc9706e9 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -30,13 +30,19 @@
 	<div id="identifier-pannel" style="display:none">
 		<%= link_to image_tag('/images/qrweixin.jpg', size: '150x150', alt: 'trustie', class: "weixin" ), home_path %>
 		<div class="weixin-content">微信扫码</div>
-	</div> 
+	</div>
 	<div class="main-content-bar" id="main-content-bar">
 		<div style="float: left">
-			<%= image_tag '/images/transparent.png', size: "75x75" %>
+          <!-- <#%= image_tag(get_project_avatar(@first_page), size: "75x75") %>  -->
+          <% if get_avatar?(@first_page) %>
+              <%= image_tag(url_to_avatar(@first_page), size: "75x75") %>
+          <% else %>
+              <%= image_tag '/images/transparent.png', size: "75x75" %>
+          <% end %>
+
 		</div>		
 	<div class="welcome_left" id="welcome_left">
-		<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_project) %></span> <span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_project_description) %></span>
+		<span class="font_welcome_trustie"><%= @first_page.title %></span> <span class="font_welcome_tdescription">, <%= @first_page.description %></span>
 	</div>
 	<div class="search-bar" id="search-bar">
 		<%= render :partial => "search_project", :locals => {:project_type => 0}%>	
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 716889bbc..11c9e054a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -515,6 +515,7 @@ zh:
   label_project_new_description: '项目可以是软件开发项目，也可以是协作研究项目。'
   label_project_plural: 项目列表
   label_project_score: 项目评分
+  label_first_page_made: 首页定制
   label_x_projects:
     zero:  无项目
     one:   1 个项目
@@ -561,6 +562,10 @@ zh:
   label_login_with_open_id_option: 或使用OpenID登录
   label_password_lost: 忘记密码
   label_home: 主页
+  label_web_title: 浏览器标题
+  label_site_title: 网站标题
+  label_site_description: 网站简介
+  label_site_image: 简介图片
   #by young
   label_requirement: 需求
   label_new_course: 课程列表
diff --git a/config/routes.rb b/config/routes.rb
index f9dd53cf3..7c5f878eb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -558,6 +558,7 @@ RedmineApp::Application.routes.draw do
   match 'admin', :controller => 'admin', :action => 'index', :via => :get
   match 'admin/projects', :controller => 'admin', :action => 'projects', :via => :get
   match 'admin/users', :controller => 'admin', :action => 'users', :via => :get
+  match 'admin/first_page_made',:controller => 'admin',:action => 'first_page_made',:via => [:get,:post]
   match 'admin/search', :controller => 'admin', :action => 'search', :via => [:get, :post]
   match 'admin/plugins', :controller => 'admin', :action => 'plugins', :via => :get
   match 'admin/info', :controller => 'admin', :action => 'info', :via => :get
diff --git a/db/migrate/20140710071720_create_first_pages.rb b/db/migrate/20140710071720_create_first_pages.rb
new file mode 100644
index 000000000..fa7d01601
--- /dev/null
+++ b/db/migrate/20140710071720_create_first_pages.rb
@@ -0,0 +1,17 @@
+# -*coding:utf-8 -*-
+class CreateFirstPages < ActiveRecord::Migration
+  def change
+    create_table :first_pages do |t|
+      t.string :web_title
+      t.string :title
+      t.string :description
+
+      t.timestamps
+    end
+    fp = FirstPage.new
+    fp.web_title = "Trustie - 为大学生技术创新筑巢"
+    fp.title = "Trustie在线项目托管平台"
+    fp.description = "面向中国大学生与软件从业者，提供社交化的项目管理、代码托管、资源共享、合作交流。"
+    fp.save
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6e750aa9f..d84c30f9a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140708023356) do
+ActiveRecord::Schema.define(:version => 20140710071720) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -406,6 +406,14 @@ ActiveRecord::Schema.define(:version => 20140708023356) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
+  create_table "first_pages", :force => true do |t|
+    t.string   "web_title"
+    t.string   "title"
+    t.string   "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
   create_table "forums", :force => true do |t|
     t.string   "name",                         :null => false
     t.string   "description",  :default => ""
diff --git a/lib/redmine.rb b/lib/redmine.rb
index e17d657c8..6215a04ba 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -351,6 +351,7 @@ end
 Redmine::MenuManager.map :admin_menu do |menu|
   menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
   menu.push :users, {:controller => 'admin', :action => 'users'}, :caption => :label_user_plural
+  menu.push :first_page_made, {:controller => 'admin',:action => 'first_page_made'},:caption => :label_first_page_made
   menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural
   menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions
   menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural
diff --git a/test/fixtures/first_pages.yml b/test/fixtures/first_pages.yml
new file mode 100644
index 000000000..5af4dd417
--- /dev/null
+++ b/test/fixtures/first_pages.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  web_title: MyString
+  title: MyString
+  description: MyString
+
+two:
+  web_title: MyString
+  title: MyString
+  description: MyString
diff --git a/test/unit/first_page_test.rb b/test/unit/first_page_test.rb
new file mode 100644
index 000000000..77e2cc97a
--- /dev/null
+++ b/test/unit/first_page_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class FirstPageTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

From 6688ba61dd67ce7bea195d6f5a7a4458b86956d7 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Fri, 11 Jul 2014 09:07:09 +0800
Subject: [PATCH 3/7] =?UTF-8?q?1.=E7=94=A8=E6=88=B7=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE=E5=90=91=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=202.=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=96=87=E4=BB=B6=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=AF=86=E7=BA=A7=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/applied_project_controller.rb |   3 +-
 app/controllers/attachments_controller.rb     |  21 ++++
 app/controllers/projects_controller.rb        |   2 +-
 app/controllers/repositories_controller.rb    |   2 +-
 app/helpers/attachments_helper.rb             |   4 +-
 app/models/attachment.rb                      |  15 +++
 app/models/course.rb                          |  13 +++
 app/models/mailer.rb                          |  69 +++++++++---
 app/models/project.rb                         |   6 +
 app/views/attachments/_form.html.erb          |   2 +-
 app/views/attachments/updateFileDense.js.erb  |  15 +++
 .../files/_course_file_dense_edit.html.erb    |  13 +++
 .../_course_show_all_attachment.html.erb      |  12 ++
 .../_course_sort_by_attachtypel.html.erb      | 106 ++++++++++--------
 .../files/_project_file_dense_edit.html.erb   |  13 +++
 app/views/files/_show_all_attachment.html.erb |  12 ++
 app/views/files/_sort_by_attachtypel.html.erb | 106 ++++++++++--------
 app/views/files/index.html.erb                |  17 +++
 app/views/mailer/applied_project.html.erb     |   5 +
 app/views/mailer/applied_project.text.erb     |   4 +
 config/locales/en.yml                         |   2 +
 config/locales/zh.yml                         |   2 +
 config/routes.rb                              |   1 +
 ...40710024054_add_is_public_to_attachment.rb |   5 +
 ...710030426_update_attachment_public_attr.rb |  22 ++++
 db/schema.rb                                  |   3 +-
 .../lib/acts_as_attachable.rb                 |  21 ++++
 public/javascripts/attachments.js             |   5 +-
 public/stylesheets/application.css            |   2 +
 public/stylesheets/nyan.css                   |   5 +
 30 files changed, 388 insertions(+), 120 deletions(-)
 create mode 100644 app/views/attachments/updateFileDense.js.erb
 create mode 100644 app/views/files/_course_file_dense_edit.html.erb
 create mode 100644 app/views/files/_project_file_dense_edit.html.erb
 create mode 100644 app/views/mailer/applied_project.html.erb
 create mode 100644 app/views/mailer/applied_project.text.erb
 create mode 100644 db/migrate/20140710024054_add_is_public_to_attachment.rb
 create mode 100644 db/migrate/20140710030426_update_attachment_public_attr.rb

diff --git a/app/controllers/applied_project_controller.rb b/app/controllers/applied_project_controller.rb
index fdb45b030..3d061ef74 100644
--- a/app/controllers/applied_project_controller.rb
+++ b/app/controllers/applied_project_controller.rb
@@ -6,7 +6,8 @@ class AppliedProjectController < ApplicationController
     @project = Project.find(params[:project_id])
     @applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
     if  @applieds.count == 0
-      AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
+      appliedproject = AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
+      Mailer.applied_project(appliedproject).deliver
     end
 
     #redirect_to project_path(params[:project_id])
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 0b2ae02b3..7c1c10325 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -23,6 +23,7 @@ class AttachmentsController < ApplicationController
   
   before_filter :login_without_softapplication, only: [:download]
   accept_api_auth :show, :download, :upload
+  require 'iconv'
 
   def show
     respond_to do |format|
@@ -75,6 +76,25 @@ class AttachmentsController < ApplicationController
     end
   end
 
+  # 更新文件密级
+  def updateFileDense
+    @attachment = Attachment.find(params[:attachmentid])
+    if  @attachment != nil
+      filedense = params[:newtype].to_s
+     # d =  Iconv.conv("unicodebig","utf-8",filedense)
+      if filedense == "%E5%85%AC%E5%BC%80" #l(:field_is_public)
+        @attachment.is_public = 1
+      else
+        @attachment.is_public = 0
+      end
+      @attachment.save
+      @newfiledense = filedense
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def thumbnail
     if @attachment.thumbnailable? && thumbnail = @attachment.thumbnail(:size => params[:size])
       if stale?(:etag => thumbnail)
@@ -89,6 +109,7 @@ class AttachmentsController < ApplicationController
     end
   end
 
+
   def upload
     # Make sure that API users get used to set this content type
     # as it won't trigger Rails' automatic parsing of the request body for parameters
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 92186710c..7569ab5bb 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -746,7 +746,7 @@ class ProjectsController < ApplicationController
     #Added by young
     # @course_tag = params[:course]
     # if @course_tag == '1'
-    @course = Course.find_by_extra(@project.identifier)
+    #@course = Course.find_by_extra(@project.identifier)
     # if @project.project_type == 1
     #   render :layout => 'base_courses'
     # else
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 3b97802f5..e91f9c0a9 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -239,7 +239,7 @@ class RepositoriesController < ApplicationController
       @repositories = @project.repositories
       @course_tag = params[:course]
       project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
-      ip = RepositoriesHelper::REPO_IP_ADDRESS
+      ip  = RepositoriesHelper::REPO_IP_ADDRESS
       @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip+
       @repository.url.slice(project_path_cut, @repository.url.length).to_s
       if @course_tag == 1
diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb
index 14105bf88..b43eb22f1 100644
--- a/app/helpers/attachments_helper.rb
+++ b/app/helpers/attachments_helper.rb
@@ -109,7 +109,7 @@ module AttachmentsHelper
     domain = project.nil? ? attachAll : nobelong_attach
 
     # 搜索到的资源
-    searched_attach = domain.where("filename LIKE :like ", like:"%#{filename_condition}%").limit(limit).order('created_on desc')
+    searched_attach = domain.where("is_public=1 and filename LIKE :like ", like:"%#{filename_condition}%").limit(limit).order('created_on desc')
     #searched_attach = private_filter searched_attach
     searched_attach = paginateHelper(searched_attach, 10)
 
@@ -148,7 +148,7 @@ module AttachmentsHelper
     domain = course.nil? ? attachAll : nobelong_attach
 
     # 搜索到的资源
-    searched_attach = domain.where("filename LIKE :like ", like:"%#{filename_condition}%").limit(limit).order('created_on desc')
+    searched_attach = domain.where("is_public=1 and filename LIKE :like ", like:"%#{filename_condition}%").limit(limit).order('created_on desc')
     #searched_attach = private_filter searched_attach
     searched_attach = paginateHelper(searched_attach, 10)
 
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 116e2de9a..0eb3e7666 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -196,6 +196,21 @@ class Attachment < ActiveRecord::Base
     suffix
   end
 
+  # 文件密级的字符描述
+  def file_dense_str
+    if self.is_public == 1
+      dense = l(:field_is_public)
+    else
+      dense =  l(:field_is_private)
+    end
+    dense
+  end
+
+  # 文件可设置的密级列表
+  def file_dense_list
+    denselist = [l(:field_is_public),l(:field_is_private)]
+  end
+
   def suffixArr
     @@SuffixArr
   end
diff --git a/app/models/course.rb b/app/models/course.rb
index 5034ab0d8..b6974eed0 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -90,6 +90,18 @@ class Course < ActiveRecord::Base
     false
   end
 
+  # Returns the mail adresses of users that should be always notified on project events
+  def recipients
+    notified_users.collect {|user| user.mail}
+  end
+
+  # Returns the users that should be notified on project events
+  def notified_users
+    # TODO: User part should be extracted to User#notify_about?
+    members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all')}.collect {|m| m.principal}
+  end
+
+
   # 课程的短描述信息
   def short_description(length = 255)
     description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
@@ -112,6 +124,7 @@ class Course < ActiveRecord::Base
     @attachmenttypes = Attachmentstype.find(:all, :conditions => ["#{Attachmentstype.table_name}.typeId= ?",self.attachmenttype ])
   end
 
+
   # 获取资源后缀名列表
   def contenttypes
     attachmenttypes
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index ef4996eac..131c72c8c 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -141,6 +141,19 @@ class Mailer < ActionMailer::Base
       :subject => s
   end
 
+  # 用户申请加入项目邮件通知
+  def applied_project(applied)
+    @project =applied.project
+    redmine_headers 'Project' => @project,
+                    'User' =>  applied.user
+    @user = applied.user
+    recipients = @project.manager_recipients
+    s = l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name)
+    @applied_url =  url_for(:controller => 'projects', :action => 'settings', :id => @project.id,:tab=>'members')
+    mail :to => recipients,
+         :subject => s
+  end
+
   def reminder(user, issues, days)
     set_language_if_valid user.language
     @issues = issues
@@ -177,25 +190,45 @@ class Mailer < ActionMailer::Base
     added_to_url = ''
     @author = attachments.first.author
     case container.class.name
-    when 'Project'
-      added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container)
-      added_to = "#{l(:label_project)}: #{container}"
-      recipients = container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect  {|u| u.mail}
-    when 'Version'
-      added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
-      added_to = "#{l(:label_version)}: #{container.name}"
-      recipients = container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect  {|u| u.mail}
-    when 'Document'
-      added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
-      added_to = "#{l(:label_document)}: #{container.title}"
-      recipients = container.recipients
+      when 'Project'
+        added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container)
+        added_to = "#{l(:label_project)}: #{container}"
+        recipients = container.notified_users.select { |user| user.allowed_to?(:view_files, container) }.collect { |u| u.mail }
+      when 'Course'
+        added_to_url = url_for(:controller => 'files', :action => 'index', :course_id => container)
+        added_to = "#{l(:label_course)}: #{container}"
+        recipients = container.notified_users.select { |user| user.allowed_to?(:view_files, container) }.collect { |u| u.mail }
+      when 'Version'
+        added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
+        added_to = "#{l(:label_version)}: #{container.name}"
+        recipients = container.project.notified_users.select { |user| user.allowed_to?(:view_files, container.project) }.collect { |u| u.mail }
+      when 'Document'
+        added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
+        added_to = "#{l(:label_document)}: #{container.title}"
+        recipients = container.recipients
+    end
+    if container.class.name == 'Course'
+      redmine_headers 'Course' => container.id
+      @attachments = attachments
+      @added_to = added_to
+      @added_to_url = added_to_url
+      mail :to => recipients,
+           :subject => "[#{container.name}] #{l(:label_attachment_new)}"
+    elsif  container.class.name == 'Project'
+      redmine_headers 'Project' => container.id
+      @attachments = attachments
+      @added_to = added_to
+      @added_to_url = added_to_url
+      mail :to => recipients,
+           :subject => "[#{container.name}] #{l(:label_attachment_new)}"
+    else
+      redmine_headers 'Project' => container.project.identifier
+      @attachments = attachments
+      @added_to = added_to
+      @added_to_url = added_to_url
+      mail :to => recipients,
+           :subject => "[#{container.project.name}] #{l(:label_attachment_new)}"
     end
-    redmine_headers 'Project' => container.project.identifier
-    @attachments = attachments
-    @added_to = added_to
-    @added_to_url = added_to_url
-    mail :to => recipients,
-      :subject => "[#{container.project.name}] #{l(:label_attachment_new)}"
   end
 
   # Builds a Mail::Message object used to email recipients of a news' project when a news item is added.
diff --git a/app/models/project.rb b/app/models/project.rb
index 5efaf10ab..37ca8f20b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -207,6 +207,12 @@ class Project < ActiveRecord::Base
   end
 # end
 
+  # 管理员的邮件列表
+  def manager_recipients
+    notified = project.project_infos.collect(&:user)
+    notified.collect(&:mail)
+  end
+
   def initialize(attributes=nil, *args)
     super
 
diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index d568dd63c..7f1887b23 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -3,10 +3,10 @@
   <% container.attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-
       <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
           link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
       <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
   <% end %>
diff --git a/app/views/attachments/updateFileDense.js.erb b/app/views/attachments/updateFileDense.js.erb
new file mode 100644
index 000000000..86fa36d4c
--- /dev/null
+++ b/app/views/attachments/updateFileDense.js.erb
@@ -0,0 +1,15 @@
+$('#edit-file-dense-form-<%= @attachment.id.to_s%>').hide();
+$('#field_file_dense_id_label<%= @attachment.id.to_s%>').show();
+$('#edit_box_dense<%= @attachment.id.to_s%>').show();
+<%if @attachment.is_public == 1%>
+$('#field_file_dense_id_label<%= @attachment.id.to_s%>').html('公开');
+<%else%>
+$('#field_file_dense_id_label<%= @attachment.id.to_s%>').html('私有');
+<%end%>
+// 下面2种写法都没起作用，暂时使用上面的非本地化模式
+// <%if @attachment.is_public == 1%>
+// $('#field_file_dense_id_label<%= @attachment.id.to_s%>').html('<%l(:field_is_public)%>');
+// <%else%>
+// $('#field_file_dense_id_label<%= @attachment.id.to_s%>').html('<%l(:field_is_private)%>');
+// <%end%>
+// $('#field_file_dense_id_label<%= @attachment.id.to_s%>').html(<%=@newfiledense%>);
diff --git a/app/views/files/_course_file_dense_edit.html.erb b/app/views/files/_course_file_dense_edit.html.erb
new file mode 100644
index 000000000..53041ef14
--- /dev/null
+++ b/app/views/files/_course_file_dense_edit.html.erb
@@ -0,0 +1,13 @@
+<% edit_allowed = User.current.allowed_to?(:manage_files, @course) %>
+<% if file_dense_list.any? %>
+    <div id="edit-file-dense-form-<%=attachment.id%>" class="hidden">
+      <%= select_tag "file_dense",
+                     options_for_select(file_dense_list,attachment.file_dense_str), :onchange=>"file_dense_edit("+attachment.id.to_s + ",this.value)"%>
+    </div>
+    <%= link_to(image_tag('edit/edit.png'), 'javascript:void(0);',:style=>"white-space:nowrap;", :id=>"edit_box_dense"+attachment.id.to_s ,
+                :onclick =>"$('#edit-file-dense-form-" +attachment.id.to_s+ "').show();
+                $('#field_file_dense_id_label" +attachment.id.to_s+ "').hide();
+                $('#edit_box_dense" +attachment.id.to_s+ "').hide();") if edit_allowed %>
+
+<% end %>
+
diff --git a/app/views/files/_course_show_all_attachment.html.erb b/app/views/files/_course_show_all_attachment.html.erb
index 1a8a8ca65..a6da426c6 100644
--- a/app/views/files/_course_show_all_attachment.html.erb
+++ b/app/views/files/_course_show_all_attachment.html.erb
@@ -18,6 +18,7 @@
     <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
     <%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
     <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %>
+    <%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense") %>
     <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
     <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
     <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
@@ -34,6 +35,9 @@
           </tr>
       <% end -%>
       <% container.attachments.each do |file| %>
+          <%if file.is_public == 0 && !User.current.member_of?(@project)%>
+              <%next%>
+          <%end%>
           <tr class="file <%= cycle("odd", "odd") %>">
             <td class="filename" style="font-size: 13px;  "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
             <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
@@ -45,6 +49,14 @@
               </span>
             </td>
             <td class="content_type"><%= file.show_suffix_type %></td>
+            <td class="field_file_dense">
+              <span id="field_file_dense_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.file_dense_str %></span>
+              &nbsp;
+      <span id="field_file_dense_id_edit<%= file.id %>" style="white-space:nowrap;">
+        <%= render :partial => 'course_file_dense_edit', :locals => {:file_dense_list => file.file_dense_list,
+                                                                     :attachment => file} %>
+        </span>
+            </td>
             <td class="downloads"><%= file.downloads %></td>
             <!-- <td class="digest" width="300px"><%= file.description %></td> -->
             <td align="center">
diff --git a/app/views/files/_course_sort_by_attachtypel.html.erb b/app/views/files/_course_sort_by_attachtypel.html.erb
index f73cac072..cda832493 100644
--- a/app/views/files/_course_sort_by_attachtypel.html.erb
+++ b/app/views/files/_course_sort_by_attachtypel.html.erb
@@ -5,66 +5,78 @@
 <% edit_allowed = User.current.allowed_to?(:manage_files, @course) %>
 <table class="list files" id="ver-zebra">
   <colgroup>
-  <col class="vzebra-odd"/>
-  <col class="vzebra-even"/>
-  <col class="vzebra-odd"/>
-  <col class="vzebra-even"/>
-  <!-- <col class="vzebra-odd"/> -->
-</colgroup>
-<thead>
+    <col class="vzebra-odd"/>
+    <col class="vzebra-even"/>
+    <col class="vzebra-odd"/>
+    <col class="vzebra-even"/>
+    <!-- <col class="vzebra-odd"/> -->
+  </colgroup>
+  <thead>
   <tr>
     <%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure") %>
     <%#= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope => "col", :id => "vzebra-comedy") %>
     <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
     <%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
-    <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope =>"col", :id=> "vzebra-contenttype")%>
+    <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %>
+    <%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense") %>
     <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
     <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
     <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
   </tr>
-</thead>
-<tbody>
+  </thead>
+  <tbody>
   <% @containers.each do |container| %>
-  <% next if container.attachments.empty? -%>
-  <% container.attachments.each do |file| %>
-  <% if isTypeOk(file,selAttachType,selContentType) %>
-  <tr class="file <%= cycle("odd", "odd") %>">
-    <td class="filename" style="font-size: 13px; "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
-    <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
-    <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
-    <td class="attach_type">
-      <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.typeName %></span>
-      &nbsp;
+      <% next if container.attachments.empty? -%>
+      <% container.attachments.each do |file| %>
+          <% if file.is_public == 0 && !User.current.member_of?(@project) %>
+              <% next %>
+          <% end %>
+          <% if isTypeOk(file, selAttachType, selContentType) %>
+              <tr class="file <%= cycle("odd", "odd") %>">
+                <td class="filename" style="font-size: 13px; "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
+                <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
+                <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
+                <td class="attach_type">
+                  <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.typeName %></span>
+                  &nbsp;
       <span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
         <%= render :partial => 'attachments/course_type_edit', :locals => {:attachmenttypes => attachmenttypes,
-          :attachment => file,:contentype=>selContentType} %>
+                                                                           :attachment => file, :contentype => selContentType} %>
         </span>
-      </td>
-      <td class="content_type"><%= file.show_suffix_type %></td>
-      <td class="downloads"><%= file.downloads %></td>
-      <!-- <td class="digest" width="300px"><%= file.description %></td> -->
-      <td align="center">
-        <%= link_to(image_tag('delete.png'), attachment_path(file),
-        :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
-      </td>
-    </tr>
-    <tr>
-      <td class='description' colspan="6">
-        <div class="tags_area">
-          <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
-          <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
-          <div class="tags_gradint"></div>
-        </div>
-        <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
-        </div>
-      </td>
-    </tr>
-    <% end -%>
-    <% end -%>
-    <% reset_cycle %>
-    <% end -%>
-    <!-- %= h downloadAll(@containers) % -->
-    <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
+                </td>
+                <td class="content_type"><%= file.show_suffix_type %></td>
+                <td class="field_file_dense">
+                  <span id="field_file_dense_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.file_dense_str %></span>
+                  &nbsp;
+      <span id="field_file_dense_id_edit<%= file.id %>" style="white-space:nowrap;">
+        <%= render :partial => 'course_file_dense_edit', :locals => {:file_dense_list => file.file_dense_list,
+                                                                     :attachment => file} %>
+        </span>
+                </td>
+                <td class="downloads"><%= file.downloads %></td>
+                <!-- <td class="digest" width="300px"><%= file.description %></td> -->
+                <td align="center">
+                  <%= link_to(image_tag('delete.png'), attachment_path(file),
+                              :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
+                </td>
+              </tr>
+              <tr>
+                <td class='description' colspan="6">
+                  <div class="tags_area">
+                    <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
+                    <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
+                    <div class="tags_gradint"></div>
+                  </div>
+                  <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
+                  </div>
+                </td>
+              </tr>
+          <% end -%>
+      <% end -%>
+      <% reset_cycle %>
+  <% end -%>
+  <!-- %= h downloadAll(@containers) % -->
+  <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
 
   </tbody>
 </table>
diff --git a/app/views/files/_project_file_dense_edit.html.erb b/app/views/files/_project_file_dense_edit.html.erb
new file mode 100644
index 000000000..daa4b927d
--- /dev/null
+++ b/app/views/files/_project_file_dense_edit.html.erb
@@ -0,0 +1,13 @@
+<% edit_allowed = User.current.allowed_to?(:manage_files, @project) %>
+<% if file_dense_list.any? %>
+    <div id="edit-file-dense-form-<%=attachment.id%>" class="hidden">
+      <%= select_tag "file_dense",
+                     options_for_select(file_dense_list,attachment.file_dense_str), :onchange=>"file_dense_edit("+attachment.id.to_s + ",this.value)"%>
+    </div>
+    <%= link_to(image_tag('edit/edit.png'), 'javascript:void(0);',:style=>"white-space:nowrap;", :id=>"edit_box_dense"+attachment.id.to_s ,
+                :onclick =>"$('#edit-file-dense-form-" +attachment.id.to_s+ "').show();
+                $('#field_file_dense_id_label" +attachment.id.to_s+ "').hide();
+                $('#edit_box_dense" +attachment.id.to_s+ "').hide();") if edit_allowed %>
+
+<% end %>
+
diff --git a/app/views/files/_show_all_attachment.html.erb b/app/views/files/_show_all_attachment.html.erb
index 07dc6a27f..8c624d176 100644
--- a/app/views/files/_show_all_attachment.html.erb
+++ b/app/views/files/_show_all_attachment.html.erb
@@ -18,6 +18,7 @@
     <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
     <%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
     <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %>
+    <%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense") %>
     <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
     <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
     <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
@@ -34,6 +35,9 @@
           </tr>
       <% end -%>
       <% container.attachments.each do |file| %>
+          <%if file.is_public == 0 && !User.current.member_of?(@project)%>
+          <%next%>
+          <%end%>
           <tr class="file <%= cycle("odd", "odd") %>">
             <td class="filename" style="font-size: 13px;  "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
             <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
@@ -45,6 +49,14 @@
               </span>
             </td>
             <td class="content_type"><%= file.show_suffix_type %></td>
+            <td class="field_file_dense">
+              <span id="field_file_dense_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.file_dense_str %></span>
+              &nbsp;
+      <span id="field_file_dense_id_edit<%= file.id %>" style="white-space:nowrap;">
+        <%= render :partial => 'project_file_dense_edit', :locals => {:file_dense_list => file.file_dense_list,
+                                                                      :attachment => file} %>
+        </span>
+            </td>
             <td class="downloads"><%= file.downloads %></td>
             <!-- <td class="digest" width="300px"><%= file.description %></td> -->
             <td align="center">
diff --git a/app/views/files/_sort_by_attachtypel.html.erb b/app/views/files/_sort_by_attachtypel.html.erb
index 01c57c490..d3723c340 100644
--- a/app/views/files/_sort_by_attachtypel.html.erb
+++ b/app/views/files/_sort_by_attachtypel.html.erb
@@ -5,66 +5,78 @@
 <% edit_allowed = User.current.allowed_to?(:manage_files, @project) %>
 <table class="list files" id="ver-zebra">
   <colgroup>
-  <col class="vzebra-odd"/>
-  <col class="vzebra-even"/>
-  <col class="vzebra-odd"/>
-  <col class="vzebra-even"/>
-  <!-- <col class="vzebra-odd"/> -->
-</colgroup>
-<thead>
+    <col class="vzebra-odd"/>
+    <col class="vzebra-even"/>
+    <col class="vzebra-odd"/>
+    <col class="vzebra-even"/>
+    <!-- <col class="vzebra-odd"/> -->
+  </colgroup>
+  <thead>
   <tr>
     <%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure") %>
     <%#= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope => "col", :id => "vzebra-comedy") %>
     <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
     <%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
-    <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope =>"col", :id=> "vzebra-contenttype")%>
+    <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %>
+    <%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense") %>
     <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
     <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
     <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
   </tr>
-</thead>
-<tbody>
+  </thead>
+  <tbody>
   <% @containers.each do |container| %>
-  <% next if container.attachments.empty? -%>
-  <% container.attachments.each do |file| %>
-  <% if isTypeOk(file,selAttachType,selContentType) %>
-  <tr class="file <%= cycle("odd", "odd") %>">
-    <td class="filename" style="font-size: 13px; "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
-    <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
-    <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
-    <td class="attach_type">
-      <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.typeName %></span>
-      &nbsp;
+      <% next if container.attachments.empty? -%>
+      <% container.attachments.each do |file| %>
+          <% if file.is_public == 0 && !User.current.member_of?(@project) %>
+              <% next %>
+          <% end %>
+          <% if isTypeOk(file, selAttachType, selContentType) %>
+              <tr class="file <%= cycle("odd", "odd") %>">
+                <td class="filename" style="font-size: 13px; "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
+                <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
+                <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
+                <td class="attach_type">
+                  <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.typeName %></span>
+                  &nbsp;
       <span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
         <%= render :partial => 'attachments/type_edit', :locals => {:attachmenttypes => attachmenttypes,
-          :attachment => file,:contentype=>selContentType} %>
+                                                                    :attachment => file, :contentype => selContentType} %>
         </span>
-      </td>
-      <td class="content_type"><%= file.show_suffix_type %></td>
-      <td class="downloads"><%= file.downloads %></td>
-      <!-- <td class="digest" width="300px"><%= file.description %></td> -->
-      <td align="center">
-        <%= link_to(image_tag('delete.png'), attachment_path(file),
-        :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
-      </td>
-    </tr>
-    <tr>
-      <td class='description' colspan="6">
-        <div class="tags_area">
-          <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
-          <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
-          <div class="tags_gradint"></div>
-        </div>
-        <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
-        </div>
-      </td>
-    </tr>
-    <% end -%>
-    <% end -%>
-    <% reset_cycle %>
-    <% end -%>
-    <!-- %= h downloadAll(@containers) % -->
-    <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
+                </td>
+                <td class="content_type"><%= file.show_suffix_type %></td>
+                <td class="field_file_dense">
+                  <span id="field_file_dense_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.file_dense_str %></span>
+                  &nbsp;
+      <span id="field_file_dense_id_edit<%= file.id %>" style="white-space:nowrap;">
+        <%= render :partial => 'project_file_dense_edit', :locals => {:file_dense_list => file.file_dense_list,
+                                                                      :attachment => file} %>
+        </span>
+                </td>
+                <td class="downloads"><%= file.downloads %></td>
+                <!-- <td class="digest" width="300px"><%= file.description %></td> -->
+                <td align="center">
+                  <%= link_to(image_tag('delete.png'), attachment_path(file),
+                              :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
+                </td>
+              </tr>
+              <tr>
+                <td class='description' colspan="6">
+                  <div class="tags_area">
+                    <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
+                    <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
+                    <div class="tags_gradint"></div>
+                  </div>
+                  <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
+                  </div>
+                </td>
+              </tr>
+          <% end -%>
+      <% end -%>
+      <% reset_cycle %>
+  <% end -%>
+  <!-- %= h downloadAll(@containers) % -->
+  <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
 
   </tbody>
 </table>
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index b086b90db..69b41fc28 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -207,6 +207,23 @@
         <%end%>
 
     }
+
+    // 编辑文件密级
+    function file_dense_edit(id, type) {
+        $.ajax({
+            url: '<%=updateFileDense_attachments_path%>',
+            type: "POST",
+            remote:"true",
+            data: {
+                attachmentid: encodeURIComponent(id),
+                newtype: encodeURIComponent(type)
+            }
+
+        }).complete(function (xhr, textStatus) {
+                });
+
+    }
+
 </script>
 
 
diff --git a/app/views/mailer/applied_project.html.erb b/app/views/mailer/applied_project.html.erb
new file mode 100644
index 000000000..4f266e6ce
--- /dev/null
+++ b/app/views/mailer/applied_project.html.erb
@@ -0,0 +1,5 @@
+<%= l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name) %>
+<hr />
+
+<h1><%= link_to(h(@project.name), @applied_url) %></h1>
+
diff --git a/app/views/mailer/applied_project.text.erb b/app/views/mailer/applied_project.text.erb
new file mode 100644
index 000000000..7af8c2018
--- /dev/null
+++ b/app/views/mailer/applied_project.text.erb
@@ -0,0 +1,4 @@
+<%= l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name) %>
+
+<h1><%= link_to(h(@project.name), @applied_url) %></h1>
+
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4c177b58e..2231100b7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -233,6 +233,7 @@ en:
   field_mail: Email
   field_job_category: Job category   # added by bai
   field_filename: File
+  field_file_dense: File Dense
   field_filesize: Size
   field_downloads: Downloads
   field_author: Author
@@ -1079,6 +1080,7 @@ en:
   text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
   text_project_closed: This project is closed and read-only.
   text_turning_multiple_off: "If you disable multiple values, multiple values will be removed in order to preserve only one value per item."
+  text_applied_project: "User %{id} Apply Join Project %{project}"
 
   default_role_manager: Manager
   default_role_developer: Developer
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index dcbd1d6ec..07802e7db 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -251,6 +251,7 @@ zh:
   field_lastname_eg: '(例：张三丰，请填写[张])'
   field_mail: 邮件地址
   field_filename: 文件
+  field_file_dense: 文件密级
   field_filesize: 大小
   field_downloads: 下载次数
   field_author: 作者
@@ -1105,6 +1106,7 @@ zh:
   text_own_membership_delete_confirmation: 你正在删除你现有的某些或全部权限，如果这样做了你可能将会再也无法编辑该项目了。你确定要继续吗？
   text_zoom_in: 放大
   text_zoom_out: 缩小
+  text_applied_project: "用户 %{id} 申请加入项目 %{project}"
 
   default_role_manager: 管理人员
   default_role_developer: 开发人员
diff --git a/config/routes.rb b/config/routes.rb
index f9dd53cf3..1ad026dc3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -515,6 +515,7 @@ RedmineApp::Application.routes.draw do
   resources :attachments, :only => [:show, :destroy]  do
     collection do
       match "updateType" , via: [:get, :post]
+      match "updateFileDense" , via: [:get, :post]
       match "renderTag" , via: [:get, :post]
     end
   end
diff --git a/db/migrate/20140710024054_add_is_public_to_attachment.rb b/db/migrate/20140710024054_add_is_public_to_attachment.rb
new file mode 100644
index 000000000..2276304c8
--- /dev/null
+++ b/db/migrate/20140710024054_add_is_public_to_attachment.rb
@@ -0,0 +1,5 @@
+class AddIsPublicToAttachment < ActiveRecord::Migration
+  def change
+    add_column :attachments, :is_public, :integer,:default => 1
+  end
+end
diff --git a/db/migrate/20140710030426_update_attachment_public_attr.rb b/db/migrate/20140710030426_update_attachment_public_attr.rb
new file mode 100644
index 000000000..339c52543
--- /dev/null
+++ b/db/migrate/20140710030426_update_attachment_public_attr.rb
@@ -0,0 +1,22 @@
+class UpdateAttachmentPublicAttr < ActiveRecord::Migration
+  def up
+    # 更新资源文件的is_public属性
+    Attachment.all.each do |res|
+      if res.is_public
+        if(res.container.nil? ||
+            (res.container.class.to_s=="Project" && res.container.is_public == false) ||
+            (res.container.has_attribute?(:project) && res.container.project && res.container.project.is_public == false) ||
+            (res.container.class.to_s=="HomeworkAttach" && res.container.bid.reward_type == 3) ||
+            (res.container.class.to_s=="Course" && res.container.is_public == false) ||
+            (res.container.has_attribute?(:course) && res.container.course && res.container.course.is_public == false)
+        )
+          res.is_public = false
+          res.save
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 93aa90c44..8fa520eba 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140707095213) do
+ActiveRecord::Schema.define(:version => 20140710030426) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -51,6 +51,7 @@ ActiveRecord::Schema.define(:version => 20140707095213) do
     t.string   "description"
     t.string   "disk_directory"
     t.integer  "attachtype",                   :default => 1
+    t.integer  "is_public",                    :default => 1
   end
 
   add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
diff --git a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
index 30bbaedda..1318f8afa 100644
--- a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
+++ b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
@@ -60,11 +60,28 @@ module Redmine
           @unsaved_attachments ||= []
         end
 
+        # 设置资源文件的公开属性
+        # add by nwb
+        def set_attachment_public(res)
+          # 公开的资源判断他的父级的公开属性
+          if res.is_public
+            if( (self.class.to_s=="Project" && self.is_public == false) ||
+                (self.has_attribute?(:project) && self.project && self.project.is_public == false) ||
+                (self.class.to_s=="HomeworkAttach" && self.bid.reward_type == 3) ||
+                (self.class.to_s=="Course" && self.is_public == false) ||
+                (self.has_attribute?(:course) && self.course && self.course.is_public == false)
+            )
+              res.is_public = false
+            end
+          end
+        end
+
         def save_attachmentsex(attachments, author=User.current,attachment_type)
           @curattachment_type = attachment_type
           result = save_attachments(attachments,author)
           result
         end
+
         def save_attachments(attachments, author=User.current)
           if attachments.is_a?(Hash)
             attachments = attachments.stringify_keys
@@ -94,6 +111,10 @@ module Redmine
                 a.filename = attachment['filename'] unless attachment['filename'].blank?
                 a.content_type = attachment['content_type']
               end
+              if !attachment[:is_public]
+                a.is_public = false
+              end
+              set_attachment_public(a)
               next unless a
               a.description = attachment['description'].to_s.strip
               a.attachtype = @curattachment_type;
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 663183b9a..c60a77bd3 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -23,7 +23,9 @@ function addFile(inputEl, file, eagerUpload) {
     fileSpan.append(
         $('<input>', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name),
         $('<input>', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 255, 'placeholder': $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload),
-       $('<a>&nbsp</a>').attr({ 'href': "#", 'class': 'remove-upload', 'data-confirm' : "您确定要删除吗？" }).click(removeFile).toggle(!eagerUpload),
+        $('<span >公开:</span>').attr({  'class': 'ispublic-label' }) ,
+        $('<input>', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public]', checked:'checked' } ).toggle(!eagerUpload),
+        $('<a>&nbsp</a>').attr({ 'href': "#", 'class': 'remove-upload', 'data-confirm' : "您确定要删除吗？" }).click(removeFile).toggle(!eagerUpload),
         $('<div>', {  'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} )
     ).appendTo('#attachments_fields');
 
@@ -63,6 +65,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
       .done(function(result) {
         progressSpan.progressbar( 'value', 100 ).remove();
         fileSpan.find('input.description, a').css('display', 'inline-block');
+        fileSpan.find('input.is_public_checkbox, a').css('display', 'inline-block');
       })
       .fail(function(result) {
         progressSpan.text(result.statusText);
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 89ee39ada..10b8fb328 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1850,6 +1850,8 @@ span.required {color: #bb0000;}
 #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
 a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;}
 a.remove-upload:hover {text-decoration:none !important;}
+#attachments_fields input.is_public_checkbox {width:20px;}
+#attachments_fields span.ispublic-label {width:50px;margin-left:10px; }
 
 /*gcm upload file count and deleteall*/
 #upload_file_count #count {color:red; font-size:1.5em;}
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 30496a061..b57796aa3 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -1081,6 +1081,11 @@ div.tags_area {
     border-bottom: 1px solid #c8d4fd;
 }
 
+#ver-zebra #vzebra-field_file_dense, #ver-zebra #vzebra-children {
+    background: #ffffff;
+    border-bottom: 1px solid #c8d4fd;
+}
+
 #ver-zebra #vzebra-comedy, #ver-zebra #vzebra-action {
     background: #ffffff;
     border-bottom: 1px solid #d6dfff;

From 2be5041d0de8b996182a03ca86740706b69937af Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Fri, 11 Jul 2014 10:42:55 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/application.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 10b8fb328..aae90eb4e 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1843,6 +1843,7 @@ span.required {color: #bb0000;}
 .summary {font-style: italic;}
 
 #attachments_fields input.description {margin-left:4px; width:100px; }
+#attachments_fields span {display:block; white-space:nowrap;}
 #attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';}
 #attachments_fields input.filename {border:0; height:1.8em; width:150px; color:#555; background-color:inherit; background:url(../images/attachment.png) no-repeat 1px 50%; padding-left:18px;}/*Modified by young*/
 #attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
@@ -1851,7 +1852,7 @@ span.required {color: #bb0000;}
 a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;}
 a.remove-upload:hover {text-decoration:none !important;}
 #attachments_fields input.is_public_checkbox {width:20px;}
-#attachments_fields span.ispublic-label {width:50px;margin-left:10px; }
+#attachments_fields span.ispublic-label {display:inline-block;width:50px;margin-left:10px; }
 
 /*gcm upload file count and deleteall*/
 #upload_file_count #count {color:red; font-size:1.5em;}

From 6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Fri, 11 Jul 2014 11:36:00 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 28 +++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 7fd5cec17..b283b4792 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -50,19 +50,39 @@ class AttachmentsController < ApplicationController
   end
 
   def download
-    if true || @attachment.container.is_a?(Version) || @attachment.container.is_a?(Project)
+    # modify by nwb
+    # 下载添加权限设置
+    candown = false
+    if @attachment.container.has_attribute?(:project) && @attachment.container.project
+      project = @attachment.container.project
+      candown= User.current.member_of?(project)
+    elsif  @attachment.container.is_a?(Project)
+      project = @attachment.container
+      candown= User.current.member_of?(project)
+    elsif @attachment.container.has_attribute?(:course) && @attachment.container.course
+      course = @attachment.container.course
+      candown= User.current.member_of_course?(course)
+    elsif @attachment.container.is_a?(Course)
+      course = @attachment.container
+      candown= User.current.member_of_course?(course)
+    elsif @attachment.container.class.to_s=="HomeworkAttach" && @attachment.container.bid.reward_type == 3
+      candown = true
+    end
+    if candown || User.current.admin?
       @attachment.increment_download
+    else
+      render_403 :message => :notice_not_authorized
     end
 
+
     if stale?(:etag => @attachment.digest)
       # images are sent inline
       send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
-                                      :type => detect_content_type(@attachment),
-                                      :disposition => (@attachment.image? ? 'inline' : 'attachment')
+                :type => detect_content_type(@attachment),
+                :disposition => (@attachment.image? ? 'inline' : 'attachment')
     end
   rescue => e
     redirect_to "http://" + (Setting.host_name.to_s) +"/file_not_found.html"
-    return
   end
 
   #更新资源文件类型

From 3dfcc90574071ab2b0b56435d9bd8988234f5c47 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 11 Jul 2014 11:41:54 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E3=80=81=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E9=A6=96=E9=A1=B5=E5=AE=9A=E5=88=B6=20=E8=B6=85?=
 =?UTF-8?q?=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E8=B4=A6=E6=88=B7=E4=B8=AD?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=AE=9A=E5=88=B6=E7=95=8C=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb           | 66 ++++++++++++++++++-
 app/controllers/welcome_controller.rb         | 23 +++++--
 app/helpers/application_helper.rb             |  2 +-
 app/views/admin/contest_page_made.html.erb    | 39 +++++++++++
 app/views/admin/course_page_made.html.erb     | 37 +++++++++++
 app/views/admin/first_page_made.html.erb      | 18 +++--
 app/views/admin/project_page_made.html.erb    | 31 +++++++++
 app/views/welcome/contest.html.erb            | 13 ++--
 app/views/welcome/course.html.erb             |  9 ++-
 app/views/welcome/index.html.erb              |  2 +
 config/locales/zh.yml                         |  3 +
 config/routes.rb                              |  2 +
 ...20140710095123_add_cloumn_to_first_page.rb |  9 +++
 db/migrate/20140711010124_alt_column_name.rb  |  5 ++
 ...12924_add_contest_and_course_first_page.rb | 17 +++++
 db/schema.rb                                  |  3 +-
 16 files changed, 259 insertions(+), 20 deletions(-)
 create mode 100644 app/views/admin/contest_page_made.html.erb
 create mode 100644 app/views/admin/course_page_made.html.erb
 create mode 100644 app/views/admin/project_page_made.html.erb
 create mode 100644 db/migrate/20140710095123_add_cloumn_to_first_page.rb
 create mode 100644 db/migrate/20140711010124_alt_column_name.rb
 create mode 100644 db/migrate/20140711012924_add_contest_and_course_first_page.rb

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 152fb059e..d87644e43 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -238,9 +238,9 @@ class AdminController < ApplicationController
   #首页定制
   def first_page_made
     if request.get?
-      @first_page = FirstPage.all.first
+      @first_page = FirstPage.where("page_type = 'project'").first
     elsif request.post?
-      @first_page = FirstPage.all.first
+      @first_page = FirstPage.where("page_type = 'project'").first
       @first_page.web_title = params[:web_title]
       @first_page.description = params[:description]
       @first_page.title = params[:title]
@@ -262,6 +262,68 @@ class AdminController < ApplicationController
         end
       end
     end
+  end
+
+  def course_page_made
+    if request.get?
+      @course_page = FirstPage.where("page_type = 'course'").first
+      @first_page = FirstPage.where("page_type = 'project'").first
+    elsif request.post?
+      @first_page = FirstPage.where("page_type = 'project'").first
+      @course_page = FirstPage.where("page_type = 'course'").first
+      @first_page.web_title = params[:web_title]
+      @course_page.title = params[:course_title]
+      @course_page.description = params[:course_description]
+      if @first_page.save && @course_page.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_update)
+            redirect_to admin_course_page_made_path
+          }
+          format.api  { render_api_ok }
+        end
+      else
+        respond_to do |format|
+          format.html {
+            course_page_made
+            render :action => 'course_page_made'
+          }
+          format.api  { render_validation_errors(@first_page) }
+          format.api  { render_validation_errors(@course_page) }
+        end
+      end
+    end
+  end
 
+  def contest_page_made
+    if request.get?
+      @contest_page = FirstPage.where("page_type = 'contest'").first
+      @first_page = FirstPage.where("page_type = 'project'").first
+    elsif request.post?
+      @first_page = FirstPage.where("page_type = 'project'").first
+      @contest_page = FirstPage.where("page_type = 'contest'").first
+      @first_page.web_title = params[:web_title]
+      @contest_page.title = params[:contest_title]
+      @contest_page.description = params[:contest_description]
+      if @first_page.save && @contest_page.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_update)
+            redirect_to admin_contest_page_made_path
+          }
+          format.api  { render_api_ok }
+        end
+      else
+        respond_to do |format|
+          format.html {
+            contest_page_made
+            render :action => 'contest_page_made'
+          }
+          format.api  { render_validation_errors(@first_page) }
+          format.api  { render_validation_errors(@contest_page) }
+        end
+      end
+    end
   end
+
 end
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 0920d2e42..03bca6162 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -16,12 +16,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class WelcomeController < ApplicationController
+  include ApplicationHelper
   caches_action :robots
   # before_filter :fake, :only => [:index, :course]
   before_filter :entry_select, :only => [:index]
  
   def index
-    @first_page = FirstPage.all.first
+    @first_page = FirstPage.where("page_type = 'project'").first
   end
 
   def robots
@@ -30,6 +31,7 @@ class WelcomeController < ApplicationController
   end
   
   def course
+    @course_page = FirstPage.where("page_type = 'course'").first
     if params[:school_id]
       @school_id = params[:school_id]
     elsif User.current.logged?  && User.current.user_extensions.school
@@ -41,13 +43,24 @@ class WelcomeController < ApplicationController
   
   
  def logolink()
+   @course_page = FirstPage.where("page_type = 'course'").first
+   logo = get_avatar?(@course_page)
     id = params[:school_id]
     logo_link = ""
-    if id.nil? and User.current.user_extensions.school.nil?
-      logo_link = '/images/transparent.png'
+    if id.nil? && User.current.user_extensions.school.nil?
+      if logo
+        logo_link = url_to_avatar(@course_page)
+      else
+        logo_link = '/images/transparent.png'
+      end
+
     else
       if id == "0"
-        logo_link = '/images/transparent.png'
+        if logo
+          logo_link = url_to_avatar(@course_page)
+        else
+          logo_link = '/images/transparent.png'
+        end
       else
         if id.nil?
           if School.find(User.current.user_extensions.school.id).logo_link.nil?
@@ -66,7 +79,7 @@ class WelcomeController < ApplicationController
   
   
   def contest
-
+    @contest_page = FirstPage.where("page_type = 'contest'").first
   end
 
   def search
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3f873a64d..b63381903 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -625,7 +625,7 @@ module ApplicationHelper
   end
 
   def html_title(*args)
-    first_page = FirstPage.all.first
+    first_page = FirstPage.where("page_type = 'project'").first
     if args.empty?
       title = @html_title || []
       title << @project.name if @project
diff --git a/app/views/admin/contest_page_made.html.erb b/app/views/admin/contest_page_made.html.erb
new file mode 100644
index 000000000..b8a86fa4d
--- /dev/null
+++ b/app/views/admin/contest_page_made.html.erb
@@ -0,0 +1,39 @@
+<h3><%=l(:label_first_page_made)%></h3>
+
+<%= form_tag(:controller => 'admin', :action => 'contest_page_made') do %>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='web_title'><%= l(:label_web_title) %>:</label>
+      <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <div class="tabs">
+      <ul>
+        <li><%= link_to l(:label_project_first_page), {:action => 'first_page_made'} %></li>
+        <li><%= link_to l(:label_course_first_page), {:action => 'course_page_made'} %></li>
+        <li><%= link_to l(:label_contest_first_page), {:action => 'contest_page_made'} , :class => 'selected'%></li>
+      </ul>
+    </div>
+
+    <h4><%=l(:label_contest_first_page)%></h4>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
+    </p>
+    <div style="margin-left: 82px;">
+      <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@contest_page} %>
+    </div>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='contest_title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
+      <%= text_field_tag 'contest_title', params[:label_site_title], :value => @contest_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='contest_description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
+      <%= text_area_tag 'contest_description',@contest_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+    <%= submit_tag l(:button_save), :class => "small", :name => nil %>
+<% end %>
+<div>
+
+
+
+</div>
\ No newline at end of file
diff --git a/app/views/admin/course_page_made.html.erb b/app/views/admin/course_page_made.html.erb
new file mode 100644
index 000000000..4554fb8e0
--- /dev/null
+++ b/app/views/admin/course_page_made.html.erb
@@ -0,0 +1,37 @@
+<h3><%=l(:label_first_page_made)%></h3>
+
+<%= form_tag(:controller => 'admin', :action => 'course_page_made') do %>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='web_title'><%= l(:label_web_title) %>:</label>
+      <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <div class="tabs">
+      <ul>
+        <li><%= link_to l(:label_project_first_page), {:action => 'first_page_made'} %></li>
+        <li><%= link_to l(:label_course_first_page), {:action => 'course_page_made'}, :class => 'selected' %></li>
+        <li><%= link_to l(:label_contest_first_page), {:action => 'contest_page_made'} %></li>
+      </ul>
+    </div>
+    <h4><%=l(:label_course_first_page)%></h4>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
+    </p>
+    <div style="margin-left: 82px;">
+      <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@course_page} %>
+    </div>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='course_title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
+      <%= text_field_tag 'course_title', params[:label_site_title], :value => @course_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='course_description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
+      <%= text_area_tag 'course_description',@course_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+    <%= submit_tag l(:button_save), :class => "small", :name => nil %>
+<% end %>
+<div>
+
+
+
+</div>
\ No newline at end of file
diff --git a/app/views/admin/first_page_made.html.erb b/app/views/admin/first_page_made.html.erb
index 9e863d813..a64bbb443 100644
--- a/app/views/admin/first_page_made.html.erb
+++ b/app/views/admin/first_page_made.html.erb
@@ -1,16 +1,25 @@
 <h3><%=l(:label_first_page_made)%></h3>
 
 <%= form_tag(:controller => 'admin', :action => 'first_page_made') do %>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='web_title'><%= l(:label_web_title) %>:</label>
+      <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <div class="tabs">
+      <ul>
+        <li><%= link_to l(:label_project_first_page), {:action => 'first_page_made'}, :class => 'selected' %></li>
+        <li><%= link_to l(:label_course_first_page), {:action => 'course_page_made'} %></li>
+        <li><%= link_to l(:label_contest_first_page), {:action => 'contest_page_made'} %></li>
+      </ul>
+    </div>
+    <h4><%=l(:label_project_first_page)%></h4>
     <p style="margin-left:60px;padding-right: 20px;">
       <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
      </p>
     <div style="margin-left: 82px;">
         <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@first_page} %>
     </div>
-    <p style="margin-left:60px;padding-right: 20px;">
-      <label for='web_title'><%= l(:label_web_title) %>:</label>
-    <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
-      </p>
+
     <p style="margin-left:60px;padding-right: 20px;">
       <label for='title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
       <%= text_field_tag 'title', params[:label_site_title], :value => @first_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
@@ -19,6 +28,7 @@
       <label for='description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
       <%= text_area_tag 'description',@first_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
     </p>
+
       <%= submit_tag l(:button_save), :class => "small", :name => nil %>
 <% end %>
 <div>
diff --git a/app/views/admin/project_page_made.html.erb b/app/views/admin/project_page_made.html.erb
new file mode 100644
index 000000000..e338c21a9
--- /dev/null
+++ b/app/views/admin/project_page_made.html.erb
@@ -0,0 +1,31 @@
+<h3><%=l(:label_first_page_made)%></h3>
+
+<%= form_tag(:controller => 'admin', :action => 'first_page_made') do %>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='web_title'><%= l(:label_web_title) %>:</label>
+      <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <h4><%=l(:label_project_first_page)%></h4>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
+    </p>
+    <div style="margin-left: 82px;">
+      <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@first_page} %>
+    </div>
+
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
+      <%= text_field_tag 'title', params[:label_site_title], :value => @first_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
+      <%= text_area_tag 'description',@first_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+    <%= submit_tag l(:button_save), :class => "small", :name => nil %>
+<% end %>
+<div>
+
+
+
+</div>
\ No newline at end of file
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index c87cc13e1..c3bd120da 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -114,12 +114,17 @@
 	<div class="main-content-bar" id="main-content-bar">
 	<!--文字-->	
 		<div style="float: left">
-			<%= image_tag '/images/transparent.png', size: "75x75" %>
+          <% if get_avatar?(@contest_page) %>
+              <%= image_tag(url_to_avatar(@contest_page), size: "75x75") %>
+          <% else %>
+              <%= image_tag '/images/transparent.png', size: "75x75" %>
+          <% end %>
 		</div>	
 	<div class="welcome_left" id="welcome_left">
-
-			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %>&nbsp;<%= l(:label_welcome_trustie_contest) %></span> <span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_contest_description) %></span>
-	</div>
+        <% unless @contest_page.nil? %>
+			<span class="font_welcome_trustie"><%= @contest_page.title %></span> <span class="font_welcome_tdescription">, <%= @contest_page.description %></span>
+	    <% end %>
+    </div>
 
 <!--搜索框-->	
 	<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">		
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index cfde8fca4..f6bffe51c 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -51,14 +51,17 @@
 						<% end %>
 					<% end %>
 				<% end %> </span>
-      <span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_course) %> </span>
+      <% unless @course_page.nil? %>
+        <span class="font_welcome_trustie"><%= @course_page.title %> </span>
+
       <% if @school_id.nil? and User.current.user_extensions.school.nil? %>
-          <span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_course_description) %></span>
+          <span class="font_welcome_tdescription">, <%= @course_page.description %></span>
       <% else %>
           <% if @school_id == "0" %>
-              <span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_course_description) %></span>
+              <span class="font_welcome_tdescription">, <%= @course_page.description %></span>
           <% end %>
       <% end %>
+      <% end %>
     </div>
     <div class="search-bar" id="search-bar">
       <%= render :partial => "search_course", :locals => {:project_type => Project::ProjectType_course} %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index ffc9706e9..d1d807207 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -42,7 +42,9 @@
 
 		</div>		
 	<div class="welcome_left" id="welcome_left">
+      <% unless @first_page.nil? %>
 		<span class="font_welcome_trustie"><%= @first_page.title %></span> <span class="font_welcome_tdescription">, <%= @first_page.description %></span>
+      <% end %>
 	</div>
 	<div class="search-bar" id="search-bar">
 		<%= render :partial => "search_project", :locals => {:project_type => 0}%>	
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 11c9e054a..69af5cd2a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -516,6 +516,9 @@ zh:
   label_project_plural: 项目列表
   label_project_score: 项目评分
   label_first_page_made: 首页定制
+  label_project_first_page: 项目托管平台首页
+  label_course_first_page: 课程实践平台首页
+  label_contest_first_page: 竞赛实战平台首页
   label_x_projects:
     zero:  无项目
     one:   1 个项目
diff --git a/config/routes.rb b/config/routes.rb
index 7c5f878eb..f6b391108 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -559,6 +559,8 @@ RedmineApp::Application.routes.draw do
   match 'admin/projects', :controller => 'admin', :action => 'projects', :via => :get
   match 'admin/users', :controller => 'admin', :action => 'users', :via => :get
   match 'admin/first_page_made',:controller => 'admin',:action => 'first_page_made',:via => [:get,:post]
+  match 'admin/course_page_made',:controller => 'admin',:action => 'course_page_made',:via => [:get,:post]
+  match 'admin/contest_page_made',:controller => 'admin',:action => 'contest_page_made',:via => [:get,:post]
   match 'admin/search', :controller => 'admin', :action => 'search', :via => [:get, :post]
   match 'admin/plugins', :controller => 'admin', :action => 'plugins', :via => :get
   match 'admin/info', :controller => 'admin', :action => 'info', :via => :get
diff --git a/db/migrate/20140710095123_add_cloumn_to_first_page.rb b/db/migrate/20140710095123_add_cloumn_to_first_page.rb
new file mode 100644
index 000000000..6720a8aa4
--- /dev/null
+++ b/db/migrate/20140710095123_add_cloumn_to_first_page.rb
@@ -0,0 +1,9 @@
+class AddCloumnToFirstPage < ActiveRecord::Migration
+  def change
+    add_column :first_pages,:type,:string
+
+    fr = FirstPage.all.first
+    fr.type = "project"
+    fr.save
+  end
+end
diff --git a/db/migrate/20140711010124_alt_column_name.rb b/db/migrate/20140711010124_alt_column_name.rb
new file mode 100644
index 000000000..24b784765
--- /dev/null
+++ b/db/migrate/20140711010124_alt_column_name.rb
@@ -0,0 +1,5 @@
+class AltColumnName < ActiveRecord::Migration
+  def change
+    rename_column :first_pages,:type,:page_type
+  end
+end
diff --git a/db/migrate/20140711012924_add_contest_and_course_first_page.rb b/db/migrate/20140711012924_add_contest_and_course_first_page.rb
new file mode 100644
index 000000000..801219bd5
--- /dev/null
+++ b/db/migrate/20140711012924_add_contest_and_course_first_page.rb
@@ -0,0 +1,17 @@
+# -*coding:utf-8 -*-
+class AddContestAndCourseFirstPage < ActiveRecord::Migration
+  def change
+    fp = FirstPage.new
+    fp.web_title = ""
+    fp.title = "Trustie在线课程实践平台"
+    fp.description = "面向中国高校教师与大学生，提供社交化的课程管理、资源共享、合作实验、协同研究。"
+    fp.page_type = "course"
+    fp.save
+    fp1 = FirstPage.new
+    fp1.web_title = ""
+    fp1.title = "Trustie在线竞赛实战平台"
+    fp1.description = "面向中国大学生与编程爱好者，提供社交化的竞赛管理、应用管理、代码托管、合作交流。"
+    fp1.page_type = "contest"
+    fp1.save
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d84c30f9a..8123e15de 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140710071720) do
+ActiveRecord::Schema.define(:version => 20140711012924) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -412,6 +412,7 @@ ActiveRecord::Schema.define(:version => 20140710071720) do
     t.string   "description"
     t.datetime "created_at",  :null => false
     t.datetime "updated_at",  :null => false
+    t.string   "page_type"
   end
 
   create_table "forums", :force => true do |t|

From e1c7aaa2208025ceba5c8ccfc131ca0fa34a10e0 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 11 Jul 2014 11:53:31 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=86=B2=E7=AA=81=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/schema.rb | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 9e21541c2..fa41ed1d5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -12,7 +12,6 @@
 # It's strongly recommended to check this file into your version control system.
 
 ActiveRecord::Schema.define(:version => 20140711012924) do
->>>>>>> 056f86caad29ca95632d9da9e1e616cd00e2349a
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -805,7 +804,7 @@ ActiveRecord::Schema.define(:version => 20140711012924) do
   end
 
   create_table "relative_memos", :force => true do |t|
-    t.integer  "osp_id",                                :null => false
+    t.integer  "osp_id"
     t.integer  "parent_id"
     t.string   "subject",                               :null => false
     t.text     "content",                               :null => false
@@ -842,19 +841,6 @@ ActiveRecord::Schema.define(:version => 20140711012924) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
-  create_table "rich_rich_files", :force => true do |t|
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-    t.string   "rich_file_file_name"
-    t.string   "rich_file_content_type"
-    t.integer  "rich_file_file_size"
-    t.datetime "rich_file_updated_at"
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.text     "uri_cache"
-    t.string   "simplified_type",        :default => "file"
-  end
-
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1