diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 456de2626..fa1d6f463 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -86,7 +86,7 @@ protected end end - %w(member banned builder privileged platinum contributor janitor moderator admin).each do |level| + %w(member banned builder gold platinum contributor janitor moderator admin).each do |level| define_method("#{level}_only") do if !CurrentUser.user.is_banned? && CurrentUser.user.__send__("is_#{level}?") true diff --git a/app/controllers/post_votes_controller.rb b/app/controllers/post_votes_controller.rb index f5cfe71c9..4cf3c05c6 100644 --- a/app/controllers/post_votes_controller.rb +++ b/app/controllers/post_votes_controller.rb @@ -1,5 +1,5 @@ class PostVotesController < ApplicationController - before_filter :privileged_only + before_filter :gold_only def create @post = Post.find(params[:post_id]) diff --git a/app/controllers/user_feedbacks_controller.rb b/app/controllers/user_feedbacks_controller.rb index 91f2f96aa..e08ab3e03 100644 --- a/app/controllers/user_feedbacks_controller.rb +++ b/app/controllers/user_feedbacks_controller.rb @@ -1,5 +1,5 @@ class UserFeedbacksController < ApplicationController - before_filter :privileged_only, :only => [:new, :edit, :create, :update, :destroy] + before_filter :gold_only, :only => [:new, :edit, :create, :update, :destroy] respond_to :html, :xml, :json rescue_from User::PrivilegeError, :with => "static/access_denied" diff --git a/app/controllers/user_name_change_requests_controller.rb b/app/controllers/user_name_change_requests_controller.rb index 4d51153c4..4563f3000 100644 --- a/app/controllers/user_name_change_requests_controller.rb +++ b/app/controllers/user_name_change_requests_controller.rb @@ -1,5 +1,5 @@ class UserNameChangeRequestsController < ApplicationController - before_filter :privileged_only, :only => [:new, :create, :show] + before_filter :gold_only, :only => [:new, :create, :show] before_filter :admin_only, :only => [:index, :approve, :reject, :destroy] rescue_from User::PrivilegeError, :with => :access_denied diff --git a/app/helpers/admin/users_helper.rb b/app/helpers/admin/users_helper.rb index 31e844bcc..8728fff09 100644 --- a/app/helpers/admin/users_helper.rb +++ b/app/helpers/admin/users_helper.rb @@ -2,7 +2,7 @@ module Admin::UsersHelper def user_level_select(object, field) options = [ ["Member", User::Levels::MEMBER], - ["Gold", User::Levels::PRIVILEGED], + ["Gold", User::Levels::GOLD], ["Platinum", User::Levels::PLATINUM], ["Builder", User::Levels::BUILDER], ["Contributor", User::Levels::CONTRIBUTOR], diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9f9f31901..2bbb33d59 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -82,7 +82,7 @@ module ApplicationHelper if positive_or_negative == :positive html << " [" + link_to("+", new_user_feedback_path(:user_feedback => {:category => "positive", :user_id => user.id})) + "]" - unless user.is_privileged? + unless user.is_gold? html << " [" + link_to("invite", new_moderator_invitation_path(:invitation => {:name => user.name, :level => User::Levels::CONTRIBUTOR})) + "]" end else diff --git a/app/helpers/moderator/dashboards_helper.rb b/app/helpers/moderator/dashboards_helper.rb index 8a59cf293..e7c872280 100644 --- a/app/helpers/moderator/dashboards_helper.rb +++ b/app/helpers/moderator/dashboards_helper.rb @@ -4,7 +4,7 @@ module Moderator choices = [ ["", ""], ["Member", 20], - ["Privileged", 30], + ["Gold", 30], ["Contributor", 33], ["Janitor", 35], ["Moderator", 40], diff --git a/app/helpers/moderator/invitations_helper.rb b/app/helpers/moderator/invitations_helper.rb index 4d6a58cff..dc5e893d2 100644 --- a/app/helpers/moderator/invitations_helper.rb +++ b/app/helpers/moderator/invitations_helper.rb @@ -2,7 +2,7 @@ module Moderator module InvitationsHelper def level_select choices = [] - choices << ["Privileged", User::Levels::PRIVILEGED] + choices << ["Gold", User::Levels::GOLD] choices << ["Contributor", User::Levels::CONTRIBUTOR] select(:invitation, :level, choices) end diff --git a/app/helpers/post_appeals_helper.rb b/app/helpers/post_appeals_helper.rb index 7cbe4c3de..819c676c0 100644 --- a/app/helpers/post_appeals_helper.rb +++ b/app/helpers/post_appeals_helper.rb @@ -10,4 +10,4 @@ module PostAppealsHelper html << '' html.join("\n").html_safe end -end \ No newline at end of file +end diff --git a/app/logical/anonymous_user.rb b/app/logical/anonymous_user.rb index 1de815e21..2b21e916c 100644 --- a/app/logical/anonymous_user.rb +++ b/app/logical/anonymous_user.rb @@ -197,7 +197,7 @@ class AnonymousUser "" end - %w(member banned privileged builder platinum contributor janitor moderator admin).each do |name| + %w(member banned gold builder platinum contributor janitor moderator admin).each do |name| define_method("is_#{name}?") do false end diff --git a/app/logical/post_sets/post.rb b/app/logical/post_sets/post.rb index 7d5b89df0..216194cc2 100644 --- a/app/logical/post_sets/post.rb +++ b/app/logical/post_sets/post.rb @@ -30,7 +30,7 @@ module PostSets end def has_deleted? - CurrentUser.is_privileged? && tag_string !~ /status/ && ::Post.tag_match("#{tag_string} status:deleted").exists? + CurrentUser.is_gold? && tag_string !~ /status/ && ::Post.tag_match("#{tag_string} status:deleted").exists? end def has_explicit? diff --git a/app/logical/post_sets/search_error.rb b/app/logical/post_sets/search_error.rb index 8899c1e86..6683b51a2 100644 --- a/app/logical/post_sets/search_error.rb +++ b/app/logical/post_sets/search_error.rb @@ -1,4 +1,4 @@ module PostSets class SearchError < Exception end -end \ No newline at end of file +end diff --git a/app/models/artist.rb b/app/models/artist.rb index 2688709f1..155a2ef90 100644 --- a/app/models/artist.rb +++ b/app/models/artist.rb @@ -11,7 +11,7 @@ class Artist < ActiveRecord::Base has_one :wiki_page, :foreign_key => "title", :primary_key => "name" has_one :tag_alias, :foreign_key => "antecedent_name", :primary_key => "name" accepts_nested_attributes_for :wiki_page - attr_accessible :body, :name, :url_string, :other_names, :other_names_comma, :group_name, :wiki_page_attributes, :notes, :as => [:member, :privileged, :builder, :platinum, :contributor, :janitor, :moderator, :default, :admin] + attr_accessible :body, :name, :url_string, :other_names, :other_names_comma, :group_name, :wiki_page_attributes, :notes, :as => [:member, :gold, :builder, :platinum, :contributor, :janitor, :moderator, :default, :admin] attr_accessible :is_active, :as => [:builder, :contributor, :janitor, :moderator, :default, :admin] attr_accessible :is_banned, :as => :admin @@ -116,8 +116,8 @@ class Artist < ActiveRecord::Base Artist.new.tap do |artist| if params[:name] artist.name = params[:name] - if CurrentUser.user.is_privileged? - # below privileged users are limited to two tags + if CurrentUser.user.is_gold? + # below gold users are limited to two tags post = Post.tag_match("source:http #{artist.name} status:any").first else post = Post.tag_match("source:http #{artist.name}").first diff --git a/app/models/favorite.rb b/app/models/favorite.rb index 4cd0a47a1..6ffd664f9 100644 --- a/app/models/favorite.rb +++ b/app/models/favorite.rb @@ -11,7 +11,7 @@ class Favorite < ActiveRecord::Base return if Favorite.for_user(user.id).exists?(:user_id => user.id, :post_id => post.id) Favorite.create(:user_id => user.id, :post_id => post.id) Post.update_all("fav_count = fav_count + 1", "id = #{post.id}") - Post.update_all("score = score + 1", "id = #{post.id}") if user.is_privileged? + Post.update_all("score = score + 1", "id = #{post.id}") if user.is_gold? post.append_user_to_fav_string(user.id) user.add_favorite!(post) user.increment!(:favorite_count) @@ -22,7 +22,7 @@ class Favorite < ActiveRecord::Base return unless Favorite.for_user(user.id).exists?(:user_id => user.id, :post_id => post.id) Favorite.destroy_all(:user_id => user.id, :post_id => post.id) Post.update_all("fav_count = fav_count - 1", "id = #{post.id}") - Post.update_all("score = score - 1", "id = #{post.id}") if user.is_privileged? + Post.update_all("score = score - 1", "id = #{post.id}") if user.is_gold? post.delete_user_from_fav_string(user.id) user.remove_favorite!(post) user.decrement!(:favorite_count) diff --git a/app/models/forum_post.rb b/app/models/forum_post.rb index d4a255234..5d2b5822d 100644 --- a/app/models/forum_post.rb +++ b/app/models/forum_post.rb @@ -1,5 +1,5 @@ class ForumPost < ActiveRecord::Base - attr_accessible :body, :topic_id, :as => [:member, :builder, :janitor, :privileged, :platinum, :contributor, :admin, :moderator, :default] + attr_accessible :body, :topic_id, :as => [:member, :builder, :janitor, :gold, :platinum, :contributor, :admin, :moderator, :default] attr_accessible :is_locked, :is_sticky, :is_deleted, :as => [:admin, :moderator, :janitor] belongs_to :creator, :class_name => "User" belongs_to :updater, :class_name => "User" diff --git a/app/models/forum_topic.rb b/app/models/forum_topic.rb index c78e0b4e8..f51519d12 100644 --- a/app/models/forum_topic.rb +++ b/app/models/forum_topic.rb @@ -1,5 +1,5 @@ class ForumTopic < ActiveRecord::Base - attr_accessible :title, :original_post_attributes, :as => [:member, :builder, :privileged, :platinum, :contributor, :janitor, :moderator, :admin, :default] + attr_accessible :title, :original_post_attributes, :as => [:member, :builder, :gold, :platinum, :contributor, :janitor, :moderator, :admin, :default] attr_accessible :is_sticky, :is_locked, :is_deleted, :as => [:janitor, :admin, :moderator] belongs_to :creator, :class_name => "User" belongs_to :updater, :class_name => "User" diff --git a/app/models/pool.rb b/app/models/pool.rb index adc4acf9a..7365d272a 100644 --- a/app/models/pool.rb +++ b/app/models/pool.rb @@ -12,7 +12,7 @@ class Pool < ActiveRecord::Base before_validation :initialize_creator, :on => :create after_save :create_version before_destroy :create_mod_action_for_destroy - attr_accessible :name, :description, :post_ids, :post_id_array, :post_count, :is_active, :as => [:member, :privileged, :platinum, :contributor, :janitor, :moderator, :admin, :default] + attr_accessible :name, :description, :post_ids, :post_id_array, :post_count, :is_active, :as => [:member, :gold, :platinum, :contributor, :janitor, :moderator, :admin, :default] attr_accessible :is_deleted, :as => [:janitor, :moderator, :admin] module SearchMethods diff --git a/app/models/post.rb b/app/models/post.rb index acda408a2..377d562e8 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -31,7 +31,7 @@ class Post < ActiveRecord::Base has_many :disapprovals, :class_name => "PostDisapproval", :dependent => :destroy validates_uniqueness_of :md5 validates_presence_of :parent, :if => lambda {|rec| !rec.parent_id.nil?} - attr_accessible :source, :rating, :tag_string, :old_tag_string, :last_noted_at, :parent_id, :as => [:member, :builder, :privileged, :platinum, :contributor, :janitor, :moderator, :admin, :default] + attr_accessible :source, :rating, :tag_string, :old_tag_string, :last_noted_at, :parent_id, :as => [:member, :builder, :gold, :platinum, :contributor, :janitor, :moderator, :admin, :default] attr_accessible :is_rating_locked, :is_note_locked, :as => [:builder, :contributor, :janitor, :moderator, :admin] attr_accessible :is_status_locked, :as => [:admin] diff --git a/app/models/tag_subscription.rb b/app/models/tag_subscription.rb index 5269953c5..cc049ca56 100644 --- a/app/models/tag_subscription.rb +++ b/app/models/tag_subscription.rb @@ -130,7 +130,7 @@ class TagSubscription < ActiveRecord::Base def self.process_all CurrentUser.scoped(User.admins.first, "127.0.0.1") do find_each do |tag_subscription| - if $job_task_daemon_active != false && tag_subscription.creator.is_privileged? && tag_subscription.is_active? + if $job_task_daemon_active != false && tag_subscription.creator.is_gold? && tag_subscription.is_active? begin tag_subscription.process tag_subscription.save diff --git a/app/models/user.rb b/app/models/user.rb index 1e1dd7f4f..95c0452a1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -7,7 +7,7 @@ class User < ActiveRecord::Base module Levels BLOCKED = 10 MEMBER = 20 - PRIVILEGED = 30 + GOLD = 30 PLATINUM = 31 BUILDER = 32 CONTRIBUTOR = 33 @@ -17,7 +17,7 @@ class User < ActiveRecord::Base end attr_accessor :password, :old_password - attr_accessible :enable_privacy_mode, :enable_post_navigation, :new_post_navigation_layout, :password, :old_password, :password_confirmation, :password_hash, :email, :last_logged_in_at, :last_forum_read_at, :has_mail, :receive_email_notifications, :comment_threshold, :always_resize_images, :favorite_tags, :blacklisted_tags, :name, :ip_addr, :time_zone, :default_image_size, :enable_sequential_post_navigation, :per_page, :hide_deleted_posts, :style_usernames, :as => [:moderator, :janitor, :contributor, :privileged, :member, :anonymous, :default, :builder, :admin] + attr_accessible :enable_privacy_mode, :enable_post_navigation, :new_post_navigation_layout, :password, :old_password, :password_confirmation, :password_hash, :email, :last_logged_in_at, :last_forum_read_at, :has_mail, :receive_email_notifications, :comment_threshold, :always_resize_images, :favorite_tags, :blacklisted_tags, :name, :ip_addr, :time_zone, :default_image_size, :enable_sequential_post_navigation, :per_page, :hide_deleted_posts, :style_usernames, :as => [:moderator, :janitor, :contributor, :gold, :member, :anonymous, :default, :builder, :admin] attr_accessible :level, :as => :admin validates_length_of :name, :within => 2..100, :on => :create validates_format_of :name, :with => /\A[^\s:]+\Z/, :on => :create, :message => "cannot have whitespace or colons" @@ -229,7 +229,7 @@ class User < ActiveRecord::Base def level_hash return { "Member" => Levels::MEMBER, - "Gold" => Levels::PRIVILEGED, + "Gold" => Levels::GOLD, "Platinum" => Levels::PLATINUM, "Builder" => Levels::BUILDER, "Contributor" => Levels::CONTRIBUTOR, @@ -255,8 +255,8 @@ class User < ActiveRecord::Base when Levels::MEMBER :member - when Levels::PRIVILEGED - :privileged + when Levels::GOLD + :gold when Levels::BUILDER :builder @@ -286,7 +286,7 @@ class User < ActiveRecord::Base when Levels::BUILDER "Builder" - when Levels::PRIVILEGED + when Levels::GOLD "Gold" when Levels::PLATINUM @@ -321,8 +321,8 @@ class User < ActiveRecord::Base level >= Levels::BUILDER end - def is_privileged? - level >= Levels::PRIVILEGED + def is_gold? + level >= Levels::GOLD end def is_platinum? @@ -356,7 +356,7 @@ class User < ActiveRecord::Base end def set_per_page - if per_page.nil? || !is_privileged? + if per_page.nil? || !is_gold? self.per_page = Danbooru.config.posts_per_page end @@ -398,7 +398,7 @@ class User < ActiveRecord::Base module ForumMethods def has_forum_been_updated? - return false unless is_privileged? + return false unless is_gold? newest_topic = ForumTopic.order("updated_at desc").first return false if newest_topic.nil? return true if last_forum_read_at.nil? @@ -426,7 +426,7 @@ class User < ActiveRecord::Base end def can_comment? - if is_privileged? + if is_gold? true else created_at <= Danbooru.config.member_comment_time_threshold @@ -434,7 +434,7 @@ class User < ActiveRecord::Base end def is_comment_limited? - if is_privileged? + if is_gold? false else Comment.where("creator_id = ? and created_at > ?", id, 1.hour.ago).count >= Danbooru.config.member_comment_limit @@ -470,7 +470,7 @@ class User < ActiveRecord::Base def tag_query_limit if is_platinum? Danbooru.config.base_tag_query_limit * 2 - elsif is_privileged? + elsif is_gold? Danbooru.config.base_tag_query_limit else 2 @@ -480,7 +480,7 @@ class User < ActiveRecord::Base def favorite_limit if is_platinum? nil - elsif is_privileged? + elsif is_gold? 20_000 else 10_000 @@ -490,7 +490,7 @@ class User < ActiveRecord::Base def api_hourly_limit if is_platinum? 20_000 - elsif is_privileged? + elsif is_gold? 10_000 else 3_000 @@ -500,7 +500,7 @@ class User < ActiveRecord::Base def statement_timeout if is_platinum? 9_000 - elsif is_privileged? + elsif is_gold? 6_000 else 3_000 diff --git a/app/models/user_feedback.rb b/app/models/user_feedback.rb index 85438b3b4..796d34a01 100644 --- a/app/models/user_feedback.rb +++ b/app/models/user_feedback.rb @@ -5,7 +5,7 @@ class UserFeedback < ActiveRecord::Base before_validation :initialize_creator, :on => :create attr_accessible :body, :user_id, :category, :user_name validates_presence_of :user, :creator, :body, :category - validate :creator_is_privileged + validate :creator_is_gold validate :user_is_not_creator after_create :create_dmail @@ -73,9 +73,9 @@ class UserFeedback < ActiveRecord::Base Dmail.create_split(:to_id => user_id, :title => "Your user record has been updated", :body => body) end - def creator_is_privileged - if !creator.is_privileged? - errors[:creator] << "must be privileged" + def creator_is_gold + if !creator.is_gold? + errors[:creator] << "must be gold" return false else return true diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb index 6d1d21634..1d671ced9 100644 --- a/app/presenters/post_presenter.rb +++ b/app/presenters/post_presenter.rb @@ -4,7 +4,7 @@ class PostPresenter < Presenter return "" end - if post.is_banned? && !CurrentUser.is_privileged? + if post.is_banned? && !CurrentUser.is_gold? return "" end @@ -113,8 +113,8 @@ class PostPresenter < Presenter end def image_html(template) - return template.content_tag("p", "The artist requested removal of this image") if @post.is_banned? && !CurrentUser.user.is_privileged? - return template.content_tag("p", template.link_to("You need a privileged account to see this image.", template.upgrade_information_users_path)) if !Danbooru.config.can_user_see_post?(CurrentUser.user, @post) + return template.content_tag("p", "The artist requested removal of this image") if @post.is_banned? && !CurrentUser.user.is_gold? + return template.content_tag("p", template.link_to("You need a gold account to see this image.", template.upgrade_information_users_path)) if !Danbooru.config.can_user_see_post?(CurrentUser.user, @post) if @post.is_flash? template.render("posts/partials/show/flash", :post => @post) @@ -127,12 +127,12 @@ class PostPresenter < Presenter def tag_list_html(template, options = {}) @tag_set_presenter ||= TagSetPresenter.new(@post.tag_array) - @tag_set_presenter.tag_list_html(template, options.merge(:show_extra_links => CurrentUser.user.is_privileged?)) + @tag_set_presenter.tag_list_html(template, options.merge(:show_extra_links => CurrentUser.user.is_gold?)) end def split_tag_list_html(template, options = {}) @tag_set_presenter ||= TagSetPresenter.new(@post.tag_array) - @tag_set_presenter.split_tag_list_html(template, options.merge(:show_extra_links => CurrentUser.user.is_privileged?)) + @tag_set_presenter.split_tag_list_html(template, options.merge(:show_extra_links => CurrentUser.user.is_gold?)) end def has_nav_links?(template) diff --git a/app/presenters/tag_set_presenter.rb b/app/presenters/tag_set_presenter.rb index 6d5ca35d5..ee0ba4035 100644 --- a/app/presenters/tag_set_presenter.rb +++ b/app/presenters/tag_set_presenter.rb @@ -108,7 +108,7 @@ private html << %{? } end - if CurrentUser.user.is_privileged? && is_index?(template) && current_query.present? + if CurrentUser.user.is_gold? && is_index?(template) && current_query.present? html << %{+ } html << %{– } end diff --git a/app/views/advertisements/_form.html.erb b/app/views/advertisements/_form.html.erb index 370cacc3c..8b20bddf9 100644 --- a/app/views/advertisements/_form.html.erb +++ b/app/views/advertisements/_form.html.erb @@ -3,4 +3,4 @@ <%= f.input :referral_url, :as => :string %> <%= f.input :status, :collection => %w(active inactive) %> <%= f.button :submit, "Submit" %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/advertisements/_jlist_rss_ads_explicit_long.html.erb b/app/views/advertisements/_jlist_rss_ads_explicit_long.html.erb index 57f74ec85..1d1b6f9b4 100644 --- a/app/views/advertisements/_jlist_rss_ads_explicit_long.html.erb +++ b/app/views/advertisements/_jlist_rss_ads_explicit_long.html.erb @@ -67,4 +67,4 @@ - \ No newline at end of file + diff --git a/app/views/advertisements/_jlist_rss_ads_explicit_short.html.erb b/app/views/advertisements/_jlist_rss_ads_explicit_short.html.erb index 2d7837cdf..36ec8bcb2 100644 --- a/app/views/advertisements/_jlist_rss_ads_explicit_short.html.erb +++ b/app/views/advertisements/_jlist_rss_ads_explicit_short.html.erb @@ -67,4 +67,4 @@ - \ No newline at end of file + diff --git a/app/views/advertisements/_jlist_rss_ads_safe_long.html.erb b/app/views/advertisements/_jlist_rss_ads_safe_long.html.erb index b564d7f10..a7206ebd0 100644 --- a/app/views/advertisements/_jlist_rss_ads_safe_long.html.erb +++ b/app/views/advertisements/_jlist_rss_ads_safe_long.html.erb @@ -60,4 +60,4 @@ - \ No newline at end of file + diff --git a/app/views/advertisements/_jlist_rss_ads_safe_short.html.erb b/app/views/advertisements/_jlist_rss_ads_safe_short.html.erb index 986196889..213bad3b1 100644 --- a/app/views/advertisements/_jlist_rss_ads_safe_short.html.erb +++ b/app/views/advertisements/_jlist_rss_ads_safe_short.html.erb @@ -60,4 +60,4 @@ - \ No newline at end of file + diff --git a/app/views/artists/_form.html.erb b/app/views/artists/_form.html.erb index ef1d9de0e..752b0daed 100644 --- a/app/views/artists/_form.html.erb +++ b/app/views/artists/_form.html.erb @@ -15,4 +15,4 @@ <%= dtext_field "artist", "notes" %> <%= f.button :submit, "Submit" %> <%= dtext_preview_button "artist", "notes" %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/artists/_search.html.erb b/app/views/artists/_search.html.erb index dc47210f8..83dc58b57 100644 --- a/app/views/artists/_search.html.erb +++ b/app/views/artists/_search.html.erb @@ -25,4 +25,4 @@ <% end %> - \ No newline at end of file + diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb index 57cd03d21..b1c6692c8 100644 --- a/app/views/comments/create.js.erb +++ b/app/views/comments/create.js.erb @@ -1 +1 @@ -$("div.comments-for-post[data-post-id=<%= @comment.post_id %>] div.list-of-comments").append("<%= escape_javascript(render('comments/partials/show/comment', :comment => @comment)) %>"); \ No newline at end of file +$("div.comments-for-post[data-post-id=<%= @comment.post_id %>] div.list-of-comments").append("<%= escape_javascript(render('comments/partials/show/comment', :comment => @comment)) %>"); diff --git a/app/views/comments/partials/index/_header.html.erb b/app/views/comments/partials/index/_header.html.erb index 9724e6758..472ec8a02 100644 --- a/app/views/comments/partials/index/_header.html.erb +++ b/app/views/comments/partials/index/_header.html.erb @@ -16,7 +16,7 @@ Score <%= post.score %> - <% if CurrentUser.is_privileged? %> + <% if CurrentUser.is_gold? %> (vote <%= link_to("up", post_votes_path(:score => "up", :post_id => post.id), :remote => true, :method => :post) %>/<%= link_to("down", post_votes_path(:score => "down", :post_id => post.id), :remote => true, :method => :post) %>) <% end %> diff --git a/app/views/dtext/_form.html.erb b/app/views/dtext/_form.html.erb index 672e490ca..7d20a5baa 100644 --- a/app/views/dtext/_form.html.erb +++ b/app/views/dtext/_form.html.erb @@ -13,4 +13,4 @@
All text is formatted using <%= link_to "DText", wiki_pages_path(:title => "help:dtext") %> - \ No newline at end of file + diff --git a/app/views/favorites/_favorited_users_list.html.erb b/app/views/favorites/_favorited_users_list.html.erb index dbbd57ea2..312ca6976 100644 --- a/app/views/favorites/_favorited_users_list.html.erb +++ b/app/views/favorites/_favorited_users_list.html.erb @@ -1 +1 @@ -<%= post.favorited_users.reverse_each.map{|user| link_to_user(user)}.join(", ").html_safe %> \ No newline at end of file +<%= post.favorited_users.reverse_each.map{|user| link_to_user(user)}.join(", ").html_safe %> diff --git a/app/views/favorites/index.html.erb b/app/views/favorites/index.html.erb index f59b7d57e..4814bc178 100644 --- a/app/views/favorites/index.html.erb +++ b/app/views/favorites/index.html.erb @@ -3,7 +3,7 @@