X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2357118c460e4a2d367e4a446a0f3e883d251415..518cf69b3429d12b22efe52b5be8fd3e910b7ac4:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c5b08e515..c78c3ea46 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3,9 +3,9 @@ module ApplicationHelper def linkify(text) if text.html_safe? - Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe + Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe else - Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")) + Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow")) end end @@ -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 @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 && @user.administrator? - css << ".hide_unless_moderator { display: none !important }" unless @user && @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" @@ -107,12 +67,10 @@ module ApplicationHelper :preferred_editor => preferred_editor } - if @user - data[:user] = @user.id.to_json + if current_user + data[:user] = current_user.id.to_json - unless @user.home_lon.nil? || @user.home_lat.nil? - data[:user_home] = { :lat => @user.home_lat, :lon => @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]