Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
- index 2de4142..0e0355f 100644
- --- a/app/controllers/posts_controller.rb
- +++ b/app/controllers/posts_controller.rb
- @@ -13,6 +13,7 @@ class PostsController < BaseCommunityController
- before_filter :login_required, :only => [:comment, :preview_comment, :preview, :post_comment]
- before_filter :set_show_avatars, :only => [:comment, :preview_comment, :show]
- + before_filter :set_show_signatures, :only => [:comment, :preview_comment, :show]
- before_filter :ensure_can_create_comments, :only => [:comment, :preview_comment, :post_comment]
- before_filter :ensure_can_create_forum_comments, :only => [:comment, :preview_comment, :post_comment]
- before_filter :setup_comments_local_request_cache, :only => [:show, :preview_comment, :comment, :ajax_comments_update]
- @@ -408,6 +409,10 @@ class PostsController < BaseCommunityController
- @show_avatars = logged_in? ? current_user.settings.display_avatars : true
- end
- + def set_show_signatures
- + @show_signatures = logged_in? ? current_user.settings.display_signatures : true
- + end
- +
- def render_portal_feature_rjs
- render :update do |page|
- page << "Control.Modal.close();"
- diff --git a/app/controllers/verge/hub_posts_controller.rb b/app/controllers/verge/hub_posts_controller.rb
- index e754859..43259ae 100644
- --- a/app/controllers/verge/hub_posts_controller.rb
- +++ b/app/controllers/verge/hub_posts_controller.rb
- @@ -15,6 +15,7 @@ class Verge::HubPostsController < HubPostsController
- def figure_out_action
- @show_avatars = logged_in?
- + @show_signatures = logged_in?
- @show_comment_children = true
- @ajax_load_comments = true
- @auto_update_comments = false
- diff --git a/app/mixins/controllers/shared/comments.rb b/app/mixins/controllers/shared/comments.rb
- index 5e04768..d0d81cf 100644
- --- a/app/mixins/controllers/shared/comments.rb
- +++ b/app/mixins/controllers/shared/comments.rb
- @@ -172,6 +172,7 @@ module Mixins::Controllers::Shared::Comments
- unless @last_version == @commentable.version.to_s
- # we disabled these filters, so call them here
- + set_show_signatures
- set_show_avatars
- ensure_community
- diff --git a/app/views/layouts/base_community.html.erb b/app/views/layouts/base_community.html.erb
- index 12f5941..c911f89 100644
- --- a/app/views/layouts/base_community.html.erb
- +++ b/app/views/layouts/base_community.html.erb
- @@ -97,6 +97,7 @@
- </div>
- <div id="main" class="main clearfix">
- + <% debugger %>
- <%= render_sponsored_post_component(@sponsored_post_component,:pushdown) %>
- <% if @front_page %>
- <div id="col-side-2" class="col col-side col-side2">
- diff --git a/app/views/shared/comments/sbn/_comment.html.erb b/app/views/shared/comments/sbn/_comment.html.erb
- index 502f762..e396cd5 100644
- --- a/app/views/shared/comments/sbn/_comment.html.erb
- +++ b/app/views/shared/comments/sbn/_comment.html.erb
- @@ -13,8 +13,10 @@
- </h5>
- <div id="<%= comment_css_id(comment, 'body')%>" class="cbody"<%= " style=\"display:none\"" unless @expanded_comments %>>
- <%= comment.body %>
- - <% unless comment.signature.blank? %>
- - <div class="sig"><%= comment.signature %></div>
- + <% if @show_signatures %>
- + <% unless comment.signature.blank? %>
- + <div class="sig"><%= comment.signature %></div>
- + <% end %>
- <% end %>
- </div>
- <p class="by">
- diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb
- index f6ac0f5..14a0a86 100644
- --- a/app/views/users/account.html.erb
- +++ b/app/views/users/account.html.erb
- @@ -114,6 +114,12 @@
- </p>
- <% end %>
- + <% user_account_setting(:display_signatures) do %>
- + <p><label>Display member signatures?</label>
- + <%= settings.select("display_signatures", [["yes", true,], ["no", false]])%>
- + </p>
- + <% end %>
- +
- <% user_account_setting(:on_mailing_list) do %>
- <p><label>Email Newsletter</label>
- <span class="taller"><%= f.check_box "on_mailing_list" %> <span style="font-size: 10px"> Check this box to receive updates from SB Nation</span></span></p>
- diff --git a/db/schema.rb b/db/schema.rb
- index cf6e6ed..4e2d2fe 100644
- --- a/db/schema.rb
- +++ b/db/schema.rb
- @@ -1,4 +1,4 @@
- -# This file is auto-generated from the current state of the database. Instead of editing this file,
- +# This file is auto-generated from the current state of the database. Instead of editing this file,
- # please use the migrations feature of Active Record to incrementally modify your database, and
- # then regenerate this schema definition.
- #
- @@ -9,7 +9,7 @@
- #
- # It's strongly recommended to check this file into your version control system.
- -ActiveRecord::Schema.define(:version => 20120604190959) do
- +ActiveRecord::Schema.define(:version => 20120614174813) do
- create_table "absolut_microsite_settings", :force => true do |t|
- t.integer "community_id", :null => false
- @@ -1755,7 +1755,7 @@ ActiveRecord::Schema.define(:version => 20120604190959) do
- t.integer "community_id"
- t.string "admin_title"
- t.integer "network_id"
- - t.integer "page_layout_id", :null => false
- + t.integer "page_layout_id", :null => false
- end
- add_index "pls_pages", ["community_id"], :name => "index_pls_pages_on_community_id"
- @@ -1973,6 +1973,7 @@ ActiveRecord::Schema.define(:version => 20120604190959) do
- t.integer "editor_type", :default => 0
- t.boolean "display_avatars", :default => true
- t.boolean "wide_layout", :default => false, :null => false
- + t.boolean "display_signatures", :default => true
- end
- create_table "solr_sync_records", :force => true do |t|
- @@ -2324,14 +2325,14 @@ ActiveRecord::Schema.define(:version => 20120604190959) do
- add_index "verge_product_review_data", ["product_id"], :name => "index_verge_product_review_data_on_product_id"
- create_table "video_post_data", :force => true do |t|
- - t.integer "entry_id", :null => false
- + t.integer "entry_id", :null => false
- t.string "vidio_token"
- t.string "vidio_id"
- t.string "vidio_tags"
- t.string "mp4_link"
- t.string "ooyala_id"
- t.boolean "syndicate_to_youtube", :default => false
- - t.text "provided_embed_code"
- + t.text "provided_embed_code"
- end
- add_index "video_post_data", ["entry_id"], :name => "index_verge_video_post_data_on_entry_id"
- @@ -2449,5 +2450,3 @@ ActiveRecord::Schema.define(:version => 20120604190959) do
- add_index "yahoo_fantasy_teams", ["yahoo_fantasy_profile_id"], :name => "index_yahoo_fantasy_teams_on_yahoo_fantasy_profile_id"
- end
- -
- -
Add Comment
Please, Sign In to add comment