From 8871652e0165e859a3a9781843bf701baaf59d50 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Mon, 28 Jul 2014 10:37:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A6=96=E9=A1=B5=E5=AE=9A?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E8=AE=BE=E7=BD=AE=E6=98=AF=E5=90=A6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA"=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B"=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb           |  1 +
 app/controllers/welcome_controller.rb         |  1 +
 app/views/admin/first_page_made.html.erb      | 24 +++++++++++--------
 app/views/layouts/_base_header.html.erb       |  4 ++++
 config/locales/zh.yml                         |  1 +
 .../20140728014933_first_page_add_column.rb   |  5 ++++
 db/schema.rb                                  | 23 +++++++++---------
 7 files changed, 38 insertions(+), 21 deletions(-)
 create mode 100644 db/migrate/20140728014933_first_page_add_column.rb

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 36b7e8598..c4a03adcf 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -153,6 +153,7 @@ class AdminController < ApplicationController
       @first_page.image_width = params[:image_width]
       @first_page.image_height = params[:image_height]
       @first_page.sort_type = params[:sort_type]
+      @first_page.show_course = params[:show_course]
       if @first_page.save
         respond_to do |format|
           flash[:notice] = l(:notice_successful_update)
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 0cca7be6e..236665b7f 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -24,6 +24,7 @@ class WelcomeController < ApplicationController
  
   def index
     @first_page = FirstPage.where("page_type = 'project'").first
+    @show_course = @first_page.show_course
     if @first_page.nil? ||  @first_page.sort_type.nil?
       @projects = find_miracle_project(10, 3,"grade desc")
     else
diff --git a/app/views/admin/first_page_made.html.erb b/app/views/admin/first_page_made.html.erb
index b83e54db1..601b2b8d8 100644
--- a/app/views/admin/first_page_made.html.erb
+++ b/app/views/admin/first_page_made.html.erb
@@ -27,24 +27,28 @@
       <label for='image_height' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_imgae_height)%>:</label>
       <%= text_field_tag  'image_height', params[:label_imgae_height], :value => @first_page.image_height,: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;" %> -->
-      <%= text_area 'first_page', 'description', :value => @first_page.description,:cols => 80, :rows => 15, :class => 'wiki-edit' %>
-      <%= wikitoolbar_for 'first_page_description' %>
-    </p>
+      <label for='title'>&nbsp;&nbsp;&nbsp;<%= l(:label_show_course) %>:</label>
+      <select name="show_course" id="show_course" style="font-size:small;width:497px;margin-left:10px;display: inline">
+        <option value="1" <%= "selected=selected" if @first_page.show_course == 1 %>><%= l(:general_text_yes) %></option>
+        <option value="2" <%= "selected=selected" if @first_page.show_course == 2 %>><%= l(:general_text_no) %></option>
+      </select>
+      </p>
     <p style="margin-left:60px;padding-right: 20px;">
       <label for='sort_type' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_sort_type)%>:</label>
-      <select name="sort_type" id="sort_type" style="font-size:small;width:496px;margin-left:80px;">
+      <select name="sort_type" id="sort_type" style="font-size:small;width:497px;margin-left:80px;">
         <option value="1" <%= "selected=selected" if @first_page.sort_type == 1 %>><%= l(:label_sort_by_active) %></option>
         <option value="2" <%= "selected=selected" if @first_page.sort_type == 2 %>><%= l(:label_sort_by_influence) %></option>
         <option value="0" <%= "selected=selected" if @first_page.sort_type == 0 %>><%= l(:label_sort_by_time) %></option>
       </select>
     </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;" %> -->
+      <%= text_area 'first_page', 'description', :value => @first_page.description,:cols => 80, :rows => 15, :class => 'wiki-edit' %>
+      <%= wikitoolbar_for 'first_page_description' %>
+    </p>
+
 
       <%= submit_tag l(:button_save), :class => "small", :name => nil %>
 <% end %>
diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index 17f0d1e60..98e14c00a 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -40,8 +40,10 @@
 		<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;" class="loggedas_li">
 			<%=link_to_user(User.current)%>
 			<ul class="sub_menu">
+              <% if @show_course.nil? || @show_course != 2 %>
 				<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
                  <% hasCourse=true%>
+
 				<li  id="course_loggedas_li"><%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id, host: Setting.course_domain} %>
                   <ul class="course_sub_menu">
                     <% User.current.courses.each do |course| %>
@@ -51,7 +53,9 @@
                     <% end %>
                   </ul>
                 </li>
+
 				<% end -%>
+              <% end %>
               <li id="project_loggedas_li"><%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %>
 
                 <% if hasCourse %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index bb4c445e8..0560750c9 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -579,6 +579,7 @@ zh:
   label_sort_type: 热门项目排序方式
   label_contest_notification_title: 竞赛通知标题
   label_contest_notification_content: 竞赛通知内容
+  label_show_course: 显示课程
   #by young
   label_requirement: 需求
   label_new_course: 课程列表
diff --git a/db/migrate/20140728014933_first_page_add_column.rb b/db/migrate/20140728014933_first_page_add_column.rb
new file mode 100644
index 000000000..408cdc54c
--- /dev/null
+++ b/db/migrate/20140728014933_first_page_add_column.rb
@@ -0,0 +1,5 @@
+class FirstPageAddColumn < ActiveRecord::Migration
+  def change
+    add_column("first_pages","show_course",:integer,default: 1)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2927e6fac..05886b190 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 => 20140725062302) do
+ActiveRecord::Schema.define(:version => 20140728014933) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -425,6 +425,7 @@ ActiveRecord::Schema.define(:version => 20140725062302) do
     t.integer  "sort_type"
     t.integer  "image_width",  :default => 107
     t.integer  "image_height", :default => 63
+    t.integer  "show_course",  :default => 1
   end
 
   create_table "forums", :force => true do |t|
@@ -845,18 +846,18 @@ ActiveRecord::Schema.define(:version => 20140725062302) 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"