From f396e04402fcd5b12fa56edc7f03edf91f1fdf35 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Tue, 7 May 2013 16:01:45 -0400
Subject: [PATCH 1/5] tweak nav links

---
 app/assets/stylesheets/specific/posts.css.scss     | 2 --
 app/views/posts/partials/show/_search_seq.html.erb | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

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/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 @@
 <div id="search-seq-nav">
   <ul>
     <li class="active">
-      <%= link_to "&laquo;prev".html_safe, show_seq_post_path(post, :tags => params[:tags], :seq => "prev"), :rel => "prev", :class => "prev" %>
+      <%= link_to "&lsaquo;&thinsp;prev".html_safe, show_seq_post_path(post, :tags => params[:tags], :seq => "prev"), :rel => "prev", :class => "prev" %>
       <span class="search-name">Search: <%= params[:tags] %></span>
-      <%= link_to "next&raquo;".html_safe, show_seq_post_path(post, :tags => params[:tags], :seq => "next"), :rel => "next", :class => "next" %>
+      <%= link_to "next&thinsp;&rsaquo;".html_safe, show_seq_post_path(post, :tags => params[:tags], :seq => "next"), :rel => "next", :class => "next" %>
     </li>
   </ul>
 </div>

From adafce0843c9482435df4b2774be7bc5c611b0e2 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Tue, 7 May 2013 16:06:38 -0400
Subject: [PATCH 2/5] fixes #1564

---
 app/views/forum_posts/_forum_post.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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? %>
-  <article data-forum-post-id="<%= forum_post.id %>">
+  <article id="forum_post_<%= forum_post.id %>" data-forum-post-id="<%= forum_post.id %>">
     <div class="author">
       <h4>
         <%= link_to_user forum_post.creator %>
@@ -37,7 +37,7 @@
             <li><%= link_to "Edit", edit_forum_post_path(forum_post.id) %></li>
           <% end %>
         <% end %>
-        <li><%= link_to "Parent", forum_topic_path(forum_post.topic, :page => forum_post.forum_topic_page) %></li>
+        <li><%= link_to "Parent", forum_topic_path(forum_post.topic, :page => forum_post.forum_topic_page, :anchor => "forum_post_#{forum_post.id}") %></li>
         <li><%= link_to "Permalink", forum_post_path(forum_post) %></li>
       </menu>
     </div>

From f165919512c79cff30c8646bc79715d1fa28f5f2 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Tue, 7 May 2013 17:23:11 -0400
Subject: [PATCH 3/5] fixes #1559

---
 app/models/user_feedback.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/user_feedback.rb b/app/models/user_feedback.rb
index 796d34a01..927463058 100644
--- a/app/models/user_feedback.rb
+++ b/app/models/user_feedback.rb
@@ -5,6 +5,7 @@ class UserFeedback < ActiveRecord::Base
   before_validation :initialize_creator, :on => :create
   attr_accessible :body, :user_id, :category, :user_name
   validates_presence_of :user, :creator, :body, :category
+  validates_inclusion_of :category, :in => %w(positive neutral negative)
   validate :creator_is_gold
   validate :user_is_not_creator
   after_create :create_dmail

From 9925f64fc053116bf977f0b2af722dc23eac4db5 Mon Sep 17 00:00:00 2001
From: kittey <m.github@sister-shadow.de>
Date: Wed, 8 May 2013 01:09:08 +0300
Subject: [PATCH 4/5] Fixes #1575

---
 app/assets/stylesheets/common/020_base.css.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 }

From b85c67f984f9c28bdd2d6a91bb23b5435139693f Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Tue, 7 May 2013 18:23:12 -0400
Subject: [PATCH 5/5] fixes #1577

---
 app/models/tag.rb | 6 ++++++
 1 file changed, 6 insertions(+)

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