From 1a03a86592cc0f8e86fd39a0996408df0e9e39fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=A4=AA?= Date: Tue, 19 Mar 2013 23:11:58 +1100 Subject: [PATCH] Kill trailing whitespace in erb files --- app/views/admin/users/edit.html.erb | 6 +++--- app/views/artists/_form.html.erb | 2 +- app/views/artists/banned.html.erb | 4 ++-- app/views/artists/edit.html.erb | 2 +- app/views/artists/index.html.erb | 2 +- app/views/artists/new.html.erb | 6 +++--- app/views/artists/search.html.erb | 4 ++-- app/views/bans/index.html.erb | 4 ++-- app/views/comments/edit.html.erb | 6 +++--- app/views/comments/index_by_comment.html.erb | 4 ++-- app/views/comments/index_by_post.html.erb | 6 +++--- .../comments/partials/index/_list.html.erb | 4 ++-- .../comments/partials/new/_form.html.erb | 2 +- .../comments/partials/show/_comment.html.erb | 2 +- app/views/comments/search.html.erb | 4 ++-- app/views/dmails/index.html.erb | 2 +- app/views/dmails/search.html.erb | 4 ++-- app/views/dmails/show.html.erb | 6 +++--- app/views/dtext/_form.html.erb | 2 +- app/views/dtext/_help.html.erb | 4 ++-- app/views/explore/posts/popular.html.erb | 4 ++-- app/views/favorites/index.html.erb | 6 +++--- app/views/forum_posts/edit.html.erb | 2 +- app/views/forum_posts/new.html.erb | 2 +- app/views/forum_topics/_form.html.erb | 6 +++--- app/views/forum_topics/edit.html.erb | 2 +- app/views/forum_topics/index.html.erb | 6 +++--- app/views/forum_topics/show.html.erb | 10 +++++----- app/views/ip_bans/index.html.erb | 2 +- app/views/ip_bans/new.html.erb | 2 +- app/views/janitor_trials/new.html.erb | 2 +- app/views/layouts/default.html.erb | 18 ++++++++--------- .../user/login_reminders/new.html.erb | 6 +++--- .../user/password_resets/edit.html.erb | 4 ++-- .../user/password_resets/new.html.erb | 4 ++-- app/views/mod_actions/index.html.erb | 2 +- .../dashboards/_search_activity.html.erb | 6 +++--- .../dashboards/_search_ip_addr.html.erb | 4 ++-- .../moderator/invitations/index.html.erb | 2 +- app/views/moderator/invitations/new.html.erb | 6 +++--- app/views/moderator/ip_addrs/index.html.erb | 2 +- app/views/moderator/ip_addrs/search.html.erb | 2 +- .../post/posts/confirm_delete.html.erb | 2 +- app/views/moderator/post/queues/show.html.erb | 6 +++--- app/views/moderator/tags/edit.html.erb | 6 +++--- app/views/news_updates/edit.html.erb | 2 +- app/views/news_updates/index.html.erb | 4 ++-- app/views/news_updates/new.html.erb | 2 +- app/views/note_versions/index.html.erb | 6 +++--- app/views/notes/index_by_note.html.erb | 4 ++-- app/views/notes/index_by_post.html.erb | 4 ++-- app/views/notes/search.html.erb | 2 +- app/views/pool_elements/_new.html.erb | 2 +- app/views/pool_orders/edit.html.erb | 2 +- app/views/pool_versions/index.html.erb | 2 +- app/views/pools/index.html.erb | 2 +- app/views/pools/search.html.erb | 4 ++-- app/views/pools/show.html.erb | 6 +++--- app/views/post_appeals/index.html.erb | 2 +- app/views/post_flags/_new.html.erb | 2 +- app/views/post_flags/index.html.erb | 2 +- app/views/post_versions/index.html.erb | 2 +- app/views/post_versions/search.html.erb | 2 +- app/views/posts/index.html.erb | 10 +++++----- .../posts/partials/common/_search.html.erb | 4 ++-- .../posts/partials/index/_mode_menu.html.erb | 2 +- .../posts/partials/index/_posts.html.erb | 4 ++-- .../posts/partials/index/_related.html.erb | 2 +- app/views/posts/partials/show/_edit.html.erb | 14 ++++++------- .../posts/partials/show/_information.html.erb | 8 ++++---- .../posts/partials/show/_notices.html.erb | 8 ++++---- .../posts/partials/show/_options.html.erb | 8 ++++---- app/views/posts/partials/show/_share.html.erb | 4 ++-- app/views/posts/show.html.erb | 20 +++++++++---------- app/views/sessions/new.html.erb | 8 ++++---- app/views/sources/_info.html.erb | 4 ++-- app/views/static/_footer.html.erb | 2 +- app/views/static/bookmarklet.html.erb | 4 ++-- app/views/static/keyboard_shortcuts.html.erb | 4 ++-- app/views/static/site_map.html.erb | 4 ++-- app/views/static/terms_of_service.html.erb | 6 +++--- app/views/tag_alias_requests/new.html.erb | 4 ++-- app/views/tag_aliases/index.html.erb | 12 +++++------ app/views/tag_aliases/new.html.erb | 2 +- .../tag_implication_requests/new.html.erb | 4 ++-- app/views/tag_implications/index.html.erb | 8 ++++---- app/views/tag_implications/new.html.erb | 2 +- .../_secondary_links.html.erb | 2 +- app/views/tag_subscriptions/index.html.erb | 4 ++-- app/views/tag_subscriptions/new.html.erb | 4 ++-- app/views/tag_subscriptions/posts.html.erb | 8 ++++---- app/views/tags/edit.html.erb | 2 +- app/views/tags/index.html.erb | 2 +- app/views/tags/search.html.erb | 8 ++++---- app/views/tags/show.html.erb | 2 +- app/views/uploads/_post.html.erb | 2 +- app/views/uploads/index.html.erb | 2 +- app/views/uploads/new.html.erb | 18 ++++++++--------- app/views/user_feedbacks/index.html.erb | 2 +- app/views/user_feedbacks/show.html.erb | 2 +- app/views/users/_login_header.html.erb | 2 +- app/views/users/_secondary_links.html.erb | 10 +++++----- app/views/users/_statistics.html.erb | 4 ++-- app/views/users/edit.html.erb | 4 ++-- app/views/users/index.html.erb | 4 ++-- app/views/users/new.html.erb | 4 ++-- app/views/users/search.html.erb | 6 +++--- app/views/users/upgrade_information.html.erb | 4 ++-- app/views/wiki_page_versions/index.html.erb | 12 +++++------ app/views/wiki_page_versions/show.html.erb | 4 ++-- app/views/wiki_pages/_excerpt.html.erb | 2 +- app/views/wiki_pages/_form.html.erb | 2 +- .../wiki_pages/_secondary_links.html.erb | 2 +- app/views/wiki_pages/_sidebar.html.erb | 2 +- app/views/wiki_pages/edit.html.erb | 4 ++-- app/views/wiki_pages/index.html.erb | 4 ++-- app/views/wiki_pages/new.html.erb | 8 ++++---- app/views/wiki_pages/search.html.erb | 4 ++-- app/views/wiki_pages/show.html.erb | 12 +++++------ 119 files changed, 271 insertions(+), 271 deletions(-) diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb index cb70f5b58..5d1b12bb8 100644 --- a/app/views/admin/users/edit.html.erb +++ b/app/views/admin/users/edit.html.erb @@ -1,15 +1,15 @@

Edit User: <%= @user.name %>

- + <%= form_tag(admin_user_path(@user), :method => :put, :class => "simple_form") do %> <%= hidden_field_tag "id", @user.id %> - +
<%= user_level_select(:user, :level) %>
- + <%= submit_tag "Update" %> <% end %>
diff --git a/app/views/artists/_form.html.erb b/app/views/artists/_form.html.erb index 3e3ff1c7f..9a64a4116 100644 --- a/app/views/artists/_form.html.erb +++ b/app/views/artists/_form.html.erb @@ -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" %> diff --git a/app/views/artists/banned.html.erb b/app/views/artists/banned.html.erb index 30b80971a..a0d235a81 100644 --- a/app/views/artists/banned.html.erb +++ b/app/views/artists/banned.html.erb @@ -1,9 +1,9 @@

Banned Artists

- +

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 banned_artist tag.

- +
    <% @artists.each do |artist| %>
  • <%= link_to artist.name, artist_path(artist) %>
    • diff --git a/app/views/artists/edit.html.erb b/app/views/artists/edit.html.erb index 7d83f996b..b17f420fc 100644 --- a/app/views/artists/edit.html.erb +++ b/app/views/artists/edit.html.erb @@ -1,7 +1,7 @@

    Edit Artist

    - <%= render "form" %> + <%= render "form" %>
    diff --git a/app/views/artists/index.html.erb b/app/views/artists/index.html.erb index ada1ac0c1..5e37af882 100644 --- a/app/views/artists/index.html.erb +++ b/app/views/artists/index.html.erb @@ -1,7 +1,7 @@

    Artists

    - + diff --git a/app/views/artists/new.html.erb b/app/views/artists/new.html.erb index 1c7da7d00..e3e4faba2 100644 --- a/app/views/artists/new.html.erb +++ b/app/views/artists/new.html.erb @@ -1,10 +1,10 @@

    New Artist

    - + <%= error_messages_for :artist %> - - <%= render "form" %> + + <%= render "form" %>
    diff --git a/app/views/artists/search.html.erb b/app/views/artists/search.html.erb index 8680277d9..9ac3685a6 100644 --- a/app/views/artists/search.html.erb +++ b/app/views/artists/search.html.erb @@ -1,7 +1,7 @@
    @@ -27,7 +27,7 @@ <% end %>
    - + <%= numbered_paginator(@bans) %>
    diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb index 5d3874275..e68f0087c 100644 --- a/app/views/comments/edit.html.erb +++ b/app/views/comments/edit.html.erb @@ -1,9 +1,9 @@
    -

    Edit Comment

    - +

    Edit Comment

    + <%= error_messages_for "comment" %> - + <%= simple_form_for(@comment) do |f| %> <%= dtext_field "comment", "body" %> <%= f.button :submit, "Submit" %> diff --git a/app/views/comments/index_by_comment.html.erb b/app/views/comments/index_by_comment.html.erb index b61e18307..23ca07281 100644 --- a/app/views/comments/index_by_comment.html.erb +++ b/app/views/comments/index_by_comment.html.erb @@ -1,7 +1,7 @@

    Comments

    - +
    <% @comments.each do |comment| %> @@ -15,7 +15,7 @@ <% end %>
    - + <%= numbered_paginator(@comments) %>
    diff --git a/app/views/comments/index_by_post.html.erb b/app/views/comments/index_by_post.html.erb index 468135de5..85b475d93 100644 --- a/app/views/comments/index_by_post.html.erb +++ b/app/views/comments/index_by_post.html.erb @@ -1,11 +1,11 @@

    Comments

    - + <% if @posts.empty? %> <%= render "post_sets/blank" %> <% end %> - + <% @posts.select {|x| Danbooru.config.can_user_see_post?(CurrentUser.user, x)}.each do |post| %>
    @@ -15,7 +15,7 @@
    <% end %> - + <%= numbered_paginator(@posts) %>
    diff --git a/app/views/comments/partials/index/_list.html.erb b/app/views/comments/partials/index/_list.html.erb index 7c35dd74b..0f84ca39f 100644 --- a/app/views/comments/partials/index/_list.html.erb +++ b/app/views/comments/partials/index/_list.html.erb @@ -18,9 +18,9 @@ <%= render :partial => "comments/partials/show/comment", :collection => comments %> <% end %>
    - +
    - +

    <%= link_to "Post comment", new_comment_path, :class => "expand-comment-response" %>

    <%= render "comments/partials/new/form", :post => post %> diff --git a/app/views/comments/partials/new/_form.html.erb b/app/views/comments/partials/new/_form.html.erb index 8202ad51f..c26b41e87 100644 --- a/app/views/comments/partials/new/_form.html.erb +++ b/app/views/comments/partials/new/_form.html.erb @@ -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}" %> -<% end %> +<% end %> diff --git a/app/views/comments/partials/show/_comment.html.erb b/app/views/comments/partials/show/_comment.html.erb index 6f1a3f0e5..96f9801f2 100644 --- a/app/views/comments/partials/show/_comment.html.erb +++ b/app/views/comments/partials/show/_comment.html.erb @@ -8,7 +8,7 @@
    <%= format_text(comment.body) %> - + <% if comment.updater_id.present? && (comment.updater_id != comment.creator_id || comment.created_at != comment.updated_at) %>

    Updated by <%= link_to comment.updater_name, user_path(comment.updater_id) %> <%= time_ago_in_words_tagged(comment.updated_at) %>

    <% end %> diff --git a/app/views/comments/search.html.erb b/app/views/comments/search.html.erb index 8cf25759d..b69f51b6f 100644 --- a/app/views/comments/search.html.erb +++ b/app/views/comments/search.html.erb @@ -1,10 +1,10 @@
    diff --git a/app/views/dmails/search.html.erb b/app/views/dmails/search.html.erb index 47815a218..9e3aa21d1 100644 --- a/app/views/dmails/search.html.erb +++ b/app/views/dmails/search.html.erb @@ -3,12 +3,12 @@

    Search Messages

    <%= 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 %>
    diff --git a/app/views/dmails/show.html.erb b/app/views/dmails/show.html.erb index ef752c220..726ba99c4 100644 --- a/app/views/dmails/show.html.erb +++ b/app/views/dmails/show.html.erb @@ -3,13 +3,13 @@

    Show Message

    <%= @dmail.title %>

    - +
    • Sender: <%= link_to @dmail.from_name, user_path(@dmail.from_id) %>
    • Recipient: <%= link_to @dmail.to_name, user_path(@dmail.to_id) %>
    • Date: <%= compact_time(@dmail.created_at) %>
    - +

    Body

    <%= format_text(@dmail.body) %> @@ -18,7 +18,7 @@

    <%= link_to "Respond", new_dmail_path(:respond_to_id => @dmail) %> | <%= link_to "Forward", new_dmail_path(:respond_to_id => @dmail, :forward => true) %> -

    +

    diff --git a/app/views/dtext/_form.html.erb b/app/views/dtext/_form.html.erb index 12fc511ae..672e490ca 100644 --- a/app/views/dtext/_form.html.erb +++ b/app/views/dtext/_form.html.erb @@ -1,4 +1,4 @@ - @@ -8,5 +8,5 @@ <%= form_tag(path, :method => "get") do %> <%= text_field_tag("tags", tags, :size => 20) %> <%= submit_tag "Go" %> - <% end %> + <% end %> diff --git a/app/views/posts/partials/index/_mode_menu.html.erb b/app/views/posts/partials/index/_mode_menu.html.erb index 4576b4771..74ae1253c 100644 --- a/app/views/posts/partials/index/_mode_menu.html.erb +++ b/app/views/posts/partials/index/_mode_menu.html.erb @@ -19,7 +19,7 @@ <% end %> - + <% end %> diff --git a/app/views/posts/partials/index/_posts.html.erb b/app/views/posts/partials/index/_posts.html.erb index 6eeabe040..8453f3c97 100644 --- a/app/views/posts/partials/index/_posts.html.erb +++ b/app/views/posts/partials/index/_posts.html.erb @@ -1,7 +1,7 @@
    <%= render_advertisement("horizontal") %> - + <%= post_set.presenter.post_previews_html(self) %> - <%= numbered_paginator(post_set.posts) %> + <%= numbered_paginator(post_set.posts) %>
    diff --git a/app/views/posts/partials/index/_related.html.erb b/app/views/posts/partials/index/_related.html.erb index 22a9a0e96..0632bae0e 100644 --- a/app/views/posts/partials/index/_related.html.erb +++ b/app/views/posts/partials/index/_related.html.erb @@ -4,7 +4,7 @@ <% if @post_set.has_deleted? %>
  • <%= link_to "Deleted posts", posts_path(:tags => "#{params[:tags]} status:deleted") %>
    • <% end %> - + <% if @post_set.is_tag_subscription? %>
  • <%= link_to "Edit subscriptions", tag_subscriptions_path %>
    • <% end %> diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb index 2d451a0e6..2b074288e 100644 --- a/app/views/posts/partials/show/_edit.html.erb +++ b/app/views/posts/partials/show/_edit.html.erb @@ -13,7 +13,7 @@ This post is rating locked. <% else %> <%= f.label :blank, "Rating" %> - +
    <%= f.radio_button :rating, :e %> <%= f.label :rating_e, "Explicit" %> @@ -23,21 +23,21 @@ <%= f.radio_button :rating, :s %> <%= f.label :rating_s, "Safe" %> -
    + <% end %>
    <% if CurrentUser.is_builder? %>
    <%= f.label :blank, "Lock" %> - +
    <%= 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" %>
    - + <%= 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 @@
    - <%= submit_tag "Submit" %> + <%= submit_tag "Submit" %>
    @@ -79,7 +79,7 @@
    - + - +
    <%= password_field_tag :password %> - + <%= check_box_tag :remember, "1", true %>
    - +
    <%= submit_tag "Submit" %>
    <% end %> - +
diff --git a/app/views/sources/_info.html.erb b/app/views/sources/_info.html.erb index 5d8895920..3354f1d4d 100644 --- a/app/views/sources/_info.html.erb +++ b/app/views/sources/_info.html.erb @@ -1,11 +1,11 @@ - <% if source.try(:available?) %>

This looks like a <%= source.site_name %> upload. <%= link_to "Fetch data", source_path(:format => "json", :url => source.referer_url(self)), :id => "fetch-data" %>.

- +
  • Artist:
  • Tags:
    • diff --git a/app/views/static/_footer.html.erb b/app/views/static/_footer.html.erb index dee6fc2b7..913458502 100644 --- a/app/views/static/_footer.html.erb +++ b/app/views/static/_footer.html.erb @@ -1,5 +1,5 @@
    - Running Danbooru v<%= Danbooru.config.version %> + Running Danbooru v<%= Danbooru.config.version %> – <%= link_to "Contact", contact_path %> <% if CurrentUser.user.enable_post_navigation %> – <%= link_to "Keyboard shortcuts available", keyboard_shortcuts_path %> diff --git a/app/views/static/bookmarklet.html.erb b/app/views/static/bookmarklet.html.erb index 78c6c899c..312a8d7af 100644 --- a/app/views/static/bookmarklet.html.erb +++ b/app/views/static/bookmarklet.html.erb @@ -1,9 +1,9 @@

    Bookmarklet

    - +

    <%= link_to "Post to Danbooru", "javascript:location.href='http://#{Danbooru.config.hostname}/uploads/new?url='+encodeURIComponent(location.href)+'&ref='+encodeURIComponent(document.referrer)" %>

    - +

    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.

    diff --git a/app/views/static/keyboard_shortcuts.html.erb b/app/views/static/keyboard_shortcuts.html.erb index 8f24e20dd..25bd31521 100644 --- a/app/views/static/keyboard_shortcuts.html.erb +++ b/app/views/static/keyboard_shortcuts.html.erb @@ -1,7 +1,7 @@

    Keyboard Shortcuts

    - +

    Listing

      @@ -10,7 +10,7 @@
    • q Search
    - +

    Post

      diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb index ee8477113..b2851b149 100644 --- a/app/views/static/site_map.html.erb +++ b/app/views/static/site_map.html.erb @@ -94,14 +94,14 @@

    • Admin

    • <%= link_to("Mod Actions", mod_actions_path) %>
    • <%= link_to("Jobs", delayed_jobs_path) %>
      • - + <% if CurrentUser.is_admin? %>
    • <%= link_to("Janitor Trials", janitor_trials_path) %>
    • <%= link_to("IP Bans", ip_bans_path) %>
    • <%= link_to("News Updates", news_updates_path) %>
    • <%= link_to("Alias & Implication Import", new_admin_alias_and_implication_import_path) %>
      • <% end %> - + <% if Danbooru.config.is_user_advertiser?(CurrentUser.user) %>
    • <%= link_to("Advertisements", advertisements_path) %>
      • <% end %> diff --git a/app/views/static/terms_of_service.html.erb b/app/views/static/terms_of_service.html.erb index 08f4d578c..6dc97cef5 100644 --- a/app/views/static/terms_of_service.html.erb +++ b/app/views/static/terms_of_service.html.erb @@ -1,7 +1,7 @@

      Terms of Service

      -

      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.

      +

      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.

      • The Site reserves the right to change these terms at any time.
        • @@ -11,13 +11,13 @@
      • You will make a best faith effort to upload only high quality anime-related images.
      • You have read the <%= link_to "tagging guidelines", wiki_pages_path(:title => "help:tags") %>.
      - +
      Post/Comment Limiting

      You cannot upload a post or comment during the first week of signing up.

      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.

      - +
      Prohibited Content

      In addition, you may not use the Site to upload any of the following:

      diff --git a/app/views/tag_alias_requests/new.html.erb b/app/views/tag_alias_requests/new.html.erb index 30bd8363c..baa1f1276 100644 --- a/app/views/tag_alias_requests/new.html.erb +++ b/app/views/tag_alias_requests/new.html.erb @@ -3,7 +3,7 @@

      Tag Alias Request

      You can request a new tag alias be created. This will create a corresponding forum topic for community review.

      - + <%= form_tag(tag_alias_request_path, :class => "simple_form") do %>
      @@ -24,7 +24,7 @@ <%= submit_tag "Submit" %>
      <% end %> - + <%= render "tag_aliases/secondary_links" %>
      diff --git a/app/views/tag_aliases/index.html.erb b/app/views/tag_aliases/index.html.erb index ee7fdbf4f..47e61abed 100644 --- a/app/views/tag_aliases/index.html.erb +++ b/app/views/tag_aliases/index.html.erb @@ -2,9 +2,9 @@
      <%= 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 %>
      @@ -16,7 +16,7 @@ Reference Status - + <% @tag_aliases.each do |tag_alias| %> @@ -34,18 +34,18 @@ <% 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 %> - <% end %> + <% end %> diff --git a/app/views/tag_aliases/new.html.erb b/app/views/tag_aliases/new.html.erb index 9152c28f5..e72e8fb9e 100644 --- a/app/views/tag_aliases/new.html.erb +++ b/app/views/tag_aliases/new.html.erb @@ -7,7 +7,7 @@ <%= f.input :consequent_name, :label => "To" %> <%= f.input :forum_topic_id, :label => "Forum" %> <%= f.button :submit %> - <% end %> + <% end %>
      diff --git a/app/views/tag_implication_requests/new.html.erb b/app/views/tag_implication_requests/new.html.erb index 7399fddb2..73d78cb7c 100644 --- a/app/views/tag_implication_requests/new.html.erb +++ b/app/views/tag_implication_requests/new.html.erb @@ -3,7 +3,7 @@

      Tag Implication Request

      You can request a new tag implication be created. This will create a corresponding forum topic for community review.

      - + <%= form_tag(tag_implication_request_path, :class => "simple_form") do %>
      @@ -24,7 +24,7 @@ <%= submit_tag "Submit" %>
      <% end %> - + <%= render "tag_implications/secondary_links" %>
    diff --git a/app/views/tag_implications/index.html.erb b/app/views/tag_implications/index.html.erb index 74df15ccf..e784aff54 100644 --- a/app/views/tag_implications/index.html.erb +++ b/app/views/tag_implications/index.html.erb @@ -2,8 +2,8 @@
    <%= 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 %>
    @@ -16,7 +16,7 @@ Reference Status - + <% @tag_implications.each do |tag_implication| %> @@ -38,7 +38,7 @@ <% end %> - <% end %> + <% end %> diff --git a/app/views/tag_implications/new.html.erb b/app/views/tag_implications/new.html.erb index 0b32a1b63..67c4f6d92 100644 --- a/app/views/tag_implications/new.html.erb +++ b/app/views/tag_implications/new.html.erb @@ -7,7 +7,7 @@ <%= f.input :consequent_name, :label => "To" %> <%= f.input :forum_topic_id, :label => "Forum" %> <%= f.button :submit %> - <% end %> + <% end %>
diff --git a/app/views/tag_subscriptions/_secondary_links.html.erb b/app/views/tag_subscriptions/_secondary_links.html.erb index b223d9048..22b5867aa 100644 --- a/app/views/tag_subscriptions/_secondary_links.html.erb +++ b/app/views/tag_subscriptions/_secondary_links.html.erb @@ -3,7 +3,7 @@
  • <%= link_to "Listing", tag_subscriptions_path %>
  • <%= link_to "New", new_tag_subscription_path %>
  • <%= link_to "Help", wiki_pages_path(:title => "help:tag_subscriptions") %>
    • - + <% if @tag_subscription && !@tag_subscription.new_record? && @tag_subscription.editable_by?(CurrentUser.user) %>
  • |
  • <%= link_to "Show", tag_subscription_path(@tag_subscription) %>
    • diff --git a/app/views/tag_subscriptions/index.html.erb b/app/views/tag_subscriptions/index.html.erb index 3fe7595a0..ffcdc582b 100644 --- a/app/views/tag_subscriptions/index.html.erb +++ b/app/views/tag_subscriptions/index.html.erb @@ -27,9 +27,9 @@ <% end %> - +

    You can create up to <%= Danbooru.config.max_tag_subscriptions %> subscriptions with up to 20 tags each.

    - + <%= sequential_paginator(@tag_subscriptions) %>
    diff --git a/app/views/tag_subscriptions/new.html.erb b/app/views/tag_subscriptions/new.html.erb index b516b7bd7..081f84beb 100644 --- a/app/views/tag_subscriptions/new.html.erb +++ b/app/views/tag_subscriptions/new.html.erb @@ -1,9 +1,9 @@

    New Tag Subscription

    - + <%= error_messages_for "tag_subscription" %> - + <%= render "form" %>
    diff --git a/app/views/tag_subscriptions/posts.html.erb b/app/views/tag_subscriptions/posts.html.erb index cd8d5f66e..6c08110cf 100644 --- a/app/views/tag_subscriptions/posts.html.erb +++ b/app/views/tag_subscriptions/posts.html.erb @@ -5,16 +5,16 @@ <%= render "posts/partials/index/mode_menu" %> <%= render "posts/partials/index/blacklist" %> - +

    Tag Subscriptions [<%= link_to "edit", tag_subscriptions_path %>]

    - + <%= @post_set.presenter.post_previews_html(self) %> <%= numbered_paginator(@posts) %>
    - - <%= render "posts/partials/common/secondary_links" %> + + <%= render "posts/partials/common/secondary_links" %> diff --git a/app/views/tags/edit.html.erb b/app/views/tags/edit.html.erb index 29ea1e000..f08fdf5a7 100644 --- a/app/views/tags/edit.html.erb +++ b/app/views/tags/edit.html.erb @@ -1,7 +1,7 @@

    Tag: <%= @tag.name %>

    - + <%= 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" %> diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb index 23bc8d295..350cbd619 100644 --- a/app/views/tags/index.html.erb +++ b/app/views/tags/index.html.erb @@ -1,6 +1,6 @@
    - +
    diff --git a/app/views/tags/search.html.erb b/app/views/tags/search.html.erb index c2cd811dc..9f87e1f48 100644 --- a/app/views/tags/search.html.erb +++ b/app/views/tags/search.html.erb @@ -6,22 +6,22 @@ <%= text_field "search", "name_matches" %> Use * for wildcard - +
    <%= select "search", "category", [""] + Danbooru.config.canonical_tag_category_mapping.to_a %>
    - +
    <%= select "search", "hide_empty", ["yes", "no"] %>
    - +
    <%= select "search", "sort", %w(date name count) %>
    - + <%= submit_tag "Search" %> <% end %> diff --git a/app/views/tags/show.html.erb b/app/views/tags/show.html.erb index 07e7f90e6..482766561 100644 --- a/app/views/tags/show.html.erb +++ b/app/views/tags/show.html.erb @@ -1,7 +1,7 @@

    Tag: <%= @tag.name %>

    - +
    • Count: <%= @tag.post_count %>
    • Category: <%= @tag.category_name %>
      • diff --git a/app/views/uploads/_post.html.erb b/app/views/uploads/_post.html.erb index 03e9cd52c..f7ba00196 100644 --- a/app/views/uploads/_post.html.erb +++ b/app/views/uploads/_post.html.erb @@ -1,4 +1,4 @@ - <% if post %> diff --git a/app/views/uploads/index.html.erb b/app/views/uploads/index.html.erb index 78fce8c61..327a07bd7 100644 --- a/app/views/uploads/index.html.erb +++ b/app/views/uploads/index.html.erb @@ -22,7 +22,7 @@ <% end %>
    Count
    - + <%= numbered_paginator(@uploads) %>
    diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb index 286d56c2a..91de41dc9 100644 --- a/app/views/uploads/new.html.erb +++ b/app/views/uploads/new.html.erb @@ -1,7 +1,7 @@

    Upload

    - +

    Before uploading, please read the <%= link_to "how to upload guide", wiki_pages_path(:title => "howto:upload") %>.

    @@ -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| %>
    <%= f.label :file %> @@ -24,10 +24,10 @@ <%= button_tag "Similar", :id => "similar-button", :type => "button" %> <%= button_tag "Artist", :id => "find-artist-button", :type => "button" %>
    - +
    <%= f.label :rating_q, "Rating" %> - +
    <%= 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" %>
    @@ -44,19 +44,19 @@ <%= f.label :parent_id, "Parent ID" %> <%= f.text_field :parent_id %>
    - +
    <%= f.label :tag_string, "Tags" %> <%= f.text_area :tag_string, :size => "60x4" %>
    - + <%= 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" %>
    - +
    <%= submit_tag "Submit", :class => "large" %>
    diff --git a/app/views/user_feedbacks/index.html.erb b/app/views/user_feedbacks/index.html.erb index db5382bbd..348555b71 100644 --- a/app/views/user_feedbacks/index.html.erb +++ b/app/views/user_feedbacks/index.html.erb @@ -1,7 +1,7 @@

    User Feedback

    - + diff --git a/app/views/user_feedbacks/show.html.erb b/app/views/user_feedbacks/show.html.erb index ba9731b49..a51863120 100644 --- a/app/views/user_feedbacks/show.html.erb +++ b/app/views/user_feedbacks/show.html.erb @@ -1,7 +1,7 @@

    User Feedback For <%= @user_feedback.user_name %>

    - +
    • Creator <%= @user_feedback.creator.name %>
    • Date <%= @user_feedback.created_at %>
      • diff --git a/app/views/users/_login_header.html.erb b/app/views/users/_login_header.html.erb index 984f0e8b5..1172f1332 100644 --- a/app/views/users/_login_header.html.erb +++ b/app/views/users/_login_header.html.erb @@ -5,7 +5,7 @@ <%= label_tag :name %> <%= text_field_tag :name %> - + <%= label_tag :password %> <%= password_field_tag :password %> <% end %> diff --git a/app/views/users/_secondary_links.html.erb b/app/views/users/_secondary_links.html.erb index 01c0eedd7..d63903b88 100644 --- a/app/views/users/_secondary_links.html.erb +++ b/app/views/users/_secondary_links.html.erb @@ -2,11 +2,11 @@
    • <%= link_to "Listing", users_path %>
    • <%= link_to "Search", search_users_path %>
      • - + <% if CurrentUser.is_anonymous? %>
    • <%= link_to "Sign up", new_user_path %>
      • <% end %> - + <% if @user && !@user.new_record? && !CurrentUser.is_anonymous? %>
    • |
      • <% if @user.id == CurrentUser.id %> @@ -19,15 +19,15 @@ <% else %>
    • <%= link_to "Send message", new_dmail_path(:dmail => {:to_id => @user.id}) %>
      • <% end %> - + <% if !CurrentUser.is_privileged? %>
    • <%= link_to "Upgrade", upgrade_information_users_path %>
      • <% end %> - + <% if CurrentUser.is_moderator? %>
    • <%= link_to "Promote", edit_admin_user_path(@user) %>
      • <% end %> - +
    • |
    • <%= link_to "Sign out", sign_out_session_path %>
      • <% end %> diff --git a/app/views/users/_statistics.html.erb b/app/views/users/_statistics.html.erb index 720ded342..64d91f81d 100644 --- a/app/views/users/_statistics.html.erb +++ b/app/views/users/_statistics.html.erb @@ -33,7 +33,7 @@
    - + @@ -83,7 +83,7 @@ - +
    Uploads <%= presenter.upload_count(self) %>
    Deleted Uploads <%= presenter.deleted_upload_count(self) %>Feedback <%= presenter.feedbacks(self) %>
    Subscriptions diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 29bb3d5e6..bb8441c01 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -1,7 +1,7 @@

    Settings

    - + <%= simple_form_for @user do |f| %>
    @@ -23,7 +23,7 @@ A list of whitespace delimited tags that show up in your profile. <%= link_to "Restore from old database", restore_uploaded_tags_user_path(@user), :method => :post, :remote => true %>
    - + <%= f.input :blacklisted_tags, :hint => "A list of newline delimited tags that you never want to see", :input_html => {:size => "40x5"} %>
    diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 9c37962f7..2aded5c6e 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,13 +1,13 @@

    Users

    - + <% form_tag(users_path, :method => :get, :class => "simple_form") do %> <%= search_field "name_matches", :label => "Name" %> <%= submit_tag "Search" %> <% end %> - +
    diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 1d0dcbd8b..17f37a2e6 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -3,9 +3,9 @@

    Sign Up

    A basic account is free and lets you keep favorites, upload artwork, and write comments. If you want <%= link_to "more features", wiki_pages_path(:title => "help:accounts") %> you can upgrade your account later.

    - +

    This site is open to web crawlers so whatever name you choose will be public!

    - +

    This includes favorites, uploads, and comments. Almost everything is public. So don't choose a name you don't want to be associated with.

    diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb index 0438cb07f..19151bb2a 100644 --- a/app/views/users/search.html.erb +++ b/app/views/users/search.html.erb @@ -2,7 +2,7 @@ diff --git a/app/views/users/upgrade_information.html.erb b/app/views/users/upgrade_information.html.erb index dce13e797..b82b439ad 100644 --- a/app/views/users/upgrade_information.html.erb +++ b/app/views/users/upgrade_information.html.erb @@ -1,9 +1,9 @@

    Upgrade Your Account

    - +

    Annoyed by ads? Want more searching power? Upgrade your account and become a power user of the best database of anime artwork on the internet.

    - +
    diff --git a/app/views/wiki_page_versions/index.html.erb b/app/views/wiki_page_versions/index.html.erb index 5ac1b2276..f26d95118 100644 --- a/app/views/wiki_page_versions/index.html.erb +++ b/app/views/wiki_page_versions/index.html.erb @@ -4,7 +4,7 @@

    Wiki Pages

    - + <%= form_tag(diff_wiki_page_versions_path, :method => :get) do %>
    @@ -14,7 +14,7 @@ - + <% @wiki_page_versions.each do |wiki_page_version| %> @@ -43,21 +43,21 @@ <% end %> - <% end %> + <% end %>
    Title IP Address Last edited
    - + <% if params[:search] && params[:search][:wiki_page_id] %> <%= submit_tag "Diff" %> <% end %> <% end %> - + <%= numbered_paginator(@wiki_page_versions) %>
    -<%= render "wiki_pages/secondary_links" %> +<%= render "wiki_pages/secondary_links" %> <% content_for(:page_title) do %> Wiki Page Versions - <%= Danbooru.config.app_name %> diff --git a/app/views/wiki_page_versions/show.html.erb b/app/views/wiki_page_versions/show.html.erb index 702a3a14c..b8fdb58be 100644 --- a/app/views/wiki_page_versions/show.html.erb +++ b/app/views/wiki_page_versions/show.html.erb @@ -1,10 +1,10 @@
    <%= render "wiki_pages/sidebar" %> - +

    <%= @wiki_page_version.pretty_title %> (<%= time_ago_in_words_tagged(@wiki_page_version.updated_at) %>)

    - +
    <%= format_text(@wiki_page_version.body) %>
    diff --git a/app/views/wiki_pages/_excerpt.html.erb b/app/views/wiki_pages/_excerpt.html.erb index e8f361700..d813735fd 100644 --- a/app/views/wiki_pages/_excerpt.html.erb +++ b/app/views/wiki_pages/_excerpt.html.erb @@ -1,4 +1,4 @@ - diff --git a/app/views/wiki_pages/_form.html.erb b/app/views/wiki_pages/_form.html.erb index 03447a250..73c3af7cf 100644 --- a/app/views/wiki_pages/_form.html.erb +++ b/app/views/wiki_pages/_form.html.erb @@ -3,7 +3,7 @@ <%= simple_form_for(@wiki_page) do |f| %> <%= f.input :title, :as => :string %> - + <%= dtext_field "wiki_page", "body" %> <% if CurrentUser.is_janitor? %> diff --git a/app/views/wiki_pages/_secondary_links.html.erb b/app/views/wiki_pages/_secondary_links.html.erb index 72b927381..eb3e16c23 100644 --- a/app/views/wiki_pages/_secondary_links.html.erb +++ b/app/views/wiki_pages/_secondary_links.html.erb @@ -7,7 +7,7 @@ <% if @wiki_page %>
  • |
  • <%= link_to "Posts (#{Post.fast_count(@wiki_page.title)})", posts_path(:tags => @wiki_page.title) %>
    • - <% unless @wiki_page.new_record? %> + <% unless @wiki_page.new_record? %>
  • <%= link_to "History", wiki_page_versions_path(:search => {:wiki_page_id => @wiki_page.id}) %>
    • <% if CurrentUser.is_member? %>
  • <%= link_to "Edit", edit_wiki_page_path(@wiki_page) %>
    • diff --git a/app/views/wiki_pages/_sidebar.html.erb b/app/views/wiki_pages/_sidebar.html.erb index f6f3884d1..ad86afb7d 100644 --- a/app/views/wiki_pages/_sidebar.html.erb +++ b/app/views/wiki_pages/_sidebar.html.erb @@ -7,7 +7,7 @@
    <%= render "wiki_pages/recent_changes" %> - +

    Blacklisted

      diff --git a/app/views/wiki_pages/edit.html.erb b/app/views/wiki_pages/edit.html.erb index 3fc666768..6f94ddadf 100644 --- a/app/views/wiki_pages/edit.html.erb +++ b/app/views/wiki_pages/edit.html.erb @@ -1,7 +1,7 @@
      <%= render "sidebar" %> - +

      Edit Wiki

      <%= render "form" %> @@ -9,7 +9,7 @@
      -<%= render "secondary_links" %> +<%= render "secondary_links" %> <% content_for(:page_title) do %> Edit Wiki Page - <%= Danbooru.config.app_name %> diff --git a/app/views/wiki_pages/index.html.erb b/app/views/wiki_pages/index.html.erb index 49d780503..b7800f885 100644 --- a/app/views/wiki_pages/index.html.erb +++ b/app/views/wiki_pages/index.html.erb @@ -4,7 +4,7 @@

      Wiki

      - + @@ -18,7 +18,7 @@ - <% end %> + <% end %>
      <%= link_to wiki_page.pretty_title, wiki_page_path(wiki_page, :noredirect => 1) %> <%= wiki_page.updated_at.strftime("%Y-%m-%d %I:%M") %> by <%= h link_to wiki_page.creator.name, user_path(wiki_page.creator) %>
      diff --git a/app/views/wiki_pages/new.html.erb b/app/views/wiki_pages/new.html.erb index c82d2649d..10a697a91 100644 --- a/app/views/wiki_pages/new.html.erb +++ b/app/views/wiki_pages/new.html.erb @@ -1,18 +1,18 @@
      <%= render "sidebar" %> - +

      New Wiki Page

      <%= render "form" %> - +

      Posts

      <%= @wiki_page.post_set.presenter.post_previews_html(self) %>
      - +
      - +
      diff --git a/app/views/wiki_pages/search.html.erb b/app/views/wiki_pages/search.html.erb index 99494bd4c..e36b9ed71 100644 --- a/app/views/wiki_pages/search.html.erb +++ b/app/views/wiki_pages/search.html.erb @@ -4,12 +4,12 @@ <%= search_field "title", :hint => "Use * for wildcard searches" %> <%= search_field "creator_name" %> <%= search_field "body_matches", :label => "Body" %> - +
      <%= select "search", "sort", ["Name", "Date"] %>
      - + <%= submit_tag "Search" %> <% end %>
    diff --git a/app/views/wiki_pages/show.html.erb b/app/views/wiki_pages/show.html.erb index 020b2af89..7ba956fb3 100644 --- a/app/views/wiki_pages/show.html.erb +++ b/app/views/wiki_pages/show.html.erb @@ -1,20 +1,20 @@
    <%= render "sidebar" %> - +

    - + <%= @wiki_page.pretty_title %> - + <% if @wiki_page.is_locked? %> (locked) <% end %>

    - +
    <%= format_text(@wiki_page.body) %> - + <% if @wiki_page.presenter.antecedent_tag_alias %>

    This tag has been aliased to <%= link_to @wiki_page.presenter.antecedent_tag_alias.consequent_name, posts_path(:tags => @wiki_page.presenter.antecedent_tag_alias.consequent_name) %>.

    <% end %> @@ -23,7 +23,7 @@

    The following tags are aliased to this tag: <%= raw @wiki_page.presenter.consequent_tag_aliases.map {|x| link_to(x.antecedent_name, posts_path(:tags => x.antecedent_name))}.join(", ") %>.

    <% end %>
    - +
    <%= @wiki_page.post_set.presenter.post_previews_html(self) %>