X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/68368118a63f4d6c2bed18cdf4dce525256b3a41..ed54379218d21b9bd52933903e8cb504a15dfe7e:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5fa021bcf..e285215b8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -37,7 +37,46 @@ module ApplicationHelper js << javascript_strings_for_key("javascripts") js << "\n" - return js + return raw(js) + end + + def style_rules + css = "" + + css << ".hidden { display: none }"; + css << ".hide_unless_logged_in { display: none }" unless @user; + css << ".hide_if_logged_in { display: none }" if @user; + css << ".hide_if_user_#{@user.id} { display: none }" if @user; + css << ".show_if_user_#{@user.id} { display: inline }" if @user; + css << ".hide_unless_administrator { display: none }" unless @user and @user.administrator?; + + return content_tag(:style, css, :type => "text/css") + end + + def if_logged_in(tag = :div, &block) + content_tag(tag, capture(&block), :class => "hide_unless_logged_in") + end + + def if_not_logged_in(tag = :div, &block) + content_tag(tag, capture(&block), :class => "hide_if_logged_in") + end + + def if_user(user, tag = :div, &block) + if user + content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") + end + end + + def unless_user(user, tag = :div, &block) + if user + content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}") + else + content_tag(tag, capture(&block)) + end + end + + def if_administrator(tag = :div, &block) + content_tag(tag, capture(&block), :class => "hide_unless_administrator") end def describe_location(lat, lon, zoom = nil, language = nil) @@ -46,8 +85,8 @@ module ApplicationHelper url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}" begin - Timeout::timeout(4) do - response = REXML::Document.new(Net::HTTP.get(URI.parse(url))) + response = Timeout::timeout(4) do + REXML::Document.new(Net::HTTP.get(URI.parse(url))) end rescue Exception response = nil @@ -80,6 +119,16 @@ module ApplicationHelper end end + def preferred_editor + if params[:editor] + params[:editor] + elsif @user and @user.preferred_editor + @user.preferred_editor + else + DEFAULT_EDITOR + end + end + private def javascript_strings_for_key(key)