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

Merge pull request #3471 from BrokenEagle/fix-controller-views

Browse Source 
Various fixes for controller views
This commit is contained in:
Albert Yi
2017-12-28 11:18:44 -08:00
committed by GitHub
parent d110f91198 71e05e8502
commit b315ee25bc
55 changed files with 429 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
Danbooru.ForumPost = {};
Danbooru.ForumPost.initialize_all = function() {
if ($("#c-forum-topics #a-show").length) {;
if ($("#c-forum-topics #a-show,#c-forum-posts #a-show").length) {;
this.initialize_edit_links();
Danbooru.keydown("e", "edit", function(e) {

2
app/assets/stylesheets/specific/bulk_update_requests.scss
View File

@@ -1,4 +1,4 @@
#c-burs {
#c-bulk-update-requests {
s.approved {
color: green;
}

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

@@ -34,11 +34,11 @@
</table>
<%= numbered_paginator(@commentaries) %>
<%= render "secondary_links" %>
</div>
</div>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Artist Commentary - <%= Danbooru.config.app_name %>
<% end %>

3
app/views/artist_commentary_versions/index.html.erb
View File

@@ -61,10 +61,11 @@
<%= numbered_paginator(@commentary_versions) %>
<%= render "artist_commentaries/secondary_links" %>
</div>
</div>
<%= render "artist_commentaries/secondary_links" %>
<% content_for(:page_title) do %>
Artist Commentary Versions - <%= Danbooru.config.app_name %>
<% end %>

4
app/views/artists/_show.html.erb
View File

@@ -21,11 +21,11 @@
<%= @post_set.presenter.post_previews_html(self) %>
</div>
</div>
<%= render "secondary_links" %>
</div>
</div>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Artist - <%= @artist.name %> - <%= Danbooru.config.app_name %>
<% end %>

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

@@ -28,11 +28,11 @@
</table>
<%= numbered_paginator(@artists) %>
<%= render "secondary_links" %>
</div>
</div>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Artists - <%= Danbooru.config.app_name %>
<% end %>

4
app/views/bans/edit.html.erb
View File

@@ -1,5 +1,5 @@
<div class="bans">
<div class="new">
<div id="c-bans">
<div id="a-edit">
<h1>Edit Ban</h1>
<%= render "form", :ban => @ban %>
</div>

4
app/views/bans/show.html.erb
View File

@@ -1,5 +1,5 @@
<div class="bans">
<div class="show">
<div id="c-bans">
<div id="a-show">
<h1>Show Ban</h1>
<ul style="margin-bottom: 1em;">
<li><strong>User</strong>: <%= link_to_user(@ban.user) %></li>

4
app/views/bulk_update_requests/edit.html.erb
View File

@@ -1,5 +1,5 @@
<div class="bulk-update-requests">
<div class="new">
<div id="c-bulk-update-requests">
<div id="a-edit">
<h1>Edit Bulk Update Request</h1>
<%= render "form" %>
</div>

2
app/views/bulk_update_requests/index.html.erb
View File

@@ -1,4 +1,4 @@
<div id="c-burs">
<div id="c-bulk-update-requests">
<div id="a-index">
<h1>Bulk Update Requests</h1>

4
app/views/bulk_update_requests/new.html.erb
View File

@@ -1,5 +1,5 @@
<div class="bulk-update-requests">
<div class="new">
<div id="c-bulk-update-requests">
<div id="a-new">
<h1>New Bulk Update Request</h1>
<%= render "form" %>

2
app/views/comments/edit.html.erb
View File

@@ -6,7 +6,7 @@
</div>
</div>
<%= render "comments/secondary_links" %>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Edit Comment - <%= Danbooru.config.app_name %>

2
app/views/comments/index.html.erb
View File

@@ -12,7 +12,7 @@
</div>
</div>
<%= render "comments/secondary_links" %>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Comments - <%= Danbooru.config.app_name %>

2
app/views/comments/search.html.erb
View File

@@ -16,7 +16,7 @@
</div>
</div>
<%= render "comments/secondary_links" %>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Search Comments - <%= Danbooru.config.app_name %>

8
app/views/delayed_jobs/index.html.erb
View File

@@ -53,9 +53,9 @@
</table>
<%= numbered_paginator(@delayed_jobs) %>
<% content_for(:page_title) do %>
Delayed Jobs - <%= Danbooru.config.app_name %>
<% end %>
</div>
</div>
<% content_for(:page_title) do %>
Delayed Jobs - <%= Danbooru.config.app_name %>
<% end %>

2
app/views/explore/posts/viewed.html.erb
View File

@@ -1,5 +1,5 @@
<div id="c-explore-posts">
<div id="a-popular">
<div id="a-viewed">
<h1>Most Viewed - <%= @post_set.presenter.date %></h1>
<%= render "posts/partials/common/inline_blacklist" %>

11
app/views/favorites/index.html.erb
View File

@@ -37,12 +37,11 @@
<%= sequential_paginator(@favorite_set.favorites) %>
</div>
</section>
<% content_for(:page_title) do %>
Favorites - <%= @user.pretty_name %> - <%= Danbooru.config.app_name %>
<% end %>
<%= render "posts/partials/common/secondary_links" %>
</div>
</div>
<%= render "posts/partials/common/secondary_links" %>
<% content_for(:page_title) do %>
Favorites - <%= @user.pretty_name %> - <%= Danbooru.config.app_name %>
<% end %>

2
app/views/forum_posts/edit.html.erb
View File

@@ -1,4 +1,4 @@
<div id="c-forum-topics">
<div id="c-forum-posts">
<div id="a-edit">
<h1>Edit Forum Post</h1>

2
app/views/forum_posts/new.html.erb
View File

@@ -1,4 +1,4 @@
<div id="c-forum-topics">
<div id="c-forum-posts">
<div id="a-new">
<% if @forum_topic %>
<h1>Reply to <%= @forum_topic.title %></h1>

6
app/views/forum_posts/partials/new/_form.html.erb
View File

@@ -1,7 +1,11 @@
<%= error_messages_for("forum_post") %>
<%= simple_form_for(forum_post) do |f| %>
<%= f.input :topic_id, :as => :hidden %>
<% if @forum_topic %>
<%= f.input :topic_id, :as => :hidden %>
<% else %>
<%= f.input :topic_id, :label => "Topic ID" %>
<% end %>
<%= dtext_field "forum_post", "body", :classes => "autocomplete-mentions" %>
<%= f.button :submit, "Submit", :data => { :disable_with => "Submitting..." } %>

2
app/views/forum_posts/search.html.erb
View File

@@ -1,4 +1,4 @@
<div id="c-forum-topics">
<div id="c-forum-posts">
<div id="a-search">
<h1>Search Forum</h1>
<%= form_tag(forum_posts_path, :method => :get, :class => "simple_form") do %>

2
app/views/forum_posts/show.html.erb
View File

@@ -1,4 +1,4 @@
<div id="c-forum-topics">
<div id="c-forum-posts">
<div id="a-show" class="single-forum-post list-of-forum-posts">
<h1>Topic: <%= @forum_post.topic.title %></h1>
<%= render "forum_post", :forum_post => @forum_post %>

2
app/views/maintenance/user/dmail_filters/edit.html.erb
View File

@@ -1,4 +1,4 @@
<div id="c-users">
<div id="c-maintenance-user-dmail-filters">
<div id="a-edit">
<h1>Edit Message Filters</h1>

36
app/views/maintenance/user/email_changes/new.html.erb
View File

@@ -1,19 +1,23 @@
<h1>Change Email</h1>
<div id="c-maintenance-user-email-changes">
<div id="a-new">
<h1>Change Email</h1>
<p>You must confirm your password in order to change your email address.</p>
<p>You must confirm your password in order to change your email address.</p>
<%= form_tag(maintenance_user_email_change_path, :class => "simple_form") do %>
<div class="input">
<label>New Email</label>
<%= email_field :email_change, :email %>
<%= form_tag(maintenance_user_email_change_path, :class => "simple_form") do %>
<div class="input">
<label>New Email</label>
<%= email_field :email_change, :email %>
</div>
<div class="input">
<label>Password</label>
<%= password_field :email_change, :password %>
</div>
<div>
<%= submit_tag "Submit" %>
</div>
<% end %>
</div>
<div class="input">
<label>Password</label>
<%= password_field :email_change, :password %>
</div>
<div>
<%= submit_tag "Submit" %>
</div>
<% end %>
</div>

18
app/views/maintenance/user/email_notifications/show.html.erb
View File

@@ -1,9 +1,13 @@
<h1>Unsubscribe</h1>
<div id="c-maintenance-user-email-notifications">
<div id="a-show">
<h1>Unsubscribe</h1>
<p>Do you wish to stop receiving all email notifications?</p>
<p>Do you wish to stop receiving all email notifications?</p>
<%= form_tag(maintenance_user_email_notification_path, :method => "delete") do %>
<%= hidden_field_tag "sig", params[:sig] %>
<%= hidden_field_tag "user_id", params[:user_id] %>
<%= submit_tag "Yes" %>
<% end %>
<%= form_tag(maintenance_user_email_notification_path, :method => "delete") do %>
<%= hidden_field_tag "sig", params[:sig] %>
<%= hidden_field_tag "user_id", params[:user_id] %>
<%= submit_tag "Yes" %>
<% end %>
</div>
</div>

4
app/views/maintenance/user/login_reminders/new.html.erb
View File

@@ -14,11 +14,11 @@
<%= submit_tag "Submit" %>
<% end %>
<%= render "sessions/secondary_links" %>
</div>
</div>
<%= render "sessions/secondary_links" %>
<% content_for(:page_title) do %>
Login Reminder - <%= Danbooru.config.app_name %>
<% end %>

4
app/views/maintenance/user/password_resets/edit.html.erb
View File

@@ -12,11 +12,11 @@
<% else %>
<p>Invalid key</p>
<% end %>
<%= render "sessions/secondary_links" %>
</div>
</div>
<%= render "sessions/secondary_links" %>
<% content_for(:page_title) do %>
Reset Password - <%= Danbooru.config.app_name %>
<% end %>

4
app/views/maintenance/user/password_resets/new.html.erb
View File

@@ -13,11 +13,11 @@
</div>
<%= submit_tag "Submit" %>
<% end %>
<%= render "sessions/secondary_links" %>
</div>
</div>
<%= render "sessions/secondary_links" %>
<% content_for(:page_title) do %>
Reset Password - <%= Danbooru.config.app_name %>
<% end %>

2
app/views/maintenance/user/passwords/edit.html.erb
View File

@@ -1,4 +1,4 @@
<div id="c-users">
<div id="c-maintenance-user-passwords">
<div id="a-edit">
<h1>Change Password</h1>

2
app/views/moderator/post/queues/random.html.erb
View File

@@ -1,5 +1,5 @@
<div id="c-moderator-post-queues">
<div id="a-show">
<div id="a-random">
<div>
<h1>Moderation Queue</h1>

2
app/views/news_updates/edit.html.erb
View File

@@ -1,5 +1,5 @@
<div id="c-news-updates">
<div id="a-new">
<div id="a-edit">
<h1>Edit Update</h1>
<%= simple_form_for(@news_update) do |f| %>

2
app/views/notes/index.html.erb
View File

@@ -37,7 +37,7 @@
</div>
</div>
<%= render "notes/secondary_links" %>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Notes - <%= Danbooru.config.app_name %>

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

@@ -34,11 +34,11 @@
</table>
<%= numbered_paginator(@pools) %>
<%= render "secondary_links" %>
</div>
</div>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Pools - <%= Danbooru.config.app_name %>
<% end %>

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

@@ -41,19 +41,6 @@
<%= render "posts/partials/index/posts", :post_set => @post_set %>
</section>
<% content_for(:page_title) do %>
<% if @post_set.tag_string.present? %>
<%= @post_set.humanized_tag_string %> - <%= Danbooru.config.app_name %>
<% else %>
<%= Danbooru.config.app_name %>
<% end %>
<% end %>
<% if params[:tags] =~ /search:/ %>
<%= render "saved_searches/secondary_links" %>
<% else %>
<%= render "posts/partials/common/secondary_links" %>
<% end %>
<%= post_search_count_js %>
@@ -63,6 +50,20 @@
</div>
</div>
<% if params[:tags] =~ /search:/ %>
<%= render "saved_searches/secondary_links" %>
<% else %>
<%= render "posts/partials/common/secondary_links" %>
<% end %>
<% content_for(:page_title) do %>
<% if @post_set.tag_string.present? %>
<%= @post_set.humanized_tag_string %> - <%= Danbooru.config.app_name %>
<% else %>
<%= Danbooru.config.app_name %>
<% end %>
<% end %>
<%= content_for(:html_header) do %>
<link href="<%= posts_path(:format => 'atom', :tags => params[:tags]) %>" rel="alternate" title="ATOM" type="application/atom+xml" />
<%= content_tag(:link, nil, rel: "prefetch", href: next_page_url, as: "html", crossorigin: "use-credentials") %>

58
app/views/related_tags/show.html.erb
View File

@@ -1,33 +1,35 @@
<div>
<h1>Related tags</h1>
<section>
<%= form_tag(related_tag_path, :method => :get) do %>
<%= text_field_tag "query", params[:query], :data => { :autocomplete => "tag" } %>
<%= select_tag "category", options_for_select([""] + TagCategory.canonical_mapping.map{|x| [x.first, x.first.downcase]}, params[:category]) %>
<%= submit_tag "Show"%>
<% end %>
</section>
<% if params[:query].present? %>
<div id="c-related-tags">
<div id="a-show">
<h1>Related tags</h1>
<section>
<table class="striped">
<thead>
<tr>
<th>Name</th>
</tr>
</thead>
<tbody>
<% @query.tags_for_html.each do |tag, category| %>
<tr>
<td class="category-<%= category %>">
<%= link_to("?", show_or_new_wiki_pages_path(:title => tag)) %>
<%= link_to(tag, posts_path(:tags => tag)) %>
</td>
</tr>
<% end %>
</tbody>
</table>
<%= form_tag(related_tag_path, :method => :get) do %>
<%= text_field_tag "query", params[:query], :data => { :autocomplete => "tag" } %>
<%= select_tag "category", options_for_select([""] + TagCategory.canonical_mapping.map{|x| [x.first, x.first.downcase]}, params[:category]) %>
<%= submit_tag "Show"%>
<% end %>
</section>
<% end %>
<% if params[:query].present? %>
<section>
<table class="striped">
<thead>
<tr>
<th>Name</th>
</tr>
</thead>
<tbody>
<% @query.tags_for_html.each do |tag, category| %>
<tr>
<td class="category-<%= category %>">
<%= link_to("?", show_or_new_wiki_pages_path(:title => tag)) %>
<%= link_to(tag, posts_path(:tags => tag)) %>
</td>
</tr>
<% end %>
</tbody>
</table>
</section>
<% end %>
</div>
</div>
<%= render "tags/secondary_links" %>

2
app/views/reports/down_voting_post.html.erb
View File

@@ -1,5 +1,5 @@
<div id="c-reports">
<div id="a-down-voting-post-report">
<div id="a-down-voting-post">
<h1>Down Voting Post Report</h1>
<p>This report uses stastistical analysis to determine if a user's uploads are being targeted by an attacker. It will take some time to generate so you will receive a DMail with the results when it finishes.</p>

4
app/views/reports/post_versions_create.html.erb
View File

@@ -1,5 +1,5 @@
<div id="c-post-versions">
<div id="a-index">
<div id="c-reports">
<div id="a-post-versions-create">
<h1>Post Changes Report</h1>
<p>Only the 1,000 most recent changes are displayed.</p>

4
app/views/reports/upload_tags.html.erb
View File

@@ -1,5 +1,5 @@
<div id="c-upload-tags-report">
<div id="a-show">
<div id="c-reports">
<div id="a-upload-tags">
<h1>Upload tag changes report for <%= @user.pretty_name %></h1>
<%= render "posts/partials/common/inline_blacklist" %>

16
app/views/static/contact.html.erb
View File

@@ -1,9 +1,13 @@
<h1>Contact</h1>
<div id="c-static">
<div id="a-contact">
<h1>Contact</h1>
<h2>Questions &amp; Comments</h2>
<h2>Questions &amp; Comments</h2>
<p>You can reach the administrator of this site at <%= mail_to Danbooru.config.contact_email, nil, :encode => :hex %>.</p>
<p>You can reach the administrator of this site at <%= mail_to Danbooru.config.contact_email, nil, :encode => :hex %>.</p>
<% content_for(:page_title) do %>
Contact - <%= Danbooru.config.app_name %>
<% end %>
<% content_for(:page_title) do %>
Contact - <%= Danbooru.config.app_name %>
<% end %>
</div>
</div>

44
app/views/tag_alias_corrections/show.html.erb
View File

@@ -1,28 +1,32 @@
<h1>Tag Alias Correction: <%= @correction.antecedent_name %> -&gt; <%= @correction.consequent_name %></h1>
<div id="c-tag-alias-corrections">
<div id="a-show">
<h1>Tag Alias Correction: <%= @correction.antecedent_name %> -&gt; <%= @correction.consequent_name %></h1>
<p>Because tag aliases are cached in memory, they may go out of sync. This action will clear out the cache and fix any lingering posts.</p>
<p>Because tag aliases are cached in memory, they may go out of sync. This action will clear out the cache and fix any lingering posts.</p>
<% @correction.each_server do |server| %>
<div style="margin-bottom: 1em;">
<h2>Server: <%= server.hostname %></h2>
<ul>
<li><strong><%= link_to server.antecedent_name, posts_path(:tags => server.antecedent_name, :raw => true) %></strong> aliased to <strong><%= server.statistics_hash["antecedent_cache"] %></strong> in cache</li>
<li><strong><%= server.consequent_name %></strong> aliased to <strong><%= server.statistics_hash["consequent_cache"] %></strong> in cache</li>
<li><strong><%= server.antecedent_name %></strong> count is <%= server.statistics_hash["antecedent_count"] %></li>
<li><strong><%= server.consequent_name %></strong> count is <%= server.statistics_hash["consequent_count"] %></li>
</ul>
<% @correction.each_server do |server| %>
<div style="margin-bottom: 1em;">
<h2>Server: <%= server.hostname %></h2>
<ul>
<li><strong><%= link_to server.antecedent_name, posts_path(:tags => server.antecedent_name, :raw => true) %></strong> aliased to <strong><%= server.statistics_hash["antecedent_cache"] %></strong> in cache</li>
<li><strong><%= server.consequent_name %></strong> aliased to <strong><%= server.statistics_hash["consequent_cache"] %></strong> in cache</li>
<li><strong><%= server.antecedent_name %></strong> count is <%= server.statistics_hash["antecedent_count"] %></li>
<li><strong><%= server.consequent_name %></strong> count is <%= server.statistics_hash["consequent_count"] %></li>
</ul>
</div>
<% end %>
<p>You can try to fix this alias. This will clear the cache and re-save all posts associated with <strong><%= @correction.antecedent_name %></strong>.</p>
<%= form_tag(tag_alias_correction_path(:tag_alias_id => @correction.tag_alias_id)) do %>
<%= submit_tag "Fix" %>
<%= submit_tag "Cancel" %>
<% end %>
</div>
<% end %>
<p>You can try to fix this alias. This will clear the cache and re-save all posts associated with <strong><%= @correction.antecedent_name %></strong>.</p>
<%= form_tag(tag_alias_correction_path(:tag_alias_id => @correction.tag_alias_id)) do %>
<%= submit_tag "Fix" %>
<%= submit_tag "Cancel" %>
<% end %>
</div>
<%= render "tag_aliases/secondary_links" %>
<% content_for(:page_title) do %>
Tag Alias Correction - <%= Danbooru.config.app_name %>
<% end %>
<% end %>

8
app/views/tag_alias_requests/new.html.erb
View File

@@ -1,5 +1,5 @@
<div id="c-tag-aliases">
<div id="a-request-new">
<div id="c-tag-alias-requests">
<div id="a-new">
<h1>Tag Alias Request</h1>
<%= error_messages_for :tag_alias_request %>
@@ -34,11 +34,11 @@
<%= dtext_preview_button "tag_alias_request", "reason" %>
</div>
<% end %>
<%= render "tag_aliases/secondary_links" %>
</div>
</div>
<%= render "tag_aliases/secondary_links" %>
<% content_for(:page_title) do %>
Tag Alias Request - <%= Danbooru.config.app_name %>
<% end %>

2
app/views/tag_aliases/index.html.erb
View File

@@ -14,7 +14,7 @@
</div>
</div>
<%= render "tag_aliases/secondary_links" %>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Tag Aliases - <%= Danbooru.config.app_name %>

34
app/views/tag_aliases/show.html.erb
View File

@@ -1,20 +1,24 @@
<h1>Tag Alias: <%= @tag_alias.antecedent_name %> -&gt; <%= @tag_alias.consequent_name %></h1>
<div id="c-tag-aliases">
<div id="a-show">
<h1>Tag Alias: <%= @tag_alias.antecedent_name %> -&gt; <%= @tag_alias.consequent_name %></h1>
<ul>
<li><strong>From</strong> <%= link_to @tag_alias.antecedent_name, posts_path(:tags => @tag_alias.antecedent_name) %></li>
<li><strong>To</strong> <%= link_to @tag_alias.consequent_name, posts_path(:tags => @tag_alias.consequent_name) %></li>
<% if @tag_alias.forum_topic_id %>
<li><strong>Reference</strong> <%= link_to "topic ##{@tag_alias.forum_topic_id}", forum_topic_path(@tag_alias.forum_topic_id) %></li>
<% end %>
<li><strong>Creator</strong> <%= link_to_user @tag_alias.creator %></li>
<li><strong>Date</strong> <%= @tag_alias.created_at %></li>
<% if @tag_alias.respond_to?(:reason) && @tag_alias.reason.present? %>
<li><strong>Reason</strong> <%= format_text @tag_alias.reason %></li>
<% end %>
</ul>
<ul>
<li><strong>From</strong> <%= link_to @tag_alias.antecedent_name, posts_path(:tags => @tag_alias.antecedent_name) %></li>
<li><strong>To</strong> <%= link_to @tag_alias.consequent_name, posts_path(:tags => @tag_alias.consequent_name) %></li>
<% if @tag_alias.forum_topic_id %>
<li><strong>Reference</strong> <%= link_to "topic ##{@tag_alias.forum_topic_id}", forum_topic_path(@tag_alias.forum_topic_id) %></li>
<% end %>
<li><strong>Creator</strong> <%= link_to_user @tag_alias.creator %></li>
<li><strong>Date</strong> <%= @tag_alias.created_at %></li>
<% if @tag_alias.respond_to?(:reason) && @tag_alias.reason.present? %>
<li><strong>Reason</strong> <%= format_text @tag_alias.reason %></li>
<% end %>
</ul>
</div>
</div>
<%= render "tag_aliases/secondary_links" %>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Tag Alias - <%= Danbooru.config.app_name %>
<% end %>
<% end %>

46
app/views/tag_corrections/new.html.erb
View File

@@ -1,23 +1,27 @@
<h1>Fix Tag: <%= @correction.tag.name %></h1>
<div id="c-tag-corrections">
<div id="a-new">
<h1>Fix Tag: <%= @correction.tag.name %></h1>
<% @correction.each_server do |server| %>
<div style="margin-bottom: 1em;">
<h2>Server: <%= server.hostname %></h2>
<ul>
<li><strong>category actual</strong>: <%= @correction.tag.category %></li>
<li><strong>category memcache</strong>: <%= server.statistics_hash["category_cache"] %></li>
<li><strong>post count memcache</strong>: <%= server.statistics_hash["post_fast_count_cache"] %></li>
<li><strong>post count db cache</strong>: <%= @correction.tag.post_count %></li>
<li><strong>post count actual:</strong> <%= @correction.tag.real_post_count %></li>
</ul>
<% @correction.each_server do |server| %>
<div style="margin-bottom: 1em;">
<h2>Server: <%= server.hostname %></h2>
<ul>
<li><strong>category actual</strong>: <%= @correction.tag.category %></li>
<li><strong>category memcache</strong>: <%= server.statistics_hash["category_cache"] %></li>
<li><strong>post count memcache</strong>: <%= server.statistics_hash["post_fast_count_cache"] %></li>
<li><strong>post count db cache</strong>: <%= @correction.tag.post_count %></li>
<li><strong>post count actual:</strong> <%= @correction.tag.real_post_count %></li>
</ul>
</div>
<% end %>
<%= form_tag(tag_correction_path(:tag_id => @correction.tag.id)) do %>
<%= submit_tag "Fix" %>
<%= submit_tag "Cancel" %>
<% end %>
<% content_for(:page_title) do %>
Tag Correction - <%= Danbooru.config.app_name %>
<% end %>
</div>
<% end %>
<%= form_tag(tag_correction_path(:tag_id => @correction.tag.id)) do %>
<%= submit_tag "Fix" %>
<%= submit_tag "Cancel" %>
<% end %>
<% content_for(:page_title) do %>
Tag Correction - <%= Danbooru.config.app_name %>
<% end %>
</div>

8
app/views/tag_implication_requests/new.html.erb
View File

@@ -1,5 +1,5 @@
<div id="c-tag-implications">
<div id="a-request-new">
<div id="c-tag-implication-requests">
<div id="a-new">
<h1>Tag Implication Request</h1>
<%= error_messages_for :tag_implication_request %>
@@ -34,11 +34,11 @@
<%= dtext_preview_button "tag_implication_request", "reason" %>
</div>
<% end %>
<%= render "tag_implications/secondary_links" %>
</div>
</div>
<%= render "tag_implications/secondary_links" %>
<% content_for(:page_title) do %>
Tag Implication Request - <%= Danbooru.config.app_name %>
<% end %>

4
app/views/tag_implications/edit.html.erb
View File

@@ -1,5 +1,5 @@
<div id="c-tag-aliases">
<div id="a-new">
<div id="c-tag-implications">
<div id="a-edit">
<h1>Edit Tag Implication</h1>
<%= error_messages_for :tag_implication %>

32
app/views/tag_implications/show.html.erb
View File

@@ -1,19 +1,23 @@
<h1>Tag Implication: <%= @tag_implication.antecedent_name %> -&gt; <%= @tag_implication.consequent_name %></h1>
<div id="c-tag-implications">
<div id="a-show">
<h1>Tag Implication: <%= @tag_implication.antecedent_name %> -&gt; <%= @tag_implication.consequent_name %></h1>
<ul>
<li><strong>From</strong> <%= link_to @tag_implication.antecedent_name, posts_path(:tags => @tag_implication.antecedent_name) %></li>
<li><strong>To</strong> <%= link_to @tag_implication.consequent_name, posts_path(:tags => @tag_implication.consequent_name) %></li>
<% if @tag_implication.forum_topic_id %>
<li><strong>Reference</strong> <%= link_to "topic ##{@tag_implication.forum_topic_id}", forum_topic_path(@tag_implication.forum_topic_id) %></li>
<% end %>
<li><strong>Creator</strong> <%= link_to_user @tag_implication.creator %></li>
<li><strong>Date</strong> <%= @tag_implication.created_at %></li>
<% if @tag_implication.respond_to?(:reason) && @tag_implication.reason.present? %>
<li><strong>Reason</strong> <%= format_text @tag_implication.reason %></li>
<% end %>
</ul>
<ul>
<li><strong>From</strong> <%= link_to @tag_implication.antecedent_name, posts_path(:tags => @tag_implication.antecedent_name) %></li>
<li><strong>To</strong> <%= link_to @tag_implication.consequent_name, posts_path(:tags => @tag_implication.consequent_name) %></li>
<% if @tag_implication.forum_topic_id %>
<li><strong>Reference</strong> <%= link_to "topic ##{@tag_implication.forum_topic_id}", forum_topic_path(@tag_implication.forum_topic_id) %></li>
<% end %>
<li><strong>Creator</strong> <%= link_to_user @tag_implication.creator %></li>
<li><strong>Date</strong> <%= @tag_implication.created_at %></li>
<% if @tag_implication.respond_to?(:reason) && @tag_implication.reason.present? %>
<li><strong>Reason</strong> <%= format_text @tag_implication.reason %></li>
<% end %>
</ul>
</div>
</div>
<%= render "tag_implications/secondary_links" %>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Tag Implication - <%= Danbooru.config.app_name %>

72
app/views/uploads/show.html.erb
View File

@@ -1,41 +1,45 @@
<h1>Upload #<%= @upload.id %></h1>
<div id="c-uploads">
<div id="a-show">
<h1>Upload #<%= @upload.id %></h1>
<ul>
<li>Date: <%= @upload.created_at %></li>
<li>Source: <%= @upload.source %></li>
<li>Tags: <%= @upload.tag_string %></li>
</ul>
<% if @upload.is_completed? %>
<p>This upload has finished processing. <%= link_to "View the post", post_path(@upload.post_id) %>.</p>
<% elsif @upload.is_pending? %>
<p>This upload is waiting to be processed. Please wait a few seconds.</p>
<% elsif @upload.is_processing? %>
<p>This upload is being processed. Please wait a few seconds.</p>
<% elsif @upload.is_duplicate? %>
<p>This upload is a duplicate: <%= link_to "post ##{@upload.duplicate_post_id}", post_path(@upload.duplicate_post_id) %></p>
<% else %>
<p>An error occurred: <%= @upload.status %></p>
<% if CurrentUser.user.is_builder? %>
<ul>
<% @upload.backtrace.to_s.split(/\n/).each do |line| %>
<li><%= line %></li>
<% end %>
<li>Date: <%= @upload.created_at %></li>
<li>Source: <%= @upload.source %></li>
<li>Tags: <%= @upload.tag_string %></li>
</ul>
<% end %>
<% if @upload.is_downloadable? %>
<%= form_tag(upload_path(@upload), :method => :put) do %>
<% submit_tag "Retry" %>
<% end %>
<% end %>
<% end %>
<p>
You can <%= link_to "upload another file", new_upload_path %> or <%= link_to "view your current uploads", uploads_path(:search => {:uploader_id => CurrentUser.id}) %>.
<% if CurrentUser.user.is_moderator? && @upload.is_pending? %>
<%= link_to "Force update", upload_path(@upload, :format => "js"), :remote => true, :method => :put %>.
<% end %>
</p>
<% if @upload.is_completed? %>
<p>This upload has finished processing. <%= link_to "View the post", post_path(@upload.post_id) %>.</p>
<% elsif @upload.is_pending? %>
<p>This upload is waiting to be processed. Please wait a few seconds.</p>
<% elsif @upload.is_processing? %>
<p>This upload is being processed. Please wait a few seconds.</p>
<% elsif @upload.is_duplicate? %>
<p>This upload is a duplicate: <%= link_to "post ##{@upload.duplicate_post_id}", post_path(@upload.duplicate_post_id) %></p>
<% else %>
<p>An error occurred: <%= @upload.status %></p>
<% if CurrentUser.user.is_builder? %>
<ul>
<% @upload.backtrace.to_s.split(/\n/).each do |line| %>
<li><%= line %></li>
<% end %>
</ul>
<% end %>
<% if @upload.is_downloadable? %>
<%= form_tag(upload_path(@upload), :method => :put) do %>
<% submit_tag "Retry" %>
<% end %>
<% end %>
<% end %>
<p>
You can <%= link_to "upload another file", new_upload_path %> or <%= link_to "view your current uploads", uploads_path(:search => {:uploader_id => CurrentUser.id}) %>.
<% if CurrentUser.user.is_moderator? && @upload.is_pending? %>
<%= link_to "Force update", upload_path(@upload, :format => "js"), :remote => true, :method => :put %>.
<% end %>
</p>
</div>
</div>
<%= render "posts/partials/common/secondary_links" %>

6
app/views/user_feedbacks/edit.html.erb
View File

@@ -1,5 +1,5 @@
<div id="c-user-feedbacks">
<div id="a-new">
<div id="a-edit">
<h1>Edit User Feedback</h1>
<div id="preview">
@@ -13,11 +13,11 @@
<%= f.button :submit, "Submit", :data => { :disable_with => "Submitting..." } %>
<%= dtext_preview_button "user_feedback", "body" %>
<% end %>
<%= render "secondary_links" %>
</div>
</div>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Edit Feedback - <%= Danbooru.config.app_name %>
<% end %>

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

@@ -36,11 +36,11 @@
</table>
<%= numbered_paginator(@user_feedbacks) %>
<%= render "secondary_links" %>
</div>
</div>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Feedback - <%= Danbooru.config.app_name %>
<% end %>

4
app/views/user_feedbacks/new.html.erb
View File

@@ -14,11 +14,11 @@
<%= f.button :submit, "Submit", :data => { :disable_with => "Submitting..." } %>
<%= dtext_preview_button "user_feedback", "body" %>
<% end %>
<%= render "secondary_links" %>
</div>
</div>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
New Feedback - <%= Danbooru.config.app_name %>
<% end %>

82
app/views/user_name_change_requests/index.html.erb
View File

@@ -1,46 +1,48 @@
<div id="c-user-name-change-requests">
<h1>Name Change Requests</h1>
<table class="striped" width="100%">
<thead>
<tr>
<th>User</th>
<th>Request</th>
<th>Reason</th>
<th>Status</th>
<th>Date</th>
<th></th>
</tr>
</thead>
<tbody>
<% @change_requests.each do |change_request| %>
<div id="a-index">
<h1>Name Change Requests</h1>
<table class="striped" width="100%">
<thead>
<tr>
<td><%= link_to_user change_request.user %></td>
<td>
<strong><%= change_request.original_name %></strong> ->
<strong><%= change_request.desired_name %></strong>
</td>
<td>
<% if CurrentUser.is_admin? || CurrentUser.user == change_request.user %>
<%= change_request.change_reason %>
<% end %>
</td>
<td>
<%= change_request.status %>
<% if change_request.approved? %>
by <%= link_to_user change_request.approver %>
<% elsif change_request.rejected? %>
for reason: <%= link_to change_request.rejection_reason %>
<% end %>
</td>
<td><%= compact_time change_request.created_at %></td>
<td><%= link_to "view", user_name_change_request_path(change_request) %></td>
<th>User</th>
<th>Request</th>
<th>Reason</th>
<th>Status</th>
<th>Date</th>
<th></th>
</tr>
<% end %>
</tbody>
</table>
<%= numbered_paginator(@change_requests) %>
</thead>
<tbody>
<% @change_requests.each do |change_request| %>
<tr>
<td><%= link_to_user change_request.user %></td>
<td>
<strong><%= change_request.original_name %></strong> ->
<strong><%= change_request.desired_name %></strong>
</td>
<td>
<% if CurrentUser.is_admin? || CurrentUser.user == change_request.user %>
<%= change_request.change_reason %>
<% end %>
</td>
<td>
<%= change_request.status %>
<% if change_request.approved? %>
by <%= link_to_user change_request.approver %>
<% elsif change_request.rejected? %>
for reason: <%= link_to change_request.rejection_reason %>
<% end %>
</td>
<td><%= compact_time change_request.created_at %></td>
<td><%= link_to "view", user_name_change_request_path(change_request) %></td>
</tr>
<% end %>
</tbody>
</table>
<%= numbered_paginator(@change_requests) %>
</div>
</div>
<%= render "secondary_links" %>

32
app/views/user_name_change_requests/new.html.erb
View File

@@ -1,20 +1,24 @@
<h1>Name Change Request</h1>
<div id="c-user-name-change-requests">
<div id="a-new">
<h1>Name Change Request</h1>
<p>You can request a name change once per week. Your previous names will still
be visible on your profile to other Danbooru members, but they won't be visible
to search engines.</p>
<p>You can request a name change once per week. Your previous names will still
be visible on your profile to other Danbooru members, but they won't be visible
to search engines.</p>
<%= error_messages_for "change_request" %>
<%= error_messages_for "change_request" %>
<%= form_tag(user_name_change_requests_path, :class => "simple_form") do %>
<div class="input">
<label for="desired_name">Desired Name</label>
<%= text_field_tag "desired_name" %>
<%= form_tag(user_name_change_requests_path, :class => "simple_form") do %>
<div class="input">
<label for="desired_name">Desired Name</label>
<%= text_field_tag "desired_name" %>
</div>
<div class="input">
<%= submit_tag "Submit", :data => { :disable_with => "Submitting..." } %>
</div>
<% end %>
</div>
<div class="input">
<%= submit_tag "Submit", :data => { :disable_with => "Submitting..." } %>
</div>
<% end %>
</div>
<%= render "secondary_links" %>

160
app/views/user_name_change_requests/show.html.erb
View File

@@ -1,88 +1,90 @@
<div id="c-user-name-change-requests">
<h1>Name Change Request</h1>
<div id="a-show">
<h1>Name Change Request</h1>
<table class="aligned-vertical">
<tbody>
<tr>
<th>Date</th>
<td>
<%= compact_time @change_request.created_at %>
<% if @change_request.updated_at - @change_request.created_at > 5.minutes %>
(updated <%= time_ago_in_words_tagged @change_request.updated_at %>)
<table class="aligned-vertical">
<tbody>
<tr>
<th>Date</th>
<td>
<%= compact_time @change_request.created_at %>
<% if @change_request.updated_at - @change_request.created_at > 5.minutes %>
(updated <%= time_ago_in_words_tagged @change_request.updated_at %>)
<% end %>
</td>
</tr>
<tr>
<th>User</th>
<td><%= link_to_user @change_request.user %></td>
</tr>
<tr>
<th>Request</th>
<td>
<strong><%= @change_request.original_name %></strong> ->
<strong><%= @change_request.desired_name %></strong>
</td>
</tr>
<tr>
<th>Reason</th>
<td><%= @change_request.change_reason %></td>
</tr>
<tr>
<th>Status</th>
<td>
<%= @change_request.status %>
<% if @change_request.approved? %>
by <%= link_to_user @change_request.approver %>
<% elsif @change_request.rejected? %>
for reason: <%= link_to @change_request.rejection_reason %>
<% end %>
</td>
</tr>
</tbody>
</table>
<% if @change_request.pending? && CurrentUser.user.is_admin? %>
<section>
<h2>Feedback</h2>
<ul>
<% @change_request.feedback.each do |feedback| %>
<li class="feedback-category-<%= feedback.category %>">
<p><%= feedback.body %></p>
<p class="info">Submitted by <%= link_to_user feedback.creator.name %> <%= time_ago_in_words_tagged feedback.created_at %></p>
</li>
<% end %>
</td>
</tr>
<tr>
<th>User</th>
<td><%= link_to_user @change_request.user %></td>
</tr>
<tr>
<th>Request</th>
<td>
<strong><%= @change_request.original_name %></strong> ->
<strong><%= @change_request.desired_name %></strong>
</td>
</tr>
<tr>
<th>Reason</th>
<td><%= @change_request.change_reason %></td>
</tr>
<tr>
<th>Status</th>
<td>
<%= @change_request.status %>
<% if @change_request.approved? %>
by <%= link_to_user @change_request.approver %>
<% elsif @change_request.rejected? %>
for reason: <%= link_to @change_request.rejection_reason %>
<% end %>
</td>
</tr>
</tbody>
</table>
<% if @change_request.pending? && CurrentUser.user.is_admin? %>
<section>
<h2>Feedback</h2>
<ul>
<% @change_request.feedback.each do |feedback| %>
<li class="feedback-category-<%= feedback.category %>">
<p><%= feedback.body %></p>
<p class="info">Submitted by <%= link_to_user feedback.creator.name %> <%= time_ago_in_words_tagged feedback.created_at %></p>
</li>
</ul>
</section>
<section>
<h2>Statistics</h2>
<ul>
<li>Level: <%= @change_request.user.level_string %></li>
<li>Uploads: <%= link_to @change_request.user.post_upload_count, posts_path("user:#{@change_request.user.name}") %></li>
<li>Updates: <%= link_to @change_request.user.post_update_count, post_versions_path(:search => {:updater_id => @change_request.user.id}) %></li>
<li>Notes: <%= link_to @change_request.user.note_update_count, note_versions_path(:search => {:updater_id => @change_request.user.id}) %></li>
<li>Favorites: <%= @change_request.user.favorite_count %></li>
</ul>
</section>
<section>
<h2>Options</h2>
<%= form_tag(approve_user_name_change_request_path(@change_request)) do %>
<%= submit_tag "Approve" %>
<% end %>
</ul>
</section>
<section>
<h2>Statistics</h2>
<ul>
<li>Level: <%= @change_request.user.level_string %></li>
<li>Uploads: <%= link_to @change_request.user.post_upload_count, posts_path("user:#{@change_request.user.name}") %></li>
<li>Updates: <%= link_to @change_request.user.post_update_count, post_versions_path(:search => {:updater_id => @change_request.user.id}) %></li>
<li>Notes: <%= link_to @change_request.user.note_update_count, note_versions_path(:search => {:updater_id => @change_request.user.id}) %></li>
<li>Favorites: <%= @change_request.user.favorite_count %></li>
</ul>
</section>
<%= form_tag(reject_user_name_change_request_path(@change_request), :class => "simple_form") do %>
<div class="input">
<label>Reason</label>
<%= text_field_tag "reason" %>
</div>
<section>
<h2>Options</h2>
<%= form_tag(approve_user_name_change_request_path(@change_request)) do %>
<%= submit_tag "Approve" %>
<% end %>
<%= form_tag(reject_user_name_change_request_path(@change_request), :class => "simple_form") do %>
<div class="input">
<label>Reason</label>
<%= text_field_tag "reason" %>
</div>
<div class="input">
<%= submit_tag "Reject" %>
</div>
<% end %>
</section>
<% end %>
<div class="input">
<%= submit_tag "Reject" %>
</div>
<% end %>
</section>
<% end %>
</div>
</div>
<%= render "secondary_links" %>

3
app/views/users/index.html.erb
View File

@@ -55,10 +55,11 @@
<%= numbered_paginator(@users) %>
<%= render "secondary_links" %>
</div>
</div>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Users - <%= Danbooru.config.app_name %>
<% end %>