From 6bcaf01fe26f537fbb4088d13f9f3618d3ac133e Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 7 Sep 2015 16:01:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=BC=B9=E5=87=BA=E6=A1=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resource_share_for_project_popup.html.erb | 6 +++---
 app/views/users/_resource_share_popup.html.erb             | 6 +++---
 public/stylesheets/new_user.css                            | 4 ++--
 public/stylesheets/public_new.css                          | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

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 482569297..40bbd5e7c 100644
--- a/app/views/users/_resource_share_for_project_popup.html.erb
+++ b/app/views/users/_resource_share_for_project_popup.html.erb
@@ -30,11 +30,11 @@
     <div class="courseReferContainer">
     <% if !projects.empty?  %>
         <% projects.each do |project| %>
-        <ul class="courseSend fl">
-          <li class="fl">
+        <ul class="courseSend">
+          <li class="" style="display:inline-block">
             <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
           </li>
-          <li class="sendCourseName fl"><%= project.name%></li>
+          <li class="sendCourseName"><%= project.name%></li>
         </ul>
         <% end %>
     </div>
diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb
index 219402cbf..ed2ed44a6 100644
--- a/app/views/users/_resource_share_popup.html.erb
+++ b/app/views/users/_resource_share_popup.html.erb
@@ -30,11 +30,11 @@
         <div class="courseReferContainer">
         <% if !courses.empty?  %>
             <% courses.each do |course| %>
-            <ul class="courseSend fl">
-              <li class="fl">
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
                 <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
               </li>
-              <li class="sendCourseName fl"><%= course.name%></li>
+              <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
             </ul>
             <% end %>
           </div>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index f8000f674..539e9ce54 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -410,9 +410,9 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .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;}
 .searchIconPopup:hover {cursor: pointer}
-.courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;}
+.courseSend {width:390px; height:15px; line-height:15px; margin-bottom:10px;display:block;white-space:nowrap;}
 .courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}
-.sendCourseName {font-size:12px; color:#5f6060;}
+.sendCourseName {font-size:12px; color:#5f6060;display:inline-block}
 .courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#269ac9; margin-right:25px; float:left;cursor: pointer;}
 .courseSendSubmit:hover {background-color:#297fb8;}
 .courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}
diff --git a/public/stylesheets/public_new.css b/public/stylesheets/public_new.css
index ec7ec26a1..15650bc65 100644
--- a/public/stylesheets/public_new.css
+++ b/public/stylesheets/public_new.css
@@ -572,7 +572,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .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;}
+.sendCourseName {font-size:12px; color:#5f6060;display:inline-block}
 .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;}