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

fix conflicts

Browse Source
This commit is contained in:
r888888888
2013-05-07 15:33:52 -07:00
parent c944d5315a 3ac080aae7
commit 4237215dad
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/common/020_base.css.scss
View File

@@ -19,7 +19,7 @@ abbr[title=required] {
blockquote { blockquote {
margin: 0 0 1em 0; margin: 0 0 1em 0;
padding: 1em; padding: 1em 1em 0.2em;
border: 1px solid #666; border: 1px solid #666;
background: #EEE; background: #EEE;
} }

2
app/assets/stylesheets/specific/posts.css.scss
View File

@@ -262,8 +262,6 @@ div#c-posts {
} }
#pool-nav, #search-seq-nav, #nav-help { #pool-nav, #search-seq-nav, #nav-help {
margin: 0px 0px 0.5em 0px;
li { li {
position: relative; position: relative;
text-align: center; text-align: center;

6
app/models/tag.rb
View File

@@ -544,12 +544,18 @@ class Tag < ActiveRecord::Base
elsif params[:order] == "date" elsif params[:order] == "date"
q = q.reorder("id desc") q = q.reorder("id desc")
elsif params[:order] == "count"
q = q.reorder("post_count desc")
elsif params[:sort] == "date" elsif params[:sort] == "date"
q = q.reorder("id desc") q = q.reorder("id desc")
elsif params[:sort] == "name" elsif params[:sort] == "name"
q = q.reorder("name") q = q.reorder("name")
elsif params[:sort] == "count"
q = q.reorder("post_count desc")
else else
q = q.reorder("id desc") q = q.reorder("id desc")
end end

4
app/views/forum_posts/_forum_post.html.erb
View File

@@ -1,5 +1,5 @@
<% if CurrentUser.is_janitor? || !forum_post.is_deleted? %> <% 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"> <div class="author">
<h4> <h4>
<%= link_to_user forum_post.creator %> <%= link_to_user forum_post.creator %>
@@ -37,7 +37,7 @@
<li><%= link_to "Edit", edit_forum_post_path(forum_post.id) %></li> <li><%= link_to "Edit", edit_forum_post_path(forum_post.id) %></li>
<% end %> <% end %>
<% 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> <li><%= link_to "Permalink", forum_post_path(forum_post) %></li>
</menu> </menu>
</div> </div>

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

@@ -1,9 +1,9 @@
<div id="search-seq-nav"> <div id="search-seq-nav">
<ul> <ul>
<li class="active"> <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> <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> </li>
</ul> </ul>
</div> </div>