diff --git a/app/assets/stylesheets/common/020_base.css.scss b/app/assets/stylesheets/common/020_base.css.scss index 10f5dab28..a4e4c8927 100644 --- a/app/assets/stylesheets/common/020_base.css.scss +++ b/app/assets/stylesheets/common/020_base.css.scss @@ -19,7 +19,7 @@ abbr[title=required] { blockquote { margin: 0 0 1em 0; - padding: 1em; + padding: 1em 1em 0.2em; border: 1px solid #666; background: #EEE; } diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index d838ab72d..ecc23089a 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -262,8 +262,6 @@ div#c-posts { } #pool-nav, #search-seq-nav, #nav-help { - margin: 0px 0px 0.5em 0px; - li { position: relative; text-align: center; diff --git a/app/models/tag.rb b/app/models/tag.rb index 0a9e6b0aa..71c570c85 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -544,12 +544,18 @@ class Tag < ActiveRecord::Base elsif params[:order] == "date" q = q.reorder("id desc") + elsif params[:order] == "count" + q = q.reorder("post_count desc") + elsif params[:sort] == "date" q = q.reorder("id desc") elsif params[:sort] == "name" q = q.reorder("name") + elsif params[:sort] == "count" + q = q.reorder("post_count desc") + else q = q.reorder("id desc") end diff --git a/app/views/forum_posts/_forum_post.html.erb b/app/views/forum_posts/_forum_post.html.erb index 0ed9f231e..fe0899d74 100644 --- a/app/views/forum_posts/_forum_post.html.erb +++ b/app/views/forum_posts/_forum_post.html.erb @@ -1,5 +1,5 @@ <% if CurrentUser.is_janitor? || !forum_post.is_deleted? %> -
+

<%= link_to_user forum_post.creator %> @@ -37,7 +37,7 @@
  • <%= link_to "Edit", edit_forum_post_path(forum_post.id) %>
  • <% end %> <% end %> -
  • <%= link_to "Parent", forum_topic_path(forum_post.topic, :page => forum_post.forum_topic_page) %>
  • +
  • <%= link_to "Parent", forum_topic_path(forum_post.topic, :page => forum_post.forum_topic_page, :anchor => "forum_post_#{forum_post.id}") %>
  • <%= link_to "Permalink", forum_post_path(forum_post) %>
  • diff --git a/app/views/posts/partials/show/_search_seq.html.erb b/app/views/posts/partials/show/_search_seq.html.erb index 073d1564c..682c02b69 100644 --- a/app/views/posts/partials/show/_search_seq.html.erb +++ b/app/views/posts/partials/show/_search_seq.html.erb @@ -1,9 +1,9 @@
    • - <%= link_to "«prev".html_safe, show_seq_post_path(post, :tags => params[:tags], :seq => "prev"), :rel => "prev", :class => "prev" %> + <%= link_to "‹ prev".html_safe, show_seq_post_path(post, :tags => params[:tags], :seq => "prev"), :rel => "prev", :class => "prev" %> Search: <%= params[:tags] %> - <%= link_to "next»".html_safe, show_seq_post_path(post, :tags => params[:tags], :seq => "next"), :rel => "next", :class => "next" %> + <%= link_to "next ›".html_safe, show_seq_post_path(post, :tags => params[:tags], :seq => "next"), :rel => "next", :class => "next" %>