diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index 550791fe2..674ceb760 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -247,6 +247,13 @@ div#c-posts { margin-right: 7em; } + #favlist { + margin-left: 1.5em; + word-wrap: break-word; + max-height: 200px; + overflow: auto; + } + #pool-nav, #search-seq-nav, #nav-help { li { position: relative; diff --git a/app/logical/d_text.rb b/app/logical/d_text.rb index 9349520db..ba353288c 100644 --- a/app/logical/d_text.rb +++ b/app/logical/d_text.rb @@ -80,6 +80,9 @@ class DText str = str.gsub(/\bpool #(\d+)/i, %{pool #\\1}) str = str.gsub(/\buser #(\d+)/i, %{user #\\1}) str = str.gsub(/\bartist #(\d+)/i, %{artist #\\1}) + str = str.gsub(/\bissue #(\d+)/i, %{issue #\\1}) + str = str.gsub(/\bpixiv #(\d+)(?!\/p\d|\d)/i, %{pixiv #\\1}) + str = str.gsub(/\bpixiv #(\d+)\/p(\d+)/i, %{pixiv #\\1/p\\2}) end def self.parse_list(str, options = {}) diff --git a/app/models/tag.rb b/app/models/tag.rb index 74756e052..a5b3f18c4 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -190,7 +190,7 @@ class Tag < ActiveRecord::Base end when :age - object =~ /(\d+)(s(econds?)?|mi(nutes?)?|h(ours?)?|d(ays?)?|w(eeks?)?|mo(nths?)?|y(ears?)?)/i + object =~ /(\d+)(s(econds?)?|mi(nutes?)?|h(ours?)?|d(ays?)?|w(eeks?)?|mo(nths?)?|y(ears?)?)?/i size = $1.to_i unit = $2 diff --git a/app/views/posts/partials/show/_information.html.erb b/app/views/posts/partials/show/_information.html.erb index 0c15837e4..bcc4f8298 100644 --- a/app/views/posts/partials/show/_information.html.erb +++ b/app/views/posts/partials/show/_information.html.erb @@ -18,7 +18,7 @@ <% if CurrentUser.is_privileged? && post.fav_count > 0 %> <%= link_to "»".html_safe, favorites_path(:post_id => post.id), :remote => true, :id => "show-favlist-link" %> <%= link_to "«".html_safe, "#", :id => "hide-favlist-link" %> -
+
<% end %>
  • Status: