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

fixes

Browse Source
This commit is contained in:
albert
2013-02-17 01:38:34 -05:00
parent 3d9f5e20c6
commit 6ba9b015e4
7 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ div#page {
} }
aside#sidebar { aside#sidebar {
width: 20%; width: 15%;
float: left; float: left;
h1 { h1 {
@@ -46,7 +46,7 @@ div#page {
} }
section#content { section#content {
width: 75%; width: 80%;
float: left; float: left;
padding-left: 2em; padding-left: 2em;
overflow: visible; overflow: visible;

2
app/controllers/pools_controller.rb
View File

@@ -16,7 +16,7 @@ class PoolsController < ApplicationController
def index def index
@search = Pool.active.search(params[:search]) @search = Pool.active.search(params[:search])
@pools = @search.paginate(params[:page]) @pools = @search.paginate(params[:page]).order("name")
respond_with(@pools) respond_with(@pools)
end end

2
app/presenters/user_presenter.rb
View File

@@ -44,7 +44,7 @@ class UserPresenter
string = "base:10 + approved:(#{approved_count} / 10) - deleted:(#{deleted_count}) / 4 - pending:#{pending_count}" string = "base:10 + approved:(#{approved_count} / 10) - deleted:(#{deleted_count}) / 4 - pending:#{pending_count}"
end end
if limit > 20 if limit >= 20
limit = 20 limit = 20
string += " = capped:20" string += " = capped:20"
elsif limit < 0 elsif limit < 0

2
app/views/forum_topics/index.html.erb
View File

@@ -26,7 +26,7 @@
<%= link_to topic.title, forum_topic_path(topic) %> <%= link_to topic.title, forum_topic_path(topic) %>
<% if topic.response_count > 30 %> <% 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 %> <% end %>
<% if topic.is_locked? %> <% if topic.is_locked? %>

1
app/views/posts/partials/show/_information.html.erb
View File

@@ -13,6 +13,7 @@
<li>Source: <%= post_source_tag(post) %></li> <li>Source: <%= post_source_tag(post) %></li>
<li>Rating: <%= post.pretty_rating %></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>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> <li>
Status: Status:
<% if post.is_pending? %> <% if post.is_pending? %>

2
script/donmai/downbooru
View File

@@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
mv public/maintenance2.html public/maintenance.html mv public/maintenance.html.bak public/maintenance.html

2
script/donmai/upbooru
View File

@@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
mv public/maintenance.html public/maintenance2.html mv public/maintenance.html public/maintenance.html.bak