Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 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="replyGrey1 mr15" onclick="all_select();">全选</a>
-    <a href="javascript:void(0);" class="replyGrey" onclick="batch_delete();">删除</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 %>');

public/stylesheets/new_public.css

@@ -285,36 +285,154 @@ a:hover.search_btn{ background: #0fa9bb;}
 .search_text{ border:1px solid #15bccf; background:#fff; width:220px; height:25px; padding-left:5px; }
 
 /*资源库*/
-.resources {width:730px; background-color:#ffffff; padding:10px;}
+/*.resources {width:730px; background-color:#ffffff; padding:10px;}*/
+/*.resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}*/
+/*.bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}*/
+/*.resourcesSelect {width:30px; height:34px; float:right; position:relative; margin-top:-6px;}*/
+/*.resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;}*/
+/*.resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}*/
+/*.resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}*/
+/*.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}*/
+/*a.resourcesGrey {font-size:12px; color:#888888;}*/
+/*a.resourcesGrey:hover {font-size:12px; color:#15bccf;}*/
+/*.resourcesBanner ul li:hover ul.resourcesType {display:block;}*/
+/*ul li:hover ul {display:block;}*/
+/*.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}*/
+/*.uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}*/
+/*a.uploadText {color:#ffffff; font-size:14px;}*/
+/*.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:right; background-color:#ffffff;}*/
+/*.searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}*/
+/*.searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}*/
+/*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/
+/*.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}*/
+/*.resourcesListCheckbox {width:40px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}*/
+/*.resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}*/
+/*.resourcesListName {width:135px; height:40px; line-height:40px; text-align:left;}*/
+/*.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
+/*a.resourcesBlack {font-size:12px; color:#4c4c4c;}*/
+/*a.resourcesBlack:hover {font-size:12px; color:#000000;}*/
+/*.dropdown-menu {*/
+  /*position: absolute;*/
+  /*top: 100%;*/
+  /*left: 0;*/
+  /*z-index: 1000;*/
+  /*display: none;*/
+  /*float: left;*/
+  /*min-width: 80px;*/
+  /*padding: 5px 0;*/
+  /*margin: 2px 0 0;*/
+  /*font-size: 12px;*/
+  /*text-align: left;*/
+  /*background-color: #fff;*/
+  /*-webkit-background-clip: padding-box;*/
+          /*background-clip: padding-box;*/
+  /*border: 1px solid #ccc;*/
+  /*border-radius: 4px;*/
+  /*-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);*/
+          /*box-shadow: 0 6px 12px rgba(0, 0, 0, .175);*/
+/*}*/
+/*.dropdown-menu > li > a {*/
+    /*display: block;*/
+    /*padding: 3px 20px;*/
+    /*clear: both;*/
+    /*font-weight: normal;*/
+    /*line-height: 1.5;*/
+    /*color:#616060;*/
+    /*white-space: nowrap;*/
+/*}*/
+/*.dropdown-menu > li > a:hover{*/
+    /*color: #ffffff;*/
+    /*text-decoration: none;*/
+    /*background-color: #64bdd9;*/
+    /*outline:none;*/
+/*}*/
+
+/*发送资源弹窗*/
+/*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
+/*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/
+/*.sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}*/
+/*.resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}*/
+/*.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}*/
+/*.resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}*/
+/*.searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}*/
+/*.searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;}*/
+/*.courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;}*/
+/*.courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}*/
+/*.sendCourseName {font-size:12px; color:#5f6060;}*/
+/*.courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;}*/
+/*.courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}*/
+/*a.sendSourceText {font-size:14px; color:#ffffff;}*/
+
+/*上传资源弹窗*/
+/*.resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}*/
+/*.uploadText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}*/
+/*.uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative;}*/
+/*.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;}*/
+/*a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px;}*/
+/*.chooseFile {color:#ffffff; display:block; margin-left:32px;}*/
+/*.uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;}*/
+/*.uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;}*/
+/*.uploadResourceIntr2 {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444;}*/
+/*.uploadType {margin:10px 0; border:1px solid #e6e6e6; width:100px; height:30px; outline:none; font-size:12px; color:#888888;}*/
+/*.uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}*/
+
+/*资源库*/
+.resources {width:728px; background-color:#ffffff; padding:10px; border:1px solid #dddddd;float: right}
+/*.resources {width:730px; background-color:#ffffff; padding:10px;float: right}*/
 .resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}
 .bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}
 .resourcesSelect {width:30px; height:34px; float:right; position:relative; margin-top:-6px;}
 .resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;}
 .resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}
 .resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}
-.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}
+/*.resourcesIcon {margin-top:15px; display:block; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat; width:25px; height:20px;}*/
+/*.resourcesIcon:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}*/
+/*.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}*/
 a.resourcesGrey {font-size:12px; color:#888888;}
 a.resourcesGrey:hover {font-size:12px; color:#15bccf;}
 .resourcesBanner ul li:hover ul.resourcesType {display:block;}
 ul li:hover ul {display:block;}
 .resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
+.resourcesUploadBox:hover {background-color:#0781b4;}
 .uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}
 a.uploadText {color:#ffffff; font-size:14px;}
-.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:right; background-color:#ffffff;}
+.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:left; background-color:#ffffff;}
 .searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}
 .searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}
-.resourcesSearchBanner {height:34px; margin-bottom:10px;}
+/*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/
-.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}
+.resourcesSearchBanner {width:710px; height:34px; margin-bottom:10px; margin-top:15px; margin-left:auto; margin-right:auto;}
-.resourcesListCheckbox {width:40px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
+/*.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}*/
-.resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}
+.resourcesListTab {width:710px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a; margin-left:auto; margin-right:auto;}
-.resourcesListName {width:135px; height:40px; line-height:40px; text-align:left;}
+/*.resourcesListName {width:175px; height:40px; line-height:40px; text-align:center;}*/
-.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}
+/*.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
+.resourcesListName {width:160px; height:40px; line-height:40px; text-align:left;}
+.resourcesListSize {width:105px; height:40px; line-height:40px; text-align:center;}
 .resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}
-.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}
+.resourcesListUploader {width:180px; height:40px; line-height:40px; text-align:center;}
-.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}
+.resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;}
-.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}
+/*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
-a.resourcesBlack {font-size:12px; color:#4c4c4c;}
+a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left}
 a.resourcesBlack:hover {font-size:12px; color:#000000;}
+.resourcesListCheckbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
+.resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}
+.resourcesList {width:710px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;}
+.resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
+.resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
+.resourcesSelectSend {float:right;}
+/*.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}*/
+.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}
+a.sendButtonBlue {color:#15bccf;}
+a.sendButtonBlue:hover {color:#ffffff;}
+.resourcesSelectSendButton:hover {background-color:#15bccf;}
+.db {display:block;}
+
 .dropdown-menu {
     position: absolute;
     top: 100%;
@@ -350,11 +468,39 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
     background-color: #64bdd9;
     outline:none;
 }
+.homepageRightBanner {width:720px; height:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;}
+.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; background:url(images/homepage_icon.png) -18px -230px no-repeat; width:150px; float:left; padding-left:15px; margin-top:4px;}
+a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
+a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;}
+.resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;}
+.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
+.resourcesUploadBox:hover {background-color:#0781b4;}
+/* 个人主页右边部分*/
+.homepageSearchIcon {width:30px; height:32px; background:url(images/nav_icon.png) -8px 3px no-repeat; float:left;}
+a.homepagePostTypeQuiz {background:url(images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;}
+a.homepagePostTypeAssignment {background:url(images/homepage_icon.png) -93px -318px no-repeat; padding-left:23px;}
+a.replyGrey {color:#888888; display:inline-block;}
+a.replyGrey:hover {color:#4b4b4b;}
+
+/*上传资源弹窗*/
+.resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
+.uploadDialogText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}
+.uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative}
+.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;}
+a.uploadBoxIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:81px; height:30px; padding-left:22px; font-size:14px; color:#ffffff;}
+a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px;}
+.chooseFile {color:#ffffff; display:block; margin-left:32px;}
+.uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;}
+.uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;}
+.uploadResourceIntr2 {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444;}
+.uploadType {margin:10px 0; border:1px solid #e6e6e6; width:100px; height:30px; outline:none; font-size:12px; color:#888888;}
+.uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}
 
 /*发送资源弹窗*/
 /*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
+/*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/
 .resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
-.sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}
+.sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:100px; display:inline-block;}
 .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
 .resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}
 .resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
@@ -366,19 +512,10 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;}
 .courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}
 a.sendSourceText {font-size:14px; color:#ffffff;}
-
+input.sendSourceText {font-size:14px;color:#ffffff;background-color:#64bdd9;}
-/*上传资源弹窗*/
+.resourcesSendTo {float:left; height:20px; margin-top:15px;}
-.resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
+.resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
-.uploadText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}
+.courseReferContainer {float:left; max-height:120px;margin-right:16px;margin-bottom:10px;    overflow:scroll; overflow-x:hidden;}
-.uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative;}
-.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;}
-a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px;}
-.chooseFile {color:#ffffff; display:block; margin-left:32px;}
-.uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;}
-.uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;}
-.uploadResourceIntr2 {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444;}
-.uploadType {margin:10px 0; border:1px solid #e6e6e6; width:100px; height:30px; outline:none; font-size:12px; color:#888888;}
-.uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}
 
 
 /*新个人主页框架css*/
@@ -445,10 +582,12 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
 a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}
-a.newsGrey {color:#4b4b4b;}
+a.newsGrey1 {color:#4b4b4b;}
-a.newsGrey:hover {color:#000000;}
+a.newsGrey1:hover {color:#000000;}
 a.replyGrey {color:#888888; display:block;}
 a.replyGrey:hover {color:#4b4b4b;}
+a.replyGrey1 {color:#888888;}
+a.replyGrey1:hover {color:#4b4b4b;}
 a.newsBlue {color:#15bccf;}
 a.newsBlue:hover {color:#0781b4;}
 a.menuGrey {color:#808080;}