Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/views/users/user_messages.html.erb

@@ -51,8 +51,9 @@
               <li class="homepageNewsPubType fl">
                 <span class="newsBlue homepageNewsPublisher">Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span>
               </li>
-              <li class="homepageNewsContent fl">
               <span style="color: red;float: left">【系统消息】</span><li class="homepageSystenMessageContent fl" id="content_<%= usm.id %>">
+              <li class="homepageSystenMessageContent fl">
+
               <%= link_to usm.content.nil? ? usm.description.html_safe : usm.content.html_safe, user_message_path(User.current, :type => "system_messages"),
                           :id => "content_link_#{usm.id}",
                           :onmouseover =>"message_titile_show($(this),event);",

public/stylesheets/new_user.css

@@ -515,7 +515,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsType {width:110px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
 .homepageNewsPubType {width:220px; font-size:12px; color:#888888; display: block;}
 .homepageNewsContent {width:365px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
-.homepageSystenMessageContent {width:291px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageSystenMessageContent {width:291px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; }
 .homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageHomeworkContent {width:245px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }