From ec97b6aaf98bfb9f3832582bcf6fa8f17113a77d Mon Sep 17 00:00:00 2001 From: albert Date: Fri, 20 Apr 2012 18:01:09 -0400 Subject: [PATCH] style tweaks --- app/models/user.rb | 8 ++++++++ app/views/layouts/_main_links.html.erb | 2 +- app/views/posts/partials/show/_options.html.erb | 2 +- app/views/users/_secondary_links.html.erb | 2 +- script/trim.sql | 11 +++++++++++ 5 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 script/trim.sql diff --git a/app/models/user.rb b/app/models/user.rb index a2f5f14b9..7242ec4aa 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -438,5 +438,13 @@ class User < ActiveRecord::Base def can_update?(object, foreign_key = :user_id) is_moderator? || is_admin? || object.__send__(foreign_key) == id end + + def dmail_count + if has_mail? + "(#{dmails.unread.count})" + else + "" + end + end end diff --git a/app/views/layouts/_main_links.html.erb b/app/views/layouts/_main_links.html.erb index 903cf8849..ba1a05ff2 100644 --- a/app/views/layouts/_main_links.html.erb +++ b/app/views/layouts/_main_links.html.erb @@ -2,7 +2,7 @@ <% if CurrentUser.user.is_anonymous? %> <%= nav_link_to("Sign in", new_session_path, :class => "login") %> <% else %> - <%= nav_link_to("My Account", user_path(CurrentUser.user)) %> + <%= nav_link_to("My Account #{CurrentUser.dmail_count}", user_path(CurrentUser.user)) %> <% end %> <%= nav_link_to("Posts", posts_path) %> <%= nav_link_to("Comments", comments_path(:group_by => "post")) %> diff --git a/app/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb index 6a6a06bd6..4216ce392 100644 --- a/app/views/posts/partials/show/_options.html.erb +++ b/app/views/posts/partials/show/_options.html.erb @@ -4,7 +4,7 @@
  • <%= link_to "Unfavorite", favorite_path(post), :remote => true, :method => :delete, :id => "remove-from-favorites" %>
  • <%= link_to "Pool", "#", :id => "pool" %>
  • <%= link_to "Translate", "#", :id => "translate", :title => "Shortcut is CTRL+N" %>
    • -
  • <%= link_to "Find similar", "http://danbooru.iqdb.org/db-search.php?url=#{post.preview_file_url}" %>
    • +
  • <%= link_to "Find similar", "http://danbooru.iqdb.org/db-search.php?url=http://#{Danbooru.config.hostname}#{post.preview_file_url}" %>
    • <% unless post.is_status_locked? %> <% if !post.is_deleted? && !post.is_pending? %> diff --git a/app/views/users/_secondary_links.html.erb b/app/views/users/_secondary_links.html.erb index f3c66565f..cbde7300e 100644 --- a/app/views/users/_secondary_links.html.erb +++ b/app/views/users/_secondary_links.html.erb @@ -10,7 +10,7 @@ <% if @user.id == CurrentUser.id %>
  • <%= link_to "Settings", edit_user_path(CurrentUser.user) %>
  • <%= link_to "Profile", user_path(CurrentUser.user) %>
    • -
  • <%= link_to "Messages (#{CurrentUser.dmails.unread.count})", dmails_path(:search => {:owner_id_eq => CurrentUser.id, :to_id_eq => CurrentUser.id}) %>
    • +
  • <%= link_to "Messages #{CurrentUser.dmail_count}", dmails_path(:search => {:owner_id_eq => CurrentUser.id, :to_id_eq => CurrentUser.id}) %>
    • <% else %>
  • <%= link_to "Send message", new_dmail_path(:dmail => {:to_id => @user.id}) %>
    • <% end %> diff --git a/script/trim.sql b/script/trim.sql new file mode 100644 index 000000000..0a976b20e --- /dev/null +++ b/script/trim.sql @@ -0,0 +1,11 @@ +set statement_timeout = 0; +delete from posts where id < 1000000; +delete from comments where post_id < 1000000; +delete from favorites where post_id < 1000000; +delete from flagged_post_details where post_id < 1000000; +delete from note_versions where post_id < 1000000; +delete from notes where post_id < 1000000; +delete from pools_posts where post_id < 1000000; +delete from post_appeals where post_id < 1000000; +delete from post_tag_histories where post_id < 1000000; +delete from post_votes where post_id < 1000000;