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

app/controllers/student_work_controller.rb

@@ -43,6 +43,14 @@ class StudentWorkController < ApplicationController
   end
 
   def index
+    # 消息状态更新
+    @homework.course_messages.each do |homework_message|
+      if User.current.id == homework_message.user_id
+        homework_message.update_attributes(:viewed => true)
+      end
+    end
+
+    # 消息end
     #设置作业对应的forge_messages表的viewed字段
     query_student_work = @homework.course_messages
     query_student_work.each do |query|

app/controllers/users_controller.rb

@@ -106,6 +106,7 @@ class UsersController < ApplicationController
       return
     end
     # 当前用户查看消息，则设置消息为已读
+    if params[:viewed] == "all"
       course_querys = @user.course_messages
       forge_querys = @user.forge_messages
       user_querys = @user.user_feedback_messages
@@ -116,6 +117,7 @@ class UsersController < ApplicationController
         user_querys.update_all(:viewed => true)
         forum_querys.update_all(:viewed => true)
       end
+    end
     # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
     case params[:type]
       when nil

app/views/layouts/_footer.html.erb

@@ -5,7 +5,7 @@
       <li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
       <li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
       <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
-      <li class="fl"><span class="f_grey mw20" title="暂未开放"><%= l(:label_forums)%></span></li>
+      <li class="fl"><a href="<%= forums_path %>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
 
     </ul>
   </div>

app/views/users/user_messages.html.erb

@@ -29,6 +29,11 @@
   </div>
 <div class="resources mt10" id="users_setting">
 <div>
+<% if params[:type].nil? %>
+    <div class="newsReadSetting">
+        有&nbsp;<span class="c_red"><%= User.current.count_new_message %></span>&nbsp;封未读<a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
+    </div>
+<% end %>
 <% if @message_alls.count >0 %>
     <%# 课程消息 %>
     <% unless @message_alls.nil? %>
@@ -52,7 +57,11 @@
                       <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"}",
-                                    :title => "#{ma.course_message.comments.html_safe}" %></li>
+                                    :onmouseover =>"message_titile_show($(this),event)",
+                                    :onmouseout => "message_titile_hide($(this))" %></li>
+                      <div  style="display: none" >
+                        <%= ma.course_message.comments.html_safe %>
+                      </div>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>
@@ -80,11 +89,21 @@
                     <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="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" %>"><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
+                      <% if ma.course_message.parent_id.nil? %>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%= link_to ma.course_message.parent_id.nil? ? ma.course_message.subject.html_safe : ma.course_message.content.html_safe,
+                            <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
-                                    course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
                                         :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
                                         :title => "#{ma.course_message.subject.html_safe}" %></a></li>
+                      <% else %>
+                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                            <%= link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
+                                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
+                                        :onmouseover =>"message_titile_show($(this),event)",
+                                        :onmouseout => "message_titile_hide($(this))" %></a></li>
+                          <div  style="display: none" >
+                            <%= ma.course_message.content.html_safe %>
+                          </div>
+                      <% end %>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
 
                     </ul>
@@ -150,11 +169,23 @@
                       <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
                       <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
                         <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span></li>
+                      <% if ma.forge_message.parent_id.nil? %>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%=link_to ma.forge_message.parent_id.nil? ? ma.forge_message.subject.html_safe : ma.forge_message.content.html_safe, project_boards_path(ma.forge_message.project,
+                            <%=link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project,
                                        :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
                                        :topic_id => ma.forge_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
                                        :title => "#{ma.forge_message.subject.html_safe}" %></a></li>
+                      <% else %>
+                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                            <%=link_to ma.forge_message.content.html_safe, project_boards_path(ma.forge_message.project,
+                                       :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
+                                       :topic_id => ma.forge_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
+                                       :onmouseover =>"message_titile_show($(this),event)",
+                                       :onmouseout => "message_titile_hide($(this))" %></a></li>
+                          <div  style="display: none" >
+                            <%= ma.forge_message.content.html_safe %>
+                          </div>
+                      <% end %>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>
@@ -180,7 +211,9 @@
                         <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了新闻：</span></li>
                       <li class="homepageNewsContent fl">
                         <%= link_to "#{ma.forge_message.comments.html_safe}",
-                                    {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.forge_message.comments.html_safe}"%></li>
+                                    {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                                     :title => "#{ma.forge_message.comments.html_safe}" %>
+                      </li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>
@@ -196,9 +229,21 @@
                         <%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue homepageNewsPublisher" %>
                         <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %></span>
                       </li>
+                      <% if ma.memo.parent_id.nil? %>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%= link_to ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content}" %></a>
+                            <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                                        :title => "#{ma.memo.subject}" %></a>
                           </li>
+                      <% else %>
+                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                            <%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                                        :onmouseover =>"message_titile_show($(this),event)",
+                                        :onmouseout => "message_titile_hide($(this))" %></a>
+                          </li>
+                          <div  style="display: none" >
+                            <%= ma.memo.content.html_safe %>
+                          </div>
+                      <% end %>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.memo.created_at).html_safe %> </li>
                     </ul>
                 <% end %>
@@ -215,8 +260,13 @@
                         <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %></span>
                       </li>
                       <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.journals_for_message.notes}" %></a>
+                        <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                                    :onmouseover =>"message_titile_show($(this),event)",
+                                    :onmouseout => "message_titile_hide($(this))" %></a>
                       </li>
+                      <div  style="display: none" >
+                        <%= ma.journals_for_message.notes.html_safe %>
+                      </div>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
 
                     </ul>
@@ -236,6 +286,17 @@
 </div>
 </div>
 
+<script>
+  function message_titile_show(obj,e)
+  {
+      obj.parent().next("div").show();
+      obj.parent().next("div").css("top",e.pageY).css("left",e.pageX).css("position","fixed");
+  }
+  function message_titile_hide(obj)
+  {
+      obj.parent().next("div").hide();
+  }
+</script>
 
 
 

db/migrate/20150829024549_course_messages.rb

@@ -3,6 +3,7 @@ class CourseMessages < ActiveRecord::Migration
   def up
     Course.all.each do |course|
       transaction do
+        put course.id
         course.course_messages << CourseMessage.new(:user_id => course.tea_id,:course_id => course.id)
         # 作业
         course.homework_commons.each do |homework_common|

db/migrate/20150829081822_update_message_time.rb

@@ -11,6 +11,7 @@ class UpdateMessageTime < ActiveRecord::Migration
             cmessage.created_at = cmessage.course_message.created_on
           end
           cmessage.save
+          puts cmessage.id
 
           course_all_message = MessageAll.where("message_type = '#{cmessage.class.to_s}' and message_id = '#{cmessage.id}'").first
           course_all_message.created_at = cmessage.created_at

db/migrate/20150829130302_update_forge_message_time.rb

@@ -11,6 +11,7 @@ class UpdateForgeMessageTime < ActiveRecord::Migration
             fmessage.created_at = fmessage.forge_message.created_on
           end
           fmessage.save
+          puts fmessage.id
 
           forge_all_message = MessageAll.where("message_type = '#{fmessage.class.to_s}' and message_id = '#{fmessage.id}'").first
           forge_all_message.created_at = fmessage.created_at

db/migrate/20150901004812_update_memo_message_time.rb

@@ -11,6 +11,7 @@ class UpdateMemoMessageTime < ActiveRecord::Migration
             memo_message.created_at = memo_message.memo.created_on
           end
           memo_message.save
+          puts memo_message.id
 
           memo_messages = MessageAll.where("message_type = '#{memo_message.class.to_s}' and message_id = '#{memo_message.id}'").first
           memo_messages.created_at = memo_message.created_at

public/javascripts/init_KindEditor.js

@@ -1,6 +1,6 @@
 function init_editor(params){
     var editor = params.kindutil.create(params.textarea, {
-        resizeType : 0,minWidth:"1px",width:"100%",minHeight:"40px",
+        resizeType : 0,minWidth:"1px",width:"100%",minHeight:"28px",
         items:['emoticons'],
         afterChange:function(){//按键事件
             nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});

public/stylesheets/new_user.css

@@ -525,7 +525,7 @@ a.replyGrey1 {color:#888888;}
 a.replyGrey1:hover {color:#4b4b4b;}
 a.newsBlue {color:#269ac9;}
 a.newsBlue:hover {color:#297fb8;}
-a.newsBlack {color:#000000; font-size:13px; font-weight:bold}
+a.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
 a.menuGrey {color:#808080;}
 a.menuGrey:hover {color:#fe7d68;}
 .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}

public/stylesheets/project.css

@@ -391,16 +391,17 @@ blockquote {
     border-right: 1px solid #e0e0e0;
     border-top: 1px solid #e0e0e0;
     border-bottom: 1px solid #e0e0e0;
-    padding-left: .6em;
+    padding-left: 0.6em;
-    padding-top: .6em;
+    padding-top: 0.6em;
-    padding-right: .6em;
+    padding-right: 0.6em;
-    padding-bottom: .6em;
+    padding-bottom: 0.6em;
     margin-left: 1.4em;
-    margin-right: .4em;
+    margin-right: 0.4em;
     border-radius: 4px;
     font-family: "Microsoft YaHei";
-    background: url(http://test.forge.trustie.net/images/requirements/xreference.jpg.pagespeed.ic.h4inUJNyH0.jpg);
+    /*background: url('../images/requirements/reference.jpg');*/
     background-size: 100% 100%;
+    margin-top:5px;
 }
 /*上传项目图片*/
 .upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer}