jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' into develop

This commit is contained in:
sw 2014-10-24 14:23:12 +08:00
parent a40cf51d02 782098c6e7
commit b141afe98d
4 changed files with 60 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/helpers/application_helper.rb
View File

@ -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

2
app/views/my/account.html.erb
View File

@ -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);

129
app/views/school/index.html.erb
View File

@ -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)) -%>

3
config/locales/zh.yml
View File

@ -2056,8 +2056,7 @@ zh:
label_x_activity:
zero: 个动态
one: 个动态
other: 个动态
label_school_all: 中国高校
other: 个动态
label_upload_files: 上传资源
label_relation_files: 关联已有资源
label_contest_settings: 配置竞赛