Merge branch 'sw_new_course' into dev_hjq

app/controllers/users_controller.rb

@@ -1424,7 +1424,7 @@ class UsersController < ApplicationController
     @attachments = paginateHelper @attachments,15
     respond_to do |format|
       format.js
-      format.html {render :layout => 'base_users_new'}
+      format.html {render :layout => 'new_base_user'}
     end
   end
 

app/views/layouts/_logined_header.html.erb

@@ -8,7 +8,7 @@
         <a href="javascript:void(0);" class="homepageWhite f16">首页</a>
       </li>
       <li class="navHomepageMenu fl">
-        <a href="javascript:void(0);" class="homepageWhite f16">资源库</a></li>
+        <a href="<%=url_for(:controller => 'users', :action => 'user_resource',:id=>@user.id,:type=>1)%>" class="homepageWhite f16">资源库</a></li>
       <li class="navHomepageMenu fl">
         <a href="javascript:void(0);" class="homepageWhite f16">作业</a>
       </li>

app/views/users/_resource_share_for_project_popup.html.erb

@@ -26,6 +26,7 @@
 
     <%= hidden_field_tag(:send_id, send_id) %>
     <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="courseReferContainer">
     <% if !projects.empty?  %>
         <% projects.each do |project| %>
         <ul class="courseSend fl">
@@ -35,7 +36,7 @@
           <li class="sendCourseName fl"><%= truncate( project.name,:length=>18)%></li>
         </ul>
         <% end %>
-
+    </div>
   </div>
   <div>
     <div class="courseSendSubmit">

app/views/users/_resource_share_popup.html.erb

@@ -26,6 +26,7 @@
 
     <%= hidden_field_tag(:send_id, send_id) %>
     <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="courseReferContainer">
     <% if !courses.empty?  %>
         <% courses.each do |course| %>
         <ul class="courseSend fl">
@@ -35,14 +36,14 @@
           <li class="sendCourseName fl"><%= truncate(course.name,:length=>18)%></li>
         </ul>
         <% end %>
-
+      </div>
   </div>
   <div>
     <div class="courseSendSubmit">
       <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
       <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
     </div>
-    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="closeModal();">取消</a></div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="closeModal();">取消</a></div>
   </div>
   <div class="cl"></div>
     <% end %>

app/views/users/user_resource.html.erb

@@ -92,8 +92,8 @@
     <div class="resourcesCheckAll">
       <input id="checkboxAll" type="checkbox" value="" onclick="all_select();"  class="resourcesCheckbox" />
     </div>
-    <a href="javascript:void(0);" class="replyGrey mr15" onclick="all_select();">全选</a>
-    <a href="javascript:void(0);" class="replyGrey" onclick="batch_delete();">删除</a>
+    <a href="javascript:void(0);" class="replyGrey1 mr15" onclick="all_select();">全选</a>
+    <a href="javascript:void(0);" class="replyGrey1" onclick="batch_delete();">删除</a>
     <div class="resourcesSelectSend">
       <div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
       <div class="resourcesSelectSendButton" onclick="batch_send();">
@@ -447,6 +447,54 @@ $(".resourcesList").click(function(e) {
 
       lastSendType = sendType;
   }
+//  var iWidth = document.documentElement.clientWidth;
+//  var iHeight = document.documentElement.clientHeight;
+//  var moveX = 0;
+//  var moveY = 0;
+//  var moveTop = 0;
+//  var moveLeft = 0;
+//  var moveable = false;
+//  var docMouseMoveEvent = document.onmousemove;
+//  var docMouseUpEvent = document.onmouseup;
+//  $("#upload_box").mousedown(function() {
+//      var evt = getEvent();
+//      moveable = true;
+//      moveX = evt.clientX;
+//      moveY = evt.clientY;
+//
+//      moveTop = parseInt($("#upload_box").css('top'));
+//      moveLeft = parseInt($("#upload_box").css('left'));
+//
+//      $(document).mousemove( function() {
+//          if (moveable) {
+//              var evt = getEvent();
+//              var x = moveLeft + evt.clientX - moveX;
+//              var y = moveTop + evt.clientY - moveY;
+//              if ( x > 0 &&( x + 322 < iWidth) && y > 0 && (y + 257 < iHeight) ) {
+//                  $("#upload_box").css('left',  x + "px");
+//                  $("#upload_box").css('top', y + "px");
+//                  console.log( moveX)
+//                  console.log( moveY)
+//              }
+//          }
+//      });
+//      $(document).mouseup (function () {
+//          if (moveable) {
+//              document.onmousemove = docMouseMoveEvent;
+//              document.onmouseup = docMouseUpEvent;
+//              moveable = false;
+//              moveX = 0;
+//              moveY = 0;
+//              moveTop = 0;
+//              moveLeft = 0;
+//          }
+//      });
+//  });
+//
+//  // 获得事件Event对象，用于兼容IE和FireFox
+//  function getEvent() {
+//      return window.event || arguments.callee.caller.arguments[0];
+//  }
 
 </script>
 

app/views/users/user_resource_create.js.erb

@@ -1,5 +1,4 @@
 
 closeModal();
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
-
-$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+//这里不能将翻页的更新