issue导航,首页贴吧动态html,加入了最后回复

This commit is contained in:
yanxd 2014-05-06 17:04:24 +08:00
parent f8746d6812
commit 05baffe4f3
6 changed files with 104 additions and 16 deletions

View File

@ -6,6 +6,7 @@ unless RUBY_PLATFORM =~ /w32/
gem 'rubyzip' gem 'rubyzip'
gem 'zip-zip' gem 'zip-zip'
end end
gem 'thin'
gem 'seems_rateable', path: 'lib/seems_rateable' gem 'seems_rateable', path: 'lib/seems_rateable'
gem "rails", "3.2.13" gem "rails", "3.2.13"
gem "jquery-rails", "~> 2.0.2" gem "jquery-rails", "~> 2.0.2"

View File

@ -40,7 +40,9 @@ GEM
arel (3.0.2) arel (3.0.2)
builder (3.0.0) builder (3.0.0)
coderay (1.0.9) coderay (1.0.9)
daemons (1.1.9)
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.3)
fastercsv (1.5.0) fastercsv (1.5.0)
hike (1.2.3) hike (1.2.3)
i18n (0.6.1) i18n (0.6.1)
@ -91,6 +93,10 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.18.1) thor (0.18.1)
tilt (1.4.1) tilt (1.4.1)
treetop (1.4.14) treetop (1.4.14)
@ -117,3 +123,4 @@ DEPENDENCIES
rdoc (>= 2.4.2) rdoc (>= 2.4.2)
ruby-openid (~> 2.1.4) ruby-openid (~> 2.1.4)
seems_rateable! seems_rateable!
thin

View File

@ -59,7 +59,13 @@ module IssuesHelper
def issue_heading(issue) def issue_heading(issue)
#h("#{issue.tracker} ##{issue.id}") #h("#{issue.tracker} ##{issue.id}")
h("#{issue.tracker} #{issue.source_from}") #h("#{issue.tracker} #{issue.source_from}")
s = ''
s << ">>"
s << link_to(@issue.project.name+l(:issue_list), project_issues_path(@issue.project))
s << " >"
s << @issue.source_from
s.html_safe
end end
def render_issue_subject_with_tree(issue) def render_issue_subject_with_tree(issue)

View File

@ -1,4 +1,5 @@
<%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %> <%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
<% html_title "#{@issue.tracker.name} #{@issue.source_from}: #{@issue.subject}" %> <% html_title "#{@issue.tracker.name} #{@issue.source_from}: #{@issue.subject}" %>
<%= render :partial => 'action_menu' %> <%= render :partial => 'action_menu' %>

View File

@ -96,22 +96,28 @@
<%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%></h3> <%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%></h3>
<span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span> <span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
</div> </div>
<div class="welcome-box-list-new"> <div class="welcome-box-list-new memo_activity">
<% find_new_forum_topics(7).each do |topic|%> <% find_new_forum_topics(7).each do |topic|%>
<li class="message-brief-intro" style="line-height: 1.63em;padding-bottom:3px;"> <li class="message-brief-intro">
<div style="display: inline-block; width: 100%;"> <div class='memo_title'>
<span style="color:gray; display: inline-block; margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %>
<%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;", :target => "_blank" %> </div>
</span> <div class='memo_attr'>
<br> <span class='memo_timestamp'>
<span style="margin-left: 24px; color: rgb(172, 174, 177); white-space: nowrap; font-size 9pt !important;;"><%= l(:field_updated_on) %><%=time_tag_welcome(topic_last_time topic)%>前</span> <%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
<span style="margin-left: 8px; margin-bottom: 0px; color: rgb(172, 174, 177) !important; white-space: nowrap;"> </span>
由&nbsp;<%= link_to topic.author ? topic.author : 'Anonymous', user_path(topic.author_id), :style => "font-size: 9pt !important; color: rgb(17, 102, 173);", :target => "_blank" %>&nbsp;发表 <span class="memo_author">
</span> 楼主: <%= link_to_user(topic.author) %>
<span style="float: right; color: rgb(172, 174, 177); white-space: nowrap; font-size 9pt !important;;">回复(<%= link_to (topic.parent ? topic.parent.replies_count : topic.replies_count), topic.event_url, :target => "_blank" %>)</span> </span>
<span class="memo_last_person">
最后回复:<%=link_to_user topic.last_reply.try(:author) %>
</span>
<span class="memo_reply">
回复(<%= link_to topic.try(:replies_count), topic.event_url %>)
</span>
</div> </div>
</li> </li>
<% end %> <% end %>
</div> </div>
</ul> </ul>
</div> </div>

View File

@ -1,3 +1,8 @@
* 再添加的时候按照功能划分区块随便加的被删掉自负
*/
/************************** 某部分开始 *****************************/
/************************** 某部分结束 *****************************/
.top_bar{ .top_bar{
height: auto; height: auto;
} }
@ -377,3 +382,65 @@ a.attachments_list_color {
line-height: 1.3em; line-height: 1.3em;
margin-bottom: 3px; margin-bottom: 3px;
} }
/************************** 贴吧动态 开始 *****************************/
/*贴吧活动*/
.memo_activity{
}
/*帖子li*/
.memo_activity .message-brief-intro{
line-height: 1.76em;
padding:3px;
margin:3px;
}
/*帖子中的链接*/
.memo_activity a {
color: #105CB6;
}
/*帖子标题*/
.memo_activity .memo_title{
display: inline-block;
margin-bottom: 3px;
padding-left: 20px;
background: url('/images/list-icon.png') no-repeat scroll ;
background-position: left center;
font-size: 10pt;
}
/*帖子的各种属性*/
.memo_activity .memo_attr{
margin-left: 20px;
}
/*帖子的时间*/
.memo_activity .memo_timestamp{
color: #999999;
white-space: nowrap;
font-size: 9pt;
}
/*帖子的作者*/
.memo_activity .memo_author{
margin-left: 8px;
margin-bottom: 0px;
color: #999999;
white-space: nowrap;
font-size: 9pt;
}
.memo_activity span a{
color: gray;
}
/*帖子的最后回复人*/
.memo_activity .memo_last_person{
margin-left: 8px;
margin-bottom: 0px;
color: #999999;
white-space: nowrap;
font-size: 9pt;
}
/*帖子的总回复数量*/
.memo_activity .memo_reply{
float: right;
color: rgb(172, 174, 177);
white-space: nowrap;
font-size: 10pt;
}
/************************** 贴吧动态 结束 ****************************