X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/44629832dd0207d7b0f50b93f1d00b4373dd4d49..7913592b5e959750d76264c0a817b735c38aea85:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5d61e8c63..adcf5c6c0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,34 +1,34 @@ module ApplicationHelper - require 'rexml/document' + require "rexml/document" 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 def rss_link_to(*args) - return link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" }); + link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall") end def atom_link_to(*args) - return link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" }); + 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 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 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? - return content_tag(:style, css, :type => "text/css") + content_tag(:style, css, :type => "text/css") end def if_logged_in(tag = :div, &block) @@ -40,9 +40,7 @@ module ApplicationHelper end def if_user(user, tag = :div, &block) - if user - content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") - end + content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") if user end def unless_user(user, tag = :div, &block) @@ -57,22 +55,18 @@ module ApplicationHelper content_tag(tag, capture(&block), :class => "hide_unless_administrator") 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" + id = "#{object_name}_#{method}" + type = options.delete(:format) || "markdown" content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do output_buffer << content_tag(:div, :id => "#{id}_content", :class => "richtext_content") do - output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:format => format))) + output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:type => type))) output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview richtext") end output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do - output_buffer << render("site/#{format}_help") + output_buffer << render("site/#{type}_help") output_buffer << content_tag(:div, :class => "buttons") do output_buffer << submit_tag(I18n.t("site.richtext_area.edit"), :id => "#{id}_doedit", :class => "richtext_doedit deemphasize", :disabled => true) output_buffer << submit_tag(I18n.t("site.richtext_area.preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview deemphasize") @@ -104,4 +98,28 @@ module ApplicationHelper def current_page_class(path) :current if current_page?(path) end + + def application_data + data = { + :locale => I18n.locale, + :preferred_editor => preferred_editor + } + + if current_user + data[:user] = current_user.id.to_json + + 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] + + if @oauth + data[:token] = @oauth.token + data[:token_secret] = @oauth.secret + data[:consumer_key] = @oauth.client_application.key + data[:consumer_secret] = @oauth.client_application.secret + end + + data + end end