Merge branch 'szzh' into dev_hjq

app/controllers/account_controller.rb

@@ -365,14 +365,15 @@ class AccountController < ApplicationController
 
   def invalid_credentials
     logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
-    flash.now[:error] = l(:notice_account_invalid_creditentials)
-    render :layout => 'login'
+    flash[:error] = l(:notice_account_invalid_creditentials)
+    # render :layout => 'login'
+    redirect_to signin_path(:login=>true)
   end
   
   def invalid_credentials_new
     logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
-    flash.now[:error] = l(:notice_account_invalid_creditentials_new)
-    render :layout => 'login'
+    flash[:error] = l(:notice_account_invalid_creditentials_new)
+    render signin_path(:login=>true)
   end
 
   # Register a user for email activation.

app/controllers/users_controller.rb

@@ -627,14 +627,15 @@ class UsersController < ApplicationController
   end
 
   def show
+
     @page = params[:page] ? params[:page].to_i + 1 : 0
-    @type = params[:type]
+
     user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")"
     user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
     course_types = "('Message','News','HomeworkCommon','poll')"
     project_types = "('Message','Issue')"
-    if @type
-      case @type
+    if params[:type].present?
+      case params[:type]
         when "course_homework"
           @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('created_at desc').limit(10).offset(@page * 10)
         when "course_news"
@@ -654,6 +655,7 @@ class UsersController < ApplicationController
       @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
     # @user_activities = paginateHelper @user_activities,500
+    @type = params[:type]
     respond_to do |format|
       format.js
       format.html {render :layout => 'new_base_user'}

app/views/account/login.html.erb

@@ -1,7 +1,7 @@
 <%= stylesheet_link_tag 'new_user'%>
 <%= stylesheet_link_tag 'leftside'%>
 
-<script>
+<script type="text/javascript">
 
 //    $(document).ready(function(){
 //        $("#loginSignButton").click(function(){
@@ -12,6 +12,20 @@
 //            $("#signUpBox").css({display:"none"});
 //            $("#loginInBox").css({display:"block"});
 //        });
+//    });
+//    $(function(){
+//        $("#username").keypress(function(e){
+//            alert(11);
+//            if (e.keyCode == '13') {
+//                $('#main_login_form').submit();
+//            }
+//        });
+//
+//        $("#password").keypress(function(e){
+//            if (e.keyCode == '13') {
+//                $('#main_login_form').submit();
+//            }
+//        });
 //    });
 
     $(document).ready(function(){
@@ -162,6 +176,12 @@
 
         });
     });
+
+        function user_name_keypress(e){
+            if (e.keyCode == '13') {
+                $('#main_login_form').submit();
+            }
+        }
 </script>
 <div class="loginContentContainer">
   <div class="loginContent">
@@ -186,7 +206,7 @@
           <%= back_url_hidden_field_tag %>
           <div class="mb20">
             <%= text_field_tag 'username', params[:username], :tabindex => '1' ,
-                               :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或昵称'%>
+                               :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或昵称', :onkeypress => "user_name_keypress(event);"%>
             <!--<input type="text" placeholder="请输入邮箱地址或昵称" class="loginSignBox" />-->
           </div>
           <% if Setting.openid? %>
@@ -196,7 +216,7 @@
           <% end %>
           <div>
             <!--<input type="text" placeholder="请输密码" class="loginSignBox" />-->
-            <%= password_field_tag 'password', nil, :tabindex => '2',:class=>'loginSignBox' ,:placeholder=>'请输密码'%>
+            <%= password_field_tag 'password', nil, :tabindex => '2',:class=>'loginSignBox' ,:placeholder=>'请输密码', :onkeypress => "user_name_keypress(event);"%>
           </div>
           <div class="loginSignOption">
             <% if Setting.autologin? %>

app/views/courses/_history.html.erb

@@ -5,7 +5,7 @@
           <div class="ping_dispic">
             <%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %>
           </div>
-          <div class="ping_discon upload_img" style="width: 610px;">
+          <div class="ping_discon upload_img" style="width: 670px;">
             <div class="ping_distop f14">
               <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span>

app/views/layouts/_logined_header.html.erb

@@ -33,12 +33,21 @@
 
       $(function(){
           $("#navHomepageSearchInput").keypress(function(e){
-              if (e.keyCode == '13') {
+              var name = $.trim($('#navHomepageSearchInput').val());
+              if (e.keyCode == '13' && name != "" &&  name.length != 0) {
                   $('#type').val($('input[type=radio]:checked').val());
                   $(this).parent().submit();
               }
           })
       });
+
+      function search_in_header(obj){
+          var name = $.trim($('#navHomepageSearchInput').val());
+          if (name != "" &&  name.length != 0) {
+              $('#type').val($('input[type=radio]:checked').val());
+              obj.parent().submit();
+          }
+      }
   </script>
   <div class="fl" id="navHomepageSearch">
     <!--<form class="navHomepageSearchBox">-->
@@ -46,9 +55,10 @@
 
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
       <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索"/>
-        <input type="hidden" name="search_type" id="type" value=""/>
-        <a href="javascript:void(0);" class="homepageSearchIcon" onclick="$('#type').val($('input[type=radio]:checked').val());$(this).parent().submit();"></a>
-     <% end %>
+      <input type="hidden" name="search_type" id="type" value=""/>
+      <input type="text" class="none"/>
+      <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
+    <% end %>
     <div class="navSearchTypeBox" id="navHomepageSearchType">
       <div class="fl mr15 mt8">
         <input type="radio"  value="courses" name="search_type" checked/>

app/views/layouts/_unlogin_header.html.erb

@@ -9,45 +9,53 @@
       </li>
     </ul>
   </div>
- <script>
-     function search(doc){
-         //alert(1)
-        // val = $('input:radio[name="search_type"]:checked').val();
-        // alert(2)
-        // $("#search_type").val(val);
-       //  alert(3)
-         $(doc).parent().submit();
-     }
-     <% type = type%>
-     $(function (){
-         if('<%= type %>' != null && '<%= type %>' == 'courses' ){
-             $('input:radio[value="courses"]').attr('checked','checked');
-         }
-         if('<%= type %>' != null && '<%= type %>' == 'projects' ){
-             $('input:radio[value="projects"]').attr('checked','checked');
-         }
-         if('<%= type %>' != null && '<%= type %>' == 'users' ){
-             $('input:radio[value="users"]').attr('checked','checked');
-         }
-     });
+  <script>
+      function search(doc){
+          //alert(1)
+          // val = $('input:radio[name="search_type"]:checked').val();
+          // alert(2)
+          // $("#search_type").val(val);
+          //  alert(3)
+          $(doc).parent().submit();
+      }
+      <% type = type%>
+      $(function (){
+          if('<%= type %>' != null && '<%= type %>' == 'courses' ){
+              $('input:radio[value="courses"]').attr('checked','checked');
+          }
+          if('<%= type %>' != null && '<%= type %>' == 'projects' ){
+              $('input:radio[value="projects"]').attr('checked','checked');
+          }
+          if('<%= type %>' != null && '<%= type %>' == 'users' ){
+              $('input:radio[value="users"]').attr('checked','checked');
+          }
+      });
 
-     $(function(){
-         $("#navHomepageSearchInput").keypress(function(e){
-             if (e.keyCode == '13') {
-                 $('#type').val($('input[type=radio]:checked').val());
-                 $(this).parent().submit();
-             }
-         })
-     });
- </script>
+      function search_in_header(obj){
+          var name = $.trim($('#navHomepageSearchInput').val());
+          if (name != "" &&  name.length != 0) {
+              $('#type').val($('input[type=radio]:checked').val());
+              obj.parent().submit();
+          }
+      }
+
+          function search_in_header_I(e,obj){
+              var name = $.trim($('#navHomepageSearchInput').val());
+              if (e.keyCode == '13' && name != "" &&  name.length != 0) {
+                  $('#type').val($('input[type=radio]:checked').val());
+                  obj.parent().submit();
+              }
+          }
+  </script>
   <div class="fl" id="navHomepageSearch">
     <!--<form class="navHomepageSearchBox">-->
     <% name = name%>
 
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" />
-      <input type="hidden" name="search_type" id="type" value=""/>
-      <a href="javascript:void(0);" class="homepageSearchIcon" onclick="$('#type').val($('input[type=radio]:checked').val());$(this).parent().submit();"></a>
+        <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" onkeypress="search_in_header_I(event,$(this));"/>
+        <input type="hidden" name="search_type" id="type" value=""/>
+        <input type="text" style="display: none;"/>
+        <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
     <% end %>
     <div class="navSearchTypeBox" id="navHomepageSearchType">
       <div class="fl mr15 mt8">

app/views/layouts/login.html.erb

@@ -15,18 +15,6 @@
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
 </head>
-<script type="text/javascript" charset="utf-8">
-    $(function() {
-        $(document).keyup(function (e) {
-            var e = e || event,
-            code = e.which || e.keyCode;
-            if (code == 13 && $("#loginInBox").css('display') == 'block') {
-                e.preventDefault();
-                $('#main_login_form').submit();
-            }
-        });
-    });
-</script>
 <div class="navContainer">
     <% is_current_user = User.current.logged? && User.current == @user%>
     <% if User.current.logged? %>

app/views/news/_course_form.html.erb

@@ -27,7 +27,7 @@
     <%= render :partial => 'attachments/new_form', :locals => {:container => @news} %>
     <div class="cl"></div>
   </li>
-  <li class="ml40" >
+  <li class="ml50" >
     <% if is_new %>
       <%= link_to l(:button_create), "javascript:void(0)", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fl c_white' %>
       <%= link_to l(:button_cancel), course_news_index_path(@course), :onclick => '$("#add-news").hide()', :class => 'blue_btn grey_btn fl c_white' %>

app/views/poll/_poll.html.erb

@@ -2,7 +2,7 @@
 <% poll_name = poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
 <% if @is_teacher%>
   <li title="<%= poll.polls_name %>">
-    <div style="width: 310px;float: left;">
+    <div style="width: 370px;float: left;">
       <% if has_commit %>
           <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
       <% else %>

app/views/users/_course_attachment.html.erb

@@ -5,7 +5,7 @@
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo">
+      <div class="homepagePostTo mb12">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -15,7 +15,7 @@
         <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.container_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
         <!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
       </div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle mb12">
         <a href="javascript:void(0);" class="postGrey"><%=activity.filename.to_s(附件名称)%></a>
       </div>
       <div class="homepagePostSubmitContainer">

app/views/users/_course_homework.html.erb

@@ -4,7 +4,7 @@
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo mb8" style="word-break:break-all;">
+      <div class="homepagePostTo mb8 break_word">
         <% if activity.try(:user).try(:realname) == ' ' %>
             <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -12,7 +12,7 @@
         <% end %> TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
       </div>
-      <div class="homepagePostTitle mb8" style="word-break:break-all;"> <!--+"(作业名称)"-->
+      <div class="homepagePostTitle mb8 break_word"> <!--+"(作业名称)"-->
         <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
       </div>
       <div class="homepagePostSubmitContainer">

app/views/users/_course_message.html.erb

@@ -4,7 +4,7 @@
           <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
         </div>
         <div class="homepagePostDes">
-          <div class="homepagePostTo mb12" style="word-break:break-all;">
+          <div class="homepagePostTo mb12 break_word">
             <% if activity.try(:author).try(:realname) == ' ' %>
                 <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
             <% else %>
@@ -14,7 +14,7 @@
             <%= link_to activity.course.name.to_s+" | 课程讨论区", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
             <%#= link_to activity.course.name.to_s+"(课程讨论区)", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
           </div>
-          <div class="homepagePostTitle mb12" style="word-break:break-all;">
+          <div class="homepagePostTitle mb12 break_word">
             <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
               <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %>
             <% else %>
@@ -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"><%= reply.content.html_safe %></div>
+                              <div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div>
                             </div>
                             <div class="cl"></div>
                           </li>

app/views/users/_course_news.html.erb

@@ -4,7 +4,7 @@
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo mb12" style="word-break:break-all;">
+      <div class="homepagePostTo mb12 break_word">
         <% if @ctivity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -12,7 +12,7 @@
         <% end %> TO  <!--+"(课程名称)"-->
         <%= link_to activity.course.name.to_s+" | 课程通知", course_path(activity.course), :class => "newsBlue ml15", :style => "word-break:break-all" %>
       </div>
-      <div class="homepagePostTitle mb12" style="word-break:break-all;"> <!--+"(通知标题)"-->
+      <div class="homepagePostTitle mb12 break_word"> <!--+"(通知标题)"-->
         <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey", :style => "word-break:break-all" %>
       </div>
       <div class="homepagePostSubmitContainer">
@@ -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"><%= comment.comments.html_safe %></div>
+                    <div class="homepagePostReplyContent break_word"><%= comment.comments.html_safe %></div>
                   </div>
                   <div class="cl"></div>
                 </li>

app/views/users/_course_poll.html.erb

@@ -7,7 +7,7 @@
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo" style="word-break:break-all;">
+      <div class="homepagePostTo mb12 break_word">
         <% if activity.try(:user).try(:realname) == ' ' %>
             <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -17,7 +17,7 @@
         <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
         <!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
       </div>
-      <div class="homepagePostTitle" style="word-break:break-all;">
+      <div class="homepagePostTitle break_word" >
         <%#= link_to activity.polls_name.to_s/*+"(问卷名称)"*/, %>
         <% if has_commit %>
             <%= link_to poll_name, poll_result_poll_path(activity.id), :class => "postGrey"%>

app/views/users/_project_attachment.html.erb

@@ -1,5 +1,5 @@
 <div class="resources mt10">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+  <div class="homepagePostBrief mt10" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">

app/views/users/_project_create.html.erb

@@ -1,5 +1,5 @@
 <div class="resources mt10">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+  <div class="homepagePostBrief mt10" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">

app/views/users/_project_document.html.erb

@@ -1,5 +1,5 @@
 <div class="resources mt10">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+  <div class="homepagePostBrief mt10" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">

app/views/users/_project_issue.html.erb

@@ -4,7 +4,7 @@
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo mb12"  style="word-break:break-all;">
+      <div class="homepagePostTo mb12 break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -12,7 +12,7 @@
         <% end %>  TO
         <%=  link_to activity.project.name.to_s+" | 项目缺陷", project_path(activity.project), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
         </div>
-      <div class="homepagePostTitle mb12" style="word-break:break-all;">
+      <div class="homepagePostTitle mb12 break_word">
         <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %>
         <span class='<%= get_issue_priority(activity.priority_id)[0] %>'><%= get_issue_priority(activity.priority_id)[1] %></span>
       </div>
@@ -28,11 +28,11 @@
         </div>
         <div class="homepagePostDeadline">时间：<%=format_date(activity.created_on) %></div>
       </div>
-      <div class="homepagePostIntro" id="activity_description_<%= user_activity.id %>">缺陷描述：<%= activity.description.html_safe %></div>
+      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id %>">缺陷描述：<%= activity.description.html_safe %></div>
       <div class="mt10" style="font-weight:normal;">
         <% if activity.attachments.any? %>
             <% activity.attachments.each do |attachment| %>
-                  <div style="white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;">
+                  <div class="break_word">
                   <span title="<%= attachment.filename %>" id="attachment_">
                     <%= link_to_short_attachment attachment, :class => 'homepagePostFileAtt newsBlue', :download => true -%>
                   </span>
@@ -107,8 +107,8 @@
                     <div class="homepagePostReplyPublisher">
                       <% if reply.try(:user).try(:realname) == ' ' %>
                           <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                          <%# else %>
-                          <%#= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                          <% else %>
+                          <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_date(reply.created_on) %>
 
@@ -116,10 +116,10 @@
                     </div>
                     <% if reply.details.any? %>
                         <% details_to_strings(reply.details).each do |string| %>
-                            <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%= string %></div>
+                            <div class="homepagePostReplyContent break_word"><%= string %></div>
                         <% end %>
                     <% else %>
-                        <div class="homepagePostReplyContent"><%= reply.notes.html_safe %></div>
+                        <div class="homepagePostReplyContent break_word"><%= reply.notes.html_safe %></div>
                     <% end %>
                   </div>
                   <div class="cl"></div>

app/views/users/_project_journal.html.erb

@@ -1,5 +1,5 @@
 <div class="resources mt10">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+  <div class="homepagePostBrief mt10" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">

app/views/users/_project_message.html.erb

@@ -1,10 +1,10 @@
 <div class="resources mt10">
-  <div class="homepagePostBrief">
+  <div class="homepagePostBrief mt10">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo mb12" style="word-break:break-all;">
+      <div class="homepagePostTo mb12 break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -14,7 +14,7 @@
         <%= link_to activity.project.name.to_s+" | 项目讨论区",project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
         <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.project.name %>(项目讨论区)</a>-->
       </div>
-      <div class="homepagePostTitle mb12" style="word-break:break-all;">
+      <div class="homepagePostTitle mb12 break_word">
         <% if activity.parent_id.nil? %>
             <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %>
         <% else %>
@@ -24,7 +24,7 @@
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostDeadline">时间：<%= format_date(activity.created_on) %></div>
       </div>
-      <div class="homepagePostIntro" id="activity_description_<%= user_activity.id%>">帖子描述：
+      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id%>">帖子描述：
         <% if activity.parent_id.nil? %>
             <%= activity.content.to_s.html_safe%>
         <% else %>
@@ -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"><%= reply.content.html_safe %></div>
+                    <div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div>
                   </div>
                   <div class="cl"></div>
                 </li>

app/views/users/show.html.erb

@@ -14,7 +14,7 @@
     $(window).scroll(scrollHandler);
 </script>
 
-<input type="hidden" value="<%= @type%>" id="user_activities_type">
+<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
 <div class="resources">
   <div class="homepageRightBanner">
     <div class="NewsBannerName">最新动态</div>

app/views/users/show_chen.erb

@@ -138,10 +138,10 @@
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo mb12"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15 mr5">黄井泉</a><span class="c_blue">，</span><a href="javascript:void(0);" class="newsBlue ml5">陈正东</a>
       </div>
-      <div class="homepagePostTitle"><a href="javascript:void(0);" class="postGrey">假期开心吗？（讨论区内容）</a></div>
+      <div class="homepagePostTitle mb12"><a href="javascript:void(0);" class="postGrey">假期开心吗？（讨论区内容）</a></div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostDeadline">时间：2015-07-31</div>
       </div>
@@ -205,9 +205,9 @@
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo mb12"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15">Trustie Forge（项目名称）</a></div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle mb12">
         <a href="javascript:void(0);" class="postGrey">上传资源未显示在项目动态中（缺陷标题）</a><span class="homepagePostProjectState">正常</span>
       </div>
       <div class="homepagePostSubmitContainer">

public/stylesheets/courses.css

@@ -1,7 +1,7 @@
 
 /*右侧内容--动态*/
-.project_r_h{ width:670px; height:40px; background:#eaeaea; margin-bottom:10px;}
-.project_r_h02{ width:920px; height:40px; background:#eaeaea; margin-bottom:10px;}
+.project_r_h{ width:730px; height:40px; background:#eaeaea; margin-bottom:10px;}
+.project_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;}
 .project_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
 .project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;}
 .project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;}
@@ -52,7 +52,7 @@ a:hover.problem_new_btn{ background:#ff7143; color:#fff;}
 .problem_p span{ color:#ff3e00;}
 a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;}
 a:hover.problem_pic{border:1px solid #64bdd9;}
-.problem_txt{ width:610px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;}
+.problem_txt{ width:670px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;}
 a.problem_name{ color:#ff5722;max-width:60px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
 a:hover.problem_name{ color:#d33503;}
 a.problem_tit{ color:#0781b4; max-width:410px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;vertical-align: top;}
@@ -105,14 +105,14 @@ a:hover.grey_btn{ background:#717171; color:#fff;}
 .w90{width:90px;}
 .ml10{margin-left:10px;}
 .resource{  width:670px;}
-.re_top{width:660px; height:40px; background:#eaeaea; padding:5px;}
+.re_top{width:720px; height:40px; background:#eaeaea; padding:5px;}
 .re_top input{ float:left;}
 .re_search{ margin-top:7px; margin-left:5px;}
 .re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;}
 .re_schbtn{ width:60px; height:26px;  color:#fff; margin-right:5px; border:none;  margin-left:0px;padding-left: 0px;}
 a.re_fabu { display:block; width:90px; height:30px; font-size:14px; color:#fff; text-align:center; padding-top:10px; }
 a:hover.re_fabu{background:#55a1b9;}
-.re_con{ margin:5px; width:665px;}
+.re_con{ margin:5px; width:720px;}
 .re_con_top{color:#494949; }
 .re_con_top span{ color:#999999; font-weight:bold;}
 a.re_select{ display:block;  border:1px solid #ff9900; color:#ff9900;  margin-left:10px; padding:1px 5px;}
@@ -172,7 +172,7 @@ a:hover.work_edit{color: #fff; background: #64bdd9;}
 .wzan a{ display: block;}
 a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;}
 a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
-.msg_box{ width:670px;  border-bottom:1px dashed #CCC; padding-top:10px;}
+.msg_box{ width:728px;  border-bottom:1px dashed #CCC; padding-top:10px;}
 .msg_box h4{ }
 .msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666;  font-size:12px; }
 
@@ -212,7 +212,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_C{border-bottom:1px dashed #CCC; padding:10px 0 0px;}
 .ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;}
 .ping_dispic a:hover{border:1px solid #15bccf;}
-.ping_discon{ float:left; width:610px; margin-left:10px; }
+.ping_discon{ float:left; width:670px; margin-left:10px; }
 /*.ping_distop span{ float:left;}*/
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
@@ -221,16 +221,16 @@ a:hover.ping_sub{ background:#14a8b9;}
 /* 创建作品 work */
 .Newwork{ width:668px; height:418px;}
 .N_top{ float:right; margin-left:390px; }
-.N_con{ color:#484747; font-weight:bold; width:660px; margin-top:10px; }
+.N_con{ color:#484747; font-weight:bold; width:710px; margin-top:10px; }
 .N_con p{ }
 .w430{ width:470px;}
 .w557{ width:557px;}
 .w350{ width:350px;}
 .h400{height: 400px !important;}
 .w620{ width:480px; height:160px; border:1px solid #CCC;}
-.bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:470px;  }
+.bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:530px;  }
 .bo02{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:480px; margin-left:2px; color: #999;  }
-.hwork_txt{ width:560px; padding-left:5px; background:#fff;}
+.hwork_txt{ width:610px; padding-left:5px; background:#fff;}
 a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:10px;}
 a:hover.tijiao{ background:#0f99a9;}
 .members_left{ float:left; width:410px;  margin-right:20px; text-align:center;}
@@ -556,7 +556,7 @@ a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #64bdd9; pa
 
 /* 20150423作业评分*/
 .ml14{ margin-left:14px;}
-.w548{ width:552px;}
+.w548{ width:600px;}
 .w547{ width:544px;}
 .w196{ width:182px;}
 .w459{ width:459px;}
@@ -572,18 +572,18 @@ a:hover.icon_add{background:url(../stylesheets/images/icons.png) -20px -310px no
 .w664{ width:664px;}
 .w140{ width:140px;}
 .talklist_box{  }
-.talkmain_box{ width:670px; border-bottom:1px dashed #d9d9d9;  margin-bottom:20px; margin-top: 10px;}
+.talkmain_box{ width:730px; border-bottom:1px dashed #d9d9d9;  margin-bottom:20px; margin-top: 10px;}
 .talkmain_pic{}
 a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;}
 a:hover.talkmain_pic{border:1px solid #64bdd9;}
-.talkmain_txt{ width:610px; margin-left:10px; color:#333;}
+.talkmain_txt{ width:670px; margin-left:10px; color:#333;}
 a.talkmain_name{ color:#ff5722;}
 a:hover.talkmain_name{ color:#d33503;}
 .talkmain_tit{ color:#0781b4; width:450px; display:block; }
 .talklist_main{   }
 /*.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}*/
 .talkConIpt{ background:#f2f2f2; }
-.talkWrapBox{ width:610px; margin-left:60px; }
+.talkWrapBox{ width:660px; margin-left:60px; }
 .inputFeint{ border:1px solid #d9d9d9; background:#fff; width:583px; height:50px; margin:10px;  margin-bottom:5px;color:#666;}
 .inputFeint02{ border:1px solid #d9d9d9; background:#fff; width:535px; height:30px;  margin:5px 0 5px 50px; color:#666;}
 .inputFeint03{ border:1px solid #d9d9d9; background:#fff; width:490px; height:30px;  margin:5px 0 5px 0px; color:#666;}
@@ -592,7 +592,7 @@ a.Msg_pic{ display:block; width:34px; height:34px; padding:2px; border:1px solid
 a:hover.Msg_pic{border:1px solid #64bdd9;}
 a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px solid #e3e3e3; float:left;}
 a:hover.Reply_pic{border:1px solid #64bdd9;}
-.Msg_txt{ float:left; width:540px; margin-left:10px;}
+.Msg_txt{ float:left; width:630px; margin-left:10px;}
 .Msg_txt p{ }
 .talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;}
 .talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; }
@@ -604,7 +604,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 
 /* 20150423作业评分*/
 .ml14{ margin-left:14px;}
-.w548{ width:552px;}
+.w548{ width:600px;}
 .w547{ width:544px;}
 .w196{ width:196px;}
 .w186{ width:186px;}

public/stylesheets/header.css

@@ -90,8 +90,8 @@ li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
 a.topnav_login_box:hover {color:#a1ebff;}
 .navRow1 {margin:0; padding:0;}
 .navRow2 {margin:0; padding:0;}
-.topnav_login_list{ border:1px solid #15bccf; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -5px;}
-.topnav_login_list a{color:#15bccf;}
+.topnav_login_list{ border:1px solid #269ac9; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -4px;}
+.topnav_login_list a{color:#269ac9;}
 .topnav_login_list li{ }
 
 /*底部*/

public/stylesheets/new_user.css

@@ -938,7 +938,7 @@ img.ui-datepicker-trigger {
 #attachments_fields input.filename {
     border: 0;
     height: 1.8em;
-    width: 630px;
+    width: 200px;
     color: #7f7f7f;
     background-color: inherit;
     background: url(../images/pic_file.png) 0 3px no-repeat;