Network layout

Daniela Feitosa
1 parent 2841bca8
Showing 2 changed files with 63 additions and 52 deletions Show diff stats
app/views/profile/_profile_network_activities.rhtml
public/stylesheets/application.css
-  <% network_activities.each do |activity| %>
-    <li class='profile-network-item <%= activity.verb %>' id='profile-network-item-<%= activity.id %>'>
-      <div class='profile-network-image'>
-        <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
-        <% if logged_in? && current_person.follows?(activity.user) && current_person != activity.user %>
-          <p class='profile-network-send-message'><%= link_to_function _('Scrap'), "hide_and_show(['#profile-network-message-response-#{activity.id}'],['#profile-network-message-#{activity.id}', '#profile-network-form-#{activity.id}']);$('content_#{activity.id}').value='';return false", :class => "profile-send-message", :title => _("Send a message to %s") % activity.user.name  %></p>
-        <% end %>
-      </div>
-      <div class='profile-network-description'>
-        <p class='profile-network-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
-        <p class='profile-network-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-        <%= button_to_remote(:delete, content_tag(:span, _('Remove')), :url =>{:action => 'remove_notification', :activity_id => activity.id}, :update => "profile-network-item-#{activity.id}") if can_edit_profile %>
-        <p class='profile-network-where'><%= _('In community %s') % link_to(activity.target.name, activity.target.url) if !profile.is_a?(Community) && activity.target.is_a?(Community) %></p>
-      </div>
-        <div id='profile-network-message-<%= activity.id%>' style='display:none;'>
-        <div id='profile-network-form-<%= activity.id%>' style='display:none;'>
-        <p class='profile-network-message'>
-          <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :not_load_scraps => true}, :update => "profile-network-message-response-#{activity.id}", :success =>"hide_and_show(['#profile-network-form-#{activity.id}'],['#profile-network-message-response-#{activity.id}'])" do %>
-            <%= limited_text_area :scrap, :content, 420, "content_#{activity.id}", :cols => 50, :rows => 2 %>
-            <%= hidden_field_tag 'receiver_id', activity.user.id %>
-            <%= submit_button :add, _('Leave a message') %>
-            <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-network-message-#{activity.id}'],[]);return false" %>
-          <% end %>
-        </p>
-        </div>
-        <div id='profile-network-message-response-<%=activity.id%>' class='profile-network-message-response'></div>
-        </div>
-      <hr />  
-    </li>
-  <% end %>
+<% network_activities.each do |activity| %>
+  <li class='profile-activity-item <%= activity.verb %>' id='profile-network-item-<%= activity.id %>'>
+    <%= render :partial => activity.verb, :locals => { :activity => activity }%>
+    <hr/>
+    <ul class="profile-wall-activities-comments" style='padding-left: 50px;width:auto'>
+      <%= render :partial => 'comment', :collection => activity.comments %>
+    </ul>
+  
+    <%#= render :partial => 'profile_comment_form', :locals => { :activity => activity } %> 
+    <hr />  
+  </li>
+<% end %>
 <% if network_activities.current_page < network_activities.total_pages %>
   <div id='profile_network_activities_page_<%= network_activities.current_page %>'>
     <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_network_activities', :page => (network_activities.current_page + 1)}, :update => "profile_network_activities_page_#{network_activities.current_page}" %>
@@ -5913,7 +5913,10 @@ h1#agenda-title {
 #profile-wall li.profile-activity-item.upload_image span,
 #profile-wall li.profile-activity-item.upload_image span img,
-#profile-wall li.profile-activity-item.upload_image span a {
+#profile-wall li.profile-activity-item.upload_image span a,
+#profile-network li.profile-activity-item.upload_image span,
+#profile-network li.profile-activity-item.upload_image span img,
+#profile-network li.profile-activity-item.upload_image span a {
   width: 98px;
   height: 86px;
   display: block;
@@ -5921,19 +5924,23 @@ h1#agenda-title {
   position: absolute;
 }
-#profile-wall li.profile-activity-item.upload_image span {
+#profile-wall li.profile-activity-item.upload_image span,
+#profile-network li.profile-activity-item.upload_image span {
   position: relative;
   float: left;
   margin: 5px 5px 5px 0;
 }
-#profile-wall li.profile-activity-item.upload_image span a {
+#profile-wall li.profile-activity-item.upload_image span a,
+#profile-network li.profile-activity-item.upload_image span a {
   background: transparent url(/images/gallery-image-activity-border.png) center center no-repeat;
   text-indent: -5000em;
 }
 #profile-wall li.profile-activity-item.upload_image .article-comment span,
-#profile-wall li.profile-activity-item.upload_image .profile-wall-actions span {
+#profile-wall li.profile-activity-item.upload_image .profile-wall-actions span,
+#profile-network li.profile-activity-item.upload_image .article-comment span,
+#profile-network li.profile-activity-item.upload_image .profile-wall-actions span {
   display: inline;
   position: static;
   margin: 0;
@@ -5942,22 +5949,27 @@ h1#agenda-title {
   height: auto;
 }
-#profile-wall li.profile-activity-item ul.profile-wall-activities-comments {
+#profile-wall li.profile-activity-item ul.profile-wall-activities-comments,
+#profile-network li.profile-activity-item ul.profile-wall-activities-comments {
   margin-top: 0;
 }
-#profile-wall li.profile-activity-item.upload_image .profile-activity-text {
+#profile-wall li.profile-activity-item.upload_image .profile-activity-text,
+#profile-network li.profile-activity-item ul.profile-wall-activities-comments {
   padding-left: 50px;
 }
 #profile-wall li.profile-activity-item.join_community .profile-activity-text a img,
-#profile-wall li.profile-activity-item.new_friendship .profile-activity-text a img {
+#profile-wall li.profile-activity-item.new_friendship .profile-activity-text a img,
+#profile-network li.profile-activity-item.join_community .profile-activity-text a img,
+#profile-network li.profile-activity-item.new_friendship .profile-activity-text a img {
   margin: 5px 5px 0 0;
   padding: 1px;
   border: 1px solid #ccc;
 }
-#profile-wall li.profile-activity-item.create_article {
+#profile-wall li.profile-activity-item.create_article,
+#profile-netowrk li.profile-activity-item.create_article {
   position: relative;
 }
@@ -6233,52 +6245,63 @@ h1#agenda-title {
   background: transparent;
 }
-#profile-wall ul.profile-wall-activities-comments {
+#profile-wall ul.profile-wall-activities-comments,
+#profile-network ul.profile-wall-activities-comments {
   margin-top: 35px;
 }
-#profile-wall .profile-wall-activities-comments li {
+#profile-wall .profile-wall-activities-comments li,
+#profile-network .profile-wall-activities-comments li {
   background: #e8e8e8;
   border-bottom: 1px solid #d2d2d2 !important;
   border-top: 1px solid #fff;
   margin-bottom: 0;
 }
-#profile-wall .profile-wall-activities-comments img {
+#profile-wall .profile-wall-activities-comments img,
+#profile-network .profile-wall-activities-comments img {
   width: 33px;
   height: 33px;
 }
 #profile-wall .profile-wall-activities-comments .comment_reply,
-#profile-wall .profile-wall-activities-comments h4 {
+#profile-wall .profile-wall-activities-comments h4,
+#profile-network .profile-wall-activities-comments .comment_reply,
+#profile-network .profile-wall-activities-comments h4 {
   display: none;
 }
-#profile-wall .profile-wall-activities-comments .comment-picture {
+#profile-wall .profile-wall-activities-comments .comment-picture,
+#profile-network .profile-wall-activities-comments .comment-picture {
   width: 33px;
   margin-right: 10px;
 }
-#profile-wall .profile-wall-activities-comments .comment-text p {
+#profile-wall .profile-wall-activities-comments .comment-text p,
+#profile-network .profile-wall-activities-comments .comment-text p {
   margin: 0;
 }
-#profile-wall .profile-wall-activities-comments .profile-activity-time {
+#profile-wall .profile-wall-activities-comments .profile-activity-time,
+#profile-network .profile-wall-activities-comments .profile-activity-time {
   clear: both;
 }
-#profile-wall .profile-wall-activities-comments .comment-details {
+#profile-wall .profile-wall-activities-comments .comment-details,
+#profile-network .profile-wall-activities-comments .comment-details {
   padding: 0;
 }
-#profile-wall .profile-wall-activities-comments .article-comment .button-bar {
+#profile-wall .profile-wall-activities-comments .article-comment .button-bar,
+#profile-network .profile-wall-activities-comments .article-comment .button-bar {
   float: none !important;
   padding: 0;
   text-align: right;
   position: static;
 }
-#profile-wall .profile-wall-activities-comments .article-comment .button-bar a.button {
+#profile-wall .profile-wall-activities-comments .article-comment .button-bar a.button,
+#profile-network .profile-wall-activities-comments .article-comment .button-bar a.button {
   background: transparent;
   border: 0;
   height: auto;
@@ -6293,11 +6316,13 @@ h1#agenda-title {
   float: none;
 }
-#profile-wall .profile-wall-activities-comments .article-comment .button-bar a.button:hover {
+#profile-wall .profile-wall-activities-comments .article-comment .button-bar a.button:hover,
+#profile-network .profile-wall-activities-comments .article-comment .button-bar a.button:hover {
   text-decoration: underline;
 }
-#profile-wall .profile-wall-activities-comments .article-comment .button-bar .button span {
+#profile-wall .profile-wall-activities-comments .article-comment .button-bar .button span,
+#profile-network .profile-wall-activities-comments .article-comment .button-bar .button span {
   display: inline;
   position: static;
   display: inline;
@@ -6455,13 +6480,17 @@ h1#agenda-title {
   width: 98%;
 }
-#profile_activities .profile-activity-image, #profile-network .profile-network-image, #profile-wall .profile-wall-image {
+#profile_activities .profile-activity-image,
+#profile-network .profile-activity-image,
+#profile-wall .profile-wall-image {
   width: 50px;
   margin: 5px;
   float: left;
 }
-#profile-activity .profile-activity-description, #profile-network .profile-network-description, #profile-wall .profile-wall-description {
+#profile-activity .profile-activity-description,
+#profile-network .profile-activity-description,
+#profile-wall .profile-wall-description {
   width: 80%;
   word-wrap: break-word;
 }
1	- <% network_activities.each do \|activity\| %>
2	- <li class='profile-network-item <%= activity.verb %>' id='profile-network-item-<%= activity.id %>'>
3	- <div class='profile-network-image'>
4	- <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
5	- <% if logged_in? && current_person.follows?(activity.user) && current_person != activity.user %>
6	- <p class='profile-network-send-message'><%= link_to_function _('Scrap'), "hide_and_show(['#profile-network-message-response-#{activity.id}'],['#profile-network-message-#{activity.id}', '#profile-network-form-#{activity.id}']);$('content_#{activity.id}').value='';return false", :class => "profile-send-message", :title => _("Send a message to %s") % activity.user.name %></p>
7	- <% end %>
8	- </div>
9	- <div class='profile-network-description'>
10	- <p class='profile-network-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
11	- <p class='profile-network-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
12	- <%= button_to_remote(:delete, content_tag(:span, _('Remove')), :url =>{:action => 'remove_notification', :activity_id => activity.id}, :update => "profile-network-item-#{activity.id}") if can_edit_profile %>
13	- <p class='profile-network-where'><%= _('In community %s') % link_to(activity.target.name, activity.target.url) if !profile.is_a?(Community) && activity.target.is_a?(Community) %></p>
14	- </div>
15	- <div id='profile-network-message-<%= activity.id%>' style='display:none;'>
16	- <div id='profile-network-form-<%= activity.id%>' style='display:none;'>
17	- <p class='profile-network-message'>
18	- <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :not_load_scraps => true}, :update => "profile-network-message-response-#{activity.id}", :success =>"hide_and_show(['#profile-network-form-#{activity.id}'],['#profile-network-message-response-#{activity.id}'])" do %>
19	- <%= limited_text_area :scrap, :content, 420, "content_#{activity.id}", :cols => 50, :rows => 2 %>
20	- <%= hidden_field_tag 'receiver_id', activity.user.id %>
21	- <%= submit_button :add, _('Leave a message') %>
22	- <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-network-message-#{activity.id}'],[]);return false" %>
23	- <% end %>
24	- </p>
25	- </div>
26	- <div id='profile-network-message-response-<%=activity.id%>' class='profile-network-message-response'></div>
27	- </div>
28	- <hr />
29	- </li>
30	- <% end %>	1	+<% network_activities.each do \|activity\| %>
		2	+ <li class='profile-activity-item <%= activity.verb %>' id='profile-network-item-<%= activity.id %>'>
		3	+ <%= render :partial => activity.verb, :locals => { :activity => activity }%>
		4	+ <hr/>
		5	+ <ul class="profile-wall-activities-comments" style='padding-left: 50px;width:auto'>
		6	+ <%= render :partial => 'comment', :collection => activity.comments %>
		7	+ </ul>
		8	+
		9	+ <%#= render :partial => 'profile_comment_form', :locals => { :activity => activity } %>
		10	+ <hr />
		11	+ </li>
		12	+<% end %>
31	<% if network_activities.current_page < network_activities.total_pages %>	13	<% if network_activities.current_page < network_activities.total_pages %>
32	<div id='profile_network_activities_page_<%= network_activities.current_page %>'>	14	<div id='profile_network_activities_page_<%= network_activities.current_page %>'>
33	<%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_network_activities', :page => (network_activities.current_page + 1)}, :update => "profile_network_activities_page_#{network_activities.current_page}" %>	15	<%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_network_activities', :page => (network_activities.current_page + 1)}, :update => "profile_network_activities_page_#{network_activities.current_page}" %>