From 378e8cbefd103ec4dc27fe6b8eea99fd73074d17 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 28 Mar 2014 14:55:34 +0800
Subject: [PATCH] socailForge#329

---
 app/models/issue.rb                      |  5 ++++-
 app/views/users/show.html.erb            |  6 +++---
 app/views/users/user_activities.html.erb | 24 ++++++++++++------------
 app/views/welcome/course.html.erb        |  5 +++++
 app/views/welcome/index.html.erb         |  5 +++++
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 1ea358a37..43bc6537d 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -56,7 +56,10 @@ class Issue < ActiveRecord::Base
                      :include => [:project, :visible_journals],
                      # sort by id so that limited eager loading doesn't break with postgresql
                      :order_column => "#{table_name}.id"
-  acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"},
+  acts_as_event :title => Proc.new {|o| 
+                        #"#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"
+                        "#{o.tracker.name} #{o.source_from} (#{o.status}): #{o.subject}"
+                        },
                 :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o}},
                 :type => Proc.new {|o| 'issue' + (o.closed? ? ' closed' : '') }
 
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index bf96cd3f5..2369b25d0 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -158,9 +158,9 @@
 <% when 'Issue' %>
 						<tr>
 	<% if e.user == User.current%>
-							<td colspan="2" valign="top"><strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= link_to(l(:label_activity_project)+act.project.name, project_path(act.project.identifier))%> <%= link_to format_activity_title("#{act.tracker.name} ##{act.id} (#{act.status}): #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %></td>
+							<td colspan="2" valign="top"><strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %></td>
 	<% else %>
-							<td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;<%= link_to(l(:label_activity_project)+act.project.name, project_path(act.project.identifier))%> <%= link_to format_activity_title("#{act.tracker.name} ##{act.id} (#{act.status}): #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %></td>
+							<td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;<%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %></td>
 	<% end %>
 						</tr>
 						<tr> <td colspan="2" width="580" > <p class="font_description"> <%= textilizable act.description %> </p></td> </tr>
@@ -253,6 +253,6 @@
 <% end %>
 <script type="text/javascript" language="javascript">
 	$(document).ready(function($) {
-		$("#content .pagination:first~ div").find("a").attr("target", "_blank");
+		$("#content .pagination:first~ div").first().find("a").attr("target", "_blank");
 	});
 </script>
\ No newline at end of file
diff --git a/app/views/users/user_activities.html.erb b/app/views/users/user_activities.html.erb
index 44447d47c..faea90fd3 100644
--- a/app/views/users/user_activities.html.erb
+++ b/app/views/users/user_activities.html.erb
@@ -1,21 +1,21 @@
-<!--<% unless @events_by_day.empty? %>
+<!--<%# unless @events_by_day.empty? %>
 
 <div id="activity">
-<% @events_by_day.keys.sort.reverse.each do |day| %>
-<h4><%= format_activity_day(day) %></h4>
+<%# @events_by_day.keys.sort.reverse.each do |day| %>
+<h4><%#= format_activity_day(day) %></h4>
 <dl>
-<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
-  <dt class="<%= e.event_type %>">
-  <span class="time"><%= format_time(e.event_datetime, false) %></span>
-  <%= content_tag('span', h(e.project), :class => 'project') %>
-  <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
-  <dd><span class="description"><%= format_activity_description(e.event_description) %></span></dd>
-<% end -%>
+<%# @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
+  <dt class="<%#= e.event_type %>">
+  <span class="time"><%#= format_time(e.event_datetime, false) %></span>
+  <%#= content_tag('span', h(e.project), :class => 'project') %>
+  <%#= link_to format_activity_title(e.event_title), e.event_url %></dt>
+  <dd><span class="description"><%#= format_activity_description(e.event_description) %></span></dd>
+<%# end -%>
 </dl>
-<% end -%>
+<%# end -%>
  
 </div>
-<% end %> -->
+<%# end %> -->
 
 
 <% unless @events_by_day.empty? %>
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index d8e2ce70c..71acc78aa 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -17,6 +17,11 @@
 			$('#' + id).val(content);
 		}
 	}
+	// 给主页用户弹新页面
+	$(document).ready(function($) {
+		$("#loggedas").find("a").attr("target", "_blank");
+		//$("#content .tabs_new~ .pagination").find("a").removeAttr("target");
+	});
 </script>
 
 
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index de6f3e119..0af3f5134 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -17,6 +17,11 @@
 			$('#' + id).val(content);
 		}
 	}
+	// 给主页用户弹新页面
+	$(document).ready(function($) {
+		$("#loggedas").find("a").attr("target", "_blank");
+		//$("#content .tabs_new~ .pagination").find("a").removeAttr("target");
+	});
 </script>