fixes
This commit is contained in:
@@ -25,7 +25,7 @@ div#page {
|
||||
}
|
||||
|
||||
aside#sidebar {
|
||||
width: 20%;
|
||||
width: 15%;
|
||||
float: left;
|
||||
|
||||
h1 {
|
||||
@@ -46,7 +46,7 @@ div#page {
|
||||
}
|
||||
|
||||
section#content {
|
||||
width: 75%;
|
||||
width: 80%;
|
||||
float: left;
|
||||
padding-left: 2em;
|
||||
overflow: visible;
|
||||
|
||||
@@ -16,7 +16,7 @@ class PoolsController < ApplicationController
|
||||
|
||||
def index
|
||||
@search = Pool.active.search(params[:search])
|
||||
@pools = @search.paginate(params[:page])
|
||||
@pools = @search.paginate(params[:page]).order("name")
|
||||
respond_with(@pools)
|
||||
end
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ class UserPresenter
|
||||
string = "base:10 + approved:(#{approved_count} / 10) - deleted:(#{deleted_count}) / 4 - pending:#{pending_count}"
|
||||
end
|
||||
|
||||
if limit > 20
|
||||
if limit >= 20
|
||||
limit = 20
|
||||
string += " = capped:20"
|
||||
elsif limit < 0
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
<%= link_to topic.title, forum_topic_path(topic) %>
|
||||
|
||||
<% if topic.response_count > 30 %>
|
||||
<%= link_to "last", forum_topic_path(topic, :page => (topic.response_count / 30.0).ceil), :class => "last-page" %>
|
||||
<%= link_to "last", forum_topic_path(topic, :page => (topic.response_count / Danbooru.config.posts_per_page.to_f).ceil), :class => "last-page" %>
|
||||
<% end %>
|
||||
|
||||
<% if topic.is_locked? %>
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
<li>Source: <%= post_source_tag(post) %></li>
|
||||
<li>Rating: <%= post.pretty_rating %></li>
|
||||
<li>Score: <span id="score-for-post-<%= post.id %>"><%= post.score %></span> <% if CurrentUser.is_privileged? %>(vote <%= link_to "up", post_votes_path(:post_id => post.id, :score => "up"), :remote => true, :method => :post %>/<%= link_to "down", post_votes_path(:post_id => post.id, :score => "down"), :remote => true, :method => :post %>)<% end %></li>
|
||||
<li>ID: <%= post.id %></li>
|
||||
<li>
|
||||
Status:
|
||||
<% if post.is_pending? %>
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
mv public/maintenance2.html public/maintenance.html
|
||||
mv public/maintenance.html.bak public/maintenance.html
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
mv public/maintenance.html public/maintenance2.html
|
||||
mv public/maintenance.html public/maintenance.html.bak
|
||||
|
||||
Reference in New Issue
Block a user