Merge branch 'dev_hjq' into szzh

app/views/users/user_messages.html.erb

@@ -52,7 +52,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 %>
@@ -180,7 +184,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 %>
@@ -197,7 +203,7 @@
                         <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %></span>
                       </li>
                       <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.parent_id.nil? ? ma.memo.subject : 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"}", :title => "#{ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content}" %></a>
                       </li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.memo.created_at).html_safe %> </li>
                     </ul>
@@ -215,8 +221,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 +247,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>
 
 
 

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-top: .6em;
-    padding-right: .6em;
-    padding-bottom: .6em;
+    padding-left: 0.6em;
+    padding-top: 0.6em;
+    padding-right: 0.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}