Kill trailing whitespace in erb files

This commit is contained in:
小太
2013-03-19 23:11:58 +11:00
parent aef86bda04
commit 1a03a86592
119 changed files with 271 additions and 271 deletions

View File

@@ -1,15 +1,15 @@
<div id="c-admin-users">
<div id="a-edit">
<h1>Edit User: <%= @user.name %></h1>
<%= form_tag(admin_user_path(@user), :method => :put, :class => "simple_form") do %>
<%= hidden_field_tag "id", @user.id %>
<div class="input integer optional">
<label for="user_level" class="optional">Level</label>
<%= user_level_select(:user, :level) %>
</div>
<%= submit_tag "Update" %>
<% end %>
</div>

View File

@@ -9,7 +9,7 @@
<%= f.input :group_name %>
<%= f.input :url_string, :label => "URLs", :as => :text, :input_html => {:size => "50x5"} %>
<%= f.input :is_active %>
<%= dtext_field "artist", "notes" %>
<%= f.button :submit, "Submit" %>
<%= dtext_preview_button "artist", "notes" %>

View File

@@ -1,9 +1,9 @@
<div id="c-artists">
<div id="a-banned">
<h1>Banned Artists</h1>
<p>The following artists have requested they be removed from the site. Please do not upload any works from these artists. These artists all have implications pointing to the <code>banned_artist</code> tag.</p>
<ul>
<% @artists.each do |artist| %>
<li><%= link_to artist.name, artist_path(artist) %></li>

View File

@@ -1,7 +1,7 @@
<div id="c-artists">
<div id="a-edit">
<h1>Edit Artist</h1>
<%= render "form" %>
<%= render "form" %>
</div>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-artists">
<div id="a-index">
<h1>Artists</h1>
<table class="striped" width="100%">
<thead>
<tr>

View File

@@ -1,10 +1,10 @@
<div id="c-artists">
<div id="a-new">
<h1>New Artist</h1>
<%= error_messages_for :artist %>
<%= render "form" %>
<%= render "form" %>
</div>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-artists">
<div id="a-search">
<h1>Search Artists</h1>
<div id="search-form">
<%= form_tag(artists_path, :method => :get, :class => "simple_form") do %>
<div class="input">
@@ -9,7 +9,7 @@
<%= text_field "search", "name" %>
<p class="hint">You can search on any name or URL</p>
</div>
<div class="input">
<label>Sort</label>
<%= select "search", "sort", ["Date", "Name"] %>

View File

@@ -1,7 +1,7 @@
<div class="bans">
<div class="index">
<h1>Bans</h1>
<table class="striped" width="100%">
<thead>
<tr>
@@ -27,7 +27,7 @@
<% end %>
</tbody>
</table>
<%= numbered_paginator(@bans) %>
</div>
</div>

View File

@@ -1,9 +1,9 @@
<div id="c-comments">
<div id="a-edit">
<h1>Edit Comment</h1>
<h1>Edit Comment</h1>
<%= error_messages_for "comment" %>
<%= simple_form_for(@comment) do |f| %>
<%= dtext_field "comment", "body" %>
<%= f.button :submit, "Submit" %>

View File

@@ -1,7 +1,7 @@
<div id="c-comments">
<div id="a-index">
<h1>Comments</h1>
<div class="comments-for-post">
<div class="list-of-comments">
<% @comments.each do |comment| %>
@@ -15,7 +15,7 @@
<% end %>
</div>
</div>
<%= numbered_paginator(@comments) %>
</div>
</div>

View File

@@ -1,11 +1,11 @@
<div id="c-comments">
<div id="a-index">
<h1>Comments</h1>
<% if @posts.empty? %>
<%= render "post_sets/blank" %>
<% end %>
<% @posts.select {|x| Danbooru.config.can_user_see_post?(CurrentUser.user, x)}.each do |post| %>
<div class="post post-preview" data-tags="<%= post.tag_string %>" data-uploader="<%= post.uploader_name %>" data-rating="<%= post.rating %>" data-flags="<%= post.status %>" data-score="<%= post.score %>" data-parent-id="<%= post.parent_id %>" data-has-children="<%= post.has_children? %>" data-id="<%= post.id %>" data-width="<%= post.image_width %>" data-height="<%= post.image_height %>">
<div class="preview">
@@ -15,7 +15,7 @@
<div class="clearfix"></div>
</div>
<% end %>
<%= numbered_paginator(@posts) %>
</div>
</div>

View File

@@ -18,9 +18,9 @@
<%= render :partial => "comments/partials/show/comment", :collection => comments %>
<% end %>
</div>
<div class="clearfix"></div>
<div class="new-comment">
<p><%= link_to "Post comment", new_comment_path, :class => "expand-comment-response" %></p>
<%= render "comments/partials/new/form", :post => post %>

View File

@@ -6,4 +6,4 @@
<%= dtext_field "comment", "body", :input_id => "comment_response_for_#{post.id}", :preview_id => "dtext-preview-for-#{post.id}" %>
<%= dtext_preview_button "comment", "body", :input_id => "comment_response_for_#{post.id}", :preview_id => "dtext-preview-for-#{post.id}" %>
<%= submit_tag "Post" %> <%= check_box "comment", "do_not_bump_post", :id => "comment_do_not_bump_post_#{post.id}" %> <label for="comment_do_not_bump_post_<%= post.id %>">No bump</label>
<% end %>
<% end %>

View File

@@ -8,7 +8,7 @@
<div class="content">
<div class="body prose">
<%= format_text(comment.body) %>
<% if comment.updater_id.present? && (comment.updater_id != comment.creator_id || comment.created_at != comment.updated_at) %>
<p class="info">Updated by <%= link_to comment.updater_name, user_path(comment.updater_id) %> <%= time_ago_in_words_tagged(comment.updated_at) %></p>
<% end %>

View File

@@ -1,10 +1,10 @@
<div id="c-comments">
<div id="a-search">
<h1>Search Comments</h1>
<%= form_tag(comments_path, :method => :get, :class => "simple_form") do %>
<%= hidden_field_tag "group_by", "comment" %>
<%= search_field "body_matches", :label => "Body" %>
<%= search_field "creator_name", :label => "User" %>
<%= search_field "post_tags_match", :label => "Tags", :hint => "Meta-tags not supported" %>

View File

@@ -28,7 +28,7 @@
<% end %>
</tbody>
</table>
<%= numbered_paginator(@dmails) %>
</div>
</div>

View File

@@ -3,12 +3,12 @@
<h1>Search Messages</h1>
<%= form_tag(dmails_path, :method => :get, :class => "simple_form") do %>
<%= hidden_field_tag :folder, params[:folder] %>
<%= search_field "message_matches", :label => "Message" %>
<%= search_field "to_name", :label => "To" %>
<%= search_field "from_name", :label => "From" %>
<%= submit_tag "Search" %>
<% end %>
<% end %>
</div>
</div>

View File

@@ -3,13 +3,13 @@
<div class="dmail">
<h1>Show Message</h1>
<h2><%= @dmail.title %></h2>
<ul style="margin-bottom: 1em;">
<li><strong>Sender</strong>: <%= link_to @dmail.from_name, user_path(@dmail.from_id) %></li>
<li><strong>Recipient</strong>: <%= link_to @dmail.to_name, user_path(@dmail.to_id) %></li>
<li><strong>Date</strong>: <%= compact_time(@dmail.created_at) %></li>
</ul>
<h3>Body</h3>
<div class="prose">
<%= format_text(@dmail.body) %>
@@ -18,7 +18,7 @@
<p>
<%= link_to "Respond", new_dmail_path(:respond_to_id => @dmail) %>
| <%= link_to "Forward", new_dmail_path(:respond_to_id => @dmail, :forward => true) %>
</p>
</p>
</div>
</div>
</div>

View File

@@ -1,4 +1,4 @@
<!--
<!--
- name
- input_id
- input_name

View File

@@ -11,7 +11,7 @@ h1. A header
* List item 2
* List item 3
Linebreaks are important between lists,
Linebreaks are important between lists,
headers, and paragraphs.
URLs are automatically linked: http://www.google.com
@@ -26,5 +26,5 @@ A {{post link}}. Alternatively, post #1234.
Also works with forum posts, comments and pools.
<%= link_to "Read more", wiki_pages_path(:title => "help:dtext") %>.
</pre>
</pre>
</div>

View File

@@ -1,9 +1,9 @@
<div id="c-explore-posts">
<div id="a-index">
<h1>Popular: <%= @post_set.presenter.range_text %></h1>
<%= @post_set.presenter.nav_links(self) %>
<%= render "blacklists" %>
<%= @post_set.presenter.post_previews_html(self) %>

View File

@@ -15,7 +15,7 @@
</ul>
</section>
</aside>
<section id="content">
<h1>Favorites</h1>
@@ -23,12 +23,12 @@
<%= sequential_paginator(@favorite_set.favorites) %>
</section>
<% content_for(:page_title) do %>
Favorites - <%= CurrentUser.name %> - <%= Danbooru.config.app_name %>
<% end %>
<%= render "posts/partials/common/secondary_links" %>
<%= render "posts/partials/common/secondary_links" %>
</div>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-forum-topics">
<div id="a-edit">
<h1>Edit Forum Post</h1>
<%= render "form", :forum_post => @forum_post %>
</div>
</div>

View File

@@ -5,7 +5,7 @@
<% else %>
<h1>New Forum Post</h1>
<% end %>
<%= render "form", :forum_post => @forum_post %>
<%= error_messages_for "forum_post" %>
</div>

View File

@@ -8,15 +8,15 @@
<% if !@forum_topic.new_record? %>
<%= hidden_field_tag "forum_topic[original_post_attributes][topic_id]", @forum_topic.id %>
<% end %>
<%= dtext_field "forum_post", "body", :input_name => "forum_topic[original_post_attributes][body]", :value => @forum_topic.original_post.body %>
<% end %>
<% if CurrentUser.is_janitor? %>
<%= f.input :is_sticky %>
<%= f.input :is_locked %>
<% end %>
<%= f.button :submit, "Submit" %>
<%= dtext_preview_button "forum_post", "body" %>
<% end %>

View File

@@ -1,7 +1,7 @@
<div id="c-forum-topics">
<div id="a-edit">
<h1>Edit Forum Topic</h1>
<%= render "form" %>
</div>
</div>

View File

@@ -18,11 +18,11 @@
<% if topic.is_sticky? %>
<span class="sticky">Sticky:</span>
<% end %>
<% if topic.updated_at > (CurrentUser.last_forum_read_at || Time.now) %>
<span class="new">NEW</span>
<% end %>
<%= link_to topic.title, forum_topic_path(topic) %>
<% if topic.response_count > Danbooru.config.posts_per_page %>
@@ -40,7 +40,7 @@
<% end %>
</tbody>
</table>
<%= numbered_paginator(@forum_topics) %>
</div>
</div>

View File

@@ -6,7 +6,7 @@
(deleted)
<% end %>
</h1>
<% if @forum_topic.is_locked? %>
<div class="notice">
<p>This topic has been locked.</p>
@@ -14,13 +14,13 @@
<% end %>
<%= render "forum_posts/listing", :forum_posts => @forum_posts %>
<p><%= link_to "Reply &raquo;".html_safe, new_forum_post_path(:topic_id => @forum_topic.id), :id => "new-response-link" %></p>
<div style="display: none;" id="topic-response">
<%= render "forum_posts/form", :forum_post => ForumPost.new(:topic_id => @forum_topic.id) %>
</div>
<%= numbered_paginator(@forum_posts) %>
</div>
</div>
@@ -40,7 +40,7 @@
$('html, body').animate({
scrollTop: $("#forum_post_body").offset().top - 100
}, 500);
e.preventDefault();
})
});

View File

@@ -22,7 +22,7 @@
<% end %>
</tbody>
</table>
<%= numbered_paginator(@ip_bans) %>
</div>
</div>

View File

@@ -3,7 +3,7 @@
<h1>New IP Ban</h1>
<%= error_messages_for "ip_ban" %>
<%= simple_form_for(@ip_ban) do |f| %>
<%= f.input :ip_addr, :label => "IP Address" %>
<%= f.input :reason, :input_html => {:size => "50x5"} %>

View File

@@ -7,7 +7,7 @@
<%= f.button :submit, "Submit" %>
<%= f.button :submit, "Test" %>
<% end %>
<p id="test-results"></p>
</div>
</div>

View File

@@ -25,29 +25,29 @@
<body>
<header id="top">
<%= render "news_updates/listing" %>
<h1><%= link_to Danbooru.config.app_name, "/" %></h1>
<nav>
<%= render "layouts/main_links" %>
<%= yield :secondary_links %>
</nav>
<%= render "layouts/more_links" %>
</header>
<div id="page">
<% if CurrentUser.is_anonymous? && session[:started_at] && session[:started_at] < 1.minute.ago && cookies[:hide_sign_up_notice].blank? %>
<%= render "users/sign_up_notice" %>
<% end %>
<% if !CurrentUser.is_anonymous? && !CurrentUser.is_privileged? && cookies[:hide_upgrade_account_notice].blank? && params[:action] != "upgrade_information" %>
<%= render "users/upgrade_notice" %>
<% end %>
<% if !CurrentUser.is_privileged? && CurrentUser.user.created_at > 2.weeks.ago %>
<%= render "users/tos" %>
<% end %>
<%- if flash[:notice] -%>
<div class="ui-corner-all ui-state-highlight" id="notice"><%= flash[:notice] %></div>
<%- else -%>
@@ -56,11 +56,11 @@
<%= yield :layout %>
</div>
<footer>
<%= yield :page_footer_content %>
<%= yield :page_footer_content %>
</footer>
<%= render "static/footer" %>
</body>
</html>

View File

@@ -5,16 +5,16 @@
<p>If you supplied an email address when signing up, <%= Danbooru.config.app_name %> can email you your login information. Password details will not be provided and will not be changed.</p>
<p>If you didn't supply a valid email address, you are out of luck.</p>
<%= form_tag(maintenance_user_login_reminder_path, :class => "simple_form") do %>
<div class="input email required">
<label for="user_email" class="required">Email</label>
<%= email_field(:user, :email) %>
</div>
<%= submit_tag "Submit" %>
<% end %>
<%= render "sessions/secondary_links" %>
</div>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-maintenance-user-password-resets">
<div id="a-edit">
<h1>Reset Password</h1>
<% if @nonce %>
<%= form_tag(maintenance_user_password_reset_path, :method => :put) do %>
<%= hidden_field_tag :email, params[:email] %>
@@ -12,7 +12,7 @@
<% else %>
<p>Invalid key</p>
<% end %>
<%= render "sessions/secondary_links" %>
</div>
</div>

View File

@@ -1,11 +1,11 @@
<div id="c-maintenance-user-password-resets">
<div id="a-new">
<h1>Reset Password</h1>
<p>If you supplied an email address when signing up, <%= Danbooru.config.app_name %> can reset your password. You will receive an email confirming your request for a new password.</p>
<p>If you didn't supply a valid email address, you are out of luck.</p>
<%= form_tag(maintenance_user_password_reset_path, :class => "simple_form") do %>
<div class="input email required">
<label for="nonce_email" class="required">Email</label>

View File

@@ -19,7 +19,7 @@
<% end %>
</tbody>
</table>
<%= numbered_paginator(@mod_actions) %>
</div>
</div>

View File

@@ -1,13 +1,13 @@
<%= form_tag(moderator_dashboard_path, :method => :get, :class => "simple_form") do %>
<div class="input">
<label for="min_date">Minimum Date</label>
<%= text_field_tag :min_date, @dashboard.min_date %>
<%= text_field_tag :min_date, @dashboard.min_date %>
</div>
<div class="input">
<label for="max_level">Max Level</label>
<%= user_level_select_tag(:max_level) %><br>
</div>
<%= submit_tag "Search" %>
<% end %>

View File

@@ -3,7 +3,7 @@
<label for="user_ids">Search IPs</label>
<%= text_field_tag "search[ip_addr]", params[:ip_addrs] %>
</div>
<%= submit_tag "Search" %>
<% end %>
@@ -12,6 +12,6 @@
<label for="user_ids">Search User IDs</label>
<%= text_field_tag "search[user_id]", params[:user_ids] %>
</div>
<%= submit_tag "Search" %>
<% end %>

View File

@@ -1,7 +1,7 @@
<div id="c-moderator-invitations">
<div id="a-index">
<h1>Invitations</h1>
<ul>
<% @users.each do |user| %>
<li><%= link_to user.name, user_path(user) %></li>

View File

@@ -1,18 +1,18 @@
<div id="c-moderator-invitations">
<div id="a-new">
<h1>New Invitation</h1>
<%= form_tag(moderator_invitations_path, :class => "simple_form") do %>
<div class="input">
<label>User</label>
<%= text_field :invitation, :user_name, :value => params[:invitation][:name] %>
</div>
<div class="input">
<label>Level</label>
<%= level_select %>
</div>
<%= submit_tag %>
<% end %>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-moderator-ip-addrs">
<div id="a-index">
<h1>IP Addresses</h1>
<table>
<thead>
<tr>

View File

@@ -1,7 +1,7 @@
<div id="c-moderator-ip-addrs">
<div id="a-search">
<h1>Search IP Addresses</h1>
<%= form_tag(moderator_ip_addrs_path, :class => "simple_form") do %>
<%= search_field "user_name", :label => "User" %>
<%= search_field "ip_addr", :label => "IP Addr" %>

View File

@@ -9,7 +9,7 @@
<label for="reason">Reason</label>
<%= text_area_tag "reason" %>
</div>
<%= submit_tag "Delete" %>
<%= submit_tag "Cancel" %>
<% end %>

View File

@@ -9,7 +9,7 @@
<div>
<h1>Moderation Queue</h1>
<div id="moderation-guideline">
<h1>Deletion Guidelines</h1>
<p>
@@ -37,7 +37,7 @@
<li><strong>Score</strong>: <%= post.score %></li>
<li>
<strong>Size:</strong>
<%= number_to_human_size(post.file_size) %>
<%= number_to_human_size(post.file_size) %>
<% if post.is_image? %>
(<%= post.image_width %>x<%= post.image_height %>)
<% end %>
@@ -56,7 +56,7 @@
</article>
<% end %>
</div>
<%= numbered_paginator(@posts) %>
</div>
</div>

View File

@@ -1,18 +1,18 @@
<div id="c-moderator-tags">
<div id="a-edit">
<h1>Mass Edit</h1>
<%= form_tag(moderator_tag_path, :method => :put, :class => "simple_form") do %>
<div class="input">
<label>Antecedent</label>
<%= text_field :tag, :antecedent, :value => params[:antecedent] %>
</div>
<div class="input">
<label>Consequent</label>
<%= text_field :tag, :consequent, :value => params[:consequent] %>
</div>
<div class="input">
<%= submit_tag "Submit" %>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-news-updates">
<div id="a-new">
<h1>Edit Update</h1>
<%= simple_form_for(@news_update) do |f| %>
<%= f.input :message, :hint => "Use HTML for formatting", :input_html => {:size => "30x5"} %>
<%= f.button :submit, "Submit" %>

View File

@@ -1,7 +1,7 @@
<div id="c-news-updates">
<div id="a-index">
<h1>News Updates</h1>
<table class="striped" width="100%">
<thead>
<tr>
@@ -20,7 +20,7 @@
<% end %>
</tbody>
</table>
<%= numbered_paginator(@news_updates) %>
</div>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-news-updates">
<div id="a-new">
<h1>New Update</h1>
<%= simple_form_for(@news_update) do |f| %>
<%= f.input :message, :hint => "Use HTML for formatting", :input_html => {:size => "30x5"} %>
<%= f.button :submit, "Submit" %>

View File

@@ -1,7 +1,7 @@
<div id="c-note-versions">
<div id="a-index">
<h1>Note Changes</h1>
<table width="100%" class="striped">
<thead>
<tr>
@@ -15,7 +15,7 @@
<th width="10%">Edited By</th>
<th width="10%">Date</th>
<th width="10%">Options</th>
</tr>
</tr>
</thead>
<tbody>
<% @note_versions.each do |note_version| %>
@@ -37,7 +37,7 @@
<% end %>
</td>
</tr>
<% end %>
<% end %>
</tbody>
</table>

View File

@@ -1,7 +1,7 @@
<div id="c-notes">
<div id="a-index">
<h1>Notes</h1>
<table width="100%" class="striped">
<thead>
<tr>
@@ -24,7 +24,7 @@
<% end %>
</tbody>
</table>
<%= sequential_paginator(@notes) %>
</div>
</div>

View File

@@ -1,9 +1,9 @@
<div id="c-notes">
<div id="a-index">
<h1>Notes</h1>
<%= @post_set.presenter.post_previews_html(self) %>
<%= numbered_paginator(@posts, false) %>
</div>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-notes">
<div id="a-search">
<h1>Search Notes</h1>
<%= form_tag(notes_path, :method => :get, :class => "simple_form") do %>
<%= hidden_field_tag "group_by", "note" %>
<%= search_field "body_matches", :label => "Body" %>

View File

@@ -8,7 +8,7 @@
<span id="pool-name-container"><%= text_field_tag "pool_name", "", :size => 20 %></span>
<span id="pool-name-hint" class="hint">Search for a pool containing (<%= link_to "see full list", all_select_pool_element_path, :remote => true %>)</span>
</div>
<div class="input">
<%= submit_tag "Submit" %>
</div>

View File

@@ -6,7 +6,7 @@
<ul id="sortable">
<% @pool.posts(:limit => 1_000).each do |post| %>
<li class="ui-state-default" id="pool[post_id_array]_<%= post.id %>">
<%= link_to(image_tag(post.preview_file_url), post_path(post)) %>
<%= link_to(image_tag(post.preview_file_url), post_path(post)) %>
</li>
<% end %>
</ul>

View File

@@ -1,7 +1,7 @@
<div id="c-pools">
<div id="a-index">
<h1>Pool History</h1>
<table width="100%" class="striped">
<thead>
<tr>

View File

@@ -13,7 +13,7 @@
<% @pools.each do |pool| %>
<%= content_tag(:tr, :id => "pool-#{pool.id}") do %>
<td>
</td>
<td>
<%= link_to h(pool.pretty_name), pool_path(pool) %>

View File

@@ -4,12 +4,12 @@
<%= search_field "name_matches", :label => "Name" %>
<%= search_field "description_matches", :label => "Description" %>
<%= search_field "creator_name", :label => "Creator" %>
<div class="input">
<label>Order</label>
<%= select "search", "sort", [["Last updated", "updated_at"], ["Name", "name"]] %>
</div>
<%= submit_tag "Search" %>
<% end %>
</div>

View File

@@ -1,17 +1,17 @@
<div id="c-pools">
<div id="a-show">
<h1>
Pool:
Pool:
<%= @pool.pretty_name %>
<% if @pool.is_deleted? %>
<span class="inactive">(deleted)</span>
<% end %>
</h1>
<div id="description">
<%= format_text(@pool.description) %>
</div>
<section id="content">
<%= @post_set.presenter.post_previews_html(self) %>

View File

@@ -19,7 +19,7 @@
<% end %>
</tbody>
</table>
<%= numbered_paginator(@post_appeals) %>
</div>
</div>

View File

@@ -20,7 +20,7 @@
</ul>
<p>Enter a reason:</p>
<%= form_tag(post_flags_path(:format => :js), :remote => true) do %>
<%= hidden_field :post_flag, :post_id %>
<%= text_area :post_flag, :reason, :size => "40x5" %>

View File

@@ -25,7 +25,7 @@
<% end %>
</tbody>
</table>
<%= numbered_paginator(@post_flags) %>
</div>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-post-versions">
<div id="a-index">
<h1>Changes</h1>
<% if @post_versions.all.empty? %>
<%= render "post_sets/blank" %>
<% else %>

View File

@@ -1,7 +1,7 @@
<div id="c-post-versions">
<div id="a-search">
<h1>Search Changes</h1>
<div id="search">
<%= form_tag(post_versions_path, :method => :get, :class => "simple_form") do %>
<%= search_field "updater_name", :label => "User" %>

View File

@@ -13,14 +13,14 @@
<h1>Tags</h1>
<%= @post_set.presenter.tag_list_html(self) %>
</section>
<%= render "posts/partials/index/related" %>
</aside>
<section id="content">
<menu id="post-sections">
<li class="active"><a href="#posts" id="show-posts-link">Posts</a></li>
<% if @post_set.has_wiki? %>
<li><a href="#wiki-except" id="show-wiki-excerpt-link">Wiki</a></li>
<% end %>
@@ -30,9 +30,9 @@
<%= render "wiki_pages/excerpt", :post_set => @post_set %>
<%= render "posts/partials/index/posts", :post_set => @post_set %>
<%= render_rss_advertisement("short", @post_set.has_explicit?) %>
<%= render_rss_advertisement("short", @post_set.has_explicit?) %>
</section>
<% content_for(:page_title) do %>
<% if @post_set.tag_string.present? %>
<%= @post_set.humanized_tag_string %> - <%= Danbooru.config.app_name %>
@@ -42,7 +42,7 @@
<% end %>
<%= render "posts/partials/common/secondary_links" %>
</div>
</div>

View File

@@ -1,4 +1,4 @@
<!--
<!--
- path
- tags
-->
@@ -8,5 +8,5 @@
<%= form_tag(path, :method => "get") do %>
<%= text_field_tag("tags", tags, :size => 20) %>
<%= submit_tag "Go" %>
<% end %>
<% end %>
</section>

View File

@@ -19,7 +19,7 @@
<% end %>
<option value="edit-tag-script">Edit tag script</option>
<option value="apply-tag-script">Apply tag script</option>
</select>
</select>
</form>
</section>
<% end %>

View File

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

View File

@@ -4,7 +4,7 @@
<% if @post_set.has_deleted? %>
<li><%= link_to "Deleted posts", posts_path(:tags => "#{params[:tags]} status:deleted") %></li>
<% end %>
<% if @post_set.is_tag_subscription? %>
<li><%= link_to "Edit subscriptions", tag_subscriptions_path %></li>
<% end %>

View File

@@ -13,7 +13,7 @@
This post is rating locked.
<% else %>
<%= f.label :blank, "Rating" %>
<fieldset class="ratings">
<%= f.radio_button :rating, :e %>
<%= f.label :rating_e, "Explicit" %>
@@ -23,21 +23,21 @@
<%= f.radio_button :rating, :s %>
<%= f.label :rating_s, "Safe" %>
</fieldset>
</fieldset>
<% end %>
</div>
<% if CurrentUser.is_builder? %>
<div class="input">
<%= f.label :blank, "Lock" %>
<fieldset class="locks">
<%= f.check_box :is_note_locked %>
<%= f.label :is_note_locked, "Notes" %>
<%= f.check_box :is_rating_locked %>
<%= f.label :is_rating_locked, "Rating" %>
<% if CurrentUser.is_admin? %>
<%= f.check_box :is_status_locked %>
<%= f.label :is_status_locked, "Status" %>
@@ -63,7 +63,7 @@
<%= f.label :tag_string, "Tags" %>
<%= f.text_area :tag_string , :size => "50x3" %>
</div>
<%= button_tag "Related tags", :id => "related-tags-button", :type => "button" %>
<%= button_tag "Artists", :id => "related-artists-button", :type => "button" %>
<%= button_tag "Characters", :id => "related-characters-button", :type => "button" %>
@@ -71,7 +71,7 @@
</div>
<div class="input">
<%= submit_tag "Submit" %>
<%= submit_tag "Submit" %>
</div>
<div id="artist-tags-container">
@@ -79,7 +79,7 @@
<div id="artist-tags">
</div>
</div>
<div id="related-tags-container">
<h1>Related Tags</h1>
<div id="related-tags">

View File

@@ -6,7 +6,7 @@
<li>Approver: <%= link_to(post.approver.name, user_path(post.approver_id)) %></li>
<% end %>
<li>
Size: <%= link_to_if Danbooru.config.can_user_see_post?(CurrentUser.user, post), number_to_human_size(post.file_size), post.file_url %>
Size: <%= link_to_if Danbooru.config.can_user_see_post?(CurrentUser.user, post), number_to_human_size(post.file_size), post.file_url %>
<% if post.is_image? %>
(<%= post.image_width %>x<%= post.image_height %>)
<% end %>
@@ -20,15 +20,15 @@
<% if post.is_pending? %>
Pending
<% end %>
<% if post.is_deleted? %>
Deleted
<% end %>
<% if post.is_flagged? %>
Flagged
<% end %>
<% if !post.is_pending? && !post.is_deleted? %>
Active
<% end %>

View File

@@ -1,7 +1,7 @@
<% if post.is_flagged? && !post.is_deleted? && post.flags.any? %>
<div class="ui-corner-all ui-state-highlight notice">
<p>This post was flagged for deletion: </p>
<%= post_flag_reasons(post) %>
</div>
<% end %>
@@ -15,7 +15,7 @@
<% if post.is_deleted? && post.flags.any? %>
<div class="ui-corner-all ui-state-highlight notice">
<p>This post was deleted for the following reasons: </p>
<%= post_flag_reasons(post) %>
</div>
<% end %>
@@ -23,7 +23,7 @@
<% if post.is_pending? %>
<div class="ui-corner-all ui-state-highlight notice" id="pending-approval-notice">
This post is pending approval (<%= link_to "learn more", wiki_pages_path(:title => "help:post_moderation") %>)
<% if CurrentUser.is_janitor? && !post.disapproved_by?(CurrentUser.user) %>
<div class="quick-mod">
<% unless post.is_status_locked? %>
@@ -37,7 +37,7 @@
<% if (post.is_flagged? || post.is_deleted?) && post.appeals.any? %>
<div class="ui-corner-all ui-state-highlight notice">
<p>This post was appealed:</p>
<p>This post was appealed:</p>
<%= post_appeal_reasons(post) %>
</div>
<% end %>

View File

@@ -10,16 +10,16 @@
<li><%= link_to "Add note", "#", :id => "translate", :title => "Shortcut is CTRL+N" %></li>
<% end %>
<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? %>
<% if !post.is_deleted? && !post.is_pending? %>
<li><%= link_to "Flag", new_post_flag_path(:post_id => post.id), :id => "flag" %></li>
<% end %>
<% if post.is_flagged? || post.is_deleted? %>
<li><%= link_to "Appeal", new_post_appeal_path(:post_id => post.id), :id => "appeal" %></li>
<% end %>
<% if CurrentUser.is_janitor? %>
<% if post.is_flagged? || post.is_pending? %>
<li><%= link_to "Approve", moderator_post_approval_path(:post_id => post.id), :remote => true, :method => :post, :id => "approve" %></li>
@@ -34,7 +34,7 @@
<% end %>
<% end %>
<% end %>
<% if CurrentUser.is_admin? %>
<li><%= link_to "Expunge", annihilate_moderator_post_post_path(:post_id => post.id), :remote => true, :method => :post, :id => "annihilate", :confirm => "This will permanently delete this post (meaning the file will be deleted). Are you sure you want to delete this post?" %></li>
<% end %>

View File

@@ -10,12 +10,12 @@
<script type="text/javascript">
var addthis_config = {"data_track_addressbar": false};
var addthis_share = {
"url":"<%= j post_path(post, :only_path => false, :host => Danbooru.config.hostname) %>",
"url":"<%= j post_path(post, :only_path => false, :host => Danbooru.config.hostname) %>",
"title": "<%= j post.presenter.humanized_essential_tag_string %>"
};
</script>
<script type="text/javascript" src="http://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-4f8dbf8a41066ac7"></script>
<!-- AddThis Button END -->
<!-- AddThis Button END -->
</div>

View File

@@ -2,9 +2,9 @@
<div id="a-show">
<aside id="sidebar">
<%= render "posts/partials/common/search", :path => posts_path, :tags => params[:tags] %>
<%= render_advertisement("vertical") %>
<section id="tag-list">
<%= @post.presenter.split_tag_list_html(self) %>
</section>
@@ -13,7 +13,7 @@
<h1>Information</h1>
<%= render "posts/partials/show/information", :post => @post %>
</section>
<section>
<h1>Options</h1>
<%= render "posts/partials/show/options", :post => @post %>
@@ -33,11 +33,11 @@
<% if @post.presenter.has_nav_links?(self) %>
<%= render "posts/partials/show/nav_links", :post => @post, :position => "top" %>
<% end %>
<%= render "posts/partials/show/notices", :post => @post %>
<%= render_advertisement("horizontal") %>
<section id="image-container">
<div id="note-container"></div>
<%= @post.presenter.image_html(self) %>
@@ -46,7 +46,7 @@
<% if @post.presenter.has_nav_links?(self) %>
<%= render "posts/partials/show/nav_links", :post => @post, :position => "bottom" %>
<% end %>
<menu id="post-sections">
<li><a href="#comments">Comments</a></li>
<% if Danbooru.config.can_user_see_post?(CurrentUser.user, @post) %>
@@ -68,11 +68,11 @@
<%= render "posts/partials/show/edit", :post => @post %>
</section>
<% end %>
<section id="share" style="display: none;">
<%= render "posts/partials/show/share", :post => @post %>
</section>
<%= render_rss_advertisement("long", @post.rating == "e") %>
</section>
</div>
@@ -84,7 +84,7 @@
<div id="appeal-dialog" title="Appeal post" style="display: none;">
<%= render "post_appeals/new" %>
</div>
<div id="add-to-pool-dialog" title="Add to pool" style="display: none;">
<%= render "pool_elements/new" %>
</div>

View File

@@ -9,20 +9,20 @@
<label for="name">Name</label>
<%= text_field_tag :name %>
</div>
<div class="input">
<label for="password">Password</label>
<%= password_field_tag :password %>
<%= check_box_tag :remember, "1", true %>
<label for="remember" id="remember-label">Remember</label>
</div>
<div class="input">
<%= submit_tag "Submit" %>
</div>
<% end %>
</section>
</section>
</div>
</div>

View File

@@ -1,11 +1,11 @@
<!--
<!--
- source
-->
<% if source.try(:available?) %>
<div id="source-info">
<p>This looks like a <%= source.site_name %> upload. <%= link_to "Fetch data", source_path(:format => "json", :url => source.referer_url(self)), :id => "fetch-data" %>.</p>
<ul>
<li><strong>Artist</strong>: <span id="source-artist"></span></li>
<li><strong>Tags</strong>: <span id="source-tags"></span></li>

View File

@@ -1,5 +1,5 @@
<footer id="page-footer">
Running Danbooru v<%= Danbooru.config.version %>
Running Danbooru v<%= Danbooru.config.version %>
&ndash; <%= link_to "Contact", contact_path %>
<% if CurrentUser.user.enable_post_navigation %>
&ndash; <%= link_to "Keyboard shortcuts available", keyboard_shortcuts_path %>

View File

@@ -1,9 +1,9 @@
<div id="c-static">
<div id="a-boomkarklet">
<h1>Bookmarklet</h1>
<p><%= link_to "Post to Danbooru", "javascript:location.href='http://#{Danbooru.config.hostname}/uploads/new?url='+encodeURIComponent(location.href)+'&ref='+encodeURIComponent(document.referrer)" %></p>
<p>Bookmark this link. Next time you are directly viewing an image (that is, the JPG/PNG/GIF file is in the URL bar) you can open this bookmarklet and you will be taken to the upload page. Depending on the site you are uploading from you may also see some options for fetching metadata.</p>
</div>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-static">
<div id="a-keyboard-shortcuts">
<h1>Keyboard Shortcuts</h1>
<section>
<h1>Listing</h1>
<ul>
@@ -10,7 +10,7 @@
<li><span class="key">q</span> Search</li>
</ul>
</section>
<section>
<h1>Post</h1>
<ul>

View File

@@ -94,14 +94,14 @@
<li><h1>Admin</h1></li>
<li><%= link_to("Mod Actions", mod_actions_path) %></li>
<li><%= link_to("Jobs", delayed_jobs_path) %></li>
<% if CurrentUser.is_admin? %>
<li><%= link_to("Janitor Trials", janitor_trials_path) %></li>
<li><%= link_to("IP Bans", ip_bans_path) %></li>
<li><%= link_to("News Updates", news_updates_path) %></li>
<li><%= link_to("Alias & Implication Import", new_admin_alias_and_implication_import_path) %></li>
<% end %>
<% if Danbooru.config.is_user_advertiser?(CurrentUser.user) %>
<li><%= link_to("Advertisements", advertisements_path) %></li>
<% end %>

View File

@@ -1,7 +1,7 @@
<div id="terms-of-service">
<div class="section">
<h4>Terms of Service</h4>
<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>
<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>
<li>The Site reserves the right to change these terms at any time.</li>
@@ -11,13 +11,13 @@
<li>You will make a best faith effort to upload only high quality anime-related images.</li>
<li>You have read the <%= link_to "tagging guidelines", wiki_pages_path(:title => "help:tags") %>.</li>
</ul>
<div class="section">
<h6>Post/Comment Limiting</h6>
<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>
<p>In addition, you may not use the Site to upload any of the following:</p>

View File

@@ -3,7 +3,7 @@
<h1>Tag Alias Request</h1>
<p>You can request a new tag alias be created. This will create a corresponding forum topic for community review.</p>
<%= form_tag(tag_alias_request_path, :class => "simple_form") do %>
<div class="input">
<label>Antecedent</label>
@@ -24,7 +24,7 @@
<%= submit_tag "Submit" %>
</div>
<% end %>
<%= render "tag_aliases/secondary_links" %>
</div>
</div>

View File

@@ -2,9 +2,9 @@
<div id="a-index">
<div class="search">
<%= form_tag(general_search_tag_aliases_path, :method => :get) do %>
<%= text_field_tag "query", params[:query] %>
<%= text_field_tag "query", params[:query] %>
<%= submit_tag "Search Aliases" %>
<%= submit_tag "Search Implications" %>
<%= submit_tag "Search Implications" %>
<% end %>
</div>
@@ -16,7 +16,7 @@
<th width="10%">Reference</th>
<th width="10%">Status</th>
<th width="20%"></th>
</tr>
</tr>
</thead>
<tbody>
<% @tag_aliases.each do |tag_alias| %>
@@ -34,18 +34,18 @@
<td>
<% if CurrentUser.is_admin? %>
<%= link_to "Delete", tag_alias_path(tag_alias), :remote => true, :method => :delete, :confirm => "Are you sure you want to delete this alias?" %>
<% if tag_alias.is_pending? %>
| <%= link_to "Approve", approve_tag_alias_path(tag_alias), :remote => true, :method => :post %>
<% end %>
<% if CurrentUser.is_moderator? %>
| <%= link_to "Fix", tag_alias_correction_path(:tag_alias_id => tag_alias.id) %>
<% end %>
<% end %>
</td>
</tr>
<% end %>
<% end %>
</tbody>
</table>

View File

@@ -7,7 +7,7 @@
<%= f.input :consequent_name, :label => "To" %>
<%= f.input :forum_topic_id, :label => "Forum" %>
<%= f.button :submit %>
<% end %>
<% end %>
</div>
</div>

View File

@@ -3,7 +3,7 @@
<h1>Tag Implication Request</h1>
<p>You can request a new tag implication be created. This will create a corresponding forum topic for community review.</p>
<%= form_tag(tag_implication_request_path, :class => "simple_form") do %>
<div class="input">
<label>Antecedent</label>
@@ -24,7 +24,7 @@
<%= submit_tag "Submit" %>
</div>
<% end %>
<%= render "tag_implications/secondary_links" %>
</div>
</div>

View File

@@ -2,8 +2,8 @@
<div id="a-index">
<div class="search">
<%= form_tag(general_search_tag_aliases_path, :method => :get) do %>
<%= text_field_tag "query", params[:query] %>
<%= submit_tag "Search Implications" %>
<%= text_field_tag "query", params[:query] %>
<%= submit_tag "Search Implications" %>
<%= submit_tag "Search Aliases" %>
<% end %>
</div>
@@ -16,7 +16,7 @@
<th width="10%">Reference</th>
<th width="10%">Status</th>
<th width="15%"></th>
</tr>
</tr>
</thead>
<tbody>
<% @tag_implications.each do |tag_implication| %>
@@ -38,7 +38,7 @@
<% end %>
</td>
</tr>
<% end %>
<% end %>
</tbody>
</table>

View File

@@ -7,7 +7,7 @@
<%= f.input :consequent_name, :label => "To" %>
<%= f.input :forum_topic_id, :label => "Forum" %>
<%= f.button :submit %>
<% end %>
<% end %>
</div>
</div>

View File

@@ -3,7 +3,7 @@
<li><%= link_to "Listing", tag_subscriptions_path %></li>
<li><%= link_to "New", new_tag_subscription_path %></li>
<li><%= link_to "Help", wiki_pages_path(:title => "help:tag_subscriptions") %></li>
<% if @tag_subscription && !@tag_subscription.new_record? && @tag_subscription.editable_by?(CurrentUser.user) %>
<li>|</li>
<li><%= link_to "Show", tag_subscription_path(@tag_subscription) %></li>

View File

@@ -27,9 +27,9 @@
<% end %>
</tbody>
</table>
<p class="info">You can create up to <%= Danbooru.config.max_tag_subscriptions %> subscriptions with up to 20 tags each.</p>
<%= sequential_paginator(@tag_subscriptions) %>
</div>
</div>

View File

@@ -1,9 +1,9 @@
<div id="c-tag-subscriptions">
<div id="a-new">
<h1>New Tag Subscription</h1>
<%= error_messages_for "tag_subscription" %>
<%= render "form" %>
</div>
</div>

View File

@@ -5,16 +5,16 @@
<%= render "posts/partials/index/mode_menu" %>
<%= render "posts/partials/index/blacklist" %>
</aside>
<section id="content">
<h1>Tag Subscriptions [<%= link_to "edit", tag_subscriptions_path %>]</h1>
<%= @post_set.presenter.post_previews_html(self) %>
<%= numbered_paginator(@posts) %>
</section>
<%= render "posts/partials/common/secondary_links" %>
<%= render "posts/partials/common/secondary_links" %>
</div>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-tags">
<div id="a-edit">
<h1>Tag: <%= @tag.name %></h1>
<%= simple_form_for(@tag) do |f| %>
<%= f.input :category, :collection => Danbooru.config.canonical_tag_category_mapping.to_a, :include_blank => false %>
<%= f.button :submit, "Submit" %>

View File

@@ -1,6 +1,6 @@
<div id="c-tags">
<div id="a-index">
<table class="striped">
<table class="striped">
<thead>
<tr>
<th>Count</th>

View File

@@ -6,22 +6,22 @@
<%= text_field "search", "name_matches" %>
<span class="hint">Use * for wildcard</span>
</div>
<div class="input">
<label for="search_category">Category</label>
<%= select "search", "category", [""] + Danbooru.config.canonical_tag_category_mapping.to_a %>
</div>
<div class="input">
<label for="search_hide_empty">Hide Empty</label>
<%= select "search", "hide_empty", ["yes", "no"] %>
</div>
<div class="input">
<label for="search_sort">Sort</label>
<%= select "search", "sort", %w(date name count) %>
</div>
<%= submit_tag "Search" %>
<% end %>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-tags">
<div id="a-show">
<h1>Tag: <%= @tag.name %></h1>
<ul>
<li>Count: <%= @tag.post_count %></li>
<li>Category: <%= @tag.category_name %></li>

View File

@@ -1,4 +1,4 @@
<!--
<!--
- post
-->
<% if post %>

View File

@@ -22,7 +22,7 @@
<% end %>
</tbody>
</table>
<%= numbered_paginator(@uploads) %>
</div>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-uploads">
<div id="a-new">
<h1>Upload</h1>
<div id="upload-guide-notice">
<p>Before uploading, please read the <%= link_to "how to upload guide", wiki_pages_path(:title => "howto:upload") %>.</p>
</div>
@@ -9,9 +9,9 @@
<%= render "image" %>
<%= render "post", :post => @post %>
<%= render "sources/info", :source => @source %>
<%= error_messages_for "upload" %>
<%= form_for(@upload, :html => {:multipart => true, :class => "simple_form", :id => 'form'}) do |f| %>
<div class="input">
<%= f.label :file %>
@@ -24,10 +24,10 @@
<%= button_tag "Similar", :id => "similar-button", :type => "button" %>
<%= button_tag "Artist", :id => "find-artist-button", :type => "button" %>
</div>
<div class="input">
<%= f.label :rating_q, "Rating" %>
<fieldset class="ratings">
<%= f.radio_button :rating, :e %>
<%= f.label :rating_e, "Explicit", :title => "Hardcore porn, visible genitals, gore" %>
@@ -35,7 +35,7 @@
<%= f.radio_button :rating, :q %>
<%= f.label :rating_q, "Questionable", :title => "Nudity, anything erotic" %>
<%= f.radio_button :rating, :s %>
<%= f.radio_button :rating, :s %>
<%= f.label :rating_s, "Safe", :title => "Everything else" %>
</fieldset>
</div>
@@ -44,19 +44,19 @@
<%= f.label :parent_id, "Parent ID" %>
<%= f.text_field :parent_id %>
</div>
<div class="input">
<div>
<%= f.label :tag_string, "Tags" %>
<%= f.text_area :tag_string, :size => "60x4" %>
</div>
<%= button_tag "Related tags", :id => "related-tags-button", :type => "button" %>
<%= button_tag "Artists", :id => "related-artists-button", :type => "button" %>
<%= button_tag "Characters", :id => "related-characters-button", :type => "button" %>
<%= button_tag "Copyrights", :id => "related-copyrights-button", :type => "button" %>
</div>
<div class="input">
<%= submit_tag "Submit", :class => "large" %>
</div>

View File

@@ -1,7 +1,7 @@
<div id="c-user-feedbacks">
<div id="a-index">
<h1>User Feedback</h1>
<table class="striped" width="100%">
<thead>
<tr>

View File

@@ -1,7 +1,7 @@
<div id="c-user-feedbacks">
<div id="a-show">
<h1>User Feedback For <%= @user_feedback.user_name %></h1>
<ul>
<li><strong>Creator</strong> <%= @user_feedback.creator.name %></li>
<li><strong>Date</strong> <%= @user_feedback.created_at %></li>

Some files were not shown because too many files have changed in this diff Show More