X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b095b59d5e0ee805e49980af80b21bd1acff1345..392b68a65fd6ffa521b89e079b234bb0241380d3:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5266bf633..329aa25e8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,5 +1,5 @@ module ApplicationHelper - require 'rexml/document' + require "rexml/document" def linkify(text) if text.html_safe? @@ -10,11 +10,11 @@ module ApplicationHelper 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 @@ -25,10 +25,10 @@ module ApplicationHelper 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 << ".hide_unless_administrator { display: none !important }" unless @user && @user.administrator? + css << ".hide_unless_moderator { display: none !important }" unless @user && @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) @@ -58,7 +58,7 @@ module ApplicationHelper end def richtext_area(object_name, method, options = {}) - id = "#{object_name.to_s}_#{method.to_s}" + id = "#{object_name}_#{method}" format = options.delete(:format) || "markdown" content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do