From 5627e2559067a0d0e2985e65e3170facd7cf6630 Mon Sep 17 00:00:00 2001
From: Carlos Purificacao <carloseugenio@gmail.com>
Date: Thu, 14 May 2015 11:15:01 -0300
Subject: [PATCH] Header working for html_safe

---
 app/helpers/application_helper.rb | 12 ++++++++++++
 app/helpers/layout_helper.rb      |  7 +++++--
 app/views/layouts/_user.html.erb  | 21 +++++++++++----------
 config/initializers/html_safe.rb  | 10 +++++-----
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 11f222a..88898c9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1160,6 +1160,18 @@ module ApplicationHelper
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
   end
 
+  def usermenu_notlogged_in
+    login_str = '<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>'
+    ret = _("<span class='login'>%s</span>") % modal_inline_link_to(login_str.html_safe, login_url, '#inlineLoginBox', :id => 'link_login')
+    return ret.html_safe
+  end
+
+  def usermenu_signup
+    signup_str = '<strong>' + _('Sign up') + '</strong>'
+    ret = _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to(signup_str.html_safe, :controller => 'account', :action => 'signup')
+    return ret.html_safe
+
+  end
   def limited_text_area(object_name, method, limit, text_area_id, options = {})
     content_tag(:div, [
       text_area(object_name, method, { :id => text_area_id, :onkeyup => "limited_text_area('#{text_area_id}', #{limit})" }.merge(options)),
diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb
index 57687c7..d1ab1a8 100644
--- a/app/helpers/layout_helper.rb
+++ b/app/helpers/layout_helper.rb
@@ -40,7 +40,8 @@ module LayoutHelper
 
     output += templete_javascript_ng.to_s
 
-    output
+    # This output should be safe!
+    output.html_safe
   end
 
   def noosfero_stylesheets
@@ -64,7 +65,9 @@ module LayoutHelper
       output << stylesheet_link_tag(global_css_pub)
     end
     output << stylesheet_link_tag(theme_stylesheet_path)
-    output.join "\n"
+
+    # This output should be safe!
+    output.join("\n").html_safe
   end
 
   def noosfero_layout_features
diff --git a/app/views/layouts/_user.html.erb b/app/views/layouts/_user.html.erb
index cec9a5d..25db153 100644
--- a/app/views/layouts/_user.html.erb
+++ b/app/views/layouts/_user.html.erb
@@ -7,18 +7,19 @@
     </span>
   <% else %>
     <span class='not-logged-in'>
-      <%= _("<span class='login'>%s</span>") % modal_inline_link_to('<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("") %>
+      <%= usermenu_notlogged_in %>
+      <% @plugins.dispatch(:alternative_authentication_link).collect do |content|%>
+         <%= instance_exec(&content) %> 
+      <%end%>
 
-    <div id='inlineLoginBox' style='display: none;'>
-      <%= render :file => 'account/login', :locals => { :is_popin => true } %>
-    </div>
+      <div id='inlineLoginBox' style='display: none;'>
+        <%= render :file => 'account/login', :locals => { :is_popin => 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) %>
+        <%= usermenu_signup %>
+      <% end %>
+    </span>
   <% end %>
   <form action="/search/articles" 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=''" />
diff --git a/config/initializers/html_safe.rb b/config/initializers/html_safe.rb
index 53bd16c..8b07ec1 100644
--- a/config/initializers/html_safe.rb
+++ b/config/initializers/html_safe.rb
@@ -3,8 +3,8 @@
 # Disable Rails html autoescaping. This is due to noosfero using too much helpers/models to output html.
 # It it would change too much code and make it hard to maintain.
 # FIXME THIS IS SO WRONG
-class Object
-  def html_safe?
-    true
-  end
-end
+#class Object
+#  def html_safe?
+#    true
+#  end
+#end
--
libgit2 0.21.2