Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/views/org_document_comments/edit.html.erb

@@ -1,6 +1,6 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
-    <%= javascript_include_tag "des_KindEditor"  %>
+    <%= javascript_include_tag "des_kindEditor" %>
 <% end %>
 
 <script>

app/views/org_document_comments/new.html.erb

@@ -1,6 +1,6 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
-    <%= javascript_include_tag "des_KindEditor"  %>
+    <%= javascript_include_tag "des_kindEditor"  %>
 <% end %>
 
 <script>

app/views/users/search_user_course.js.erb

@@ -10,16 +10,16 @@
 //$("#upload_box").html('<%#= escape_javascript( render :partial => "resource_share_popup" ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 //$("#upload_box").css('display','block');
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% elsif params[:send_type] == 'file' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% elsif params[:send_type] == 'message' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% end %>
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","415px").css("left","1045px");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
 $('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 var val =  $("#search_course_input").val();

app/views/users/search_user_org.js.erb

@@ -8,7 +8,7 @@
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","415px").css("left","1045px");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
 $('#ajax-modal').parent().addClass("popbox").addClass("shareDP");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 var val =  $("#search_org_input").val();

app/views/users/search_user_project.js.erb

@@ -8,7 +8,7 @@
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","415px").css("left","1045px");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
 $('#ajax-modal').parent().addClass("resourceUploadPopup").addClass("popbox")
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 //$("#search_project_input").focus();

app/views/users/user_import_homeworks.js.erb

@@ -4,3 +4,4 @@ $('#ajax-modal').siblings().remove();
 var mTop = ($(window).height()-646)/2;
 var mLeft = ($(window).width()-1054)/2;
 $('#ajax-modal').parent().css("border","3px solid #269ac9").css("top","mTop").css("left","mLeft").css("position","fixed");
+$('#ajax-modal').css("margin","15px");

app/views/users/user_resource.html.erb

@@ -358,12 +358,14 @@
         if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
             $.ajax({
                 type: 'get',
-                url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize()
+                url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize(),
+                data:{send_type:'file'}
             });
         }else{
             $.ajax({
                 type: 'get',
-                url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()
+                url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize(),
+                data:{send_type:'file'}
             });
 
         }

db/schema.rb

@@ -1219,7 +1219,6 @@ ActiveRecord::Schema.define(:version => 20160202034530) do
   create_table "org_members", :force => true do |t|
     t.integer  "user_id"
     t.integer  "organization_id"
-    t.string   "role"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
   end