rename references of privileged to gold

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

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])

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"
 

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
 

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],

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

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],

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

app/helpers/post_appeals_helper.rb

@@ -10,4 +10,4 @@ module PostAppealsHelper
     html << '</ul>'
     html.join("\n").html_safe
   end
-end
+end

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

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?

app/logical/post_sets/search_error.rb

@@ -1,4 +1,4 @@
 module PostSets
   class SearchError < Exception
   end
-end
+end

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?
+          if CurrentUser.user.is_gold?
-            # below privileged users are limited to two tags
+            # 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

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)

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"

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"

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

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]
 

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

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
+      when Levels::GOLD
-        :privileged
+        :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?
+    def is_gold?
-      level >= Levels::PRIVILEGED
+      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

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
+  def creator_is_gold
-    if !creator.is_privileged?
+    if !creator.is_gold?
-      errors[:creator] << "must be privileged"
+      errors[:creator] << "must be gold"
       return false
     else
       return true

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", "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 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", 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)

app/presenters/tag_set_presenter.rb

@@ -108,7 +108,7 @@ private
         html << %{<a class="wiki-link" href="/wiki_pages/show_or_new?title=#{u(tag)}">?</a> }
       end
 
-      if CurrentUser.user.is_privileged? && is_index?(template) && current_query.present?
+      if CurrentUser.user.is_gold? && is_index?(template) && current_query.present?
         html << %{<a href="/posts?tags=#{u(current_query)}+#{u(tag)}" class="search-inc-tag">+</a> }
         html << %{<a href="/posts?tags=#{u(current_query)}+-#{u(tag)}" class="search-exl-tag">&ndash;</a> }
       end

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 %>
+<% end %>

app/views/advertisements/_jlist_rss_ads_explicit_long.html.erb

@@ -67,4 +67,4 @@
   </script>
   <!-- End J-List Product Feed -->
 
-</div>
+</div>

app/views/advertisements/_jlist_rss_ads_explicit_short.html.erb

@@ -67,4 +67,4 @@
 </script>
 <!-- End J-List Product Feed -->
 
-</div>
+</div>

app/views/advertisements/_jlist_rss_ads_safe_long.html.erb

@@ -60,4 +60,4 @@
 </script>
 <!-- End J-List Product Feed -->
 
-</div>
+</div>

app/views/advertisements/_jlist_rss_ads_safe_short.html.erb

@@ -60,4 +60,4 @@
 </script>
 <!-- End J-List Product Feed -->
 
-</div>
+</div>

app/views/artists/_form.html.erb

@@ -15,4 +15,4 @@
   <%= dtext_field "artist", "notes" %>
   <%= f.button :submit, "Submit" %>
   <%= dtext_preview_button "artist", "notes" %>
-<% end %>
+<% end %>

app/views/artists/_search.html.erb

@@ -25,4 +25,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

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)) %>");
+$("div.comments-for-post[data-post-id=<%= @comment.post_id %>] div.list-of-comments").append("<%= escape_javascript(render('comments/partials/show/comment', :comment => @comment)) %>");

app/views/comments/partials/index/_header.html.erb

@@ -16,7 +16,7 @@
       <strong>Score</strong>
       <span>
         <span id="score-for-post-<%= post.id %>"><%= post.score %></span>
-        <% 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 %>
       </span>

app/views/dtext/_form.html.erb

@@ -13,4 +13,4 @@
     <div id="<%= preview_id %>" class="dtext-preview prose"></div>
   </div>
    <span class="hint">All text is formatted using <%= link_to "DText", wiki_pages_path(:title => "help:dtext") %></span>
-</div>
+</div>

app/views/favorites/_favorited_users_list.html.erb

@@ -1 +1 @@
-<%= post.favorited_users.reverse_each.map{|user| link_to_user(user)}.join(", ").html_safe %>
+<%= post.favorited_users.reverse_each.map{|user| link_to_user(user)}.join(", ").html_safe %>

app/views/favorites/index.html.erb

@@ -3,7 +3,7 @@
     <aside id="sidebar">
       <%= render "posts/partials/common/search", :path => favorites_path, :tags => @favorite_set.tag_string %>
 
-      <% if CurrentUser.is_privileged? %>
+      <% if CurrentUser.is_gold? %>
         <section id="mode-box">
           <%= render "posts/partials/index/mode_menu" %>
         </section>

app/views/forum_posts/_forum_post.html.erb

@@ -43,4 +43,4 @@
     </div>
     <div class="clearfix"></div>
   </article>
-<% end %>
+<% end %>

app/views/forum_posts/new.js.erb

@@ -7,4 +7,4 @@ $("#topic-response").show();
 $('html, body').animate({
     scrollTop: $("#forum_post_body").offset().top - 100
 }, 500);
-$("#forum_post_body").selectEnd();
+$("#forum_post_body").selectEnd();

app/views/forum_topics/show.html.erb

@@ -47,4 +47,4 @@
       })
     });
   </script>
-<% end %>
+<% end %>

app/views/ip_bans/destroy.js.erb

@@ -1 +1 @@
-location.reload();
+location.reload();

app/views/layouts/_main_links.html.erb

@@ -20,4 +20,4 @@
     <%= nav_link_to("Dashboard", moderator_dashboard_path) %>
   <% end %>
   <%= nav_link_to("More &raquo;".html_safe, site_map_path, :id => "site-map-link") %>
-</menu>
+</menu>

app/views/layouts/_more_links.html.erb

@@ -2,4 +2,4 @@
   <ul>
     <%= nav_link_to("More &raquo;".html_safe, site_map_path) %>
   </ul>
-</div>
+</div>

app/views/layouts/default.html.erb

@@ -40,7 +40,7 @@
       <%= render "users/sign_up_notice" %>
     <% end %>
 
-    <% if !CurrentUser.is_anonymous? && !CurrentUser.is_privileged? && cookies[:hide_upgrade_account_notice].blank? && params[:action] != "upgrade_information" %>
+    <% if !CurrentUser.is_anonymous? && !CurrentUser.is_gold? && cookies[:hide_upgrade_account_notice].blank? && params[:action] != "upgrade_information" %>
       <%= render "users/upgrade_notice" %>
     <% end %>
 
@@ -52,7 +52,7 @@
       <%= render "users/dmail_notice" %>
     <% end %>
 
-    <% if cookies["accepted_tos"].blank? && !CurrentUser.is_privileged? %>
+    <% if cookies["accepted_tos"].blank? && !CurrentUser.is_gold? %>
       <%= render "users/tos" %>
     <% end %>
 

app/views/maintenance/user/login_reminder_mailer/notice.html.erb

@@ -1 +1 @@
-<p>Your username is <%= @user.name %>.</p>
+<p>Your username is <%= @user.name %>.</p>

app/views/moderator/dashboards/_activity_artist.html.erb

@@ -14,4 +14,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

app/views/moderator/dashboards/_activity_comment.html.erb

@@ -18,4 +18,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

app/views/moderator/dashboards/_activity_mod_action.html.erb

@@ -16,4 +16,4 @@
   </tbody>
 </table>
 
-<p><%= link_to "View all actions", mod_actions_path %></p>
+<p><%= link_to "View all actions", mod_actions_path %></p>

app/views/moderator/dashboards/_activity_tag.html.erb

@@ -14,4 +14,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

app/views/moderator/dashboards/_activity_upload.html.erb

@@ -14,4 +14,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

app/views/moderator/dashboards/_activity_user_feedback.html.erb

@@ -16,4 +16,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

app/views/moderator/dashboards/_activity_wiki_page.html.erb

@@ -14,4 +14,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

app/views/moderator/dashboards/_search_activity.html.erb

@@ -10,4 +10,4 @@
   </div>
 
   <%= submit_tag "Search" %>
-<% end %>
+<% end %>

app/views/moderator/post/approvals/create.js.erb

@@ -13,4 +13,4 @@ $("#pending-approval-notice").hide();
 $("#c-moderator-post-queues #post-<%= @post.id %>").hide();
 Danbooru.notice("Post was approved");
 
-<% end %>
+<% end %>

app/views/moderator/post/approvals/create.json.erb

@@ -1 +1 @@
-{"success": <%= @post.errors.empty? %>, "reason": <%= raw @post.errors.full_messages.join("; ").to_json %>}
+{"success": <%= @post.errors.empty? %>, "reason": <%= raw @post.errors.full_messages.join("; ").to_json %>}

app/views/moderator/post/disapprovals/create.js.erb

@@ -12,4 +12,4 @@ $("#pending-approval-notice").hide();
 $("#c-moderator-post-queues #post-<%= @post.id %>").hide();
 Danbooru.notice("Post was hidden");
 
-<% end %>
+<% end %>

app/views/moderator/post/posts/confirm_ban.html.erb

@@ -9,4 +9,4 @@
 
   <%= submit_tag "Ban" %>
   <%= submit_tag "Cancel" %>
-<% end %>
+<% end %>

app/views/moderator/post/posts/confirm_delete.html.erb

@@ -12,4 +12,4 @@
 
   <%= submit_tag "Delete" %>
   <%= submit_tag "Cancel" %>
-<% end %>
+<% end %>

app/views/moderator/post/posts/expunge.js.erb

@@ -1 +1 @@
-Danbooru.notice("Post was permanently deleted");
+Danbooru.notice("Post was permanently deleted");

app/views/moderator/post/posts/undelete.js.erb

@@ -1,3 +1,3 @@
 $("#c-posts #delete").show();
 $("#c-posts #undelete").hide();
-Danbooru.notice("Post was undeleted");
+Danbooru.notice("Post was undeleted");

app/views/notes/_note.html.erb

@@ -1 +1 @@
-<article data-width="<%= note.width %>" data-height="<%= note.height %>" data-x="<%= note.x %>" data-y="<%= note.y %>" data-id="<%= note.id %>"><%= raw DText.sanitize(note.body) %></article>
+<article data-width="<%= note.width %>" data-height="<%= note.height %>" data-x="<%= note.x %>" data-y="<%= note.y %>" data-id="<%= note.id %>"><%= raw DText.sanitize(note.body) %></article>

app/views/pool_elements/new.html.erb

@@ -1 +1 @@
-<%= render "pool_elements/new" %>
+<%= render "pool_elements/new" %>

app/views/pools/_search.html.erb

@@ -42,4 +42,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

app/views/post_appeals/new.html.erb

@@ -1 +1 @@
-<%= render "post_appeals/new" %>
+<%= render "post_appeals/new" %>

app/views/post_flags/new.html.erb

@@ -1 +1 @@
-<%= render "post_flags/new" %>
+<%= render "post_flags/new" %>

app/views/post_sets/_blank.html.erb

@@ -1,3 +1,3 @@
 <p>Nobody here but us chickens!</p>
 
-<p class="paginator"><%= link_to "Go back", :back, :rel => "prev" %></p>
+<p class="paginator"><%= link_to "Go back", :back, :rel => "prev" %></p>

app/views/posts/partials/index/_edit.html.erb

@@ -6,4 +6,4 @@
     <%= submit_tag "Submit" %>
     <%= submit_tag "Cancel" %>
   <% end %>
-</div>
+</div>

app/views/posts/partials/index/_mode_menu.html.erb

@@ -1,4 +1,4 @@
-<% if CurrentUser.is_privileged? %>
+<% if CurrentUser.is_gold? %>
   <section id="mode-box">
     <h1>Mode</h1>
     <form action="/">

app/views/posts/partials/show/_information.html.erb

@@ -13,9 +13,9 @@
   </li>
   <li>Source: <%= post_source_tag(post) %></li>
   <li>Rating: <%= post.pretty_rating %></li>
-  <li>Score: <span id="score-for-post-<%= post.id %>"><%= post.score %></span> <% if CurrentUser.is_privileged? %>(vote <%= link_to "up", post_votes_path(:post_id => post.id, :score => "up"), :remote => true, :method => :post %>/<%= link_to "down", post_votes_path(:post_id => post.id, :score => "down"), :remote => true, :method => :post %>)<% end %></li>
+  <li>Score: <span id="score-for-post-<%= post.id %>"><%= post.score %></span> <% if CurrentUser.is_gold? %>(vote <%= link_to "up", post_votes_path(:post_id => post.id, :score => "up"), :remote => true, :method => :post %>/<%= link_to "down", post_votes_path(:post_id => post.id, :score => "down"), :remote => true, :method => :post %>)<% end %></li>
   <li>Favorites: <span id="favcount-for-post-<%= post.id %>"><%= post.fav_count %></span>
-  <% if CurrentUser.is_privileged? && post.fav_count > 0 %>
+  <% if CurrentUser.is_gold? && post.fav_count > 0 %>
     <%= link_to "&raquo;".html_safe, favorites_path(:post_id => post.id), :remote => true, :id => "show-favlist-link" %>
     <%= link_to "&laquo;".html_safe, "#", :id => "hide-favlist-link" %>
     <div id="favlist"></div>
@@ -42,4 +42,4 @@
       Active
     <% end %>
   </li>
-</ul>
+</ul>

app/views/posts/partials/show/_options.html.erb

@@ -46,4 +46,4 @@
       <% end %>
     <% end %>
   <% end %>
-</ul>
+</ul>

app/views/posts/revert.js.erb

@@ -1 +1 @@
-location.reload();
+location.reload();

app/views/report_mailer/moderator_report.html.erb

@@ -32,4 +32,4 @@
 </table>
 </div>
 </body>
-</html>
+</html>

app/views/sessions/new.html.erb

@@ -30,4 +30,4 @@
  Sign in - <%= Danbooru.config.app_name %>
 <% end %>
 
-<%= render "secondary_links" %>
+<%= render "secondary_links" %>

app/views/static/error.html.erb

@@ -2,4 +2,4 @@
   <p><%= @error_message %></p>
 <% else %>
   <p>Error: <%= @exception.to_s %></p>
-<% end %>
+<% end %>

app/views/static/error.xml.erb

@@ -3,4 +3,4 @@
 <result success="false"><%= @error_message %></result>
 <% else %>
 <result success="false"><%= @exception.to_s %></result>
-<% end %>
+<% end %>

app/views/tag_alias_corrections/show.html.erb

@@ -21,4 +21,4 @@
   <%= submit_tag "Cancel" %>
 <% end %>
 
-<%= render "tag_aliases/secondary_links" %>
+<%= render "tag_aliases/secondary_links" %>

app/views/tag_aliases/approve.js.erb

@@ -1 +1 @@
-$("#tag-alias-status-for-<%= @tag_alias.id %>").html("queued");
+$("#tag-alias-status-for-<%= @tag_alias.id %>").html("queued");

app/views/tag_implications/approve.js.erb

@@ -1 +1 @@
-$("#tag-implication-status-for-<%= @tag_implication.id %>").html("queued");
+$("#tag-implication-status-for-<%= @tag_implication.id %>").html("queued");

app/views/tags/_search.html.erb

@@ -43,4 +43,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

app/views/user_feedbacks/_secondary_links.html.erb

@@ -1,6 +1,6 @@
 <% content_for(:secondary_links) do %>
   <menu>
-    <% if CurrentUser.is_privileged? %>
+    <% if CurrentUser.is_gold? %>
       <% if @user_feedback %>
         <li><%= link_to "New", new_user_feedback_path(:user_feedback => {:user_id => @user_feedback.user_id}) %></li>
       <% elsif params[:search] && params[:search][:user_id] %>

app/views/user_mailer/dmail_notice.html.erb

@@ -9,4 +9,4 @@
 
 <p><%= link_to "View message", dmail_path(@dmail, :host => Danbooru.config.hostname, :only_path => false) %></p>
 </body>
-</html>
+</html>

app/views/user_mailer/upgrade.html.erb

@@ -3,4 +3,4 @@
 <body>
 <p>You can upgrade your account by sending $20 USD via Paypal to <%= mail_to Danbooru.config.upgrade_account_email %>. Be sure to include your username.</p>
 </body>
-</html>
+</html>

app/views/user_mailer/upgrade_fail.html.erb

@@ -3,4 +3,4 @@
 <body>
 <p>Account upgrades are currently disabled.</p>
 </body>
-</html>
+</html>

app/views/user_name_change_requests/index.html.erb

@@ -21,4 +21,4 @@
   </table>
   
   <%= numbered_paginator(@change_requests) %>
-</div>
+</div>

app/views/user_name_change_requests/new.html.erb

@@ -18,4 +18,4 @@
   <div class="input">
     <%= submit_tag "Submit" %>
   </div>
-<% end %>
+<% end %>

app/views/users/_secondary_links.html.erb

@@ -12,7 +12,7 @@
       <li>|</li>
       <% if @user.id == CurrentUser.id %>
         <li><%= link_to "Settings", edit_user_path(CurrentUser.user) %></li>
-        <% if @user.is_privileged? %>
+        <% if @user.is_gold? %>
           <li><%= link_to "Edit subscriptions", tag_subscriptions_path %></li>
         <% end %>
         <li><%= link_to "Profile", user_path(CurrentUser.user) %></li>
@@ -21,7 +21,7 @@
         <li><%= link_to "Send message", new_dmail_path(:dmail => {:to_id => @user.id}) %></li>
       <% end %>
 
-      <% if !CurrentUser.is_privileged? %>
+      <% if !CurrentUser.is_gold? %>
         <li><%= link_to "Upgrade", upgrade_information_users_path %></li>
       <% end %>
 

app/views/users/_statistics.html.erb

@@ -124,4 +124,4 @@
         </tr>
       <% end %>
   </table>
-</div>
+</div>

app/views/users/edit.html.erb

@@ -9,7 +9,7 @@
         <div class="input">
           <label>Name</label>
           
-          <% if CurrentUser.user.is_privileged? %>
+          <% if CurrentUser.user.is_gold? %>
             <p><%= link_to "Request a name change", new_user_name_change_request_path %></p>
           <% else %>
             <p>You must <%= link_to "upgrade your account", upgrade_information_users_path %> to request a name change</p>
@@ -21,7 +21,7 @@
         <%= f.input :comment_threshold, :hint => "Comments below this score will be hidden by default" %>
         <%= f.input :default_image_size, :hint => "Show original image or show resampled #{Danbooru.config.large_image_width} pixel version", :label => "Default image width", :collection => [["850px", "large"], ["original", "original"]], :include_blank => false %>
         
-        <% if CurrentUser.user.is_privileged? %>
+        <% if CurrentUser.user.is_gold? %>
           <%= f.input :per_page, :label => "Posts per page", :as => :select, :collection => (1..100), :include_blank => false %>
         <% end %>
         

app/views/wiki_page_versions/diff.html.erb

@@ -10,4 +10,4 @@
   </div>
 </div>
 
-<%= render "wiki_pages/secondary_links" %>
+<%= render "wiki_pages/secondary_links" %>

config/danbooru_default_config.rb

@@ -46,8 +46,8 @@ module Danbooru
       true
     end
 
-    # Set to true to give all new users privileged access.
+    # Set to true to give all new users gold access.
-    def start_as_privileged?
+    def start_as_gold?
       false
     end
 
@@ -109,7 +109,7 @@ module Danbooru
 
     # Determines who can see ads.
     def can_see_ads?(user)
-      !user.is_privileged?
+      !user.is_gold?
     end
 
     # Users cannot search for more than X regular tags at a time.
@@ -231,7 +231,7 @@ module Danbooru
     end
 
     def is_user_restricted?(user)
-      !user.is_privileged?
+      !user.is_gold?
     end
 
     def is_user_advertiser?(user)

config/deploy/production.rb

@@ -1,2 +1,2 @@
 server "sonohara.donmai.us", :web, :app, :db, :primary => true
-server "hijiribe.donmai.us", :web, :app
+server "hijiribe.donmai.us", :web, :app

config/initializers/unicorn.rb

@@ -4,4 +4,4 @@
 if defined? Unicorn
   ::NewRelic::Agent.manual_start()
   ::NewRelic::Agent.after_fork(:force_reconnect => true)
-end
+end

config/unicorn/production.rb

@@ -39,4 +39,4 @@ pid "#{app_path}/tmp/pids/unicorn.pid"
 
 # after_fork do |server, worker|
 #   ActiveRecord::Base.establish_connection
-# end
+# end

public/503.html

@@ -18,7 +18,7 @@
 </head>
 <body>
 	<div style="text-align: center; margin-top: 5em;">
-		<p style="width: 40em; margin: auto;">The server is currently overloaded. You can purchase a <a href="/503-redirect.html">privileged account</a> for $20 to view this page anyway.</p>
+		<p style="width: 40em; margin: auto;">The server is currently overloaded. You can purchase a <a href="/503-redirect.html">gold account</a> for $20 to view this page anyway.</p>
 		<p style="width: 40em; margin: auto;"> This page will automatically refresh in one minute.</p>
 	</div>
 </body>

script/fixes/009.rb

@@ -16,4 +16,4 @@ Note.find_each do |note|
   note.update_column(:version, i)
 end
 
-UserFeedback.delete_all("creator_id = user_id")
+UserFeedback.delete_all("creator_id = user_id")

test/factories/artist_url.rb

@@ -3,4 +3,4 @@ FactoryGirl.define do
     artist
     url {Faker::Internet.domain_name}
   end
-end
+end

test/factories/ban.rb

@@ -3,4 +3,4 @@ FactoryGirl.define do
     reason {Faker::Lorem.words.join(" ")}
     duration 60
   end
-end
+end

test/factories/comment.rb

@@ -3,4 +3,4 @@ FactoryGirl.define do
     post
     body {Faker::Lorem.sentences.join(" ")}
   end
-end
+end

test/factories/comment_vote.rb

@@ -2,4 +2,4 @@ FactoryGirl.define do
   factory(:comment_vote) do
     score 1
   end
-end
+end

test/factories/forum_post.rb

@@ -2,4 +2,4 @@ FactoryGirl.define do
   factory(:forum_post) do
     body {Faker::Lorem.sentences.join(" ")}
   end
-end
+end

test/factories/forum_topic.rb

@@ -4,4 +4,4 @@ FactoryGirl.define do
     is_sticky false
     is_locked false
   end
-end
+end

test/factories/ip_ban.rb

@@ -4,4 +4,4 @@ FactoryGirl.define do
     reason {Faker::Lorem.words.join(" ")}
     ip_addr "127.0.0.1"
   end
-end
+end