Download as
Browse Code »

Commit 893aa26fda1da3480373b62a8d013b6d90057c1a

Authored by Daniela Feitosa
1 parent 68a6f60d
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

Some enhancements 

Profile is the first tab
Replaced "Leave a scrap" by "Share"
Fixed CSS of profile-network
Fixed js to add title of comment textarea after posting
Showing 4 changed files with 18 additions and 14 deletions   Show diff stats
app/views/profile/_profile.rhtml
  Diff comments   View file @893aa26
... ... @@ -6,19 +6,18 @@
6 6  
7 7 <% tabs = plugins_tabs.select { |tab| tab[:start] } %>
8 8  
9   - <% if logged_in? && current_person.follows?(@profile) %>
10   - <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
11   - <% end %>
12   -
13 9 <% if @profile.organization? %>
14   - <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
15 10 <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %>
  11 + <% if logged_in? && current_person.follows?(@profile) %>
  12 + <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
  13 + <% end %>
  14 + <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
16 15 <% elsif @profile.person? %>
  16 + <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
17 17 <% if logged_in? && current_person.follows?(@profile) %>
  18 + <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
18 19 <% tabs << {:title => _('Network'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
19 20 <% end %>
20   -
21   - <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
22 21 <% end %>
23 22  
24 23 <% tabs += plugins_tabs.select { |tab| !tab[:start] } %>
... ...
app/views/profile/_profile_wall.rhtml
  Diff comments   View file @893aa26
... ... @@ -3,7 +3,7 @@
3 3 <%= flash[:error] %>
4 4 <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %>
5 5 <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %>
6   - <%= submit_button :scrap, _('Leave a scrap') %>
  6 + <%= submit_button :scrap, _('Share') %>
7 7 <% end %>
8 8 </div>
9 9 <div id='leave_scrap_response'></div>
... ...
public/javascripts/application.js
  Diff comments   View file @893aa26
... ... @@ -725,7 +725,7 @@ jQuery(function($){
725 725 },
726 726 success: function(data) {
727 727 $('#profile_activities').html(data);
728   - $('.submit-with-keypress').val('');
  728 + $(field).val($(field).attr('title'));
729 729 }
730 730 });
731 731 return false;
... ...
public/stylesheets/application.css
  Diff comments   View file @893aa26
... ... @@ -6019,7 +6019,7 @@ h1#agenda-title {
6019 6019 }
6020 6020  
6021 6021 #profile-activity .profile-activity-description .icon-delete,
6022   -#profile-network .profile-network-description .icon-delete,
  6022 +#profile-network .profile-activity-description .icon-delete,
6023 6023 #profile-wall .profile-wall-description .icon-delete {
6024 6024 position: absolute;
6025 6025 top: 4px;
... ... @@ -6031,7 +6031,9 @@ h1#agenda-title {
6031 6031 -moz-border-radius: 3px;
6032 6032 }
6033 6033  
6034   -#profile-activity .profile-activity-text, #profile-network .profile-network-text, #profile-wall .profile-wall-text {
  6034 +#profile-activity .profile-activity-text,
  6035 +#profile-network .profile-activity-text,
  6036 +#profile-wall .profile-wall-text {
6035 6037 font-size: 13px;
6036 6038 margin: 2px 5px;
6037 6039 }
... ... @@ -6040,7 +6042,9 @@ h1#agenda-title {
6040 6042 padding-top: 0;
6041 6043 }
6042 6044  
6043   -#profile_activities .profile-activity-time, #profile-network .profile-network-time, #profile-wall .profile-wall-time {
  6045 +#profile_activities .profile-activity-time,
  6046 +#profile-network .profile-activity-time,
  6047 +#profile-wall .profile-wall-time {
6044 6048 font-size: 11px;
6045 6049 margin: 5px;
6046 6050 color: #babdb6;
... ... @@ -6048,7 +6052,9 @@ h1#agenda-title {
6048 6052 }
6049 6053  
6050 6054 #profile-wall .profile-wall-send-reply,
6051   -#profile_activities .profile-activity-time, #profile-network .profile-network-time, #profile-wall .profile-wall-time,
  6055 +#profile_activities .profile-activity-time,
  6056 +#profile-network .profile-activity-time,
  6057 +#profile-wall .profile-wall-time,
6052 6058 .profile-wall-actions a {
6053 6059 display: block;
6054 6060 float: right;
... ... @@ -6500,7 +6506,6 @@ h1#agenda-title {
6500 6506 #profile-activity .profile-activity-description,
6501 6507 #profile-network .profile-activity-description,
6502 6508 #profile-wall .profile-wall-description {
6503   - width: 80%;
6504 6509 word-wrap: break-word;
6505 6510 }
6506 6511  
... ...