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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
sw 2014-09-12 16:24:57 +08:00
parent b5edc0a686 c40ede1101
commit 6ac4136d39
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,10 +3,6 @@
<script type="text/javascript">
$(document).ready(function() {
$("#province").html("<option value='0' selected = true style='display: none;'></option>");
$.ajax({
type :"POST",
url :'/school/get_province',
@ -43,7 +39,7 @@
<script type="text/javascript">
function test(id){
location.href = encodeURI('http://course.trustie.net/?school_id='+id);
location.href = encodeURI('http://<%= Setting.host_course %>/?school_id='+id);
}
</script>
@ -55,7 +51,7 @@
//alert(value);
if(value == "")
{
alert("搜索条件不能为空");
alert("<%= l(:label_search_conditions_not_null) %>");
return;
}
//alert(province);
@ -82,17 +78,17 @@
<div>
<p>
<%= link_to "全部学校",school_index_path %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<%= link_to l(:label_all_schol),school_index_path %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<% if User.current.logged? %>
<a href="http://course.trustie.net">我的学校</a>
<a href="http://<%= Setting.host_course %>"><%= l(:label_my_school) %></a>
<% end %>
</p>
<ul>
<li style="width: 40%; float: left">请选择省份:
<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="搜索" onclick="ssearch()"></li>
<input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="ssearch()"></li>
</ul>
</div>

2
app/views/tags/_show_contests.html.erb
View File

@ -4,7 +4,7 @@
<% contests_results.each do |contest| %>
<p class="font_description2">
<strong><%= l(:label_tags_contest) %>:<%= link_to "#{contest.name}",
:controller => "contests",:action => "show",:id => contest.id %></strong>
:controller => "contests",:action => "show_contest",:id => contest.id %></strong>
<br />
<strong><%= l(:label_tags_contest_description) %>:</strong><%= contest.description %>
<%= contest.updated_on %>

8
config/locales/en.yml
View File

@ -1816,5 +1816,9 @@ en:
label_forums_max_length: Post Bar describing the maximum length of 65535 characters
label_unknow_type: Unknow type
label_score_less_than_zero: Score less than 0, revised to 0
review_assignments: review assignments
label_private: private
review_assignments: Review assignments
label_private: private
label_my_school: My school
label_all_schol: All school
label_select_province: Please select the provinces
label_search_conditions_not_null: The search conditions can not be empty

4
config/locales/zh.yml
View File

@ -2119,3 +2119,7 @@ zh:
label_score_less_than_zero: 得分小于0，修正为0
review_assignments: 评审任务
label_private: 私有
label_my_school: 我的学校
label_all_schol: 全部学校
label_select_province: 请选择省份
label_search_conditions_not_null: 搜索条件不能为空