diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2af2b9c42..72027a118 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -177,7 +177,7 @@ class UsersController < ApplicationController
         return
     end
     respond_to do |format|
-      format.html{render :layout=>'base_users_new'}
+      format.html{render :layout=>'new_base_user'}
     end
   end
 
@@ -1400,7 +1400,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
 
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index c91b452dc..d45adecf6 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/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>
@@ -38,7 +38,10 @@
     </ul>
   </div>
   <div class="navHomepageNews">
-    <a href="javascript:void(0);" class="homepageNewsIcon">
+    <%= link_to image_tag("/images/news_icon_small.png" , :width => "21", :height => "24"), {:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user} %>
+    <% if User.current.count_new_message >0 %>
+        <div class="newsActive"></div>
+    <% end %>
     <div class="newsActive"></div>
-  </a></div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb
index 9cd744c9a..01a2375c1 100644
--- a/app/views/users/_resource_share_for_project_popup.html.erb
+++ b/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">
diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb
index ea1ada447..7f1c5a005 100644
--- a/app/views/users/_resource_share_popup.html.erb
+++ b/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 %>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 3c4ea18ca..c36fdc293 100644
--- a/app/views/users/user_resource.html.erb
+++ b/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>
 
diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb
index 16ec4d82a..ba3efbdfb 100644
--- a/app/views/users/user_resource_create.js.erb
+++ b/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 %>');
\ No newline at end of file
+//这里不能将翻页的更新
\ No newline at end of file
diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css
index 09ca8a8ec..40b049b7e 100644
--- a/public/stylesheets/new_public.css
+++ b/public/stylesheets/new_public.css
@@ -9,7 +9,6 @@ a:link,a:visited{color:#7f7f7f;text-decoration:none;}
 a:hover,a:active{color:#000;}
 
 /*常用*/
-.user_score_box{width:250px;height:180px;position:fixed !important;z-index:100;left:60%;top:65%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
 .hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .none{display: none;}
 .rside_back{ width:670px;  margin-left:10px;  background:#fff;  margin-bottom:10px;}
@@ -23,7 +22,7 @@ table{ background:#fff;}
 .line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 .no_border{ border:none;background:none;}
 .min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 135px -193px no-repeat; cursor:pointer;}
-.db {display:block;}
+
 /* font & color */
 h2{ font-size:18px; color:#15bccf;}
 h3{ font-size:14px; color:#e8770d;}
@@ -71,7 +70,6 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml90{ margin-left:90px;}
 .ml100{ margin-left:100px;}
 .ml110{ margin-left:110px;}
-.ml150 { margin-left:150px;}
 .mr5{ margin-right:5px;}
 .mr45 {margin-right:45px;}
 .mr55{ margin-right:55px;}
@@ -84,7 +82,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt3{ margin-top:3px;}
 .mt5{ margin-top:5px;}
 .mt8{ margin-top:8px;}
-.mt10{ margin-top:10px !important;}
+.mt10{ margin-top:10px;}
 .mt15 {margin-top:15px;}
 .mb4{ margin-bottom:4px;}
 .mb5{ margin-bottom:5px;}
@@ -230,7 +228,7 @@ a:hover.bgreen_n_btn{background:#08a384;}
 #TopNav{}
 #TopNav ul li{ margin-top:8px;}
 .topnav_a a{ font-size:14px; font-weight:bold; color:#fff; margin-right:10px;}
-.topnav_a a:hover{color: #a1ebff;}
+.topnav_a a:hover{color: #a1ebff;;}
 #userInfo {float:right; display:inline-block; width:130px; padding-top:5px;}
 .userInfoRow2 {margin-top:-5px;}
 .myPractice {display:inline-block;}
@@ -286,47 +284,155 @@ a.search_btn{ display:block; background:#15bccf; color:#fff; width:60px; height:
 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;}*/
+/*.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 10px 20px 10px; border:1px solid #dddddd;}
+.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: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;}
-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;}
+/*.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;}
-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;}
+.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: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 {width:710px; height:34px; margin-bottom:10px; margin-top:15px; margin-left:auto; margin-right:auto;}
+/*.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}*/
 .resourcesListTab {width:710px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a; margin-left:auto; margin-right:auto;}
-.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;}
+/*.resourcesListName {width:175px; 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:180px; 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;}*/
+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;}
-a.resourcesBlack {font-size:12px; color:#4c4c4c;}
-a.resourcesBlack:hover {font-size:12px; color:#000000;}
+.db {display:block;}
+
 .dropdown-menu {
     position: absolute;
     top: 100%;
@@ -362,13 +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:100px; display:inline-block;}
-.resourcesSendTo {float:left; height:20px; margin-top:15px;}
-.resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .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;}
@@ -378,24 +510,12 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .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;}
-.courseSendSubmit:hover {background-color:#0182bb;}
 .courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}
-.courseSendCancel:hover {background-color:#717171;}
-a.sendSourceText {font-size:14px; color:#ffffff; display:block;}
-
-/*上传资源弹窗*/
-.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;}
-.uploadBox:hover {background-color:#0182bb;}
-a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px; display:block;}
-.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;}
+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;}
+.resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
+.courseReferContainer {float:left; max-height:120px;margin-right:16px;margin-bottom:10px;    overflow:scroll; overflow-x:hidden;}
 
 
 /*新个人主页框架css*/
@@ -403,16 +523,12 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
 .navHomepage {width:1000px; height:54px; background-color:#15bccf; margin:0 auto;}
-.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
-.navHomepageMenu {margin-right:20px; padding-left:10px; padding-right:10px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
-.navHomepageMenu:hover {background-color:#0ea6b7;}
-.navHomepageSearchBoxcontainer {margin-top:11px; }
-.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  background-color:#ffffff;}
+.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:40px;}
+.navHomepageMenu {margin-right:40px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
+.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
 .navHomepageSearchInput {width:345px; height:32px; outline:none; border:none; float:left; padding-left:5px;; margin:0;}
 .homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;}
 a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;}
-.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #98a1a6; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
-#navSearchAlert {display:none;}
 .navHomepageNews {width:30px; display:block; float:right; margin-top:12px; position:relative;}
 .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:29px; display:block;}
 .newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
@@ -424,18 +540,18 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
 .homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
 .homepagePortraitContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding-bottom:15px;}
-.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 14px 10px 14px; position:relative; border:1px solid #cbcbcb;}
+.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 13px 5px 13px;; position:relative; border:1px solid #cbcbcb;}
 .homepagePortraitImage:hover {border:1px solid #15bccf;}
 .homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
 .homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
 .homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
 .homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
-.homepageImageName {font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:20px; float:left;}
-.homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
+.homepageImageName {font-size:16px; color:#484848; margin-left:15px; height:21px; float:left;max-width: 100px;}
+.homepageImageSexMan {width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
 .homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
 .homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
 .homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
-.homepageImageBlock {margin:0 auto; width:75px; float:left; text-align:center; display:inline-block;}
+.homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;}
 .homepageImageNumber {font-size:12px; color:#484848;}
 a.homepageImageNumber:hover {color:#15bccf;}
 .homepageImageText {font-size:12px; color:#888888;}
@@ -457,7 +573,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .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;}
 .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
-.newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
+.homepageRightBlock {}
 .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
 .homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
 .homepageNewsPublisher {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
@@ -466,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.newsGrey:hover {color:#000000;}
-a.replyGrey {color:#888888; display:inline-block;}
+a.newsGrey1 {color:#4b4b4b;}
+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;}
@@ -490,11 +608,11 @@ a.postTypeGrey:hover {color:#15bccf;}
 .homepagePostPortrait {float:left; width:90px;}
 .homepagePostDes {float:left; width:600px; margin-left:20px;}
 .homepagePostTo {font-size:14px; color:#484848; margin-bottom:15px;}
-.homepagePostTitle {font-size:14px; color:#484848; margin-bottom:15px; font-weight:bold;}
+.homepagePostTitle {font-size:14px; color:#484848; margin-bottom:15px;}
 .homepagePostSubmitContainer {height:30px; margin-bottom:15px;}
 .homepagePostSubmit {font-size:14px; color:#888888; width:80px; height:30px; text-align:center; vertical-align:middle; line-height:30px; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
-.homepagePostIntro {font-size:14px; color:#484848;}
+.homepagePostIntro {font-size:12px; color:#888888;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; height:30px; line-height:30px; vertical-align:middle;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:15px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
@@ -504,7 +622,7 @@ a.postTypeGrey:hover {color:#15bccf;}
 .homepagePostReplyBannerMore{width:330px; display:inline-block; text-align:right;}
 .homepagePostReplyInputContainer {width:670px; margin:0px auto;}
 .homepagePostReplyInput {width:663px; height:45px; max-width:663px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:20px auto 10px auto;}
-.homepagePostReplyEmotion {background:url(../images/homepage_icon.png) -90px -88px no-repeat; width:50px; height:24px; float:left; padding-left:30px;}
+.homepagePostReplyEmotion {background:url(../images/homepage_icon.png) -90px -88px no-repeat; width:70px; height:24px; float:left; padding-left:30px;}
 .homepagePostReplySubmit {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#ffffff; background-color:#15bccf;}
 .homepagePostReplySubmit:hover {background-color:#329cbd;}
 a.postReplySubmit {color:#ffffff; display:block;}
@@ -535,36 +653,6 @@ a.postGrey:hover {color:#000000;}
 a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;margin-top: 2px;margin-right: 15px;}
 a:hover.gz_btn{ color:#ff5722;}
 
-/*课程主页css*/
-.homepageCoursesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-65px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;}
-
-/*注册登陆页面*/
-#loginInBox {display:block; margin-top:143px;}
-#signUpBox {display:none; margin-top:79px;}
-#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
-#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
-#loginSignButton:hover {background-color:#0ea6b7;}
-#loginInButton:hover {background-color:#0ea6b7;}
-.loginContentContainer {width:100%; background-color:#15bccf; margin-top:1px; height:580px;}
-.loginContent {width:1000px; margin:0px auto;}
-.loginLeft {width:595px; float:left;}
-.loginLogo {padding-left:208px; padding-top:155px;}
-.loginInro {width:465px; padding-top:55px; padding-left:50px; font-size:16px; color:#ffffff;}
-.loginRight {width:405px; float:left;}
-.loginChooseBox {width:405px; height:54px; background-color:#ffffff; padding-top:18px;}
-.loginChooseList {width:350px; height:30px; font-size:14px; margin:0px auto;}
-.loginChoose {width:55px; height:30px; border-bottom:1px solid #8ad2da; text-align:center;}
-a.loginChooseTab {color:#484848; height:30px; display:block;}
-.loginInButton {width:315px; height:40px; background-color:#15bccf; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:20px;}
-.loginUpButton {width:315px; height:40px; background-color:#15bccf; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:30px;}
-.loginChooseBorder {width:295px; height:30px; border-bottom:1px solid #e3e3e3;}
-.loginChoose:hover {border-bottom:1px solid #8ad2da;}
-.loginSign {width:405px; background-color:#ffffff;}
-.loginSignBox {width:308px; height:38px; margin-left:46px; border:1px solid #98a1a6; outline:none;}
-.loginSignOption {margin-left:46px; margin-top:15px;}
-.loginIn {width:405px; background-color:#ffffff; padding-bottom:30px;}
-.loginSignAlert {font-size:12px; color:#fc0000; margin-left:60px;}
-
 
 
 /*底部*/