diff --git a/app/assets/stylesheets/specific/pools.css.scss b/app/assets/stylesheets/specific/pools.css.scss index 31f86c358..06857cdd5 100644 --- a/app/assets/stylesheets/specific/pools.css.scss +++ b/app/assets/stylesheets/specific/pools.css.scss @@ -1,5 +1,13 @@ @import "../common/000_vars.css.scss"; +a.pool-category-collection, span.pool-category-collection a { + color: #A0A; + + &:hover { + color: #B6B; + } +} + div#c-pool-elements { div#a-new { font-size: 0.8em; diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb index d3678c13d..140d2e067 100644 --- a/app/presenters/post_presenter.rb +++ b/app/presenters/post_presenter.rb @@ -161,12 +161,17 @@ class PostPresenter < Presenter return if pool.nil? html += pool_link_html(template, pool, :include_rel => true) - @post.pools.active.where("id <> ?", template.params[:pool_id]).each do |other_pool| + other_pools = @post.pools.active.where("id <> ?", template.params[:pool_id]) + other_pools = other_pools.series + other_pools.collection + + other_pools.each do |other_pool| html += pool_link_html(template, other_pool) end else + pools = @post.pools.active + pools = pools.series + pools.collection first = true - @post.pools.active.each do |pool| + pools.each do |pool| if first && template.params[:tags].blank? html += pool_link_html(template, pool, :include_rel => true) first = false @@ -187,11 +192,11 @@ class PostPresenter < Presenter if options[:include_rel] prev_rel = "prev" next_rel = "next" - klass = "active" + klass = "active pool-category-#{pool.category}" else prev_rel = nil next_rel = nil - klass = "" + klass = "pool-category-#{pool.category}" end if pool.neighbors(@post).previous diff --git a/app/views/pools/index.html.erb b/app/views/pools/index.html.erb index 8ff8204b4..36f408802 100644 --- a/app/views/pools/index.html.erb +++ b/app/views/pools/index.html.erb @@ -17,7 +17,7 @@