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-18 17:49:54 +08:00
parent ff2e3e168d 3a4400cfee
commit 79881f3dca
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@
</li> </li>
<div style="display:none;" class="message_title_red system_message_style"> <div style="display:none;" class="message_title_red system_message_style">
<% unless usm.subject.nil? %> <% unless usm.subject.nil? %>
<p><strong>标题：</strong></span><%= usm.subject %></p> <p><strong>标题：</strong><%= usm.subject %></p>
<% end %> <% end %>
<% if usm.description.nil? && usm.content.nil? %> <% if usm.description.nil? && usm.content.nil? %>
@ -307,7 +307,9 @@
:onmouseout => "message_titile_hide($(this))" %></a> :onmouseout => "message_titile_hide($(this))" %></a>
</li> </li>
<div style="display: none" class="message_title_red system_message_style" > <div style="display: none" class="message_title_red system_message_style" >
<%= get_issue_des_update(ma.forge_message).html_safe %> <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> </div>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li> <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
</ul> </ul>
@ -357,6 +359,7 @@
:onmouseout => "message_titile_hide($(this))" %></a> :onmouseout => "message_titile_hide($(this))" %></a>
</li> </li>
<div style="display: none" class="message_title_red system_message_style"> <div style="display: none" class="message_title_red system_message_style">
<%= ma.forge_message.title.html_safe %> <%= ma.forge_message.title.html_safe %>
</div> </div>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li> <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@ -398,7 +401,9 @@
:onmouseout => "message_titile_hide($(this))" %></a> :onmouseout => "message_titile_hide($(this))" %></a>
</li> </li>
<div style="display: none" class="message_title_red system_message_style"> <div style="display: none" class="message_title_red system_message_style">
<%= ma.memo.subject %> <p><strong>标题：</strong><%= ma.memo.subject %></p>
<div class="fl"><strong>内容：</strong></div>
<div class="ml36"><%= ma.memo.content.html_safe %></div>
</div> </div>
<% else %> <% else %>
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey"> <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@ -407,8 +412,9 @@
:onmouseout => "message_titile_hide($(this))" %></a> :onmouseout => "message_titile_hide($(this))" %></a>
</li> </li>
<div style="display: none" class="message_title_red system_message_style"> <div style="display: none" class="message_title_red system_message_style">
<p>标题：<%= ma.memo.subject %></p> <p><strong>标题：</strong><%= ma.memo.subject %></p>
<p>内容：<%= ma.memo.content.html_safe %></p> <div class="fl"><strong>内容：</strong></div>
<div class="ml36"><%= ma.memo.content.html_safe %></div>
</div> </div>
<% end %> <% end %>
<li class="homepageNewsTime fl"><%= time_tag(ma.memo.created_at).html_safe %> </li> <li class="homepageNewsTime fl"><%= time_tag(ma.memo.created_at).html_safe %> </li>