jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
huang 2015-09-19 10:55:36 +08:00
parent 961b2bd564 71794ccffc
commit 70f53a8376
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/views/users/user_messages.html.erb
View File

@ -89,7 +89,9 @@
:onmouseover =>"message_titile_show($(this),event)",
:onmouseout => "message_titile_hide($(this))" %></li>
<div style="display: none" class="message_title_red system_message_style">
<%= ma.course_message.title.html_safe %>
<p><strong>标题：</strong><%= ma.course_message.title %></p>
<div class="fl"><strong>内容：</strong></div>
<div class="ml36"><%= ma.course_message.description.html_safe %></div>
</div>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
@ -104,7 +106,9 @@
:onmouseover =>"message_titile_show($(this),event)",
:onmouseout => "message_titile_hide($(this))" %></li>
<div style="display: none" class="message_title_red system_message_style">
<%= ma.course_message.comments.html_safe %>
<p><strong>标题：</strong><%= ma.course_message.commented.title %></p>
<div class="fl"><strong>内容：</strong></div>
<div class="ml36"><%= ma.course_message.comments.html_safe%></div>
</div>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
@ -119,7 +123,9 @@
:onmouseover =>"message_titile_show($(this),event)",
:onmouseout => "message_titile_hide($(this))" %></a></li>
<div style="display: none" class="message_title_red system_message_style">
<%= ma.course_message.name %>
<p><strong>标题：</strong><%= ma.course_message.name %></p>
<div class="fl"><strong>内容：</strong></div>
<div class="ml36"><%= ma.course_message.description.html_safe %></div>
</div>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
@ -242,7 +248,9 @@
:onmouseover =>"message_titile_show($(this),event)",
:onmouseout => "message_titile_hide($(this))" %></a></li>
<div style="display: none" class="message_title_red system_message_style" >
<%= ma.course_message.content.html_safe %>
<p><strong>主题：</strong><%= ma.course_message.subject %></p>
<div class="fl"><strong>内容：</strong></div>
<div class="ml36"><%= ma.course_message.content.html_safe %></div>
</div>
<% end %>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@ -377,7 +385,9 @@
:onmouseout => "message_titile_hide($(this))" %></a>
</li>
<div style="display: none" class="message_title_red system_message_style">
<%= ma.forge_message.subject %>
<p><strong>主题：</strong><%= ma.forge_message.subject %></p>
<div class="fl"><strong>描述：</strong></div>
<div class="ml36"><%= ma.forge_message.description.html_safe %></div>
</div>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
@ -401,7 +411,7 @@
<div style="display: none" class="message_title_red system_message_style" >
<p><strong>问题标题：</strong><%= ma.forge_message.journalized.subject %></p>
<div class="fl"><strong>更新内容：</strong></div>
<div class="ml36"><%= get_issue_des_update(ma.forge_message).html_safe %></div>
<div class="ml60"><%= get_issue_des_update(ma.forge_message).html_safe %></div>
</div>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
@ -419,7 +429,9 @@
:onmouseover => "message_titile_show($(this),event)",
:onmouseout => "message_titile_hide($(this))" %></a></li>
<div style="display: none" class="message_title_red system_message_style">
<%= ma.forge_message.subject.html_safe %>
<p><strong>主题：</strong><%= ma.forge_message.subject %></p>
<div class="fl"><strong>内容：</strong></div>
<div class="ml36"><%= ma.forge_message.content.html_safe %></div>
</div>
<% else %>
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@ -429,7 +441,9 @@
:onmouseover => "message_titile_show($(this),event)",
:onmouseout => "message_titile_hide($(this))" %></a></li>
<div style="display: none" class="message_title_red system_message_style">
<%= ma.forge_message.content.html_safe %>
<p><strong>主题：</strong><%= ma.forge_message.subject %></p>
<div class="fl"><strong>内容：</strong></div>
<div class="ml36"><%= ma.forge_message.content.html_safe %></div>
</div>
<% end %>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@ -451,8 +465,9 @@
:onmouseout => "message_titile_hide($(this))" %></a>
</li>
<div style="display: none" class="message_title_red system_message_style">
<%= ma.forge_message.title.html_safe %>
<p><strong>标题：</strong><%= ma.forge_message.title %></p>
<div class="fl"><strong>内容：</strong></div>
<div class="ml36"><%= ma.forge_message.description.html_safe %></div>
</div>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
@ -469,7 +484,9 @@
:onmouseout => "message_titile_hide($(this))" %>
</li>
<div style="display: none" class="message_title_red system_message_style">
<%= ma.forge_message.comments.html_safe %>
<p><strong>新闻标题：</strong><%= ma.forge_message.commented.title %></p>
<div class="fl"><strong>评论内容：</strong></div>
<div class="ml60"><%= ma.forge_message.comments.html_safe %></div>
</div>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>