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

app/helpers/issues_helper.rb

@@ -59,7 +59,13 @@ module IssuesHelper
 
   def issue_heading(issue)
     #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
 
   def render_issue_subject_with_tree(issue)

app/views/issues/show.html.erb

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

app/views/welcome/index.html.erb

@@ -96,22 +96,28 @@
 			<%= 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>
 		</div>
-		<div class="welcome-box-list-new">
-			<% find_new_forum_topics(7).each do |topic|%>
-			<li class="message-brief-intro" style="line-height: 1.63em;padding-bottom:3px;">
-				<div  style="display: inline-block; width: 100%;">
-				  <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, :class => "gray" , :style => "font-size: 10pt !important;", :target => "_blank" %>
-				  </span>
-				<br>
-				<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>
-				<span style="margin-left: 8px; margin-bottom: 0px; color: rgb(172, 174, 177) !important; white-space: nowrap;">
-					由&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>
-				<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>
+		<div class="welcome-box-list-new memo_activity">
+		<% find_new_forum_topics(7).each do |topic|%>
+			<li class="message-brief-intro">
+				<div class='memo_title'>
+					<%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %>
+				</div>
+				<div class='memo_attr'>
+					<span class='memo_timestamp'>
+						<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
+					</span>
+					<span class="memo_author">
+						楼主： <%= link_to_user(topic.author) %>
+					</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>
 			</li>
-			<% end %>
+		<% end %>
 		</div>
 	</ul>
 </div> 

public/stylesheets/welcome.css

@@ -1,3 +1,8 @@
+ /*
+  * 再添加的时候按照功能划分区块，随便加的被删掉自负
+  */
+ /************************** 某部分开始 *****************************/
+ /************************** 某部分结束 *****************************/
 .top_bar{
     height: auto;
 }
@@ -285,8 +290,8 @@ div#tooltip::after {
      background-color: #FCE6EA;
      text-decoration: none;
      border-top: 1px solid #FFFFFF;
-     border-left: 1px solid #FFFFFF:
-     border-bottom:  1px solid #717171;
+     border-left: 1px solid #FFFFFF;
+     border-bottom: 1px solid #717171;
      border-right: 1px solid #717171;
 }
 .inner-content a:hover{
@@ -376,4 +381,66 @@ a.attachments_list_color {
     padding: 0 6px;
     line-height: 1.3em;
     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;
+}
+
+ /************************** 贴吧动态 结束 ****************************