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

* Created js popup for some of the secondary links in the main navbar

Browse Source 
* aliases/implications must now be approved
* anyone can now submit an alias
This commit is contained in:
albert
2011-10-24 01:01:45 -04:00
parent f94b65f5d5
commit f2f524b87f
11 changed files with 80 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/common.js
View File

@@ -16,6 +16,18 @@ $(document).ready(function() {
$(this).hide();
});
// More link
$("#site-map-link").click(function(e) {
$("#more-links").toggle();
e.preventDefault();
e.stopPropagation();
});
$("#more-links").hide().offset({top: $("#site-map-link").offset().top + $("#site-map-link").height() + 10, left: $("#site-map-link").offset().left});
$(document).click(function(e) {
$("#more-links").hide();
});
// Ajax links
$("a[data-remote=true]").click(function(e) {
Danbooru.ajax_start(e.target);

13
app/assets/stylesheets/common/main_layout.css.scss
View File

@@ -48,3 +48,16 @@ footer#page-footer {
div.clearfix {
clear: both;
}
div#more-links {
z-index: 5000;
position: absolute;
background: white;
border: 1px solid #999;
width: 8em;
line-height: 1.3em;
padding: 0.2em 0.6em;
-moz-box-shadow: 2px 2px 2px #ccc;
-webkit-box-shadow: 2px 2px 2px #ccc;
box-shadow: 2px 2px 2px #ccc;
}

3
app/controllers/tag_implications_controller.rb
View File

@@ -1,6 +1,5 @@
class TagImplicationsController < ApplicationController
before_filter :admin_only, :only => [:approve, :destroy]
before_filter :member_only, :only => [:create]
before_filter :admin_only, :only => [:new, :create, :approve, :destroy]
respond_to :html, :xml, :json, :js
def new

28
app/helpers/application_helper.rb
View File

@@ -82,29 +82,23 @@ protected
when "forum_posts"
/^\/forum_topics/
when "uploads"
/^\/post/
when "post_versions", "explore/posts"
/^\/post/
when "pool_versions"
/^\/pool/
when "comments"
/^\/comments/
when "note_versions"
/^\/note/
when "notes", "note_versions"
/^\/notes/
when "artist_versions"
/^\/artist/
when "moderator/post/dashboards"
when "posts", "uploads", "post_versions", "explore/posts", "moderator/post/dashboards", "favorites", "tag_subscriptions"
/^\/post/
when "moderator/dashboards"
/^\/moderator/
when "wiki_pages", "wiki_page_versions"
/^\/wiki_pages/
when "forum_topics", "forum_posts"
/^\/forum_topics/
else
/^\/#{controller}/
/^\/static/
end
end
end

7
app/models/tag_implication.rb
View File

@@ -24,9 +24,9 @@ class TagImplication < ActiveRecord::Base
until children.empty?
all.concat(children)
children = self.class.where(["antecedent_name IN (?) and status = ?", children, "active"]).all.map(&:consequent_name)
children = self.class.where(["antecedent_name IN (?)", children]).all.map(&:consequent_name)
end
end
end.sort
end
end
@@ -40,7 +40,7 @@ class TagImplication < ActiveRecord::Base
def update_descendant_names!
update_descendant_names
save!
update_column(:descendant_names, descendant_names)
end
def update_descendant_names_for_parent
@@ -77,6 +77,7 @@ class TagImplication < ActiveRecord::Base
def process!
update_column(:status, "processing")
update_descendant_names_for_parent
update_posts
update_column(:status, "active")
rescue Exception => e

12
app/views/layouts/_main_links.html.erb
View File

@@ -7,17 +7,7 @@
<%= nav_link_to("Posts", posts_path) %>
<%= nav_link_to("Comments", comments_path(:group_by => "post")) %>
<%= nav_link_to("Notes", notes_path(:group_by => "post")) %>
<%= nav_link_to("Artists", artists_path(:order => "date")) %>
<%= nav_link_to("Tags", tags_path(:order => "date")) %>
<% if CurrentUser.is_moderator? %>
<%= nav_link_to("Aliases", tag_aliases_path) %>
<%= nav_link_to("Implications", tag_implications_path) %>
<% end %>
<%= nav_link_to("Pools", pools_path) %>
<%= nav_link_to("Wiki", wiki_pages_path(:title => "help:home")) %>
<%= nav_link_to("Forum", forum_topics_path, :class => (CurrentUser.user.has_forum_been_updated? ? "forum-updated" : nil)) %>
<% if CurrentUser.is_janitor? %>
<%= nav_link_to("Dashboard", moderator_dashboard_path) %>
<% end %>
<%= nav_link_to("&raquo;".html_safe, site_map_path) %>
<%= nav_link_to("&raquo;".html_safe, site_map_path, :id => "site-map-link") %>
</menu>

14
app/views/layouts/_more_links.html.erb Normal file
View File

@@ -0,0 +1,14 @@
<div id="more-links">
<ul>
<%= nav_link_to("Artists", artists_path(:order => "date")) %>
<%= nav_link_to("Tags", tags_path(:order => "date")) %>
<% if CurrentUser.is_moderator? %>
<%= nav_link_to("Aliases", tag_aliases_path) %>
<%= nav_link_to("Implications", tag_implications_path) %>
<% end %>
<%= nav_link_to("Pools", pools_path) %>
<% if CurrentUser.is_janitor? %>
<%= nav_link_to("Dashboard", moderator_dashboard_path) %>
<% end %>
</ul>
</div>

2
app/views/layouts/default.html.erb
View File

@@ -30,6 +30,8 @@
<%= render "layouts/main_links" %>
<%= yield :secondary_links %>
</nav>
<%= render "layouts/more_links" %>
</header>
<div id="page">