X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a37e1b8f7035bfac0e38f5b95ea643c601e1c9b1..ed54379218d21b9bd52933903e8cb504a15dfe7e:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6e2ecd323..e285215b8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -37,7 +37,7 @@ module ApplicationHelper js << javascript_strings_for_key("javascripts") js << "\n" - return js + return raw(js) end def style_rules @@ -54,29 +54,29 @@ module ApplicationHelper end def if_logged_in(tag = :div, &block) - concat(content_tag(tag, capture(&block), :class => "hide_unless_logged_in")) + content_tag(tag, capture(&block), :class => "hide_unless_logged_in") end def if_not_logged_in(tag = :div, &block) - concat(content_tag(tag, capture(&block), :class => "hide_if_logged_in")) + content_tag(tag, capture(&block), :class => "hide_if_logged_in") end def if_user(user, tag = :div, &block) if user - concat(content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}")) + content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") end end def unless_user(user, tag = :div, &block) if user - concat(content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}")) + content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}") else - concat(content_tag(tag, capture(&block))) + content_tag(tag, capture(&block)) end end def if_administrator(tag = :div, &block) - concat(content_tag(tag, capture(&block), :class => "hide_unless_administrator")) + content_tag(tag, capture(&block), :class => "hide_unless_administrator") end def describe_location(lat, lon, zoom = nil, language = nil)