From 2a88c312c81c38c1c27ac2fa4b1f3a95abd726cc Mon Sep 17 00:00:00 2001 From: albert Date: Mon, 7 Jan 2013 16:50:00 -0500 Subject: [PATCH] fix old routes --- app/views/pool_elements/new.html.erb | 21 +------------------ app/views/post_appeals/new.html.erb | 13 +----------- app/views/post_flags/new.html.erb | 30 +--------------------------- app/views/posts/show.html.erb | 6 +++--- config/routes.rb | 4 ++-- 5 files changed, 8 insertions(+), 66 deletions(-) diff --git a/app/views/pool_elements/new.html.erb b/app/views/pool_elements/new.html.erb index 0a3b5c92f..fd8da64fe 100644 --- a/app/views/pool_elements/new.html.erb +++ b/app/views/pool_elements/new.html.erb @@ -1,20 +1 @@ -
-
- <%= form_tag(pool_element_path) do %> - <%= hidden_field_tag "post_id", @post.id %> - <%= text_field_tag "pool_name", "", :size => 20 %> - <%= submit_tag "Select" %> - <% end %> - - <% if recent_updated_pools.any? %> -
-

Recent Pools

-
    - <% recent_updated_pools.each do |pool| %> -
  • <%= pool.name %>
  • - <% end %> -
-
- <% end %> -
-
+<%= render "pool_elements/new" %> \ No newline at end of file diff --git a/app/views/post_appeals/new.html.erb b/app/views/post_appeals/new.html.erb index ad2bd8dcc..05fe4fd39 100644 --- a/app/views/post_appeals/new.html.erb +++ b/app/views/post_appeals/new.html.erb @@ -1,12 +1 @@ -
-
-

If this post was automatically deleted, then it means at least ten janitors all thought it didn't belong on the site. If you still believe this image was wrongfully deleted, then you can appeal its deletion.

- -

All users are limited to one appeal a day. For more details, please read the <%= link_to "wiki", wiki_pages_path(:title => "help:deletion_appeals") %>.

- - <%= simple_form_for(@post_appeal, :remote => true, :format => :js) do |f| %> - <%= hidden_field_tag "post_appeal[post_id]", @post_appeal.post_id %> - <%= f.text_field :reason, :size => "40x5" %> - <% end %> -
-
+<%= render "post_appeals/new" %> \ No newline at end of file diff --git a/app/views/post_flags/new.html.erb b/app/views/post_flags/new.html.erb index 726bcb351..305499e64 100644 --- a/app/views/post_flags/new.html.erb +++ b/app/views/post_flags/new.html.erb @@ -1,29 +1 @@ -
-
-

If you believe a post does not belong on this site, you can flag for its deletion. As a reminder, the following are some common reasons for flagging a post:

- -
    -
  • Not anime-related
  • -
  • Furry: a character has body fur or an animal face
  • -
  • Watermark: text or logo inserted by someone besides the original artist
  • -
  • Poor compression: JPEG artifacts
  • -
  • Guro: mutilation, extreme bodily distension
  • -
  • Bad proportions: extremely large breasts or penises
  • -
  • Manga: Multiple pages of a manga, doujinshi, or comic that don't stand up to individual scrutiny
  • -
  • Fake translations: Made up translations are banned
  • -
- -

The following are NOT valid reasons for flagging a post:

- -
    -
  • Duplicate: just parent to the original
  • -
- -

Enter a reason:

- - <%= simple_form_for(@post_flag, :remote => true, :format => :js) do |f| %> - <%= f.input :post_id, :as => :hidden %> - <%= f.text_field :reason %> - <% end %> -
-
+<%= render "post_flags/new" %> \ No newline at end of file diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb index 77372b76a..79d6e770c 100644 --- a/app/views/posts/show.html.erb +++ b/app/views/posts/show.html.erb @@ -73,15 +73,15 @@
- <%= render :template => "post_flags/new" %> + <%= render "post_flags/new" %>
- <%= render :template => "post_appeals/new" %> + <%= render "post_appeals/new" %>
- <%= render :template => "pool_elements/new" %> + <%= render "pool_elements/new" %>
diff --git a/config/routes.rb b/config/routes.rb index afc05c885..de5723757 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -195,7 +195,7 @@ Danbooru::Application.routes.draw do match "/artist" => redirect {|params, req| "/artists?page=#{req.params[:page]}"} match "/artist/index" => redirect {|params, req| "/artists?page=#{req.params[:page]}"} match "/artist/show/:id" => redirect("/artists/%{id}") - match "/artist/history/:id" => redirect("/artist_versions?search[artist_id]=%{id}") + match "/artist/history/:id" => redirect("/artist_versions?search[artist_id_eq]=%{id}") match "/comment" => redirect {|params, req| "/comments?page=#{req.params[:page]}"} match "/comment/index" => redirect {|params, req| "/comments?page=#{req.params[:page]}"} @@ -215,7 +215,7 @@ Danbooru::Application.routes.draw do match "/pool" => redirect {|params, req| "/pools?page=#{req.params[:page]}"} match "/pool/index" => redirect {|params, req| "/pools?page=#{req.params[:page]}"} match "/pool/show/:id" => redirect("/pools/%{id}") - match "/pool/history/:id" => redirect("/pool_versions?search[pool_id]=%{id}") + match "/pool/history/:id" => redirect("/pool_versions?search[pool_id_eq]=%{id}") match "/pool/recent_changes" => redirect("/pool_versions") match "/post/index.xml", :controller => "legacy", :action => "posts", :format => "xml"