diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 6f4397569..93041e1be 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -94,7 +94,7 @@
<%= format_time( @article.created_on)%>
-
+
<%= @article.content.html_safe%>
@@ -208,4 +208,11 @@
<% end %> - \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb index 9d20b5adb..c9d333e6d 100644 --- a/app/views/courses/syllabus.html.erb +++ b/app/views/courses/syllabus.html.erb @@ -94,7 +94,7 @@
<%= format_time( @article.created_on)%>
-
+
<%= @article.content.html_safe%>
@@ -214,4 +214,11 @@
<% end %> - \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index b7cc1a0c2..3028f3369 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -74,7 +74,7 @@ <%= link_to @memo.author.name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%>
<%= format_date( @memo.created_at)%>
-
+
<%= @memo.content.html_safe%>
@@ -136,4 +136,11 @@
- \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index c760e686d..66d4bd0d0 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -80,7 +80,7 @@
<%= format_time( @topic.created_on)%>
-
+
<%= @topic.content.html_safe%>
@@ -168,4 +168,11 @@
<% end %> - \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb index 6d12fe960..f46e7d5ab 100644 --- a/app/views/messages/_org_subfield_show.html.erb +++ b/app/views/messages/_org_subfield_show.html.erb @@ -109,7 +109,7 @@
<%= format_time( @topic.created_on)%>
-
+
<%= @topic.content.html_safe%>
@@ -197,4 +197,11 @@
<% end %> - \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index c98f2983e..187e1670e 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -135,7 +135,7 @@
<%= format_time( @topic.created_on)%>
-
+
<%= @topic.content.html_safe%>
@@ -225,3 +225,10 @@
+ diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb index 767c11553..05a430d57 100644 --- a/app/views/news/_course_show.html.erb +++ b/app/views/news/_course_show.html.erb @@ -85,7 +85,7 @@
<%= format_time( @news.created_on)%>
-
+
<%= @news.description.html_safe%>
@@ -182,3 +182,10 @@ <% end %>
+ diff --git a/app/views/news/_organization_show.html.erb b/app/views/news/_organization_show.html.erb index 3e608c177..3189b03bf 100644 --- a/app/views/news/_organization_show.html.erb +++ b/app/views/news/_organization_show.html.erb @@ -75,7 +75,7 @@
<%= format_time( @news.created_on)%>
-
+
<%= @news.description.html_safe%>
@@ -172,3 +172,10 @@ <% end %>
+ diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb index 880bd0885..93fd1f10c 100644 --- a/app/views/news/_project_show.html.erb +++ b/app/views/news/_project_show.html.erb @@ -85,7 +85,7 @@
<%= format_time( @news.created_on)%>
-
+
<%= @news.description.html_safe%>
@@ -182,3 +182,10 @@ <% end %>
+ diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index d4b44a3d2..b29bac7d1 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -20,10 +20,12 @@
<% unless document.content.blank? %> -
- <%= document.content.html_safe %> -
+ <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>document.id, :content=>document.content} %> <% end %> +
+ + +
<%= render :partial=>"attachments/activity_attach", :locals=>{:activity => document} %>
@@ -133,9 +135,6 @@