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

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

Browse Source
This commit is contained in:
Toks
2013-07-06 17:13:20 -04:00
parent 89650b2b8f 5342555cd8
commit 990f6751da
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/posts.js
View File

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

14
app/views/explore/posts/intro.html.erb
View File

@@ -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> <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| %> <% cache("intro-page", :expires_in => 1.hour) do %>
<div class="posts"> <% @presenter.each do |tag, post_set| %>
<h2><%= link_to tag, posts_path(:tags => tag) %></h2> <div class="posts">
<%= post_set.presenter.post_previews_html(self) %> <h2><%= link_to tag, posts_path(:tags => tag) %></h2>
<div class="clearfix"></div> <%= post_set.presenter.post_previews_html(self) %>
</div> <div class="clearfix"></div>
</div>
<% end %>
<% end %> <% end %>
</div> </div>
</div> </div>

2
config/danbooru_default_config.rb
View File

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