diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bde5a7a..6d15bfc 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -912,6 +912,15 @@ module ApplicationHelper render :file => 'layouts/_javascript' end + def noosfero_stylesheets + [ + 'application', + 'thickbox', + 'lightbox', + pngfix_stylesheet_path, + ] + end + # DEPRECATED. Do not use thisĀ· def import_controller_stylesheets(options = {}) stylesheet_import( "controller_"+ @controller.controller_name(), options ) diff --git a/app/views/layouts/application-ng.rhtml b/app/views/layouts/application-ng.rhtml index 7363c63..85f3618 100644 --- a/app/views/layouts/application-ng.rhtml +++ b/app/views/layouts/application-ng.rhtml @@ -8,7 +8,7 @@ <%= noosfero_javascript %> - <%= stylesheet_link_tag 'application', 'thickbox', 'lightbox', pngfix_stylesheet_path, :cache => 'cache' %> + <%= stylesheet_link_tag noosfero_stylesheets, :cache => 'cache' %> <%= stylesheet_link_tag template_stylesheet_path %> <%= stylesheet_link_tag icon_theme_stylesheet_path %> <%= stylesheet_link_tag theme_stylesheet_path %> diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index cb27f08..6fecede 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -14,7 +14,7 @@ <%= # Load the principal css files: - stylesheet_link_tag('application', 'thickbox', 'lightbox', pngfix_stylesheet_path, :cache => 'cache') + + stylesheet_link_tag(noosfero_stylesheets, :cache => 'cache') + stylesheet_import( %w( common help menu article button search blocks forms login-box ), :themed_source => true ) + "\n" + import_blocks_stylesheets(:themed_source => true) + "\n" + -- libgit2 0.21.2