exceptionHandle
nieguanghui 12 years ago
parent ad469d4e7d
commit c4d1b884e8

@ -123,9 +123,11 @@
<ul class="welcome-message-list" style="width: 90%;"> <ul class="welcome-message-list" style="width: 90%;">
<h3 style="">论坛热帖</h3> <h3 style="">论坛热帖</h3>
<div class="welcome-box-list"> <div class="welcome-box-list">
<%= find_hot_forum_topics.each do |topic|%>
<li class="message-brief-intro"> <li class="message-brief-intro">
<span style="color:gray">新建DIV测试项目对于本项目的作用</span> <span style="margin-left: 10px; color: green">yanpc</span><span style="margin-left:10px; color:blue">1分钟前</span> <span style="color:gray"><%= topic.subject %></span> <span style="margin-left: 10px; color: green"><%= link_to topic.author, user_path(topic.author) %></span><span style="margin-left:10px; color:blue"><%= time_tag topic.created_at %></span>
</li> </li>
<% end %>
<li class="message-brief-intro"> <li class="message-brief-intro">
<span style="color:gray">热烈祝贺论坛新版本上线欢迎大家提交bug</span><span style="margin-left: 10px; color: green">yanpc</span><span style="margin-left:10px; color:blue">5分钟前</span> <span style="color:gray">热烈祝贺论坛新版本上线欢迎大家提交bug</span><span style="margin-left: 10px; color: green">yanpc</span><span style="margin-left:10px; color:blue">5分钟前</span>
</li> </li>
@ -149,64 +151,19 @@
<ul class="user-welcome-message-list" style="width: 80%; margin-top: 80px;"> <ul class="user-welcome-message-list" style="width: 80%; margin-top: 80px;">
<h3 style="margin-left: -5px;">用户动态</h3> <h3 style="margin-left: -5px;">用户动态</h3>
<div class="user-message-box-list"> <div class="user-message-box-list">
<% find_all_activities.each do |event|%> <% find_all_activities.each do |event|%>
<li style="display: block;height:60px;"> <li style="display: block;height:60px;">
<div class="inner-right" style="float: left; height: 100%;"> <div class="inner-right" style="float: left; height: 100%;">
<img class="avatar-3" style="width: 40px; height: 40px; margin-top:10px;" src="/images/avatars/User/4861?1385345302"></img> <img class="avatar-3" style="width: 40px; height: 40px; margin-top:10px;" src="/images/avatars/User/4861?1385345302"></img>
<%= image_tag url_to_avatar(event[:event_author]), :class => "avatar-3"%> <%= image_tag url_to_avatar(event[:event_author]), :class => "avatar-3"%>
</div> </div>
<div class="inner-right" style="float: right; width:88%; height: 100%;"> <div class="inner-right" style="float: right; width:88%; height: 100%;">
<span style="color: green;"><%= event[:event_author] %></span>&nbsp;发表了评论:<span style="color: blue;"><%#= truncate(event[:event_description], length: 15, omission'...') %> <span style="color: green;"><%= event[:event_author] %></span>&nbsp;发表了评论:<span style="color: blue;"><%= truncate(event[:event_description], length: 15, omission:'...') %>
</span> </span>
<p><span><%= time_tag event[:date_time] %></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>评论(4)</span></p> <p><span><%= time_tag event[:date_time] unless event[:date_time].nil?%></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>评论(4)</span></p>
</div>
</li>
<% end %>
<li style="display: block;height:60px;">
<div class="inner-right" style="float: left; height: 100%;">
<img class="avatar-3" style="width: 40px; height: 40px; margin-top:10px;" src="/images/avatars/User/4861?1385345302"></img>
</div>
<div class="inner-right" style="float: right; width:88%; height: 100%;">
<span style="color: green;">yanpc</span>&nbsp;发表了评论:<span style="color: blue;">热烈庆祝OW2圆满结束让我们一起期待下一届的OW2比赛吧</span>
<p><span>1分钟前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>评论(4)</span></p>
</div>
</li>
<li style="display: block;height:60px;">
<div class="inner-right" style="float: left; height: 100%;">
<img class="avatar-3" style="width: 40px; height: 40px; margin-top:10px;" src="/images/avatars/User/4861?1385345302"></img>
</div>
<div class="inner-right" style="float: right; width:88%; height: 100%;">
<span style="color: green;">yanpc</span>&nbsp;发表了评论:<span style="color: blue;">热烈庆祝OW2圆满结束让我们一起期待下一届的OW2比赛吧</span>
<p><span>1分钟前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>评论(4)</span></p>
</div>
</li>
<li style="display: block; height:60px;">
<div class="inner-right" style="float: left; height: 100%;">
<img class="avatar-3" style="width: 40px; height: 40px; margin-top:10px;" src="/images/avatars/User/4861?1385345302"></img>
</div>
<div class="inner-right" style="float: right; width:88%; height: 100%;">
<span style="color: green;">yanpc</span>&nbsp;发表了评论:<span style="color: blue;">热烈庆祝OW2圆满结束让我们一起期待下一届的OW2比赛吧</span>
<p><span>1分钟前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>评论(4)</span></p>
</div>
</li>
<li style="display: block;height:60px;">
<div class="inner-right" style="float: left; height: 100%;">
<img class="avatar-3" style="width: 40px; height: 40px; margin-top:10px;" src="/images/avatars/User/4861?1385345302"></img>
</div>
<div class="inner-right" style="float: right; width:88%; height: 100%;">
<span style="color: green;">yanpc</span>&nbsp;发表了评论:<span style="color: blue;">热烈庆祝OW2圆满结束让我们一起期待下一届的OW2比赛吧</span>
<p><span>1分钟前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>评论(4)</span></p>
</div>
</li>
<li style="display: block;height:60px;">
<div class="inner-right" style="float: left; height: 100%;">
<img class="avatar-3" style="width: 40px; height: 40px; margin-top:10px;" src="/images/avatars/User/4861?1385345302"></img>
</div>
<div class="inner-right" style="float: right; width:88%; height: 100%;">
<span style="color: green;">yanpc</span>&nbsp;发表了评论:<span style="color: blue;">热烈庆祝OW2圆满结束让我们一起期待下一届的OW2比赛吧</span>
<p><span>1分钟前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>评论(4)</span></p>
</div> </div>
</li> </li>
<% end %>
</div> </div>
</ul> </ul>
</div> </div>

@ -191,6 +191,9 @@ p.layout {
margin-bottom: 6px; margin-bottom: 6px;
} }
.avatar-3 {
width: 40px; height: 40px; margin-top:10px;
}
/*p.clr, .clr { clear:both; padding:0; margin:0; background:none;}*/ /*p.clr, .clr { clear:both; padding:0; margin:0; background:none;}*/

Loading…
Cancel
Save