[Git][noosfero/noosfero][master] 2 commits: adding global css to session theme

[Leandro Nunes]

Leandro Nunes pushed to branch master at Noosfero / noosfero


Commits:
cdd072c8 by Leandro Nunes dos Santos at 2017-05-04T16:45:46-03:00
adding global css to session theme

- - - - -
ab994e10 by Leandro Nunes at 2017-05-04T20:23:45+00:00
Merge branch 'add-global-session-theme' into 'master'

adding global css to session theme

See merge request !1195
- - - - -


2 changed files:

- app/helpers/application_helper.rb
- app/helpers/layout_helper.rb


Changes:

=====================================
app/helpers/application_helper.rb
=====================================
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -280,7 +280,7 @@ module ApplicationHelper
   end
 
   def env_theme_include(template, options = {})
-    from_theme_include(environment.theme, template, options)
+    from_theme_include(session[:theme] || environment.theme, template, options)
   end
 
   def from_theme_include(theme, template, options = {})


=====================================
app/helpers/layout_helper.rb
=====================================
--- a/app/helpers/layout_helper.rb
+++ b/app/helpers/layout_helper.rb
@@ -50,7 +50,7 @@ module LayoutHelper
     plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin|
       plugin.class.public_path('style.css', true)
     }
-    global_css_pub = "/designs/themes/#{environment.theme}/global.css"
+    global_css_pub = "/designs/themes/#{session[:theme] || environment.theme}/global.css"
     global_css_at_fs = Rails.root.join 'public' + global_css_pub
 
     output = []



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/964e1151a4c57366fdbb14e54869ac2aef5cdebc...ab994e1046a3d09af833a557b1d26ed0324bfcf8

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/964e1151a4c57366fdbb14e54869ac2aef5cdebc...ab994e1046a3d09af833a557b1d26ed0324bfcf8
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170504/98fe7f3d/attachment-0001.html>