diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 0a5d9164e2..313d6c94b1 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1668,10 +1668,6 @@ tr.turn:hover { } } -.content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div - display: inline; -} - .pagination { padding-top: $lineheight; } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index adcf5c6c01..c78c3ea464 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -17,44 +17,6 @@ def atom_link_to(*args) 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 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? - - content_tag(:style, css, :type => "text/css") - end - - def if_logged_in(tag = :div, &block) - content_tag(tag, capture(&block), :class => "hide_unless_logged_in") - end - - def if_not_logged_in(tag = :div, &block) - content_tag(tag, capture(&block), :class => "hide_if_logged_in") - end - - def if_user(user, tag = :div, &block) - content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") if user - end - - def unless_user(user, tag = :div, &block) - if user - content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}") - else - content_tag(tag, capture(&block)) - end - end - - def if_administrator(tag = :div, &block) - content_tag(tag, capture(&block), :class => "hide_unless_administrator") - end - def richtext_area(object_name, method, options = {}) id = "#{object_name}_#{method}" type = options.delete(:format) || "markdown" diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index ed1e596ee1..85b9515dfe 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -13,15 +13,17 @@