diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index db51eca1d..e299be182 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -25,6 +25,11 @@
<%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>
+
+
+ <%#= textilizable e.event_url,:description %>
+
+
<%= h(truncate(strip_tags(e.event_description).gsub(/ /, ' '), length: 30, omission: '...')) %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 6270b5f50..e671f7617 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -252,17 +252,35 @@
<% if e.user == User.current %>
- <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %>
+
+ <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
+
+
+ <%= l(:label_i_new_activity) %>
+
+ <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %>
|
<% else %>
- <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %>
+
+ <%= link_to(h(e.user), user_path(e.user_id)) %>
+
+
+ <%= l(:label_new_activity) %>
+
+ <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %>
|
<% end %>
- <%= textilizable(act.description) %> |
+
+
+ <%= textilizable act, :description %>
+
+
+
+
diff --git a/db/schema.rb b/db/schema.rb
index 2927e6fac..a6e36b1e2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20140725062302) do
+ActiveRecord::Schema.define(:version => 20140725073357) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
|