Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
This commit is contained in:
commit
425e679f27
|
|
@ -90,8 +90,10 @@
|
|||
:onmouseout => "message_titile_hide($(this))" %></li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<p><strong>标题：</strong><%= ma.course_message.title %></p>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.course_message.description.html_safe %></div>
|
||||
<% unless ma.course_message.description.nil? %>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.course_message.description.html_safe %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
</ul>
|
||||
|
|
@ -107,8 +109,10 @@
|
|||
:onmouseout => "message_titile_hide($(this))" %></li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<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>
|
||||
<% unless ma.course_message.comments.nil? %>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.course_message.comments.html_safe %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
</ul>
|
||||
|
|
@ -124,8 +128,10 @@
|
|||
:onmouseout => "message_titile_hide($(this))" %></a></li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<p><strong>标题：</strong><%= ma.course_message.name %></p>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.course_message.description.html_safe %></div>
|
||||
<% unless ma.course_message.description.nil? %>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.course_message.description.html_safe %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
</ul>
|
||||
|
|
@ -240,7 +246,15 @@
|
|||
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
|
||||
<%= 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),
|
||||
:class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
|
||||
:title => "#{ma.course_message.subject.html_safe}" %></a></li>
|
||||
:onmouseover =>"message_titile_show($(this),event)",
|
||||
:onmouseout => "message_titile_hide($(this))" %></a></li>
|
||||
<div style="display: none" class="message_title_red system_message_style" >
|
||||
<p><strong>主题：</strong><%= ma.course_message.subject %></p>
|
||||
<% unless ma.course_message.content.nil? %>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.course_message.content.html_safe %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% 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),
|
||||
|
|
@ -249,8 +263,10 @@
|
|||
:onmouseout => "message_titile_hide($(this))" %></a></li>
|
||||
<div style="display: none" class="message_title_red system_message_style" >
|
||||
<p><strong>主题：</strong><%= ma.course_message.subject %></p>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.course_message.content.html_safe %></div>
|
||||
<% unless ma.course_message.content.nil? %>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.course_message.content.html_safe %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
|
|
@ -386,8 +402,10 @@
|
|||
</li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<p><strong>主题：</strong><%= ma.forge_message.subject %></p>
|
||||
<div class="fl"><strong>描述：</strong></div>
|
||||
<div class="ml36"><%= ma.forge_message.description.html_safe %></div>
|
||||
<% unless ma.forge_message.description.nil? || ma.forge_message.description == "" %>
|
||||
<div class="fl"><strong>描述：</strong></div>
|
||||
<div class="ml36"><%= ma.forge_message.description.html_safe %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
</ul>
|
||||
|
|
@ -430,8 +448,10 @@
|
|||
:onmouseout => "message_titile_hide($(this))" %></a></li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<p><strong>主题：</strong><%= ma.forge_message.subject %></p>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.forge_message.content.html_safe %></div>
|
||||
<% unless ma.forge_message.content.nil? %>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.forge_message.content.html_safe %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% else %>
|
||||
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
|
||||
|
|
@ -442,8 +462,10 @@
|
|||
:onmouseout => "message_titile_hide($(this))" %></a></li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<p><strong>主题：</strong><%= ma.forge_message.subject %></p>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.forge_message.content.html_safe %></div>
|
||||
<% unless ma.forge_message.content.nil? %>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.forge_message.content.html_safe %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
|
|
@ -466,8 +488,10 @@
|
|||
</li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<p><strong>标题：</strong><%= ma.forge_message.title %></p>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.forge_message.description.html_safe %></div>
|
||||
<% unless ma.forge_message.description.nil? %>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.forge_message.description.html_safe %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
</ul>
|
||||
|
|
@ -511,8 +535,10 @@
|
|||
</li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<p><strong>标题：</strong><%= ma.memo.subject %></p>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.memo.content.html_safe %></div>
|
||||
<% unless ma.memo.content.nil? %>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.memo.content.html_safe %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% else %>
|
||||
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
|
||||
|
|
@ -522,8 +548,10 @@
|
|||
</li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<p><strong>标题：</strong><%= ma.memo.subject %></p>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.memo.content.html_safe %></div>
|
||||
<% unless ma.memo.content.nil? %>
|
||||
<div class="fl"><strong>内容：</strong></div>
|
||||
<div class="ml36"><%= ma.memo.content.html_safe %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
<li class="homepageNewsTime fl"><%= time_tag(ma.memo.created_at).html_safe %> </li>
|
||||
|
|
|
|||
Loading…
Reference in New Issue