From 9a29edffb74b77c2c409d639de192df3fd5d8af0 Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 20 Feb 2013 14:48:24 -0500 Subject: [PATCH] readd always-resize-image user setting --- app/assets/javascripts/posts.js | 4 ++++ app/views/posts/show.html.erb | 1 + app/views/users/edit.html.erb | 1 + 3 files changed, 6 insertions(+) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 3e8eb806e..897d98905 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -20,6 +20,10 @@ this.initialize_post_image_resize_links(); this.initialize_post_image_resize_to_window_link(); this.place_jlist_ads(); + + if (Danbooru.meta("always-resize-images") === "true") { + $("#image-resize-to-window-link").click(); + } } } diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb index b37ed4f37..21b0d9742 100644 --- a/app/views/posts/show.html.erb +++ b/app/views/posts/show.html.erb @@ -98,6 +98,7 @@ + diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 9373e1133..838eee18f 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -12,6 +12,7 @@ <%= f.input :time_zone %> <%= f.input :receive_email_notifications %> <%= f.input :comment_threshold, :hint => "Comments below this score will be hidden by default" %> + <%= f.input :always_resize_images %> <%= f.input :default_image_size, :hint => "Large is #{Danbooru.config.large_image_width} pixels wide, and original is whatever the original image is", :collection => %w(large original), :include_blank => false %> <%= f.input :favorite_tags, :hint => "A list of whitespace delimited tags that show up in your profile", :input_html => {:size => "40x5"} %> <%= f.input :blacklisted_tags, :hint => "A list of newline delimited tags that you never want to see", :input_html => {:size => "40x5"} %>