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

rearrange layout, fix tag blacklist js

Browse Source
This commit is contained in:
albert
2013-02-23 20:45:33 -05:00
parent 55a7febb5b
commit 64efef4ecf
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/blacklists.js
View File

@@ -23,7 +23,7 @@
}
Danbooru.Blacklist.parse_entries = function() {
var entries = (Danbooru.meta("blacklisted-tags") || "").replace(/(rating:[qes])\w+/, "$1").split(/,/);
var entries = (Danbooru.meta("blacklisted-tags") || "nozomiisthebestlovelive").replace(/(rating:[qes])\w+/, "$1").split(/,/);
$.each(entries, function(i, tags) {
var blacklist = Danbooru.Blacklist.parse_entry(tags);

5
app/views/posts/partials/show/_image.html.erb
View File

@@ -1,5 +1,6 @@
<%= image_tag(post.file_url_for(CurrentUser.user), :width => post.image_width_for(CurrentUser.user), :height => post.image_height_for(CurrentUser.user), :id => "image", "data-original-width" => post.image_width, "data-original-height" => post.image_height, "data-large-width" => post.large_image_width, "data-large-height" => post.large_image_height) %>
<% if post.has_large? && CurrentUser.default_image_size == "large" %>
<p id="image-resize-notice">Resized to <%= number_to_percentage post.resize_percentage, :precision => 0 %> of original (<%= link_to "view original", post.file_url, :id => "image-resize-link" %>)</p>
<% end %>
<%= image_tag(post.file_url_for(CurrentUser.user), :width => post.image_width_for(CurrentUser.user), :height => post.image_height_for(CurrentUser.user), :id => "image", "data-original-width" => post.image_width, "data-original-height" => post.image_height, "data-large-width" => post.large_image_width, "data-large-height" => post.large_image_height) %>

2
app/views/posts/partials/show/_information.html.erb
View File

@@ -1,4 +1,5 @@
<ul>
<li>ID: <%= post.id %></li>
<li>Uploader: <%= link_to_unless(post.uploader.nil?, post.uploader_name, user_path(post.uploader)) %></li>
<li>Date: <time datetime="<%= post.created_at.iso8601 %>" title="<%= post.created_at.to_date %>"><%= raw time_ago_in_words_tagged(post.created_at).gsub(/about/, "") %></time></li>
<% if post.approver %>
@@ -31,5 +32,4 @@
Active
<% end %>
</li>
<li>ID: <%= post.id %></li>
</ul>

2
app/views/posts/partials/show/_options.html.erb
View File

@@ -1,10 +1,10 @@
<ul>
<% if CurrentUser.is_member? %>
<li><%= link_to "Resize to window", "#", :id => "image-resize-to-window-link" %></li>
<li><%= link_to "Favorite", favorites_path(:post_id => post.id), :remote => true, :method => :post, :id => "add-to-favorites" %></li>
<li><%= link_to "Unfavorite", favorite_path(post), :remote => true, :method => :delete, :id => "remove-from-favorites" %></li>
<li><%= link_to "Add to pool", "#", :id => "pool" %></li>
<li><%= link_to "Add note", "#", :id => "translate", :title => "Shortcut is CTRL+N" %></li>
<li><%= link_to "Resize to window", "#", :id => "image-resize-to-window-link" %></li>
<li><%= link_to "Find similar", "http://danbooru.iqdb.org/db-search.php?url=http://#{Danbooru.config.hostname}#{post.preview_file_url}" %></li>
<% unless post.is_status_locked? %>