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 11:40:41 +08:00
parent 725c9559a6 a451385d13
commit a40cf51d02
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/courses/join_private_courses.js.erb
View File

@ -1,4 +1,3 @@
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_private_course') %>'); $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_private_course') %>');
showModal('ajax-modal', '510px'); showModal('ajax-modal', '510px');
$('#ajax-modal').addClass('new-watcher');
$('#ajax-modal').css('height','330px'); $('#ajax-modal').css('height','330px');

2
app/views/files/index.html.erb
View File

@ -54,7 +54,7 @@
if (textStatus == 'success') { if (textStatus == 'success') {
eval(xhr.responseText); eval(xhr.responseText);
} else if (textStatus == 'error') { } else if (textStatus == 'error') {
alert('error'); // alert('error');
} }
} }

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

@ -5,7 +5,7 @@
$("#province").html("<option value='0' selected = true style='display: none;'></option>"); $("#province").html("<option value='0' selected = true style='display: none;'></option>");
$.ajax({ $.ajax({
type :"POST", type :"POST",
url :'/school/get_province', url :'http://<%= Setting.host_name %>/school/get_province',
data: "send", data: "send",
success: function(data, textStatus){ success: function(data, textStatus){
@ -22,7 +22,7 @@
function get_school(value){ function get_school(value){
$.ajax({ $.ajax({
type :"POST", type :"POST",
url :'/school/get_schoollist/'+encodeURIComponent(value), url :'http://<%= Setting.host_name %>/school/get_schoollist/'+encodeURIComponent(value),
data :'text', data :'text',
success: function(data){ success: function(data){
$("#schoollist").html(data); $("#schoollist").html(data);
@ -39,7 +39,7 @@
<script type="text/javascript"> <script type="text/javascript">
function test(id){ function test(id){
location.href = encodeURI('http://<%= Setting.host_course %>/?school_id='+id); location.href = encodeURI('http://<%= Setting.host_name %>/?school_id='+id);
} }
</script> </script>
@ -57,7 +57,7 @@
//alert(province); //alert(province);
$.ajax({ $.ajax({
type :"POST", type :"POST",
url :'/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+province, url :'http://<%= Setting.host_name %>/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+province,
data :'text', data :'text',
success: function(data){ success: function(data){
$("#schoollist").html(data); $("#schoollist").html(data);
@ -80,7 +80,7 @@
<%= link_to l(:label_all_schol),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? %> <% if User.current.logged? %>
<a href="http://<%= Setting.host_course %>"><%= l(:label_my_school) %></a> <a href="http://<%= Setting.host_name %>"><%= l(:label_my_school) %></a>
<% end %> <% end %>
</p> </p>
<ul> <ul>