X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..6c225bd01c53ad4cc3429e05c7bb71da3b0a4b7b:/app/helpers/application_helper.rb?ds=sidebyside diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a330eb5f9..c78c3ea46 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -17,46 +17,6 @@ module ApplicationHelper link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall") end - def style_rules - css = "" - - css << ".hidden { display: none !important }" - css << ".hide_unless_logged_in { display: none !important }" unless current_user - css << ".hide_if_logged_in { display: none !important }" if current_user - css << ".hide_if_user_#{current_user.id} { display: none !important }" if current_user - css << ".show_if_user_#{current_user.id} { display: inline !important }" if current_user - css << ".hide_unless_administrator { display: none !important }" unless current_user && current_user.administrator? - css << ".hide_unless_moderator { display: none !important }" unless current_user && current_user.moderator? - - 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 richtext_area(object_name, method, options = {}) id = "#{object_name}_#{method}" type = options.delete(:format) || "markdown" @@ -110,9 +70,7 @@ module ApplicationHelper if current_user data[:user] = current_user.id.to_json - unless current_user.home_lon.nil? || current_user.home_lat.nil? - data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } - end + data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } unless current_user.home_lon.nil? || current_user.home_lat.nil? end data[:location] = session[:location] if session[:location]