Merge commit 'refs/merge-requests/387' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/387 Conflicts: app/helpers/application_helper.rb public/designs/themes/base/style.css

Merge commit 'refs/merge-requests/387' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/387 Conflicts: app/helpers/application_helper.rb public/designs/themes/base/style.css
Rodrigo Souto
2 parents 2d3800c3 630c8265
Showing 6 changed files with 37 additions and 19 deletions Show diff stats
app/controllers/public/account_controller.rb
app/helpers/application_helper.rb
app/models/user.rb
public/designs/themes/base/style.css
public/javascripts/application.js
public/stylesheets/application.css
@@ -262,7 +262,7 @@ class AccountController &lt; ApplicationController
   def user_data
     user_data =
       if logged_in?
-        current_user.data_hash
+        current_user.data_hash self
       else
         { }
       end
@@ -356,7 +356,8 @@ module ApplicationHelper
   end
   def theme_path
-    if session[:theme]
+    if ( respond_to?(:session) && session[:theme] ) ||
+       ( @controller && @controller.session[:theme] )
       '/user_themes/' + current_theme
     else
       '/designs/themes/' + current_theme
@@ -366,7 +367,8 @@ module ApplicationHelper
   def current_theme
     @current_theme ||=
       begin
-        if (session[:theme])
+        if ( respond_to?(:session) && session[:theme] ) ||
+           ( @controller && @controller.session[:theme] )
           session[:theme]
         else
           # utility for developers: set the theme to 'random' in development mode and
@@ -375,7 +377,7 @@ module ApplicationHelper
           if ENV['RAILS_ENV'] == 'development' && environment.theme == 'random'
             @random_theme ||= Dir.glob('public/designs/themes/*').map { |f| File.basename(f) }.rand
             @random_theme
-          elsif ENV['RAILS_ENV'] == 'development' && params[:theme] && File.exists?(File.join(Rails.root, 'public/designs/themes', params[:theme]))
+          elsif ENV['RAILS_ENV'] == 'development' && respond_to?(:params) && params[:theme] && File.exists?(File.join(Rails.root, 'public/designs/themes', params[:theme]))
             params[:theme]
           else
             if profile && !profile.theme.nil?
@@ -603,15 +605,10 @@ module ApplicationHelper
   def str_gravatar_url_for(email, options = {})
     default = theme_option['gravatar'] || NOOSFERO_CONF['gravatar'] || nil
-    url = 'http://www.gravatar.com/avatar.php?gravatar_id=' +
-           Digest::MD5.hexdigest(email.to_s)
-    {
+    "http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email.to_s)}?" + {
       :only_path => false,
       :d => default
-    }.merge(options).each { |k,v|
-      url += ( '&%s=%s' % [ k,v ] )
-    }
-    url
+    }.merge(options).map{|k,v| '%s=%s' % [ k,v ] }.join('&')
   end
   def gravatar_profile_url(email)
@@ -940,7 +937,7 @@ module ApplicationHelper
     (@category ? " - #{@category.full_name}" : '')
   end
-  # DEPRECATED. Do not use this·
+  # DEPRECATED. Do not use this.
   def import_controller_stylesheets(options = {})
     stylesheet_import( "controller_"+ @controller.controller_name(), options )
   end
@@ -1158,12 +1155,12 @@ module ApplicationHelper
       pending_tasks_count = link_to(count.to_s, @environment.top_url + '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
     end
-    (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
+    (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i style="background-image:url({avatar})"></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
-    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
+    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
     manage_enterprises.to_s +
     manage_communities.to_s +
-    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
+    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +
     pending_tasks_count +
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
   end
@@ -275,7 +275,10 @@ class User &lt; ActiveRecord::Base
     end
   end
-  def data_hash
+  include ApplicationHelper
+
+  def data_hash(controller=nil)
+    @controller ||= controller
     friends_list = {}
     enterprises = person.enterprises.map { |e| { 'name' => e.short_name, 'identifier' => e.identifier } }
     self.person.friends.online.map do |person|
@@ -286,8 +289,11 @@ class User &lt; ActiveRecord::Base
         'status' => person.user.chat_status,
       }
     end
+    avatar = self.person.profile_custom_icon
+    avatar = str_gravatar_url_for(self.email, :size=>20) if avatar.blank?
     {
       'login' => self.login,
+      'avatar' => avatar,
       'is_admin' => self.person.is_admin?,
       'since_month' => self.person.created_at.month,
       'since_year' => self.person.created_at.year,
@@ -89,7 +89,7 @@ body, th, td, input {
   color: #555753;
 }
-#controlpanel, #logout, #openchat, .manage-groups {
+#user .logged-in > * {
   margin-left: 25px;
 }
@@ -105,6 +105,14 @@ body, th, td, input {
   top: 3px;
 }
+#user #homepage-link i {
+  width: 18px;
+  height: 18px;
+  left: -20px;
+  top: -2px;
+  background-position: 50% 50%;
+}
+
 #user form {
   position: relative;
   display: inline;
@@ -539,7 +539,11 @@ jQuery(function($) {
         }
         $(this).attr('href', new_href);
       });
-      var html = $(this).html().replace(/{login}/g, data.login).replace('{month}', data.since_month).replace('{year}', data.since_year);
+      var html = $(this).html()
+                        .replace(/{login}/g, data.login)
+                        .replace('{avatar}', data.avatar)
+                        .replace('{month}', data.since_month)
+                        .replace('{year}', data.since_year);
       $(this).html(html).fadeIn();
       if (data.is_admin) {
         $('#user .admin-link').show();
@@ -868,7 +868,10 @@ code input {
 }
 #manage-enterprises .simplemenu-item a {
   background-repeat: no-repeat;
-  padding-left: 20px;
+  background-position: 5px 50%;
+  padding: 1px 0px 0px 26px;
+  line-height: 15px;
+  display: block;
 }
 #manage-enterprises .simplemenu-item a span {
   display: none;
	@@ -262,7 +262,7 @@ class AccountController < ApplicationController		@@ -262,7 +262,7 @@ class AccountController < ApplicationController
262	def user_data	262	def user_data
263	user_data =	263	user_data =
264	if logged_in?	264	if logged_in?
265	- current_user.data_hash	265	+ current_user.data_hash self
266	else	266	else
267	{ }	267	{ }
268	end	268	end