From 3f7c6231637d01a689065f20b9d600a8102fc355 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 26 Aug 2016 15:57:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B5=84=E6=BA=90=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_course_file.html.erb  | 10 ++++++++--
 app/views/files/_project_file.html.erb | 10 ++++++++--
 public/stylesheets/css/public.css      |  7 ++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index 946449680..f1f36d286 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -94,7 +94,7 @@
         </p>
       </div>
   <% end %>
-  <div class="resources mt10" style="padding-bottom:5px;">
+  <div class="resources mt10 pr" style="padding-bottom:5px;">
     <div class="reTop mb5">
       <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>
@@ -115,13 +115,19 @@
       </div>
       <div class="cl"></div>
       <div class="re_con_top">
-          <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= @all_attachments.count%></span>&nbsp;个资源</p>
+          <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= @all_attachments.count%></span>&nbsp;个资源<span class="fontGrey2 ml15" style="font-weight:normal;">公共资源：1个</span><span class="fontGrey2 ml15" style="font-weight:normal;">私有资源：1个</span></p>
           <p class="f_r" style="color: #808080" id="course_filter_order">
             <%= render :partial => 'course_file_filter_order', :locals => {:remote => @is_remote, :sort => @sort, :order => @order} %>
           </p>
       </div>
     </div>
     <div class="cl"></div>
+    <div class="resource_tip_box fontGrey2">
+      <em></em>
+      <span></span>
+      <p class="mb5">私有资源：<br/>仅对本班级成员可见</p>
+      <p>公共资源：<br/>对所有用户可见</p>
+    </div>
   </div>
   <div  id="course_list">
    <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %>
diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb
index 40e5163a8..743ad34e8 100644
--- a/app/views/files/_project_file.html.erb
+++ b/app/views/files/_project_file.html.erb
@@ -65,7 +65,7 @@
         </p>
       </div>
   <% end %>
-  <div class="resources mt10" style="padding-bottom:5px;">
+  <div class="resources mt10 pr" style="padding-bottom:5px;">
     <div class="reTop mb5">
       <%= form_tag( search_project_project_files_path(@project), method: 'get',:class => "re_search",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
@@ -85,7 +85,7 @@
       </div>
       <div class="cl"></div>
       <div class="re_con_top">
-        <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= @all_attachments.count%></span>&nbsp;个资源</p>
+        <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= @all_attachments.count%></span>&nbsp;个资源<span class="fontGrey2 ml15" style="font-weight:normal;">公共资源：1个</span><span class="fontGrey2 ml15" style="font-weight:normal;">私有资源：1个</span></p>
         <p class="f_r" style="color: #808080">
           <% if @order == "asc" %>
               按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;
@@ -100,6 +100,12 @@
       </div>
     </div>
     <div class="cl"></div>
+    <div class="resource_tip_box fontGrey2">
+      <em></em>
+      <span></span>
+      <p class="mb5">私有资源：<br/>仅对本项目成员可见</p>
+      <p>公共资源：<br/>对所有用户可见</p>
+    </div>
   </div>
   <div id="course_list">
     <%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}  %>
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index f9d344cf3..b19901016 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -1418,4 +1418,9 @@ a:hover.comment_ding_link{ color:#269ac9;}
 }
 a.syllabusbox_a_blue{
     color:#3b94d6 !important;
-}
\ No newline at end of file
+}
+
+/*资源提示框*/
+.resource_tip_box {position:absolute; padding:5px 10px; white-space:nowrap; background-color:#fff; right:-150px; top:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}
+.resource_tip_box em {display:block; border-width:10px; position:absolute;top:35px; left:-20px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;}
+.resource_tip_box span {display:block; border-width:10px; position:absolute;top:35px; left:-18px; border-style:dashed solid dashed dashed; border-color:transparent #fff transparent transparent; font-size:0; line-height:0;}
\ No newline at end of file