From 893aa26fda1da3480373b62a8d013b6d90057c1a Mon Sep 17 00:00:00 2001
From: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
Date: Fri, 6 Jan 2012 18:21:05 -0200
Subject: [PATCH] Some enhancements

---
 app/views/profile/_profile.rhtml      | 13 ++++++-------
 app/views/profile/_profile_wall.rhtml |  2 +-
 public/javascripts/application.js     |  2 +-
 public/stylesheets/application.css    | 15 ++++++++++-----
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/views/profile/_profile.rhtml b/app/views/profile/_profile.rhtml
index 6656761..df3e96b 100644
--- a/app/views/profile/_profile.rhtml
+++ b/app/views/profile/_profile.rhtml
@@ -6,19 +6,18 @@
 
     <% tabs = plugins_tabs.select { |tab| tab[:start] } %>
 
-    <% if logged_in? && current_person.follows?(@profile) %>
-      <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
-    <% end %>
-
     <% if @profile.organization? %>
-      <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
       <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %>
+      <% if logged_in? && current_person.follows?(@profile) %>
+        <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
+      <% end %>
+      <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
     <% elsif @profile.person? %>
+      <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
       <% if logged_in? && current_person.follows?(@profile) %>
+        <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
         <% tabs << {:title => _('Network'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
       <% end %>
-
-      <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
     <% end %>
 
     <% tabs += plugins_tabs.select { |tab| !tab[:start] } %>
diff --git a/app/views/profile/_profile_wall.rhtml b/app/views/profile/_profile_wall.rhtml
index ab03654..3736552 100644
--- a/app/views/profile/_profile_wall.rhtml
+++ b/app/views/profile/_profile_wall.rhtml
@@ -3,7 +3,7 @@
   <%= flash[:error] %>
   <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %>
     <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %>
-    <%= submit_button :scrap, _('Leave a scrap') %>
+    <%= submit_button :scrap, _('Share') %>
   <% end %>
 </div>
 <div id='leave_scrap_response'></div>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index e436cd4..c22fb07 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -725,7 +725,7 @@ jQuery(function($){
            },
            success: function(data) {
              $('#profile_activities').html(data);
-             $('.submit-with-keypress').val('');
+             $(field).val($(field).attr('title'));
            }
        });
        return false;
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index adef92d..b92dd42 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -6019,7 +6019,7 @@ h1#agenda-title {
 }
 
 #profile-activity .profile-activity-description .icon-delete,
-#profile-network .profile-network-description .icon-delete,
+#profile-network .profile-activity-description .icon-delete,
 #profile-wall .profile-wall-description .icon-delete {
   position: absolute;
   top: 4px;
@@ -6031,7 +6031,9 @@ h1#agenda-title {
   -moz-border-radius: 3px;
 }
 
-#profile-activity .profile-activity-text, #profile-network .profile-network-text, #profile-wall .profile-wall-text {
+#profile-activity .profile-activity-text,
+#profile-network .profile-activity-text,
+#profile-wall .profile-wall-text {
   font-size: 13px;
   margin: 2px 5px;
 }
@@ -6040,7 +6042,9 @@ h1#agenda-title {
   padding-top: 0;
 }
 
-#profile_activities .profile-activity-time, #profile-network .profile-network-time, #profile-wall .profile-wall-time {
+#profile_activities .profile-activity-time,
+#profile-network .profile-activity-time,
+#profile-wall .profile-wall-time {
   font-size: 11px;
   margin: 5px;
   color: #babdb6;
@@ -6048,7 +6052,9 @@ h1#agenda-title {
 }
 
 #profile-wall .profile-wall-send-reply,
-#profile_activities .profile-activity-time, #profile-network .profile-network-time, #profile-wall .profile-wall-time,
+#profile_activities .profile-activity-time,
+#profile-network .profile-activity-time,
+#profile-wall .profile-wall-time,
 .profile-wall-actions a {
   display: block;
   float: right;
@@ -6500,7 +6506,6 @@ h1#agenda-title {
 #profile-activity .profile-activity-description,
 #profile-network .profile-activity-description,
 #profile-wall .profile-wall-description {
-  width: 80%;
   word-wrap: break-word;
 }
 
--
libgit2 0.21.2