From 5c0e3e96cc61b458e4b95342359d547c4b11408d Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 19 Jul 2014 16:41:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AF=BC=E8=88=AA=E6=A0=8F=E7=BC=BA=E5=A4=B1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=81=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=9F=9F?=
 =?UTF-8?q?=E5=90=8D=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E3=80=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E5=A4=8DFirstPage=E8=A1=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84=E8=BF=81=E7=A7=BB=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contests/show_attendingcontest.html.erb   |  2 +-
 app/views/courses/index.html.erb              |  4 ++
 app/views/issues/_list.html.erb               |  5 +-
 app/views/projects/index.html.erb             |  2 +
 .../20140719080032_repair_first_page.rb       | 59 +++++++++++++++++++
 db/schema.rb                                  | 37 ++++--------
 6 files changed, 82 insertions(+), 27 deletions(-)
 create mode 100644 db/migrate/20140719080032_repair_first_page.rb

diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb
index 6430a7c9a..cb6024e29 100644
--- a/app/views/contests/show_attendingcontest.html.erb
+++ b/app/views/contests/show_attendingcontest.html.erb
@@ -131,7 +131,7 @@
         <tr style="width:800px;">
           <span><%= l(:label_work_deposit_project) %>：</span>
           <span style="padding-left: 4px"><%= select_tag 'project', options_for_select(select_option_helper(@option)), :name => 'project', :class => 'grayline2' %></span>
-          <span><%= link_to l(:label_create_new_projects),{:controller => 'projects',:action => 'new',course: 0, project_type: 0} , :target => '_blank',host:Setting.project_domain %></span><!-- new_project_path(course: 0, project_type: 0) -->
+          <span><%= link_to l(:label_create_new_projects),{:controller => 'projects',:action => 'new',course: 0, project_type: 0,host: Setting.project_domain}, :target => '_blank' %></span><!-- new_project_path(course: 0, project_type: 0) -->
         </tr>
         <br/>
         <br/>
diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb
index 0586262e9..24eefd4cb 100644
--- a/app/views/courses/index.html.erb
+++ b/app/views/courses/index.html.erb
@@ -1,3 +1,7 @@
+<% @nav_dispaly_course_all_label = 1
+   @nav_dispaly_forum_label = 1
+   @nav_dispaly_course_label = nil
+   @nav_dispaly_store_all_label = 1 %>
 <% content_for :header_tags do %>
     <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 57d8a60cb..c9fecc6a9 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -38,7 +38,10 @@
 				<% end -%>
 				<ul class="list-group-item-meta">
 					<div class="issue-list-description">
-						<%= l(:field_description)%>:&nbsp;<%= issue.short_description %>
+                      <div class="wiki">
+                        <%= textilizable issue, :description, :attachments => issue.attachments %>
+                      </div>
+						<!-- <#%= l(:field_description)%>:&nbsp;<#%= issue.short_description %> -->
 					</div>
 				</ul>
 				<ul class="list-group-item-meta">
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index c4b2bdc9e..5d479bced 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -1,3 +1,5 @@
+<% @nav_dispaly_project_label = 1
+   @nav_dispaly_forum_label = 1 %>
 <% content_for :header_tags do %>
 <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>
diff --git a/db/migrate/20140719080032_repair_first_page.rb b/db/migrate/20140719080032_repair_first_page.rb
new file mode 100644
index 000000000..a1faf7f90
--- /dev/null
+++ b/db/migrate/20140719080032_repair_first_page.rb
@@ -0,0 +1,59 @@
+# -*coding:utf-8 -*-
+class RepairFirstPage < ActiveRecord::Migration
+  def change
+    pro_fps = FirstPage.where("page_type = 'project'")
+    if pro_fps.nil? || pro_fps.first.nil?
+      fp = FirstPage.new
+      fp.web_title = "Trustie - 为大学生技术创新筑巢"
+      fp.title = "Trustie在线项目托管平台"
+      fp.description = "面向中国大学生与软件从业者，提供社交化的项目管理、代码托管、资源共享、合作交流。"
+      fp.page_type = "project"
+      fp.sort_type = 1
+      fp.save
+    else
+      fp = pro_fps.first
+      fp.web_title = "Trustie - 为大学生技术创新筑巢"
+      fp.title = "Trustie在线项目托管平台"
+      fp.description = "面向中国大学生与软件从业者，提供社交化的项目管理、代码托管、资源共享、合作交流。"
+      fp.page_type = "project"
+      fp.sort_type = 1
+      fp.save
+    end
+    course_fps = FirstPage.where("page_type = 'course'")
+    if course_fps.nil? || course_fps.first.nil?
+      fp = FirstPage.new
+      fp.web_title = "Trustie - 为大学生技术创新筑巢"
+      fp.title = "Trustie在线课程实践平台"
+      fp.description = "面向中国高校教师与大学生，提供社交化的课程管理、资源共享、合作实验、协同研究。"
+      fp.page_type = "course"
+      fp.sort_type = 1
+      fp.save
+    else
+      fp = course_fps.first
+      fp.web_title = "Trustie - 为大学生技术创新筑巢"
+      fp.title = "Trustie在线课程实践平台"
+      fp.description = "面向中国高校教师与大学生，提供社交化的课程管理、资源共享、合作实验、协同研究。"
+      fp.page_type = "course"
+      fp.sort_type = 1
+      fp.save
+    end
+    contest_fps = FirstPage.where("page_type = 'contest'")
+    if contest_fps.nil? || contest_fps.first.nil?
+      fp1 = FirstPage.new
+      fp1.web_title = "Trustie - 为大学生技术创新筑巢"
+      fp1.title = "Trustie在线竞赛实战平台"
+      fp1.description = "面向中国大学生与编程爱好者，提供社交化的竞赛管理、应用管理、代码托管、合作交流。"
+      fp1.page_type = "contest"
+      fp1.sort_type = 1
+      fp1.save
+    else
+      fp1 = contest_fps.first
+      fp1.web_title = "Trustie - 为大学生技术创新筑巢"
+      fp1.title = "Trustie在线竞赛实战平台"
+      fp1.description = "面向中国大学生与编程爱好者，提供社交化的竞赛管理、应用管理、代码托管、合作交流。"
+      fp1.page_type = "contest"
+      fp1.sort_type = 1
+      fp1.save
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4a14a02f2..d7c625bd2 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 => 20140716021558) do
+ActiveRecord::Schema.define(:version => 20140719080032) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -809,18 +809,18 @@ ActiveRecord::Schema.define(:version => 20140716021558) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
+    t.string   "subject",                               :null => false
+    t.text     "content",                               :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
+    t.integer  "replies_count",      :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
+    t.boolean  "lock",               :default => false
+    t.boolean  "sticky",             :default => false
+    t.boolean  "is_quote",           :default => false
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+    t.integer  "viewed_count_crawl", :default => 0
+    t.integer  "viewed_count_local", :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
@@ -844,19 +844,6 @@ ActiveRecord::Schema.define(:version => 20140716021558) 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
@@ -916,7 +903,7 @@ ActiveRecord::Schema.define(:version => 20140716021558) do
 
   create_table "softapplications", :force => true do |t|
     t.string   "name"
-    t.string   "description"
+    t.text     "description"
     t.integer  "app_type_id"
     t.string   "app_type_name"
     t.string   "android_min_version_available"