From 03ef06e4baf2895debe7e561b00d4dae8e1e0d95 Mon Sep 17 00:00:00 2001
From: Caio SBA <caiosba@gmail.com>
Date: Thu, 23 Feb 2012 23:47:38 -0200
Subject: [PATCH] Wall fixes after review

---
 app/views/profile/_comment.rhtml                |  2 +-
 app/views/profile/_create_article.rhtml         |  2 +-
 app/views/profile/_default_activity.rhtml       |  2 +-
 app/views/profile/_profile_comment_form.rhtml   |  7 +------
 app/views/profile/_profile_scrap.rhtml          |  2 +-
 config/initializers/action_tracker.rb           |  2 +-
 public/images/gallery-image-activity-border.png | Bin 665 -> 0 bytes
 public/stylesheets/application.css              | 34 ++++++++++++++++++++++++++--------
 8 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/app/views/profile/_comment.rhtml b/app/views/profile/_comment.rhtml
index 2a6dcf5..a4de820 100644
--- a/app/views/profile/_comment.rhtml
+++ b/app/views/profile/_comment.rhtml
@@ -13,7 +13,7 @@
 
   <div class="comment-details">
     <div class="comment-text">
-      <%= link_to(Person.find(comment.author_id).name, Person.find(comment.author_id).url) %><br /><%= txt2html comment.body %>
+      <%= link_to(Person.find(comment.author_id).name, Person.find(comment.author_id).url) %> <%= txt2html comment.body %>
     </div>
     <div class="profile-activity-time">
       <%= time_ago_as_sentence(comment.created_at) %>
diff --git a/app/views/profile/_create_article.rhtml b/app/views/profile/_create_article.rhtml
index 584ebd1..6254a55 100644
--- a/app/views/profile/_create_article.rhtml
+++ b/app/views/profile/_create_article.rhtml
@@ -11,6 +11,6 @@
   <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
   <div class='profile-wall-actions'>
     <%= link_to _('Comment'), "#reply_content_#{activity.id}" %>
-    <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :confirm => _('Are you sure?'), :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
   </div>
 </div>
diff --git a/app/views/profile/_default_activity.rhtml b/app/views/profile/_default_activity.rhtml
index c4d0905..000264d 100644
--- a/app/views/profile/_default_activity.rhtml
+++ b/app/views/profile/_default_activity.rhtml
@@ -6,6 +6,6 @@
   <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
   <div class='profile-wall-actions'>
     <%= link_to _('Comment'), "#reply_content_#{activity.id}" %>
-    <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
   </div>
 </div>
diff --git a/app/views/profile/_profile_comment_form.rhtml b/app/views/profile/_profile_comment_form.rhtml
index a446b90..eb02453 100644
--- a/app/views/profile/_profile_comment_form.rhtml
+++ b/app/views/profile/_profile_comment_form.rhtml
@@ -2,12 +2,7 @@
   <div id='profile-wall-reply-form-<%= activity.id%>'>
     <p class='profile-wall-reply'>
       <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => 'profile_activities', :html => { :class => 'profile-wall-reply-form' } do %>
-        <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress', :title => _('Leave your comment'),
-                                        :onfocus => 'if(this.value==this.title){this.value="";this.style.color="#000"}',
-                                        :onblur => 'if(this.value==""){this.value=this.title;this.style.color="#ccc"}', :value => _('Leave your comment'), :style => 'color: #ccc' } %>
-        <%#= text_area :comment, :body, {:id => "reply_content_#{activity.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress', :title => _('Leave your comment'),
-                                        :onfocus => 'if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + current_person.profile_custom_icon + ')"',
-                                        :onblur => 'if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"', :value => _('Leave your comment'), :style => 'color: #ccc' } %>
+        <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress', :title => _('Leave your comment'), :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + current_person.profile_custom_icon + ')"' if logged_in?), :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?), :value => _('Leave your comment'), :style => 'color: #ccc' } %>
         <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
       <% end %>
     </p>
diff --git a/app/views/profile/_profile_scrap.rhtml b/app/views/profile/_profile_scrap.rhtml
index 29fb1e9..8090f98 100644
--- a/app/views/profile/_profile_scrap.rhtml
+++ b/app/views/profile/_profile_scrap.rhtml
@@ -10,7 +10,7 @@
     <% if logged_in? && current_person.follows?(scrap.sender) %>
       <span class='profile-activity-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-activity-reply-response-#{scrap.id}'],['#profile-activity-reply-#{scrap.id}', '#profile-activity-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply" %></span>
     <% end %>
-    <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-activity-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-activity-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
   <% end %>
   </div>
   <ul class="profile-activity-scrap-replies">
diff --git a/config/initializers/action_tracker.rb b/config/initializers/action_tracker.rb
index 22f6db5..7cfb0f1 100644
--- a/config/initializers/action_tracker.rb
+++ b/config/initializers/action_tracker.rb
@@ -23,7 +23,7 @@ ActionTrackerConfig.verbs = {
   },
 
   :upload_image => { 
-    :description => lambda { n_('uploaded 1 image:<br />%{thumbnails}<br style="clear: both;" />%{details}', 'uploaded %{num} images:<br />%{thumbnails}<br style="clear: both;" />%{details}', get_view_url.size) % { :num => get_view_url.size, :thumbnails => '{{ta.collect_group_with_index(:thumbnail_path){ |t,i| content_tag(:span, image_tag(t) + link_to(nil, ta.get_view_url[i]))}.last(3).join}}', :details => '{{unique_with_count(ta.collect_group_with_index(:parent_name){ |n,i| link_to(n, ta.get_parent_url[i])}, "%s").join("<br />")}}' % _("in the gallery") } },
+    :description => lambda { n_('uploaded 1 image: %{details}<br />%{thumbnails}<br style="clear: both;" />', 'uploaded %{num} images: %{details}<br />%{thumbnails}<br style="clear: both;" />', get_view_url.size) % { :num => get_view_url.size, :thumbnails => '{{ta.collect_group_with_index(:thumbnail_path){ |t,i| content_tag(:span, image_tag(t) + link_to(nil, ta.get_view_url[i]))}.last(3).join}}', :details => '{{unique_with_count(ta.collect_group_with_index(:parent_name){ |n,i| link_to(n, ta.get_parent_url[i])}, "%s").join(", ")}}' % _("in the gallery") } },
     :type => :groupable
   },
 
diff --git a/public/images/gallery-image-activity-border.png b/public/images/gallery-image-activity-border.png
index 15dd635..5662e5d 100644
Binary files a/public/images/gallery-image-activity-border.png and b/public/images/gallery-image-activity-border.png differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b08d61c..13df48f 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -5882,8 +5882,8 @@ h1#agenda-title {
 
 #profile-activity li, #profile-network li, #profile-wall li {
   display: block;
-  padding: 10px;
-  margin-bottom: 10px;
+  padding: 3px;
+  margin-bottom: 3px;
   background-color: #fff;
   border-bottom: 1px solid #e8e8e8;
   position: relative;
@@ -5933,6 +5933,15 @@ h1#agenda-title {
   color: #333;
 }
 
+#profile-activity li a, #profile-network li a, #profile-wall li a {
+  font-weight: bold;
+  text-decoration: none;
+}
+
+#profile-activity li a:hover, #profile-network li a:hover, #profile-wall li a:hover {
+  text-decoration: underline;
+}
+
 .profile-activity-text {
   margin: 0;
   color: #000;
@@ -5944,8 +5953,8 @@ h1#agenda-title {
 #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;
+  width: 124px;
+  height: 100px;
   display: block;
   overflow: hidden;
   position: absolute;
@@ -5965,7 +5974,7 @@ h1#agenda-title {
 #profile-network li.profile-activity-item.upload_image span {
   position: relative;
   float: left;
-  margin: 5px 5px 5px 0;
+  margin: 5px 0px 0px 5px;
 }
 
 #profile-wall li.profile-activity-item.upload_image span a,
@@ -5989,6 +5998,7 @@ h1#agenda-title {
   float: none;
   width: auto;
   height: auto;
+  font-weight: normal;
 }
 
 #profile-wall li.profile-activity-item ul.profile-wall-activities-comments,
@@ -6020,8 +6030,8 @@ h1#agenda-title {
   height: 16px;
   display: inline-block;
   position: absolute;
-  top: 5px;
-  right: 5px;
+  top: -4px;
+  right: -16px;
 }
 
 #profile-activity .profile-wall-scrap-replies li,
@@ -6106,10 +6116,13 @@ h1#agenda-title {
   padding: 0;
 }
 
-.profile-wall-actions a,
+#profile-wall li .profile-wall-actions a,
+#profile-activity li .profile-wall-actions a,
+#profile-network li .profile-wall-actions a,
 #profile-wall .profile-wall-send-reply a {
   text-decoration: none;
   color: #333;
+  font-weight: normal;
 }
 
 .profile-wall-actions a:hover,
@@ -6376,6 +6389,7 @@ h1#agenda-title {
   display: inline;
   position: static;
   float: none;
+  font-weight: normal;
 }
 
 #profile-wall .profile-wall-activities-comments .article-comment .button-bar a.button:hover,
@@ -6573,6 +6587,10 @@ h1#agenda-title {
   width: 375px;
 }
 
+#profile-wall li textarea {
+  width: 388px;
+}
+
 #profile-wall #leave_scrap textarea {
   width: 442px;
 }
--
libgit2 0.21.2