From 41f7e2a80409ab821e642ac4128e36384b726238 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Fri, 8 Mar 2013 13:25:31 -0500
Subject: [PATCH] move nav link help

---
 app/assets/stylesheets/specific/posts.css.scss    | 6 ------
 app/presenters/post_presenter.rb                  | 2 +-
 app/views/posts/partials/show/_nav_links.html.erb | 2 --
 app/views/static/_footer.html.erb                 | 6 +++++-
 app/views/static/keyboard_shortcuts.html.erb      | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss
index 2d06c6ae5..f0bbce445 100644
--- a/app/assets/stylesheets/specific/posts.css.scss
+++ b/app/assets/stylesheets/specific/posts.css.scss
@@ -234,12 +234,6 @@ div#c-posts {
     #nav-links {
       margin: 1em 0;
       padding: 1em 0.5em;
-      
-      #keyboard-shortcuts-link {
-        margin-top: 1em;
-        font-size: 80%;
-        font-style: italic;
-      }
     }
     
     #pool-nav, #search-seq-nav, #nav-help {
diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb
index b276fcd00..932a0fecf 100644
--- a/app/presenters/post_presenter.rb
+++ b/app/presenters/post_presenter.rb
@@ -86,7 +86,7 @@ class PostPresenter < Presenter
   end
   
   def has_nav_links?(template)
-    template.params[:tags].present? || @post.pools.active.any?
+    (template.params[:tags].present? && template.params[:tags] !~ /order:/) || @post.pools.active.any?
   end
   
   def post_footer_for_pool_html(template)
diff --git a/app/views/posts/partials/show/_nav_links.html.erb b/app/views/posts/partials/show/_nav_links.html.erb
index 055a8604d..d2e324de3 100644
--- a/app/views/posts/partials/show/_nav_links.html.erb
+++ b/app/views/posts/partials/show/_nav_links.html.erb
@@ -7,7 +7,5 @@
     <% if post.pools.active.any? %>
       <%= render "posts/partials/show/pools", :post => post %>
     <% end %>
-    
-    <p id="keyboard-shortcuts-link"><%= link_to "Keyboard shortcuts available", keyboard_shortcuts_path %></p>
   </div>
 <% end %>
diff --git a/app/views/static/_footer.html.erb b/app/views/static/_footer.html.erb
index d87116039..dee6fc2b7 100644
--- a/app/views/static/_footer.html.erb
+++ b/app/views/static/_footer.html.erb
@@ -1,3 +1,7 @@
 <footer id="page-footer">
-  Running Danbooru v<%= Danbooru.config.version %> &mdash; <%= link_to "Contact", contact_path %>
+  Running Danbooru v<%= Danbooru.config.version %> 
+  &ndash; <%= link_to "Contact", contact_path %>
+  <% if CurrentUser.user.enable_post_navigation %>
+    &ndash; <%= link_to "Keyboard shortcuts available", keyboard_shortcuts_path %>
+  <% end %>
 </footer>
diff --git a/app/views/static/keyboard_shortcuts.html.erb b/app/views/static/keyboard_shortcuts.html.erb
index b3200bf4c..6523c0438 100644
--- a/app/views/static/keyboard_shortcuts.html.erb
+++ b/app/views/static/keyboard_shortcuts.html.erb
@@ -3,7 +3,7 @@
     <h1>Keyboard Shortcuts</h1>
     
     <section>
-      <h1>Post Listing</h1>
+      <h1>Listing</h1>
       <ul>
         <li><span class="key">&larr;</span> Previous page</li>
         <li><span class="key">&rarr;</span> Next page</li>