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

* Removed memcaching for TagImplication (too many latent race conditions)

Browse Source 
* Added Post.exact_tag_match to skip normalization/metatag parsing
* Added DelayedJob support for tag alias/implication processing
This commit is contained in:
albert
2011-08-04 19:54:13 -04:00
parent 09d7bba90a
commit e106f70b6d
18 changed files with 123 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/views/static/jquery_test.html.erb
View File

@@ -1,40 +0,0 @@
<div id="jquery-test">
<div class="note" id="lots-of-text-1">
Lorem ipsum
</div>
<div class="note" id="lots-of-text-2" style="left: 400px;">
Lorem ipsum
</div>
</div>
<script type="text/javascript">
var body = $("#lots-of-text-2");
body.css({height: "auto", minWidth: 140});
var w = body[0].offsetWidth;
var h = body[0].offsetHeight;
var lo = null;
var hi = null;
var x = null;
var last = null;
if (body[0].scrollWidth <= body[0].clientWidth) {
lo = 20, hi = w
do {
x = (lo+hi)/2
body.css({minWidth: x});
if (body[0].offsetHeight > h) {
lo = x;
} else {
hi = x;
}
} while ((hi - lo) > 4);
if (body[0].offsetHeight > h) {
body.css({minWidth: hi});
}
}
</script>

12
app/views/static/terms_of_service.html.erb
View File

@@ -1,6 +1,6 @@
<div style="width: 40em; margin: 5em auto; overflow: scroll;">
<div class="section">
<h4>Terms of Service</h4>
<h1>Terms of Service</h1>
<p>By accessing the "<%= Danbooru.config.app_name %>" website ("Site") you agree to the following terms of service. If you do not agree to these terms, then please do not access the Site.</p>
<ul>
@@ -13,13 +13,13 @@
</ul>
<div class="section">
<h6>Post/Comment Limiting</h6>
<h1>Post/Comment Limiting</h1>
<p>You cannot upload a post or comment during the first week of signing up.</p>
<p>After the initial period, you can post up to one comment an hour and a variable number of posts based on how many of your previous uploads were approved or deleted.</p>
</div>
<div class="section">
<h6>Prohibited Content</h6>
<h1>Prohibited Content</h1>
<p>In addition, you may not use the Site to upload any of the following:</p>
<ul>
<li>Non-anime: Photographs of American porn actresses, for example, are prohibited. Photographs of cosplayers, figures, or prominent figures in the industry are acceptable.</li>
@@ -34,7 +34,7 @@
</div>
<div class="section">
<h4>Copyright Infringement</h4>
<h1>Copyright Infringement</h1>
<p>If you believe a post infringes upon your copyright, please send an email to the <%= mail_to Danbooru.config.contact_email, "webmaster", :encode => "hex" %> with the following pieces of information:</p>
<ul>
@@ -45,14 +45,14 @@
</div>
<div class="section">
<h4>Privacy Policy</h4>
<h1>Privacy Policy</h1>
<p>The Site will not disclose the IP address, email address, password, or DMails of any user except to the staff.</p>
<p>The Site is allowed to make public everything else, including but not limited to: uploaded posts, favorited posts, comments, forum posts, wiki edits, and note edits.</p>
</div>
<div>
<h4>Agreement</h4>
<h1>Agreement</h1>
<p>By clicking on the "I Agree" link, you have read all the terms and have agreed to them.</p>
<p><%= link_to("I Agree", params[:url] || "/", :onclick => "Cookie.put('tos', '1')") %> | <%= link_to("Cancel", "/") %></p>
</div>