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] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E6=89=98?=
 =?UTF-8?q?=E7=AE=A1=E5=B9=B3=E5=8F=B0=E9=A6=96=E9=A1=B5=E5=AE=9A=E5=88=B6?=
 =?UTF-8?q?=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