diff --git a/app/views/organizations/_org_new_course_homework.html.erb b/app/views/organizations/_org_new_course_homework.html.erb index 3de4c0293..7d6a4ac5e 100644 --- a/app/views/organizations/_org_new_course_homework.html.erb +++ b/app/views/organizations/_org_new_course_homework.html.erb @@ -2,16 +2,18 @@
<% iamge_path = get_image_path_from_content(activity.description) %> <% if iamge_path.nil? %> - # + <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), student_work_index_url_in_org(activity.id), :target => "_blank" %> + <% else %> - + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), student_work_index_url_in_org(activity.id), :target => "_blank" %> + <% end %>
<%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank' %>
- <%= activity.user.realname.nil? ? activity.user : activity.user.realname %> + <%=link_to activity.try(:user).try(:realname).nil? ? activity.try(:user).try(:login) : activity.try(:user).try(:realname), user_path(activity.user), :class=>"publisher-name fl", :target => "_blank" %>

<%= format_date activity.updated_at %>

<%= activity.journals_for_messages.count %>
diff --git a/app/views/organizations/_org_new_course_message.html.erb b/app/views/organizations/_org_new_course_message.html.erb index 3877276ce..5e586bb28 100644 --- a/app/views/organizations/_org_new_course_message.html.erb +++ b/app/views/organizations/_org_new_course_message.html.erb @@ -2,9 +2,9 @@
<% iamge_path = get_image_path_from_content(activity.content) %> <% if iamge_path.nil? %> - # + <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank" %> <% else %> - + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank" %> <% end %>
@@ -15,7 +15,7 @@ <% end %>
- <%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %> + <%=link_to activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname), user_path(activity.author), :class=>"publisher-name fl", :target => "_blank" %>

<%= format_date activity.updated_on %>

<%= activity.children.count %>
diff --git a/app/views/organizations/_org_new_course_news.html.erb b/app/views/organizations/_org_new_course_news.html.erb index ae2d03cbf..72b147ac3 100644 --- a/app/views/organizations/_org_new_course_news.html.erb +++ b/app/views/organizations/_org_new_course_news.html.erb @@ -2,16 +2,17 @@
<% iamge_path = get_image_path_from_content(activity.description) %> <% if iamge_path.nil? %> - # + <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), news_url_in_org(activity.id), :target => "_blank" %> + <% else %> - + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), news_url_in_org(activity.id), :target => "_blank" %> <% end %>
<%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank' %>
- <%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %> + <%=link_to activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname), user_path(activity.author), :class=>"publisher-name fl", :target => "_blank" %>

<%= format_date activity.created_on %>

<%= activity.comments.count %>
diff --git a/app/views/organizations/_org_new_forum_pic.html.erb b/app/views/organizations/_org_new_forum_pic.html.erb index c4fd061a5..b42c7e865 100644 --- a/app/views/organizations/_org_new_forum_pic.html.erb +++ b/app/views/organizations/_org_new_forum_pic.html.erb @@ -3,16 +3,16 @@
<% iamge_path = get_image_path_from_content(activity.content) %> <% if iamge_path.nil? %> - # + <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), organization_path(@organization, :org_subfield_id => field.id), :target => "_blank" %> <% else %> - + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), organization_path(@organization, :org_subfield_id => field.id), :target => "_blank" %> <% end %>
- <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank' %> + <%= link_to activity.title.to_s, organization_path(@organization, :org_subfield_id => field.id), :target => '_blank' %>
- <%= activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname) %> + <%=link_to activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname), user_path(activity.creator), :class=>"publisher-name fl", :target => "_blank" %>

<%= format_date activity.created_at %>

<%= activity.children.count %>
diff --git a/app/views/organizations/_org_new_project_pic.html.erb b/app/views/organizations/_org_new_project_pic.html.erb index aa91659ce..3adc77433 100644 --- a/app/views/organizations/_org_new_project_pic.html.erb +++ b/app/views/organizations/_org_new_project_pic.html.erb @@ -7,16 +7,16 @@
<% iamge_path = get_image_path_from_content(activity.description) %> <% if iamge_path.nil? %> - # + <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), issue_url_in_org(activity.id), :target => "_blank" %> <% else %> - + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), issue_url_in_org(activity.id), :target => "_blank" %> <% end %>
<%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank' %>
- <%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %> + <%=link_to activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname), user_path(activity.author), :class=>"publisher-name fl", :target => "_blank" %>

<%= format_date activity.updated_on %>

<%= activity.journals.count %>
@@ -29,9 +29,9 @@
<% iamge_path = get_image_path_from_content(activity.content) %> <% if iamge_path.nil? %> - # + <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank" %> <% else %> - + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank" %> <% end %>
@@ -42,7 +42,7 @@ <% end %>
- <%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %> + <%=link_to activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname), user_path(activity.author), :class=>"publisher-name fl", :target => "_blank" %>

<%= format_date activity.updated_on %>

<%= activity.children.count %>
@@ -55,16 +55,16 @@
<% iamge_path = get_image_path_from_content(activity.description) %> <% if iamge_path.nil? %> - # + <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), news_url_in_org(activity.id), :target => "_blank" %> <% else %> - + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), news_url_in_org(activity.id), :target => "_blank" %> <% end %>
<%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank' %>
- <%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %> + <%=link_to activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname), user_path(activity.author), :class=>"publisher-name fl", :target => "_blank" %>

<%= format_date activity.created_on %>

<%= activity.comments.count %>