From 596d4e17e9ea99196ff44170317d7e3e67a855a2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 4 Mar 2016 09:57:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_resource_info.html.erb | 19 ++++++++++---------
 app/views/users/user_resource.html.erb       |  2 +-
 public/stylesheets/public.css                |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index e34f9d237..2d5415c4e 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -23,21 +23,22 @@
     <%= render :partial => 'users/resources_list' , :locals => { :attachments => @attachments} %>
   </div>
   <div class="cl"></div>
+
+
   <div class="resource-list-option fl">
     <div class="resource-check-all">
-      <input id="checkboxAll" type="checkbox" value="" onclick="all_select();"  class="resourcesCheckbox" />
+      <input id="checkboxAll" type="checkbox" value="" onclick="all_select();" class="resourcesCheckbox" />
     </div>
-    <a href="javascript:void(0);" class="replyGrey1 mr15" onclick="all_select();">全选</a>
-    <a href="javascript:void(0);" class="replyGrey" 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();">
-        <a href="javascript:void(0);" class="sendButtonBlue db" data-remote="true" >发送</a>
-      </div>
+    <a href="javascript:void(0);" class="replyGrey mr15" onclick="all_select();">全选</a> <a href="javascript:void(0);" class="replyGrey" onclick="batch_delete();">删除</a> </div>
+  <div class="cl"></div>
+  <div class="resourcesSelectSend mt10 fl">
+    <div class="resourcesSelectSendButton fl mr15 inactive-border"  onclick="batch_send();">
+      <a href="javascript:void(0);" class="sendButtonBlue db inactive-text"  data-remote="true">发送至</a>
     </div>
+    <div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
   </div>
+
 </form>
-<div class="cl"></div>
 <div>
   <ul class="wlist" id="pages" style="margin-top: 5px;">
     <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 88e8e7140..dac0e365f 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -70,7 +70,7 @@
     }
 </script>
 
-<div class="resource-wrapper">
+<div>
   <ul class="resource-banner">
     <li class="fl resource-switch">
       <a href="<%= user_resource_user_path(@user, :type => '6') %>" class="resource-tab resource-tab-active" data-remote="true">公共资源</a>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 2699932dc..a1c96fb56 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -909,7 +909,7 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .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;}
+.resourcesSelectSend {vertical-align: middle;height: 28px;line-height: 28px;}
 .resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #269ac9; border-radius:5px; }
 a.sendButtonBlue {color:#269ac9;}
 a.sendButtonBlue:hover {color:#ffffff;}