From 782098c6e7d8ec89ca887f963088666bff6f0d4a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 24 Oct 2014 14:22:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E7=89=88?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=AE=E6=94=B9=E5=AD=A6=E6=A0=A1=E3=80=81?=
 =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E5=88=97=E8=A1=A8=E8=B7=A8=E5=9F=9F=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb |   3 -
 app/views/my/account.html.erb     |   2 +-
 app/views/school/index.html.erb   | 129 ++++++++++++++----------------
 config/locales/zh.yml             |   3 +-
 4 files changed, 60 insertions(+), 77 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2ba16c742..a577529cb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1836,11 +1836,8 @@ module ApplicationHelper
     bids_link = link_to l(:label_requirement_enterprise), {:controller => 'bids', :action => 'index'}
     forum_link = link_to l(:label_project_module_forums), {:controller => "forums", :action => "index"}
     stores_link = link_to l(:label_stores_index), {:controller => 'stores', :action=> 'index'}
-
-
     school_all_school_link = link_to l(:label_school_all), {:controller => 'school', :action => 'index'}
 
-
     #@nav_dispaly_project_label
     nav_list = Array.new
     nav_list.push(school_all_school_link) if @nav_dispaly_course_all_label && @show_course == 1
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index df7a1310b..259fa8cc4 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -16,7 +16,7 @@
     function get_options(value) {
         $.ajax({
             type: "POST",
-            url: 'http://<%= Setting.host_name%>/school/get_options/' + encodeURIComponent(value),
+            url: 'http://<%= Setting.host_user%>/school/get_options/' + encodeURIComponent(value),
             data: 'text',
             success: function (data) {
                 $("#province").val(value);
diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb
index 97035ebc2..ded1fb161 100644
--- a/app/views/school/index.html.erb
+++ b/app/views/school/index.html.erb
@@ -1,73 +1,58 @@
 <% port = ":3000" if Rails.env.development? %>
 
 <script type="text/javascript">
-	$(document).ready(function() {
-		$("#province").html("<option value='0' selected = true style='display: none;'></option>");
-		$.ajax({
-			type :"POST",
-			url :'http://<%= Setting.host_name %>/school/get_province',
-			data: "send",
-			success: function(data, textStatus){
-				
-				 $("#province").append(data.text);
-				 $("#schoollist").html(data.text_s);
-			}
-		})
-
-
-	});	
+    $(document).ready(function() {
+        $("#province").html("<option value='0' selected = true style='display: none;'></option>");
+        $.ajax({
+            type :"POST",
+            url :'http://<%= Setting.host_course %>/school/get_province',
+            data: "send",
+            success: function(data, textStatus){
+                $("#province").append(data.text);
+                $("#schoollist").html(data.text_s);
+            }
+        })
+    });
 </script>
 
 <script type="text/javascript">
-	function get_school(value){
- 		$.ajax({
- 			type :"POST",
- 			url :'http://<%= Setting.host_name %>/school/get_schoollist/'+encodeURIComponent(value),
- 			data :'text', 
- 			success: function(data){
- 				$("#schoollist").html(data);
- 				
- 				//$("#schoollist").html(data);
- 				
- 			}
- 			
- 		}
- 			
- 		)		
-	}
+    function get_school(value){
+        $.ajax({
+            type :"POST",
+            url :'http://<%= Setting.host_course %>/school/get_schoollist/'+encodeURIComponent(value),
+            data :'text',
+            success: function(data){
+                $("#schoollist").html(data);
+            }
+        })
+    }
 </script>
 
 <script type="text/javascript">
-	function test(id){
-        location.href = encodeURI('http://<%= Setting.host_name %>/?school_id='+id);
-	}
-
+    function test(id){
+        location.href = encodeURI('http://<%= Setting.host_course %>/?school_id='+id);
+    }
 </script>
 <script type="text/javascript">
-	function ssearch(){
-		//alert($("#key_word").val());
-		var value = $("#key_word").val();
-		var province = $("#province").val();
+    function ssearch(){
+        //alert($("#key_word").val());
+        var value = $("#key_word").val();
+        var province = $("#province").val();
         //alert(value);
         if(value == "")
         {
             alert("<%= l(:label_search_conditions_not_null) %>");
             return;
         }
-		//alert(province);
-		$.ajax({
- 			type :"POST",
- 			url :'http://<%= Setting.host_name %>/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+province,
- 			data :'text', 
- 			success: function(data){
- 				$("#schoollist").html(data);
- 				
- 				//$("#schoollist").html(data);
- 			}
- 		})		
-
-	}
-
+        $.ajax({
+            type :"POST",
+            url :'http://<%= Setting.host_course %>/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+province,
+            data :'text',
+            success: function(data){
+                $("#schoollist").html(data);
+            }
+        })
+    }
     function word_keydown(e){
         if(e&& e.keyCode==13){
             ssearch();
@@ -76,26 +61,28 @@
 </script>
 
 <div>
-	<p>
-
-		<%= link_to l(:label_all_schol),school_index_path  %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        <% if User.current.logged? %>
-          <a href="http://<%= Setting.host_name %>"><%= l(:label_my_school) %></a>
-        <% end %>
-	</p>
-		<ul>
-			<li style="width: 40%; float: left"><%= l(:label_select_province) %>:
-				<select id="province" name="province" onchange="get_school(this.value)"></select>
-			</li>
-			<li style="width: 50%; float: left"><input type="text" id="key_word" name="key_word"  onkeydown="word_keydown(event);"/>
-				<input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="ssearch()"></li>
-		</ul>
-
+  <p>
+    <%= link_to l(:label_all_schol),school_index_path  %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <% if User.current.logged? %>
+        <a href="http://<%= Setting.host_course %>">
+          <%= l(:label_my_school) %>
+        </a>
+    <% end %>
+  </p>
+  <ul>
+    <li style="width: 40%; float: left">
+      <%= l(:label_select_province) %>:
+      <select id="province" name="province" onchange="get_school(this.value)"></select>
+    </li>
+    <li style="width: 50%; float: left">
+      <input type="text" id="key_word" name="key_word"  onkeydown="word_keydown(event);"/>
+      <input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="ssearch()">
+    </li>
+  </ul>
 </div>
 <div style="clear: both"></div>
 <div class="school-index">
-	<ul id="schoollist" style="line-height: 25px">
-
-	</ul>
+  <ul id="schoollist" style="line-height: 25px">
+  </ul>
 </div>
 <% html_title(l(:label_school_all)) -%>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index cd522dd2c..e37e6a370 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2056,8 +2056,7 @@ zh:
   label_x_activity:
     zero: 个动态
     one: 个动态
-    other: 个动态  
-  label_school_all: 中国高校
+    other: 个动态
   label_upload_files: 上传资源
   label_relation_files: 关联已有资源
   label_contest_settings: 配置竞赛