X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c3b8897c44531788f06a51e24470e97a3abfb7b8..14086728a63933dffdceb9f5e5f25422fc288969:/app/helpers/application_helper.rb?ds=inline diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3a0ad084b..5266bf633 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -20,13 +20,13 @@ module ApplicationHelper def style_rules css = "" - css << ".hidden { display: none !important }"; - css << ".hide_unless_logged_in { display: none !important }" unless @user; - css << ".hide_if_logged_in { display: none !important }" if @user; - css << ".hide_if_user_#{@user.id} { display: none !important }" if @user; - css << ".show_if_user_#{@user.id} { display: inline !important }" if @user; - css << ".hide_unless_administrator { display: none !important }" unless @user and @user.administrator?; - css << ".hide_unless_moderator { display: none !important }" unless @user and @user.moderator?; + css << ".hidden { display: none !important }" + css << ".hide_unless_logged_in { display: none !important }" unless @user + css << ".hide_if_logged_in { display: none !important }" if @user + css << ".hide_if_user_#{@user.id} { display: none !important }" if @user + css << ".show_if_user_#{@user.id} { display: inline !important }" if @user + css << ".hide_unless_administrator { display: none !important }" unless @user and @user.administrator? + css << ".hide_unless_moderator { display: none !important }" unless @user and @user.moderator? return content_tag(:style, css, :type => "text/css") end @@ -57,20 +57,6 @@ module ApplicationHelper content_tag(tag, capture(&block), :class => "hide_unless_administrator") end - def preferred_editor - if params[:editor] - params[:editor] - elsif @user and @user.preferred_editor - @user.preferred_editor - else - DEFAULT_EDITOR - end - end - - def scale_to_zoom(scale) - Math.log(360.0 / (scale.to_f * 512.0)) / Math.log(2.0) - end - def richtext_area(object_name, method, options = {}) id = "#{object_name.to_s}_#{method.to_s}" format = options.delete(:format) || "markdown" @@ -102,4 +88,16 @@ module ApplicationHelper def friendly_date(date) content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly)) end + + def body_class + if content_for? :body_class + content_for :body_class + else + "#{params[:controller]} #{params[:controller]}-#{params[:action]}" + end + end + + def current_page_class(path) + :current if current_page?(path) + end end