X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a36f3558dd43dd5a598e36dd21fd5f7d2b4a94f5..bb48f2c136b66c59009e9354666471dadc611922:/app/helpers/application_helper.rb?ds=inline diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 10895dd60..b91710b9c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -20,12 +20,13 @@ module ApplicationHelper def style_rules css = "" - css << ".hidden { display: none }"; - css << ".hide_unless_logged_in { display: none }" unless @user; - css << ".hide_if_logged_in { display: none }" if @user; - css << ".hide_if_user_#{@user.id} { display: none }" if @user; - css << ".show_if_user_#{@user.id} { display: inline }" if @user; - css << ".hide_unless_administrator { display: none }" unless @user and @user.administrator?; + 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?; return content_tag(:style, css, :type => "text/css") end @@ -77,7 +78,7 @@ module ApplicationHelper 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 << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview") + 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 @@ -95,4 +96,8 @@ 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 end