Download as
Browse Code »

Commit 03ef06e4baf2895debe7e561b00d4dae8e1e0d95

Authored by Caio Almeida
Committed by Daniela Feitosa
1 parent 3bda463c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Wall fixes after review

Showing 8 changed files with 32 additions and 19 deletions   Show diff stats
app/views/profile/_comment.rhtml
  Diff comments   View file @03ef06e
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 13
14 <div class="comment-details"> 14 <div class="comment-details">
15 <div class="comment-text"> 15 <div class="comment-text">
16 - <%= link_to(Person.find(comment.author_id).name, Person.find(comment.author_id).url) %><br /><%= txt2html comment.body %> 16 + <%= link_to(Person.find(comment.author_id).name, Person.find(comment.author_id).url) %> <%= txt2html comment.body %>
17 </div> 17 </div>
18 <div class="profile-activity-time"> 18 <div class="profile-activity-time">
19 <%= time_ago_as_sentence(comment.created_at) %> 19 <%= time_ago_as_sentence(comment.created_at) %>
app/views/profile/_create_article.rhtml
  Diff comments   View file @03ef06e
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
11 <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p> 11 <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
12 <div class='profile-wall-actions'> 12 <div class='profile-wall-actions'>
13 <%= link_to _('Comment'), "#reply_content_#{activity.id}" %> 13 <%= link_to _('Comment'), "#reply_content_#{activity.id}" %>
14 - <%= 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 %> 14 + <%= 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 %>
15 </div> 15 </div>
16 </div> 16 </div>
app/views/profile/_default_activity.rhtml
  Diff comments   View file @03ef06e
@@ -6,6 +6,6 @@ @@ -6,6 +6,6 @@
6 <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p> 6 <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
7 <div class='profile-wall-actions'> 7 <div class='profile-wall-actions'>
8 <%= link_to _('Comment'), "#reply_content_#{activity.id}" %> 8 <%= link_to _('Comment'), "#reply_content_#{activity.id}" %>
9 - <%= 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 %> 9 + <%= 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 %>
10 </div> 10 </div>
11 </div> 11 </div>
app/views/profile/_profile_comment_form.rhtml
  Diff comments   View file @03ef06e
@@ -2,12 +2,7 @@ @@ -2,12 +2,7 @@
2 <div id='profile-wall-reply-form-<%= activity.id%>'> 2 <div id='profile-wall-reply-form-<%= activity.id%>'>
3 <p class='profile-wall-reply'> 3 <p class='profile-wall-reply'>
4 <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => 'profile_activities', :html => { :class => 'profile-wall-reply-form' } do %> 4 <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => 'profile_activities', :html => { :class => 'profile-wall-reply-form' } do %>
5 - <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress', :title => _('Leave your comment'),  
6 - :onfocus => 'if(this.value==this.title){this.value="";this.style.color="#000"}',  
7 - :onblur => 'if(this.value==""){this.value=this.title;this.style.color="#ccc"}', :value => _('Leave your comment'), :style => 'color: #ccc' } %>  
8 - <%#= text_area :comment, :body, {:id => "reply_content_#{activity.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress', :title => _('Leave your comment'),  
9 - :onfocus => 'if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + current_person.profile_custom_icon + ')"',  
10 - :onblur => 'if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"', :value => _('Leave your comment'), :style => 'color: #ccc' } %> 5 + <%= 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' } %>
11 <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %> 6 <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
12 <% end %> 7 <% end %>
13 </p> 8 </p>
app/views/profile/_profile_scrap.rhtml
  Diff comments   View file @03ef06e
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <% if logged_in? && current_person.follows?(scrap.sender) %> 10 <% if logged_in? && current_person.follows?(scrap.sender) %>
11 <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> 11 <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>
12 <% end %> 12 <% end %>
13 - <%= 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) %> 13 + <%= 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) %>
14 <% end %> 14 <% end %>
15 </div> 15 </div>
16 <ul class="profile-activity-scrap-replies"> 16 <ul class="profile-activity-scrap-replies">
config/initializers/action_tracker.rb
  Diff comments   View file @03ef06e
@@ -23,7 +23,7 @@ ActionTrackerConfig.verbs = { @@ -23,7 +23,7 @@ ActionTrackerConfig.verbs = {
23 }, 23 },
24 24
25 :upload_image => { 25 :upload_image => {
26 - :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") } }, 26 + :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") } },
27 :type => :groupable 27 :type => :groupable
28 }, 28 },
29 29
public/images/gallery-image-activity-border.png
View file @03ef06e

665 Bytes | W: | H:

1.01 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
public/stylesheets/application.css
  Diff comments   View file @03ef06e
@@ -5882,8 +5882,8 @@ h1#agenda-title { @@ -5882,8 +5882,8 @@ h1#agenda-title {
5882 5882
5883 #profile-activity li, #profile-network li, #profile-wall li { 5883 #profile-activity li, #profile-network li, #profile-wall li {
5884 display: block; 5884 display: block;
5885 - padding: 10px;  
5886 - margin-bottom: 10px; 5885 + padding: 3px;
  5886 + margin-bottom: 3px;
5887 background-color: #fff; 5887 background-color: #fff;
5888 border-bottom: 1px solid #e8e8e8; 5888 border-bottom: 1px solid #e8e8e8;
5889 position: relative; 5889 position: relative;
@@ -5933,6 +5933,15 @@ h1#agenda-title { @@ -5933,6 +5933,15 @@ h1#agenda-title {
5933 color: #333; 5933 color: #333;
5934 } 5934 }
5935 5935
  5936 +#profile-activity li a, #profile-network li a, #profile-wall li a {
  5937 + font-weight: bold;
  5938 + text-decoration: none;
  5939 +}
  5940 +
  5941 +#profile-activity li a:hover, #profile-network li a:hover, #profile-wall li a:hover {
  5942 + text-decoration: underline;
  5943 +}
  5944 +
5936 .profile-activity-text { 5945 .profile-activity-text {
5937 margin: 0; 5946 margin: 0;
5938 color: #000; 5947 color: #000;
@@ -5944,8 +5953,8 @@ h1#agenda-title { @@ -5944,8 +5953,8 @@ h1#agenda-title {
5944 #profile-network li.profile-activity-item.upload_image span, 5953 #profile-network li.profile-activity-item.upload_image span,
5945 #profile-network li.profile-activity-item.upload_image span img, 5954 #profile-network li.profile-activity-item.upload_image span img,
5946 #profile-network li.profile-activity-item.upload_image span a { 5955 #profile-network li.profile-activity-item.upload_image span a {
5947 - width: 98px;  
5948 - height: 86px; 5956 + width: 124px;
  5957 + height: 100px;
5949 display: block; 5958 display: block;
5950 overflow: hidden; 5959 overflow: hidden;
5951 position: absolute; 5960 position: absolute;
@@ -5965,7 +5974,7 @@ h1#agenda-title { @@ -5965,7 +5974,7 @@ h1#agenda-title {
5965 #profile-network li.profile-activity-item.upload_image span { 5974 #profile-network li.profile-activity-item.upload_image span {
5966 position: relative; 5975 position: relative;
5967 float: left; 5976 float: left;
5968 - margin: 5px 5px 5px 0; 5977 + margin: 5px 0px 0px 5px;
5969 } 5978 }
5970 5979
5971 #profile-wall li.profile-activity-item.upload_image span a, 5980 #profile-wall li.profile-activity-item.upload_image span a,
@@ -5989,6 +5998,7 @@ h1#agenda-title { @@ -5989,6 +5998,7 @@ h1#agenda-title {
5989 float: none; 5998 float: none;
5990 width: auto; 5999 width: auto;
5991 height: auto; 6000 height: auto;
  6001 + font-weight: normal;
5992 } 6002 }
5993 6003
5994 #profile-wall li.profile-activity-item ul.profile-wall-activities-comments, 6004 #profile-wall li.profile-activity-item ul.profile-wall-activities-comments,
@@ -6020,8 +6030,8 @@ h1#agenda-title { @@ -6020,8 +6030,8 @@ h1#agenda-title {
6020 height: 16px; 6030 height: 16px;
6021 display: inline-block; 6031 display: inline-block;
6022 position: absolute; 6032 position: absolute;
6023 - top: 5px;  
6024 - right: 5px; 6033 + top: -4px;
  6034 + right: -16px;
6025 } 6035 }
6026 6036
6027 #profile-activity .profile-wall-scrap-replies li, 6037 #profile-activity .profile-wall-scrap-replies li,
@@ -6106,10 +6116,13 @@ h1#agenda-title { @@ -6106,10 +6116,13 @@ h1#agenda-title {
6106 padding: 0; 6116 padding: 0;
6107 } 6117 }
6108 6118
6109 -.profile-wall-actions a, 6119 +#profile-wall li .profile-wall-actions a,
  6120 +#profile-activity li .profile-wall-actions a,
  6121 +#profile-network li .profile-wall-actions a,
6110 #profile-wall .profile-wall-send-reply a { 6122 #profile-wall .profile-wall-send-reply a {
6111 text-decoration: none; 6123 text-decoration: none;
6112 color: #333; 6124 color: #333;
  6125 + font-weight: normal;
6113 } 6126 }
6114 6127
6115 .profile-wall-actions a:hover, 6128 .profile-wall-actions a:hover,
@@ -6376,6 +6389,7 @@ h1#agenda-title { @@ -6376,6 +6389,7 @@ h1#agenda-title {
6376 display: inline; 6389 display: inline;
6377 position: static; 6390 position: static;
6378 float: none; 6391 float: none;
  6392 + font-weight: normal;
6379 } 6393 }
6380 6394
6381 #profile-wall .profile-wall-activities-comments .article-comment .button-bar a.button:hover, 6395 #profile-wall .profile-wall-activities-comments .article-comment .button-bar a.button:hover,
@@ -6573,6 +6587,10 @@ h1#agenda-title { @@ -6573,6 +6587,10 @@ h1#agenda-title {
6573 width: 375px; 6587 width: 375px;
6574 } 6588 }
6575 6589
  6590 +#profile-wall li textarea {
  6591 + width: 388px;
  6592 +}
  6593 +
6576 #profile-wall #leave_scrap textarea { 6594 #profile-wall #leave_scrap textarea {
6577 width: 442px; 6595 width: 442px;
6578 } 6596 }