Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
ef15c15605
|
|
@ -1837,11 +1837,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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_private_course') %>');
|
||||
showModal('ajax-modal', '510px');
|
||||
$('#ajax-modal').addClass('new-watcher');
|
||||
$('#ajax-modal').css('height','330px');
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
style="word-break: break-all;word-wrap: break-word;">
|
||||
<%= label_tag l(:field_subject) %>: <%=h @memo.subject %>
|
||||
</div>
|
||||
<div class="memo-content">
|
||||
<div class="memo-content" id="memo-content_div">
|
||||
<%= textAreailizable(@memo,:content) %>
|
||||
<p>
|
||||
<% if @memo.attachments.any?%>
|
||||
|
|
@ -149,8 +149,17 @@
|
|||
|
||||
|
||||
<script type="text/javascript">
|
||||
jQuery(document).ready(function($) {
|
||||
transpotUrl('.lz');
|
||||
transpotUrl('.replies');
|
||||
});
|
||||
jQuery(document).ready(function($) {
|
||||
transpotUrl('.lz');
|
||||
transpotUrl('.replies');
|
||||
});
|
||||
window.onready = function() {
|
||||
var maxwidth = $("#memo-content_div").width();
|
||||
$("#memo-content_div").children().each(function(){
|
||||
if($(this).width()>maxwidth)
|
||||
{
|
||||
$(this).width(maxwidth);
|
||||
}
|
||||
});
|
||||
};
|
||||
</script>
|
||||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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 :'/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 :'/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){
|
||||
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 :'/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 %>
|
||||
<% 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>
|
||||
|
||||
<p>
|
||||
<%= link_to l(:label_all_schol),school_index_path %>
|
||||
<% 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)) -%>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div class="wiki wiki-page">
|
||||
<div class="wiki wiki-page" id="wiki_content_div">
|
||||
<%= textAreailizable content, :text, :attachments => content.page.attachments,
|
||||
:edit_section_links => (@sections_editable && {:controller => 'wiki', :action => 'edit', :project_id => @page.project, :id => @page.title}) %>
|
||||
<%#= content.text.html_safe %>
|
||||
|
|
|
|||
|
|
@ -68,3 +68,15 @@
|
|||
<%= render :partial => 'sidebar' %>
|
||||
<% end %>
|
||||
<% html_title @page.pretty_title %>
|
||||
|
||||
<script type="text/javascript">
|
||||
window.onready = function() {
|
||||
var maxwidth = $("#wiki_content_div").width();
|
||||
$("#wiki_content_div").children().each(function(){
|
||||
if($(this).width()>maxwidth)
|
||||
{
|
||||
$(this).width(maxwidth);
|
||||
}
|
||||
});
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -2056,8 +2056,7 @@ zh:
|
|||
label_x_activity:
|
||||
zero: 个动态
|
||||
one: 个动态
|
||||
other: 个动态
|
||||
label_school_all: 中国高校
|
||||
other: 个动态
|
||||
label_upload_files: 上传资源
|
||||
label_relation_files: 关联已有资源
|
||||
label_contest_settings: 配置竞赛
|
||||
|
|
|
|||
Loading…
Reference in New Issue