Commit 893aa26fda1da3480373b62a8d013b6d90057c1a

Authored by Daniela Feitosa
1 parent 68a6f60d

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
app/views/profile/_profile.rhtml
@@ -6,19 +6,18 @@ @@ -6,19 +6,18 @@
6 6
7 <% tabs = plugins_tabs.select { |tab| tab[:start] } %> 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 <% if @profile.organization? %> 9 <% if @profile.organization? %>
14 - <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>  
15 <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %> 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 <% elsif @profile.person? %> 15 <% elsif @profile.person? %>
  16 + <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
17 <% if logged_in? && current_person.follows?(@profile) %> 17 <% if logged_in? && current_person.follows?(@profile) %>
  18 + <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
18 <% tabs << {:title => _('Network'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %> 19 <% tabs << {:title => _('Network'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
19 <% end %> 20 <% end %>
20 -  
21 - <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>  
22 <% end %> 21 <% end %>
23 22
24 <% tabs += plugins_tabs.select { |tab| !tab[:start] } %> 23 <% tabs += plugins_tabs.select { |tab| !tab[:start] } %>
app/views/profile/_profile_wall.rhtml
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <%= flash[:error] %> 3 <%= flash[:error] %>
4 <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %> 4 <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %>
5 <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %> 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 <% end %> 7 <% end %>
8 </div> 8 </div>
9 <div id='leave_scrap_response'></div> 9 <div id='leave_scrap_response'></div>
public/javascripts/application.js
@@ -725,7 +725,7 @@ jQuery(function($){ @@ -725,7 +725,7 @@ jQuery(function($){
725 }, 725 },
726 success: function(data) { 726 success: function(data) {
727 $('#profile_activities').html(data); 727 $('#profile_activities').html(data);
728 - $('.submit-with-keypress').val(''); 728 + $(field).val($(field).attr('title'));
729 } 729 }
730 }); 730 });
731 return false; 731 return false;
public/stylesheets/application.css
@@ -6019,7 +6019,7 @@ h1#agenda-title { @@ -6019,7 +6019,7 @@ h1#agenda-title {
6019 } 6019 }
6020 6020
6021 #profile-activity .profile-activity-description .icon-delete, 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 #profile-wall .profile-wall-description .icon-delete { 6023 #profile-wall .profile-wall-description .icon-delete {
6024 position: absolute; 6024 position: absolute;
6025 top: 4px; 6025 top: 4px;
@@ -6031,7 +6031,9 @@ h1#agenda-title { @@ -6031,7 +6031,9 @@ h1#agenda-title {
6031 -moz-border-radius: 3px; 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 font-size: 13px; 6037 font-size: 13px;
6036 margin: 2px 5px; 6038 margin: 2px 5px;
6037 } 6039 }
@@ -6040,7 +6042,9 @@ h1#agenda-title { @@ -6040,7 +6042,9 @@ h1#agenda-title {
6040 padding-top: 0; 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 font-size: 11px; 6048 font-size: 11px;
6045 margin: 5px; 6049 margin: 5px;
6046 color: #babdb6; 6050 color: #babdb6;
@@ -6048,7 +6052,9 @@ h1#agenda-title { @@ -6048,7 +6052,9 @@ h1#agenda-title {
6048 } 6052 }
6049 6053
6050 #profile-wall .profile-wall-send-reply, 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 .profile-wall-actions a { 6058 .profile-wall-actions a {
6053 display: block; 6059 display: block;
6054 float: right; 6060 float: right;
@@ -6500,7 +6506,6 @@ h1#agenda-title { @@ -6500,7 +6506,6 @@ h1#agenda-title {
6500 #profile-activity .profile-activity-description, 6506 #profile-activity .profile-activity-description,
6501 #profile-network .profile-activity-description, 6507 #profile-network .profile-activity-description,
6502 #profile-wall .profile-wall-description { 6508 #profile-wall .profile-wall-description {
6503 - width: 80%;  
6504 word-wrap: break-word; 6509 word-wrap: break-word;
6505 } 6510 }
6506 6511