From 1d891d1953e684b8f5f7dc537df6c3031061c9b6 Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Thu, 29 May 2014 22:38:35 +0000
Subject: [PATCH] user-menu: loading user menu on the server-side instead of on the client-side

---
 app/helpers/application_helper.rb       | 12 ++++++------
 app/models/environment.rb               |  4 ++++
 app/views/account/accept_terms.html.erb | 10 +++++++++-
 app/views/blocks/login_block.html.erb   | 27 +++++++++++++++------------
 app/views/layouts/_user.html.erb        | 33 ++++++++++++++++++---------------
 public/javascripts/application.js       | 44 --------------------------------------------
 6 files changed, 52 insertions(+), 78 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a7e92ea..d5dbfac 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1091,10 +1091,10 @@ module ApplicationHelper
       link_to_all = nil
       if list.count > 5
         list = list.first(5)
-        link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => current_user.login)
+        link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => user.identifier)
       end
       link = list.map do |element|
-        link_to(content_tag('strong', [_('<span>Manage</span> %s') % element.short_name(25)]), @environment.top_url + "/myprofile/#{element.identifier}", :class => "icon-menu-"+element.class.identification.underscore, :title => [_('Manage %s') % element.short_name])
+        link_to(content_tag('strong', _('<span>Manage</span> %s') % element.short_name(25)), element.admin_url, :class => "icon-menu-"+element.class.identification.underscore, :title => _('Manage %s') % element.short_name)
       end
       if link_to_all
         link << link_to_all
@@ -1118,15 +1118,15 @@ module ApplicationHelper
     pending_tasks_count = ''
     count = user ? Task.to(user).pending.count : -1
     if count > 0
-      pending_tasks_count = link_to(count.to_s, @environment.top_url + '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
+      pending_tasks_count = link_to(count.to_s, user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
     end
 
-    (_("<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'))) +
+    (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.public_profile_url, :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', :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
+    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.admin_url, :title => _("Configure the environment"), :class => 'admin-link') +
     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}', :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +
+    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', user.admin_url, :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
diff --git a/app/models/environment.rb b/app/models/environment.rb
index e3b7f31..579dfa7 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -637,6 +637,10 @@ class Environment < ActiveRecord::Base
     domain
   end
 
+  def admin_url
+    { :controller => 'admin_panel', :action => 'index' }
+  end
+
   def top_url
     url = 'http://'
     url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
diff --git a/app/views/account/accept_terms.html.erb b/app/views/account/accept_terms.html.erb
index dfc4ab2..404f944 100644
--- a/app/views/account/accept_terms.html.erb
+++ b/app/views/account/accept_terms.html.erb
@@ -19,10 +19,18 @@
     <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
     <%= hidden_field_tag :answer, params[:answer] %>
 
-    <%= labelled_check_box(environment.terms_of_use_acceptance_text.blank? ? _('I read the terms of use and accepted them') : environment.terms_of_use_acceptance_text, :terms_accepted, '1', false, :onclick => 'toggle_submit_button("submit-accept-terms", this.checked)') %>
+    <%= labelled_check_box(environment.terms_of_use_acceptance_text.blank? ? _('I read the terms of use and accepted them') : environment.terms_of_use_acceptance_text, :terms_accepted, '1', false, :id => 'accept-terms') %>
     <% button_bar do %>
       <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
       <%= submit_button 'forward', _('Continue'), {:disabled => true, :class => 'disabled', :id => 'submit-accept-terms'} %>
     <% end %>
   <% end %>
 </div>
+
+<script type="text/javascript">
+  jQuery('#accept-terms').change(function(){
+    jQuery("#submit-accept-terms").toggleClass("disabled");
+    jQuery("#submit-accept-terms").prop("disabled", !jQuery("#submit-accept-terms").prop("disabled"));
+  });
+</script>
+
diff --git a/app/views/blocks/login_block.html.erb b/app/views/blocks/login_block.html.erb
index c1a3bb9..82dfea6 100644
--- a/app/views/blocks/login_block.html.erb
+++ b/app/views/blocks/login_block.html.erb
@@ -1,13 +1,16 @@
-<div class="logged-user-info" style='display: none;'>
-  <h2><%= _('Logged in as %s') % '{login}' %></h2>
-  <ul>
-    <li><%= _('User since {year}/{month}') %></li>
-    <li><%= link_to _('Homepage'), '/{login}' %></li>
-  </ul>
-  <div class="user-actions">
-    <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>
+<% if user.present? %>
+  <div class="logged-user-info">
+    <h2><%= _('Logged in as %s') % user.identifier %></h2>
+    <ul>
+      <li><%= _('User since %s/%s') % [user.created_at.month, user.created_at.year] %></li>
+      <li><%= link_to _('Homepage'), user.public_profile_url %></li>
+    </ul>
+    <div class="user-actions">
+      <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>
+    </div>
   </div>
-</div>
-<div class='not-logged-user' style='display: none;'>
-  <%= render :file => 'account/login_block' %>
-</div>
+<% else %>
+  <div class='not-logged-user'>
+    <%= render :file => 'account/login_block' %>
+  </div>
+<% end%>
diff --git a/app/views/layouts/_user.html.erb b/app/views/layouts/_user.html.erb
index 6c6fe39..5366b6d 100644
--- a/app/views/layouts/_user.html.erb
+++ b/app/views/layouts/_user.html.erb
@@ -1,21 +1,24 @@
 <div id="user">
-  <span class='logged-in' style='display: none;'>
-    <%= usermenu_logged_in %>
-  </span>
-  <span class='not-logged-in' style='display: none'>
+  <% user = (session[:user] && User.find_by_id(session[:user])) || nil %>
+  <% if user.present? %>
+    <% user = user.person %>
+    <span class='logged-in'>
+      <%= usermenu_logged_in %>
+    </span>
+  <% else %>
+    <span class='not-logged-in'>
+      <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
+      <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %>
 
-    <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
-    <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %>
+      <div id='inlineLoginBox' style='display: none;'>
+        <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
+      </div>
 
-    <div id='inlineLoginBox' style='display: none;'>
-      <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
-    </div>
-
-    <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
-      <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
-    <% end %>
-
-  </span>
+      <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+        <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
+      <% end %>
+    </span>
+  <% end %>
   <form action="/search" id="top-search" class="search_form clean" method="get">
     <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
     <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 58fc5d0..2caa3ce 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -518,16 +518,11 @@ jQuery(function($) {
   $.getJSON('/account/user_data', function userDataCallBack(data) {
     if (data.login) {
       // logged in
-      loggedInDataCallBack(data);
-      addManageEnterprisesToOldStyleMenu(data);
       if (data.chat_enabled) {
         setInterval(function(){ $.getJSON('/account/user_data', chatOnlineUsersDataCallBack)}, 10000);
       }
       $('head').append('<meta content="authenticity_token" name="csrf-param" />');
       $('head').append('<meta content="'+$.cookie("_noosfero_.XSRF-TOKEN")+'" name="csrf-token" />');
-    } else {
-      // not logged in
-      $('#user .not-logged-in, .login-block .not-logged-user').fadeIn();
     }
     if (data.notice) {
       display_notice(data.notice);
@@ -536,45 +531,6 @@ jQuery(function($) {
     $(window).trigger("userDataLoaded", data);
   });
 
-  function loggedInDataCallBack(data) {
-    // logged in
-    $('body').addClass('logged-in');
-    $('#user .logged-in, .login-block .logged-user-info').each(function() {
-      $(this).find('a[href]').each(function() {
-        var new_href = $(this).attr('href').replace('{login}', data.login);
-        if (data.email_domain) {
-          new_href = new_href.replace('{email_domain}', data.email_domain);
-        }
-        $(this).attr('href', new_href);
-      });
-      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();
-      }
-      if (data.email_domain) {
-        $('#user .webmail-link').show();
-      }
-    });
-  }
-
-  function addManageEnterprisesToOldStyleMenu(data) {
-    if ($('#manage-enterprises-link-template').length > 0) {
-      $.each(data.enterprises, function(index, enterprise) {
-        var item = $('<li>' + $('#manage-enterprises-link-template').html() + '</li>');
-        item.find('a[href]').each(function() {
-          $(this).attr('href', '/myprofile/' + enterprise.identifier);
-        });
-        item.html(item.html().replace('{name}', enterprise.name));
-        item.insertAfter('#manage-enterprises-link-template');
-      });
-    }
-  }
-
   function chatOnlineUsersDataCallBack(data) {
     if ($('#chat-online-users').length == 0) {
       return;
--
libgit2 0.21.2