From 4392ecdcd7494cb7837152060ede3c25f02ada0d Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Fri, 28 Aug 2015 15:41:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A0=BC=E5=BC=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 20 ++++++++------------
 public/stylesheets/new_user.css        |  7 ++++---
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index f4c68b12a..73c1d2a72 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -1,5 +1,4 @@
-
-  <div class="resources" id="users_setting">
+  <div class="resources">
     <div class="homepageRightBanner">
       <div class="NewsBannerName">消息</div>
       <ul class="resourcesSelect">
@@ -29,6 +28,8 @@
         </li>
       </ul>
     </div>
+    </div>
+  <div class="resources mt10" id="users_setting">
     <div>
     <% if @new_message_count >0 %>
         <%# 课程消息 %>
@@ -38,8 +39,7 @@
                     <% if ma.course_message_type == "News" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %></a></li>
-                          <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %></li>
-                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知</li>
+                          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知</span></li>
                           <li class="homepageNewsContent fl">
                             <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
                                         :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
@@ -50,8 +50,7 @@
                     <% if ma.course_message_type == "Comment" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
-                          <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %></li>
-                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知</li>
+                          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知</span></li>
                           <li class="homepageNewsContent fl">
                             <%= link_to ma.course_message.comments.html_safe, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
                                         :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
@@ -62,8 +61,7 @@
                     <% if ma.course_message_type == "HomeworkCommon" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-                          <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></a></li>
-                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了作业</li>
+                          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了作业</span></li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),:class => "newsGrey", :title => "#{ma.course_message.name}" %></a></li>
                           <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_at).html_safe %> </li>
@@ -72,8 +70,7 @@
                     <% if ma.course_message_type == "Poll" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-                          <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></a></li>
-                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了问卷</li>
+                          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了问卷</span></li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id),
                                         :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
@@ -117,8 +114,7 @@
                     <% if ma.course_message_type == "JournalsForMessage" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-                          <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></li>
-                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了作品评论</li>
+                          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了作品评论</span></li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ma.course_message.notes}" %></a></li>
                           <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_on).html_safe %> </li>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 2e560468f..b9b24dcd8 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -11,7 +11,7 @@ a:hover,a:active{color:#000;}
 
 /*常用*/
 /*#RSide{ background:#fff;}*/
-#users_setting{clear:both;width:730px;background: #fff;padding: 10px;/*滑动门的宽度*/}
+#users_setting{clear:both;width:728px;background: #fff;padding: 10px;/*滑动门的宽度*/}
 /*上传图片处理*/
 .upload_img img{max-width: 100%;}
 blockquote img{max-width: 100%;}
@@ -527,8 +527,9 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .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;}
 .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; }
-.homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
+.homepageNewsPublisher {width:80px; max-width:80px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.homepageNewsType {width:90px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
+.homepageNewsPubType {width:175px; font-size:12px; color:#888888; display: block;}
 .homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
 a.homepageWhite {color:#ffffff;}