X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f7dd79daf44de5f8f8b6c246a269e44bb258175..6c51b3cc0ad7e193c7dae3794502088faab37c7b:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 49608c4a0..4765cb35b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -26,6 +26,7 @@ module ApplicationHelper 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 @@ -56,16 +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 @@ -82,8 +73,10 @@ module ApplicationHelper output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do output_buffer << render("site/#{format}_help") - output_buffer << submit_tag(I18n.t("site.richtext_area.edit"), :id => "#{id}_doedit", :class => "richtext_doedit", :disabled => true) - output_buffer << submit_tag(I18n.t("site.richtext_area.preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview") + 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") + end end end end @@ -95,4 +88,12 @@ module ApplicationHelper I18n.t("html.dir") end end + + def friendly_date(date) + content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly)) + end + + def body_class + [params[:controller], "#{params[:controller]}-#{params[:action]}", @extra_body_class].compact.join(" ") + end end