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

Conflicts:
	public/stylesheets/new_user.css

app/controllers/users_controller.rb

@@ -649,7 +649,7 @@ class UsersController < ApplicationController
           @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
         else
           @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids}) and act_type in #{course_types}").order('created_at desc').limit(10).offset(@page * 10)
-  end
+     end
     else
       @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids}) and act_type in #{course_types}").order('created_at desc').limit(10).offset(@page * 10)
     end

app/views/mailer/send_for_user_activities.html.erb

@@ -187,7 +187,7 @@
 
 <!--项目相关-->
 <% if @issues.first || @project_messages.first || @issues_journals.first || @wiki_contents.first || @project_news.first || @project_news_comments.first || @project_journal_messages.first ||
-        @project_news_comments.first  %>
+         @project_attachments.first %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h3 class="wmail_h2" style="color:#474646; "><%= l(:label_project_overview_new)%></h3>
       <% unless @issues.first.nil? || @issues_journals.first.nil? %>

app/views/users/_course_message.html.erb

@@ -106,7 +106,7 @@
                                     ) if reply.course_destroyable_by?(User.current) %>
                                 <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
                               </div>
-                              <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%= reply.content.html_safe %>"><%= reply.content.html_safe %></div>
+                              <div class="homepagePostReplyContent"><%= reply.content.html_safe %></div>
                             </div>
                             <div class="cl"></div>
                           </li>

app/views/users/_course_news.html.erb

@@ -38,7 +38,7 @@
     <div class="homepagePostReplyBanner">
       <% count=activity.comments_count %>
       <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
-      <div class="homepagePostReplyBannerTime"><%= format_date(activity.updated_on) %></div>
+      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%if count>2 %>
           <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity.id%>" onclick="expand_reply('#reply_div_<%= user_activity.id %> li','#reply_btn_<%=user_activity.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >点击展开更多回复(<%= count.to_s%>)</a></div>
       <% end %>
@@ -83,7 +83,7 @@
                                                        :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
                       <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
                     </div>
-                    <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%= comment.comments.html_safe %>"><%= comment.comments.html_safe %></div>
+                    <div class="homepagePostReplyContent"><%= comment.comments.html_safe %></div>
                   </div>
                   <div class="cl"></div>
                 </li>

app/views/users/_course_poll.html.erb

@@ -28,7 +28,7 @@
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostDeadline">发布时间：<%= format_date(activity.published_at) %></div>
       </div>
-      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id%>">问卷描述：<%=activity.polls_description.to_s%></div>
+      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id%>">问卷描述：<%=activity.polls_description.html_safe.to_s%></div>
       <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">

app/views/users/_project_issue.html.erb

@@ -75,7 +75,7 @@
     <div class="homepagePostReplyBanner">
       <% count=activity.journals.count %>
       <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
-      <div class="homepagePostReplyBannerTime"><%= format_date(activity.updated_on) %></div>
+      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <% if count>2 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%= user_activity.id %>" onclick="expand_reply('#reply_div_<%= user_activity.id %> li','#reply_btn_<%=user_activity.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">点击展开更多回复(<%= count.to_s %>
@@ -119,7 +119,7 @@
                             <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%= string %></div>
                         <% end %>
                     <% else %>
-                        <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%= reply.notes.html_safe %></div>
+                        <div class="homepagePostReplyContent"><%= reply.notes.html_safe %></div>
                     <% end %>
                   </div>
                   <div class="cl"></div>

app/views/users/_project_message.html.erb

@@ -56,7 +56,7 @@
             <%=count %>
         <% end %>
         )</div>
-      <div class="homepagePostReplyBannerTime"><%=format_date(activity.updated_on)%></div>
+      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <%if count>2 %>
           <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity.id%>" onclick="expand_reply('#reply_div_<%= user_activity.id %> li','#reply_btn_<%=user_activity.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >点击展开更多回复(<%= count.to_s%>)</a></div>
       <% end %>
@@ -103,7 +103,7 @@
                           ) if reply.course_destroyable_by?(User.current) %>
                       <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
                     </div>
-                    <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%= reply.content.html_safe %>"><%= reply.content.html_safe %></div>
+                    <div class="homepagePostReplyContent"><%= reply.content.html_safe %></div>
                   </div>
                   <div class="cl"></div>
                 </li>

app/views/users/_resource_share_for_project_popup.html.erb

@@ -1,6 +1,6 @@
 
 
-<div class="uploadBoxContainer">
+<div class="boxContainer">
   <div>
     <div class="sendText fl">将资源发送至</div>
     <div class="resourcesSendTo">
@@ -44,7 +44,7 @@
       <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
       <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
     </div>
-    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="closeModal();">取消</a></div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="closePopUp();">取消</a></div>
   </div>
   <div class="cl"></div>
     <% end %>

app/views/users/_resource_share_popup.html.erb

@@ -1,6 +1,6 @@
 
 
-<div class="uploadBoxContainer">
+<div class="boxContainer">
   <div>
     <div class="sendText fl">将资源发送至</div>
     <div class="resourcesSendTo">
@@ -44,7 +44,7 @@
           <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
           <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
         </div>
-        <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="closeModal();">取消</a></div>
+        <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="closePopUp();">取消</a></div>
       </div>
       <div class="cl"></div>
   <% end %>

app/views/users/_user_activities.html.erb

@@ -3,16 +3,16 @@
         <script>
             //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
             //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
-            $(function(){
+            /*$(function(){
                 function nh_show_btn(){
-                    if($("#activity_message_<%= user_activity.id%>").is(':hidden')){
-                        if($("#activity_description_<%= user_activity.id%>").height()>120){
-                            $("#activity_description_<%= user_activity.id%>").toggleClass("activity_description_maxHeight");
-                            $("#activity_message_<%= user_activity.id%>").show();
+                    if($("#activity_message_<%#= user_activity.id%>").is(':hidden')){
+                        if($("#activity_description_<%#= user_activity.id%>").height()>120){
+                            $("#activity_description_<%#= user_activity.id%>").toggleClass("activity_description_maxHeight");
+                            $("#activity_message_<%#= user_activity.id%>").show();
                         }
                     }
                 }
-                var div = $("#activity_description_<%= user_activity.id%>");
+                var div = $("#activity_description_<%#= user_activity.id%>");
                 var imgs = $('img',div);
                 var lens = imgs.length;
                 function nh_load_img_end(){
@@ -24,8 +24,8 @@
                     });
                 }
                 nh_show_btn();
-            });
-            function show_more_reply(contentid, id2, id3) {
+            });*/
+            /*function show_more_reply(contentid, id2, id3) {
                 $(contentid).toggleClass("activity_description_maxHeight");
                 $(contentid).toggleClass("course_description_none");
                 var information = $(id2);
@@ -41,7 +41,7 @@
                     information.attr("value", "show_more");
                     arrow.attr("src", "/images/jiantou.jpg")
                 }
-            }
+            }*/
             function expand_reply(container,btnid){
                 var target = $(container);
                 var btn = $(btnid);

app/views/users/add_exist_file_to_course.js.erb

@@ -1,5 +1,5 @@
 <% if @flag == true%>
 alert('发送成功')
-closeModal();
+closePopUp();
 <% else%>
 <% end %>

app/views/users/add_exist_file_to_project.js.erb

@@ -1,5 +1,5 @@
 <% if @flag == true%>
 alert('发送成功')
-closeModal();
+closePopUp();
 <% else%>
 <% end %>

app/views/users/search_user_course.js.erb

@@ -12,7 +12,7 @@
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'resource_share_popup' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closePopUp();' style='margin-left: 435px;' class='resourceClose'></a>");
 $('#ajax-modal').parent().css("top","").css("left","");
 $('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");

app/views/users/search_user_project.js.erb

@@ -8,7 +8,7 @@
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'resource_share_for_project_popup' ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closePopUp();' style='margin-left: 435px;' class='resourceClose'></a>");
 $('#ajax-modal').parent().css("top","").css("left","");
 $('#ajax-modal').parent().addClass("resourceUploadPopup").addClass("popbox")
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");

app/views/users/show.html.erb

@@ -1,10 +1,10 @@
 <script type="text/javascript">
-    var scrollHandler = function(){
+    var scrollHandler = function () {
         if ($(window).scrollTop() == $(document).height() - $(window).height()) {
             $.get(
                     '<%= user_activities_path(@user.id)%>',
-                    { page : $("#show_more_activities").val(),
-                    type: $("#user_activities_type").val()},
+                    { page: $("#show_more_activities").val(),
+                        type: $("#user_activities_type").val()},
                     function (data) {
 
                     }

app/views/users/user_messages.html.erb

@@ -4,25 +4,25 @@
     <ul class="resourcesSelect">
       <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
         <ul class="newsType">
-          <li><%= link_to "全部",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user}, :class => "resourcesGrey" %></li>
+          <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
           <%# 课程相关消息 %>
-          <li><%= link_to "作业消息",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'homework'}, :class => "resourcesGrey" %></li>
-          <li><%= link_to "课程讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_message'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "课程通知",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "通知回复",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news_reply'}, :class => "resourcesGrey" %></li>
-          <li><%= link_to "课程问卷",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'poll'}, :class => "resourcesGrey"  %></a></li>
-          <li><%= link_to "作品评阅",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reviewers'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "作品讨论",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reply'}, :class => "resourcesGrey"  %></li>
+          <li><%= link_to "作业消息", user_message_path(User.current, :type => 'course_message'), :class => "homework" %></li>
+          <li><%= link_to "课程讨论区",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "通知回复", user_message_path(User.current, :type => 'course_news_reply'), :class => "resourcesGrey" %></li>
+          <li><%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>
+          <li><%= link_to "作品评阅", user_message_path(User.current, :type => 'works_reviewers'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "作品讨论", user_message_path(User.current, :type => 'works_reply'), :class => "resourcesGrey"  %></li>
           <%# 项目相关消息 %>
-          <li><%= link_to "指派问题",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "问题更新",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue_update'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "项目讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_message'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "项目新闻",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "新闻回复",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news_reply'}, :class => "resourcesGrey"  %></li>
+          <li><%= link_to "指派问题", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "问题更新", user_message_path(User.current, :type => 'issue_update'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "新闻回复", user_message_path(User.current, :type => 'forge_news_reply'), :class => "resourcesGrey"  %></li>
           <%# 项目相关消息 %>
-          <li><%= link_to "贴吧帖子",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forum'}, :class => "resourcesGrey"  %></li>
+          <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
           <%# 系统贴吧 %>
-          <li><%= link_to "用户留言",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'user_feedback'}, :class => "resourcesGrey"  %></li>
+          <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
 
         </ul>
       </li>

app/views/users/user_resource.html.erb

@@ -30,6 +30,9 @@
     {
         hideModal($(".uploadBoxContainer"));
     }
+    function closePopUp(){
+        hideModal($(".boxContainer"));
+    }
 
     function check_files(){
         return $("#attachments_fields").children().length == 0;

app/views/users/user_resource.js.erb

@@ -1,3 +1,4 @@
 $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#res_count").html(0);

public/stylesheets/new_user.css

@@ -342,10 +342,10 @@ a.uploadText {color:#ffffff; font-size:14px;}
 /*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
 /*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
 /*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
-.resourcesListName {width:160px; height:40px; line-height:40px; text-align:left;}
+.resourcesListName {width:180px; height:40px; line-height:40px; text-align:left;}
 .resourcesListSize {width:105px; height:40px; line-height:40px; text-align:center;}
 .resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}
-.resourcesListUploader {width:180px; height:40px; line-height:40px; text-align:center;}
+.resourcesListUploader {width:160px; height:40px; line-height:40px; text-align:center;}
 .resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;}
 /*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
 a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left}
@@ -405,13 +405,14 @@ a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-rep
 /*.resourcesUploadBox:hover {background-color:#0781b4;}*/
 /* 个人主页右边部分*/
 .homepageSearchIcon {width:30px; height:32px; background:url(images/nav_icon.png) -8px 3px no-repeat; float:left;}
+input.homepageSearchIcon:hover {cursor: pointer;}
 a.homepagePostTypeQuiz {background:url(images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;}
 a.homepagePostTypeAssignment {background:url(images/homepage_icon.png) -93px -318px no-repeat; padding-left:23px;}
 a.replyGrey {color:#888888; display:inline-block;}
 a.replyGrey:hover {color:#4b4b4b;}
 
 /*上传资源弹窗*/
-.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
+.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
 .uploadDialogText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:140px; display:inline-block; font-weight: bold;}
 .uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative}
 .uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#269ac9; border-radius:3px; float:left; margin-right:12px;}
@@ -430,12 +431,14 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
 .sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:100px; display:inline-block; font-weight: bold;}
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
+.boxContainer {height:33px; line-height:33px; position:relative}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
 .resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}
 .resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
 .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;}
 .courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}
 .sendCourseName {font-size:12px; color:#5f6060;}
@@ -531,7 +534,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsPublisher { max-width:100px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
 .homepageNewsType {width:100px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
 .homepageNewsPubType {width:215px; font-size:12px; color:#888888; display: block;}
-.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; max-height: 49px;}
+.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
 a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}