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

fixed default image size for users

Browse Source
This commit is contained in:
albert
2011-09-11 18:20:43 -04:00
parent 8f84061388
commit 1ca7df52b7
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/application.css.scss
View File

@@ -151,6 +151,10 @@ div.prose {
} }
} }
fieldset {
margin-bottom: 1em;
}
header { header {
margin: 0 0 1em 0; margin: 0 0 1em 0;
padding: 0; padding: 0;
@@ -187,6 +191,12 @@ input[type=submit]:hover {
/* background-color: #F6F6F6;*/ /* background-color: #F6F6F6;*/
} }
legend {
font-size: $h2_size;
font-weight: bold;
margin-bottom: 0.5em;
}
menu { menu {
margin: 0; margin: 0;
padding: 0; padding: 0;

2
app/models/user.rb
View File

@@ -14,7 +14,7 @@ class User < ActiveRecord::Base
end end
attr_accessor :password, :old_password attr_accessor :password, :old_password
attr_accessible :password, :old_password, :password_confirmation, :password_hash, :email, :last_logged_in_at, :last_forum_read_at, :has_mail, :receive_email_notifications, :comment_threshold, :always_resize_images, :favorite_tags, :blacklisted_tags, :name, :ip_addr, :time_zone attr_accessible :password, :old_password, :password_confirmation, :password_hash, :email, :last_logged_in_at, :last_forum_read_at, :has_mail, :receive_email_notifications, :comment_threshold, :always_resize_images, :favorite_tags, :blacklisted_tags, :name, :ip_addr, :time_zone, :default_image_size
validates_length_of :name, :within => 2..20, :on => :create validates_length_of :name, :within => 2..20, :on => :create
validates_format_of :name, :with => /\A[^\s:]+\Z/, :on => :create, :message => "cannot have whitespace or colons" validates_format_of :name, :with => /\A[^\s:]+\Z/, :on => :create, :message => "cannot have whitespace or colons"
validates_uniqueness_of :name, :case_sensitive => false, :on => :create validates_uniqueness_of :name, :case_sensitive => false, :on => :create

6
app/views/users/edit.html.erb
View File

@@ -9,9 +9,9 @@
<%= f.input :receive_email_notifications, :title => "Enable to receive email notification when you receive a DMail" %> <%= f.input :receive_email_notifications, :title => "Enable to receive email notification when you receive a DMail" %>
<%= f.input :comment_threshold, :title => "Comments below this score will be hidden by default" %> <%= f.input :comment_threshold, :title => "Comments below this score will be hidden by default" %>
<%= f.input :always_resize_images, :title => "Enable to automatically resize images to fit your browser window" %> <%= f.input :always_resize_images, :title => "Enable to automatically resize images to fit your browser window" %>
<%= f.input :default_image_size, :title => "Medium shows images resized to #{Danbooru.config.medium_image_width} pixels wide, large is #{Danbooru.config.large_image_width} pixels wide, and original is whatever the original image is", :collection => %w(Medium Large Original) %> <%= f.input :default_image_size, :title => "Medium shows images resized to #{Danbooru.config.medium_image_width} pixels wide, large is #{Danbooru.config.large_image_width} pixels wide, and original is whatever the original image is", :collection => %w(medium large original) %>
<%= f.input :favorite_tags, :title => "A list of whitespace delimited tags that show up in your profile" %> <%= f.input :favorite_tags, :title => "A list of whitespace delimited tags that show up in your profile", :input_html => {:size => "40x5"} %>
<%= f.input :blacklisted_tags, :title => "A list of newline delimited tags that you never want to see" %> <%= f.input :blacklisted_tags, :title => "A list of newline delimited tags that you never want to see", :input_html => {:size => "40x5"} %>
</fieldset> </fieldset>
<fieldset> <fieldset>