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

remove jlist ads

Browse Source
This commit is contained in:
r888888888
2013-04-30 23:29:28 -07:00
parent 537987a694
commit 5ebc80c133
4 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@
this.initialize_post_image_resize_links(); this.initialize_post_image_resize_links();
this.initialize_post_image_resize_to_window_link(); this.initialize_post_image_resize_to_window_link();
this.initialize_similar(); this.initialize_similar();
this.place_jlist_ads();
if (Danbooru.meta("always-resize-images") === "true") { if (Danbooru.meta("always-resize-images") === "true") {
$("#image-resize-to-window-link").click(); $("#image-resize-to-window-link").click();
@@ -204,7 +203,6 @@
$image.height($image.data("original-height")); $image.height($image.data("original-height"));
Danbooru.Note.Box.scale_all(); Danbooru.Note.Box.scale_all();
$("#image-resize-notice").hide(); $("#image-resize-notice").hide();
Danbooru.Post.place_jlist_ads();
$image.data("scale_factor", 1); $image.data("scale_factor", 1);
e.preventDefault(); e.preventDefault();
}); });
@@ -233,7 +231,6 @@
} }
Danbooru.Note.Box.scale_all(); Danbooru.Note.Box.scale_all();
Danbooru.Post.place_jlist_ads()
e.preventDefault(); e.preventDefault();
}); });
} }
@@ -355,35 +352,6 @@
} }
}); });
} }
Danbooru.Post.place_jlist_ads = function() {
var jlist = $("#jlist-rss-ads-for-show");
if (jlist.length) {
var image = $("#image");
if (image.length) {
var x = image.offset().left + image.width() + 50;
var y = image.offset().top;
if (x > $(window).width()) {
jlist.css({
position: "absolute",
width: "108px",
left: x + "px",
top: y + "px"
});
} else {
jlist.css({
position: "absolute",
width: "108px",
right: "10px",
top: y + "px"
});
}
} else {
jlist.hide();
}
}
}
})(); })();
$(document).ready(function() { $(document).ready(function() {

4
app/views/posts/index.html.erb
View File

@@ -3,8 +3,6 @@
<aside id="sidebar"> <aside id="sidebar">
<%= render "posts/partials/common/search", :path => posts_path, :tags => params[:tags] %> <%= render "posts/partials/common/search", :path => posts_path, :tags => params[:tags] %>
<%= render_advertisement("vertical") %>
<%= render "posts/partials/index/mode_menu" %> <%= render "posts/partials/index/mode_menu" %>
<%= render "posts/partials/index/blacklist" %> <%= render "posts/partials/index/blacklist" %>
@@ -29,8 +27,6 @@
<%= render "posts/partials/index/edit" %> <%= render "posts/partials/index/edit" %>
<%= render "wiki_pages/excerpt", :post_set => @post_set %> <%= render "wiki_pages/excerpt", :post_set => @post_set %>
<%= render "posts/partials/index/posts", :post_set => @post_set %> <%= render "posts/partials/index/posts", :post_set => @post_set %>
<%= render_rss_advertisement("short", @post_set.has_explicit?) %>
</section> </section>
<% content_for(:page_title) do %> <% content_for(:page_title) do %>

2
app/views/posts/partials/index/_posts.html.erb
View File

@@ -1,6 +1,4 @@
<div id="posts"> <div id="posts">
<%= render_advertisement("horizontal") %>
<%= post_set.presenter.post_previews_html(self) %> <%= post_set.presenter.post_previews_html(self) %>
<%= numbered_paginator(post_set.posts) %> <%= numbered_paginator(post_set.posts) %>

6
app/views/posts/show.html.erb
View File

@@ -3,8 +3,6 @@
<aside id="sidebar"> <aside id="sidebar">
<%= render "posts/partials/common/search", :path => posts_path, :tags => params[:tags] %> <%= render "posts/partials/common/search", :path => posts_path, :tags => params[:tags] %>
<%= render_advertisement("vertical") %>
<%= render "posts/partials/index/blacklist" %> <%= render "posts/partials/index/blacklist" %>
<section id="tag-list"> <section id="tag-list">
@@ -42,8 +40,6 @@
<%= render "posts/partials/show/notices", :post => @post %> <%= render "posts/partials/show/notices", :post => @post %>
<%= render_advertisement("horizontal") %>
<section id="image-container" data-tags="<%= @post.tag_string %>" data-user="<%= @post.uploader_name %>" data-rating="<%= @post.rating %>" data-flags="<%= @post.status_flags %>"> <section id="image-container" data-tags="<%= @post.tag_string %>" data-user="<%= @post.uploader_name %>" data-rating="<%= @post.rating %>" data-flags="<%= @post.status_flags %>">
<div id="note-container"><div id="note-helper"></div></div> <div id="note-container"><div id="note-helper"></div></div>
<%= @post.presenter.image_html(self) %> <%= @post.presenter.image_html(self) %>
@@ -78,8 +74,6 @@
<section id="share" style="display: none;"> <section id="share" style="display: none;">
<%= render "posts/partials/show/share", :post => @post %> <%= render "posts/partials/show/share", :post => @post %>
</section> </section>
<%= render_rss_advertisement("long", @post.rating == "e") %>
</section> </section>
</div> </div>