jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add new options for moving nav links

Browse Source
This commit is contained in:
albert
2013-03-07 18:31:20 -05:00
parent f8619e689e
commit d907dfedbb
13 changed files with 70 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/views/posts/partials/show/_nav_links.html.erb Normal file
View File

@@ -0,0 +1,13 @@
<% if (position == "bottom" && CurrentUser.user.new_post_navigation_layout) || (position == "top" && !CurrentUser.user.new_post_navigation_layout) %>
<div id="nav-links" class="ui-corner-all nav-notice">
<% if params[:tags].present? && CurrentUser.user.enable_post_navigation && params[:tags] !~ /order:/ %>
<%= render "posts/partials/show/search_seq", :post => post %>
<% end %>
<% 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 %>

2
app/views/posts/partials/show/_pools.html.erb
View File

@@ -1,3 +1,3 @@
<div id="pool-nav" class="ui-corner-all nav-notice">
<div id="pool-nav">
<%= @post.presenter.pool_html(self) %>
</div>

4
app/views/posts/partials/show/_search_seq.html.erb
View File

@@ -1,4 +1,4 @@
<div id="search-seq-nav" class="ui-corner-all nav-notice">
<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" %>
@@ -6,6 +6,4 @@
<%= link_to "next&raquo;".html_safe, show_seq_post_path(post, :tags => params[:tags], :seq => "next"), :rel => "next", :class => "next" %>
</li>
</ul>
<span class="close-button ui-icon ui-icon-closethick" id="close-search-seq-nav"></span>
</div>

16
app/views/posts/show.html.erb
View File

@@ -30,6 +30,10 @@
</aside>
<section id="content">
<% if @post.presenter.has_nav_links?(self) %>
<%= render "posts/partials/show/nav_links", :post => @post, :position => "top" %>
<% end %>
<%= render "posts/partials/show/notices", :post => @post %>
<%= render_advertisement("horizontal") %>
@@ -39,16 +43,8 @@
<%= @post.presenter.image_html(self) %>
</section>
<% if params[:tags] || @post.pools.active.any? %>
<%= render "posts/partials/show/nav_help" %>
<% end %>
<% if params[:tags] %>
<%= render "posts/partials/show/search_seq", :post => @post %>
<% end %>
<% if @post.pools.active.any? %>
<%= render "posts/partials/show/pools", :post => @post %>
<% if @post.presenter.has_nav_links?(self) %>
<%= render "posts/partials/show/nav_links", :post => @post, :position => "bottom" %>
<% end %>
<menu id="post-sections">

3
app/views/static/keyboard_shortcuts.html.erb
View File

@@ -17,6 +17,9 @@
<li><span class="key">n</span> New note</li>
<li><span class="key">e</span> Edit tags</li>
<li><span class="key">/</span> Search</li>
<li><span class="key">space</span> Scroll down/next post</li>
<li><span class="key">&larr;</span> Previous post</li>
<li><span class="key">&rarr;</span> Next post</li>
</ul>
</section>
</div>

12
app/views/users/edit.html.erb
View File

@@ -4,16 +4,14 @@
<%= simple_form_for @user do |f| %>
<fieldset>
<% if @user.feedback.negative.count == 0 %>
<%#= f.input :name, :as => :string %>
<% end %>
<%= f.input :email, :required => Danbooru.config.enable_email_verification?, :hint => "Used for messages and for password resets", :as => :email %>
<%= f.input :time_zone %>
<%= f.input :receive_email_notifications %>
<%= f.input :time_zone, :include_blank => false %>
<%= f.input :receive_email_notifications, :as => :select, :include_blank => false %>
<%= f.input :comment_threshold, :hint => "Comments below this score will be hidden by default" %>
<%= f.input :always_resize_images %>
<%= f.input :always_resize_images, :as => :select, :include_blank => false %>
<%= f.input :default_image_size, :hint => "Large is #{Danbooru.config.large_image_width} pixels wide, and original is whatever the original image is", :collection => %w(large original), :include_blank => false %>
<%= f.input :enable_post_navigation, :as => :select, :include_blank => false, :hint => "When searching, do you want to navigate from post to post?" %>
<%= f.input :new_post_navigation_layout, :as => :select, :label => "Pool links", :include_blank => false, :collection => [["Bottom", "true"], ["Top", "false"]], :hint => "When browsing pools, where do you want the navigation links to be placed?" %>
<%= f.input :favorite_tags, :hint => "A list of whitespace delimited tags that show up in your profile", :input_html => {:size => "40x5"} %>
<%= f.input :blacklisted_tags, :hint => "A list of newline delimited tags that you never want to see", :input_html => {:size => "40x5"} %>
</fieldset>