diff --git a/app/helpers/profile_editor_helper.rb b/app/helpers/profile_editor_helper.rb index 6ceb0f3..e9919cf 100644 --- a/app/helpers/profile_editor_helper.rb +++ b/app/helpers/profile_editor_helper.rb @@ -104,8 +104,8 @@ module ProfileEditorHelper @country_helper ||= CountriesHelper.instance end - def select_country(title, object, method, options) - labelled_form_field(title, select(object, method, [[_('[Select ...]'), nil]] + country_helper.countries, {}, options)) + def select_country(title, object, method, html_options = {}, options = {}) + labelled_form_field(title, select(object, method, [[_('[Select ...]'), nil]] + country_helper.countries, options, html_options)) end def select_schooling(object, method, options) diff --git a/config/initializers/action_mailer_extensions.rb b/config/initializers/action_mailer_extensions.rb new file mode 100644 index 0000000..02269a2 --- /dev/null +++ b/config/initializers/action_mailer_extensions.rb @@ -0,0 +1,28 @@ +module ActionMailer + class Base + class_inheritable_accessor :view_paths + + def self.prepend_view_path(path) + view_paths.unshift(*path) + ActionView::TemplateFinder.process_view_paths(path) + end + + def self.append_view_path(path) + view_paths.push(*path) + ActionView::TemplateFinder.process_view_paths(path) + end + + def self.view_paths + @view_paths ||= [template_root] + end + + def view_paths + self.class.view_paths + end + + def initialize_template_class(assigns) + ActionView::Base.new(view_paths, assigns, self) + end + + end +end diff --git a/lib/noosfero/plugin.rb b/lib/noosfero/plugin.rb index 93c1ba6..0f9f265 100644 --- a/lib/noosfero/plugin.rb +++ b/lib/noosfero/plugin.rb @@ -39,6 +39,9 @@ class Noosfero::Plugin compute_public_path((public_name + '/' + file), 'plugins') end + def root_path + Rails.root+'/plugins/'+public_name + end # Here the developer should specify the meta-informations that the plugin can # inform. diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 12fdc0b..5508c17 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2979,6 +2979,7 @@ div#activation_enterprise div { border: 1px solid #888; margin-bottom: 10px; padding: 5px 10px; + position: relative; } #product_list .product-pic { -- libgit2 0.21.2