X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c24c2e481cc6d27e76274ed4e32668a4690a7788..5ce14cfa4d7792346e96a3895df73e3510c936ea:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2c8b00c17..ae90d980e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -9,32 +9,12 @@ module ApplicationHelper end end - def rss_link_to(*args) - link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall") + def rss_link_to(args = {}) + link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall") end - def atom_link_to(*args) - link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall") - end - - def richtext_area(object_name, method, options = {}) - id = "#{object_name}_#{method}" - type = options.delete(:format) || "markdown" - - tag.div(:id => "#{id}_container", :class => "richtext_container") do - output_buffer << tag.div(:id => "#{id}_content", :class => "richtext_content") do - output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:type => type))) - output_buffer << tag.div("", :id => "#{id}_preview", :class => "richtext_preview richtext") - end - - output_buffer << tag.div(:id => "#{id}_help", :class => "richtext_help") do - output_buffer << render("site/#{type}_help") - output_buffer << 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") - end - end - end + def atom_link_to(args = {}) + link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall") end def dir @@ -50,7 +30,7 @@ module ApplicationHelper end def friendly_date_ago(date) - tag.span(time_ago_in_words(date, :scope => :'datetime.distance_in_words_ago'), :title => l(date, :format => :friendly)) + tag.span(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly)) end def body_class