From edce128e6b4f0cd0265a63bb1a60db38699f3428 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 25 Apr 2014 14:49:48 +0800
Subject: [PATCH 1/5] leanmodal

---
 app/views/my/account.html.erb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index bec07145b..9bc4cb2b5 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -3,8 +3,8 @@
 <script type="text/javascript">
 	$(document).ready(
 		function(){
-			$("#province").attr("href", "#WOpenWindow")
-			$("#province").leanModal({top: 100, closeButton: ".modal_close"});
+			$("#province_lean").attr("href", "#WOpenWindow")
+			$("#province_lean").leanModal({top: 100, closeButton: ".modal_close"});
 		}
 	);
 </script>
@@ -13,6 +13,7 @@
 
  <script type="text/javascript">
  	function get_options(value){
+        $("#province_lean").click();
  		$.ajax({
  			type :"POST",
  			url :'/school/get_options/'+encodeURIComponent(value),
@@ -109,23 +110,18 @@
 		
 
 		<p style="width:357px;padding-left: 26px;">
+            <div class="hidden" id='province_lean' ></div>
 			<% unless User.current.user_extensions.school.nil? %>
 				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province, User.current.user_extensions.school.province), :onchange => "get_options(this.value)" %>
 				<input id="occupation" name="occupation" type="hidden" value="<%=User.current.user_extensions.school.id%>" />
 				<input id="occupation_name" type="text" value="<%=User.current.user_extensions.school.name%>" readonly />
-				
-				
-				
 
-				<!--<%= select_tag "occupation", 
-					options_for_select([[User.current.user_extensions.school.name, User.current.user_extensions.school.id]])  %>-->
 			<% else %>
 				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), :onchange => "get_options(this.value)" %>
 
 				<input id="occupation" name="occupation" type="hidden" />
 				<input id="occupation_name" type="text" readonly />		
 			<% end %>
-		<!--	<input id="occupation" readonly />-->
 		</p>		
 		
 		<div id="WOpenWindow">

From 891fa65c160652b6b47064fc738fe2e13a571cca Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 25 Apr 2014 15:21:28 +0800
Subject: [PATCH 2/5] =?UTF-8?q?jquery=20=E7=82=B9=E5=87=BB=E7=9C=81?=
 =?UTF-8?q?=E4=BB=BD=E5=87=BA=E5=AD=A6=E6=A0=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 9bc4cb2b5..6efd76e15 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -5,6 +5,8 @@
 		function(){
 			$("#province_lean").attr("href", "#WOpenWindow")
 			$("#province_lean").leanModal({top: 100, closeButton: ".modal_close"});
+            $("#province option").attr("disabled", true);
+            $("#province option").click(function(){get_options(this.value);});
 		}
 	);
 </script>
@@ -19,11 +21,11 @@
  			url :'/school/get_options/'+encodeURIComponent(value),
  			data :'text', 
  			success: function(data){
- 				
- 				
  				$("#schoollist").html(data);
- 				
- 			}
+ 			},
+            complete: function() {
+                $("#province option").attr("disabled", true);
+            }
  			
  		}
  			
@@ -117,7 +119,7 @@
 				<input id="occupation_name" type="text" value="<%=User.current.user_extensions.school.name%>" readonly />
 
 			<% else %>
-				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), :onchange => "get_options(this.value)" %>
+				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), onclick: '$("#province option").attr("disabled", false)' %>
 
 				<input id="occupation" name="occupation" type="hidden" />
 				<input id="occupation_name" type="text" readonly />		

From 12c19e2bfe2554ce5a749a969ebe7fef37992824 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 25 Apr 2014 15:41:12 +0800
Subject: [PATCH 3/5] =?UTF-8?q?Revert=20"jquery=20=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=9C=81=E4=BB=BD=E5=87=BA=E5=AD=A6=E6=A0=A1"=20revert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 891fa65c160652b6b47064fc738fe2e13a571cca.
---
 app/views/my/account.html.erb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 6efd76e15..9bc4cb2b5 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -5,8 +5,6 @@
 		function(){
 			$("#province_lean").attr("href", "#WOpenWindow")
 			$("#province_lean").leanModal({top: 100, closeButton: ".modal_close"});
-            $("#province option").attr("disabled", true);
-            $("#province option").click(function(){get_options(this.value);});
 		}
 	);
 </script>
@@ -21,11 +19,11 @@
  			url :'/school/get_options/'+encodeURIComponent(value),
  			data :'text', 
  			success: function(data){
+ 				
+ 				
  				$("#schoollist").html(data);
- 			},
-            complete: function() {
-                $("#province option").attr("disabled", true);
-            }
+ 				
+ 			}
  			
  		}
  			
@@ -119,7 +117,7 @@
 				<input id="occupation_name" type="text" value="<%=User.current.user_extensions.school.name%>" readonly />
 
 			<% else %>
-				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), onclick: '$("#province option").attr("disabled", false)' %>
+				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), :onchange => "get_options(this.value)" %>
 
 				<input id="occupation" name="occupation" type="hidden" />
 				<input id="occupation_name" type="text" readonly />		

From 230b377cad7af24cee323745b292efdedb353e35 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 25 Apr 2014 15:41:40 +0800
Subject: [PATCH 4/5] oRevert "leanmodal" oik

This reverts commit edce128e6b4f0cd0265a63bb1a60db38699f3428.
---
 app/views/my/account.html.erb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 9bc4cb2b5..bec07145b 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -3,8 +3,8 @@
 <script type="text/javascript">
 	$(document).ready(
 		function(){
-			$("#province_lean").attr("href", "#WOpenWindow")
-			$("#province_lean").leanModal({top: 100, closeButton: ".modal_close"});
+			$("#province").attr("href", "#WOpenWindow")
+			$("#province").leanModal({top: 100, closeButton: ".modal_close"});
 		}
 	);
 </script>
@@ -13,7 +13,6 @@
 
  <script type="text/javascript">
  	function get_options(value){
-        $("#province_lean").click();
  		$.ajax({
  			type :"POST",
  			url :'/school/get_options/'+encodeURIComponent(value),
@@ -110,18 +109,23 @@
 		
 
 		<p style="width:357px;padding-left: 26px;">
-            <div class="hidden" id='province_lean' ></div>
 			<% unless User.current.user_extensions.school.nil? %>
 				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province, User.current.user_extensions.school.province), :onchange => "get_options(this.value)" %>
 				<input id="occupation" name="occupation" type="hidden" value="<%=User.current.user_extensions.school.id%>" />
 				<input id="occupation_name" type="text" value="<%=User.current.user_extensions.school.name%>" readonly />
+				
+				
+				
 
+				<!--<%= select_tag "occupation", 
+					options_for_select([[User.current.user_extensions.school.name, User.current.user_extensions.school.id]])  %>-->
 			<% else %>
 				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), :onchange => "get_options(this.value)" %>
 
 				<input id="occupation" name="occupation" type="hidden" />
 				<input id="occupation_name" type="text" readonly />		
 			<% end %>
+		<!--	<input id="occupation" readonly />-->
 		</p>		
 		
 		<div id="WOpenWindow">

From 8f5958abc1309abd0b4cb595c232c624e0833522 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 25 Apr 2014 16:08:00 +0800
Subject: [PATCH 5/5] mao

---
 app/controllers/projects_controller.rb | 2 +-
 app/controllers/welcome_controller.rb  | 2 +-
 app/views/files/index.html.erb         | 6 +++---
 app/views/welcome/course.html.erb      | 2 +-
 app/views/welcome/index.html.erb       | 2 +-
 config/locales/zh.yml                  | 7 ++++---
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 95fbed1d3..730546aa6 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -862,7 +862,7 @@ class ProjectsController < ApplicationController
             
       if params[:project][:is_public] == '0'
         project_status = ProjectStatus.find_by_project_id(@project.id)
-        project_status.destroy
+        project_status.destroy if project_status
       elsif params[:project][:is_public] == '1'
         project_status = ProjectStatus.create(:project_id => @project.id, :watchers_count => @project.watchers.count, :changesets_count => @project.changesets.count,:grade => 0, :project_type => @project.project_type)
       end
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index d566c9b86..5e8eef074 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -17,7 +17,7 @@
 
 class WelcomeController < ApplicationController
   caches_action :robots
-  before_filter :fake, :only => [:index, :course]
+  # before_filter :fake, :only => [:index, :course]
   before_filter :entry_select_course, :entry_select_contest, :entry_select_user, :only => [:index]
  
   def index
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index cfaba8749..98befd091 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -1,14 +1,14 @@
 <!-- <h3> --><!-- %=l(:label_attachment_plural)%></h3 -->
  
-<span class="borad-title"><%=(@project.project_type == 1) ? t(:label_user_course) : t(:label_project) %>文件共享专区</span>
+<span class="borad-title"><%=(@project.project_type == 1) ? t(:label_user_course) : t(:label_project) %>资源共享区</span>
 
 <div class="content-title-top">
   <%#= link_to(l(:label_attachment_new), 'javascript:void(0);', :onclick=>"$('#file_buttons').slideToggle();", :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %>
   <div class="clearfix"></div>
   <div id="file_buttons" class="nhidden">
     <%#= link_to('上传文件', new_project_file_path(@project), :class => 'icon m5p5 button_submit') if User.current.allowed_to?(:manage_files, @project) %>
-    <%= link_to('上传文件', 'javascript:void(0);', :class => 'icon m5p5 button_submit', :onclick => "$('#relation_file_div').slideUp();$('#upload_file_div').slideToggle('slow');") if User.current.allowed_to?(:manage_files, @project) %>
-    <%= link_to('关联已有文件', 'javascript:void(0);', :onclick => "$('#upload_file_div').slideUp();$('#relation_file_div').slideToggle();", :class => 'icon m5p5 button_submit') if User.current.allowed_to?(:manage_files, @project) %>
+    <%= link_to( l(:label_upload_files), 'javascript:void(0);', :class => 'icon m5p5 button_submit', :onclick => "$('#relation_file_div').slideUp();$('#upload_file_div').slideToggle('slow');") if User.current.allowed_to?(:manage_files, @project) %>
+    <%= link_to(l(:label_relation_files), 'javascript:void(0);', :onclick => "$('#upload_file_div').slideUp();$('#relation_file_div').slideToggle();", :class => 'icon m5p5 button_submit') if User.current.allowed_to?(:manage_files, @project) %>
     <div id="upload_file_div" class="relation_file_div hidden" >
       <%= render :partial => 'new', locals: {project: @project}%>
     </div> 
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index f757e83bb..c91b3e453 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -255,7 +255,7 @@
 </div>
 <div class="clearfix"></div>
 
-<div style="width:100%;">
+<div class="hidden" style="width:100%;">
 	<div style="width:600px;margin:0px auto;margin-top:80px;">
 	<table style="width:600px;font-size:15px; color: #e8770d;">
 		<tr>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 1ffb23856..7a241981a 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -246,7 +246,7 @@
 
 <div class="clearfix"></div>
 
-<div style="width:100%;">
+<div class="hidden" style="width:100%;">
 	<div style="width:600px;margin:0px auto;margin-top:180px;">
 	<table style="width:600px;font-size:15px; color: gray;">
 		<tr>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b3c20bcd8..da9d8a052 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1425,7 +1425,7 @@ zh:
   label_has_praisers: 赞(%{count})
   label_has_watchers: 关注(%{count})
   label_has_fans: 粉丝(%{count})
-  label_coursefile_sharingarea: 课程文件共享专区
+  label_coursefile_sharingarea: 课程资源共享区
   #modify by men
   label_x_has_fans:
     zero: 粉丝(%{count})
@@ -1668,7 +1668,7 @@ zh:
   label_public_info: （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该项目。）
   label_course_view_student: 查看其他课程
   label_course_student: 学生
-  label_homework: 课程作业
+  label_homework: 课程实践
   label_course_file: 资源库 #资料共享
   label_stores_index: 资源搜索
   label_course_new_homework: 新建作业
@@ -1829,7 +1829,8 @@ zh:
   label_sumbit_empty: 搜索内容不能为空
   
   #add by linchun (竞赛相关)
-  label_upload_files: 上传文件
+  label_upload_files: 上传资源
+  label_relation_files: 关联已有资源
   label_upload_softwarepackage: 上传软件包
   label_upload_cuttingphoto: 上传截图
   label_contests_reward_method: 奖励方式