style fixes

This commit is contained in:
albert
2011-12-06 18:58:26 -05:00
parent 4baf5be7a2
commit 8e3a6c5923
9 changed files with 22 additions and 11 deletions

View File

@@ -11,6 +11,7 @@ $(function() {
e.stopPropagation();
});
$("#more-links").show();
$("#more-links").position({
of: $("#site-map-link"),
my: "left top",

View File

@@ -7,8 +7,8 @@ div.post-previews {
article.post-preview {
height: 150px;
width: 150px;
margin-right: 30px;
margin-bottom: 30px;
margin-right: 20px;
margin-bottom: 20px;
float: left;
text-align: center;
vertical-align: middle;

View File

@@ -50,6 +50,8 @@ class UsersController < ApplicationController
else
UserMailer.upgrade(@user, params[:email]).deliver
end
redirect_to user_path(@user), :notice => "Email was sent"
end
private

View File

@@ -57,10 +57,6 @@ class Comment < ActiveRecord::Base
return vote
end
def creator_name
creator.name.tr("_", " ")
end
def editable_by?(user)
creator_id == user.id || user.is_moderator?
end

View File

@@ -1,4 +1,4 @@
<div id="more-links">
<div id="more-links" style="display: none;">
<ul>
<%= nav_link_to("Artists", artists_path(:order => "date")) %>
<%= nav_link_to("Tags", tags_path(:order => "date")) %>

View File

@@ -1,4 +1,4 @@
<div id="quick-edit-div">
<div id="quick-edit-div" style="display: none;">
<h1>Edit</h1>
<%= form_tag("/posts", :class => "simple_form", :method => :put, :id => "quick-edit-form") do %>

View File

@@ -52,11 +52,11 @@
<%= render "comments/partials/index/list", :comments => @post.comments, :post => @post, :show_header => false %>
</section>
<section id="notes">
<section id="notes" style="display: none;">
<%= render :partial => "notes/note", :collection => @post.notes.active %>
</section>
<section id="edit">
<section id="edit" style="display: none;">
<%= render "posts/partials/show/edit", :post => @post %>
</section>
</section>

View File

@@ -1,6 +1,16 @@
require 'danbooru_image_resizer/danbooru_image_resizer'
namespace :images do
desc "Generate thumbnail-sized images of posts"
task :generate_preview => :environment do
Post.where("image_width > ?", Danbooru.config.small_image_width).find_each do |post|
if post.is_image?
puts "resizing preview #{post.id}"
Danbooru.resize(post.file_path, post.preview_file_path, Danbooru.config.small_image_width, Danbooru.config.small_image_width, 80)
end
end
end
desc "Generate medium-sized images of posts"
task :generate_medium => :environment do
Post.where("image_width > ?", Danbooru.config.medium_image_width).find_each do |post|

View File

@@ -61,6 +61,7 @@ alter table comments rename column user_id to creator_id;
alter index index_comments_on_user_id rename to index_comments_on_creator_id;
drop trigger trg_comment_search_update on comments;
CREATE TRIGGER trigger_comments_on_update BEFORE INSERT OR UPDATE ON comments FOR EACH ROW EXECUTE PROCEDURE tsvector_update_trigger('body_index', 'pg_catalog.english', 'body');
update comments set creator_id = 1 where creator_id is null;
CREATE TABLE delayed_jobs (
id integer NOT NULL,
@@ -3047,6 +3048,7 @@ alter index posts_mpixels rename to index_posts_on_mpixels;
create index index_posts_on_uploader_ip_addr on posts (uploader_ip_addr);
drop function trg_posts_tags__delete();
drop function trg_posts_tags__insert();
update posts set uploader_id = 1 where uploader_id is null;
alter table post_appeals rename column user_id to creator_id;
alter index index_post_appeals_on_user_id rename to index_post_appeals_on_creator_id;
@@ -3167,7 +3169,7 @@ update users set blacklisted_tags = (select string_agg(_.tags, E'\n') from user_
update users set post_update_count = (select count(*) from post_versions where updater_id = users.id);
update users set note_update_count = (select count(*) from note_versions where updater_id = users.id);
update users set favorite_count = (select count(*) from favorites where user_id = users.id);
-- drop table user_blacklisted_tags;
drop table user_blacklisted_tags;
CREATE TABLE user_password_reset_nonces (
id integer NOT NULL,