Merge branch 'master' of https://github.com/r888888888/danbooru

app/assets/javascripts/posts.js

@@ -341,13 +341,16 @@
     $("#image-resize-link").click(function(e) {
       var $link = $(e.target);
       var $image = $("#image");
-      $image.removeAttr("src");
-      $image.attr("src", "https://www.google.com")
       $image.attr("src", $link.attr("href"));
+      $image.css("opacity", "0.25");
       $image.width($image.data("original-width"));
       $image.height($image.data("original-height"));        
+      $image.on("load", function() {
+        $image.css("opacity", "1");
+        $("#image-resize-notice").hide();
+      });
+      $("#image-resize-notice").html("Loading...");
       Danbooru.Note.Box.scale_all();
-      $("#image-resize-notice").hide();
       $image.data("scale_factor", 1);
       e.preventDefault();
     });

app/views/explore/posts/intro.html.erb

@@ -12,12 +12,14 @@
 
     <p style="text-align: center;">Type in your favorite anime, manga, or character (last name first). Here are some examples:</p>
 
-    <% @presenter.each do |tag, post_set| %>
-      <div class="posts">
-        <h2><%= link_to tag, posts_path(:tags => tag) %></h2>
-        <%= post_set.presenter.post_previews_html(self) %>
-        <div class="clearfix"></div>
-      </div>
+    <% cache("intro-page", :expires_in => 1.hour) do %>
+      <% @presenter.each do |tag, post_set| %>
+        <div class="posts">
+          <h2><%= link_to tag, posts_path(:tags => tag) %></h2>
+          <%= post_set.presenter.post_previews_html(self) %>
+          <div class="clearfix"></div>
+        </div>
+      <% end %>
     <% end %>
   </div>
 </div> 

config/danbooru_default_config.rb

@@ -4,7 +4,7 @@ module Danbooru
   class Configuration
     # The version of this Danbooru.
     def version
-      "2.23.0"
+      "2.23.1"
     end
 
     # The name of this Danbooru.