- |
- <%= link_to artist_version.name, artist_path(artist_version.artist_id) %>
- |
- <%= artist_version_other_names_diff(artist_version) %> |
- <%= artist_version.group_name %> |
+ <% if artist_version.visible? %>
+ <%= link_to artist_version.name, artist_path(artist_version.artist_id) %> |
+ <%= artist_version_other_names_diff(artist_version) %> |
+ <%= artist_version.group_name %> |
+ <% else %>
+ |
+ |
+ |
+ <% end %>
<%= compact_time artist_version.created_at %> |
<%= link_to_user artist_version.updater %> |
<% if CurrentUser.is_moderator? %>
@@ -37,11 +41,11 @@
<% end %>
<%= artist_version.is_active? %> |
-
-
- <%= artist_version_urls_diff(artist_version) %>
-
- |
+ <% if artist_version.visible? %>
+ <%= artist_version_urls_diff(artist_version) %> |
+ <% else %>
+ |
+ <% end %>
<% if CurrentUser.is_member? %>
<%= link_to "Revert to", revert_artist_path(artist_version.artist_id, :version_id => artist_version.id), :method => :put, :data => {:confirm => "Are you sure you want to revert to this version?"} %>
diff --git a/app/views/artists/edit.html.erb b/app/views/artists/edit.html.erb
index b17f420fc..97cfcc3e8 100644
--- a/app/views/artists/edit.html.erb
+++ b/app/views/artists/edit.html.erb
@@ -1,7 +1,12 @@
Edit Artist
- <%= render "form" %>
+
+ <% if @artist.visible? %>
+ <%= render "form" %>
+ <% else %>
+ The artist requested removal of this page.
+ <% end %>
diff --git a/app/views/artists/show.html.erb b/app/views/artists/show.html.erb
index ec90c9f8c..17447bba0 100644
--- a/app/views/artists/show.html.erb
+++ b/app/views/artists/show.html.erb
@@ -2,7 +2,7 @@
Artist: <%= link_to @artist.pretty_name, posts_path(:tags => @artist.name), :class => "tag-type-#{@artist.category_name}" %>
- <% if @artist.notes.present? && (!@artist.is_banned? || CurrentUser.user.is_member?) %>
+ <% if @artist.notes.present? && @artist.visible? %>
<%= format_text(@artist.notes) %>
@@ -10,34 +10,39 @@
<%= link_to "View wiki page", @artist.wiki_page %>
<% end %>
-
-
- - Status <%= @artist.status %>
+ <% if @artist.visible? %>
+
+
+ - Status <%= @artist.status %>
- <% if !@artist.is_banned? || CurrentUser.user.is_member? %>
- <% if @artist.has_tag_alias? %>
- - Tag Alias <%= @artist.tag_alias_name %>
+ <% if !@artist.is_banned? || CurrentUser.user.is_member? %>
+ <% if @artist.has_tag_alias? %>
+ - Tag Alias <%= @artist.tag_alias_name %>
+ <% end %>
+ <% if @artist.other_names.present? %>
+ - Other Names <%= link_to_artists(@artist.other_names.split(/ /)) %>
+ <% end %>
+ <% if @artist.group_name.present? %>
+ - Group <%= link_to_artist(@artist.group_name) %>
+ <% end %>
+ <% if @artist.members.any? %>
+ - Members <%= link_to_artists(@artist.members.map(&:name)) %>
+ <% end %>
+ <% @artist.urls.each do |url| %>
+ -
+ URL: <%= link_to h(url.to_s), h(url.to_s) %>
+ <% if CurrentUser.user.is_moderator? %>
+ (<%= link_to("mass edit", edit_moderator_tag_path(:antecedent => "-#{@artist.name} source:#{ArtistUrl.normalize_for_search(url.to_s)}", :consequent => @artist.name)) %>)
+ <% end %>
+
+ <% end %>
<% end %>
- <% if @artist.other_names.present? %>
- - Other Names <%= link_to_artists(@artist.other_names.split(/ /)) %>
- <% end %>
- <% if @artist.group_name.present? %>
- - Group <%= link_to_artist(@artist.group_name) %>
- <% end %>
- <% if @artist.members.any? %>
- - Members <%= link_to_artists(@artist.members.map(&:name)) %>
- <% end %>
- <% @artist.urls.each do |url| %>
- -
- URL: <%= link_to h(url.to_s), h(url.to_s) %>
- <% if CurrentUser.user.is_moderator? %>
- (<%= link_to("mass edit", edit_moderator_tag_path(:antecedent => "-#{@artist.name} source:#{ArtistUrl.normalize_for_search(url.to_s)}", :consequent => @artist.name)) %>)
- <% end %>
-
- <% end %>
- <% end %>
-
-
+
+
+
+ <% else %>
+ The artist requested removal of this page.
+ <% end %>
<%= render "secondary_links" %>
diff --git a/app/views/posts/partials/index/_excerpt.html.erb b/app/views/posts/partials/index/_excerpt.html.erb
index f0724f0e1..6ef74599c 100644
--- a/app/views/posts/partials/index/_excerpt.html.erb
+++ b/app/views/posts/partials/index/_excerpt.html.erb
@@ -4,43 +4,45 @@
<% if post_set.has_artist? %>
- <% unless post_set.artist.notes.blank? %>
-
- <%= format_text(post_set.artist.notes) %>
+ <% if post_set.artist.visible? %>
+ <% unless post_set.artist.notes.blank? %>
+
+ <%= format_text(post_set.artist.notes) %>
+
+
+ <%= link_to "View wiki page", post_set.artist.wiki_page %>
+ <% end %>
+
+
+
+ - Status <%= post_set.artist.status %>
+ <% if post_set.artist.has_tag_alias? %>
+ - Tag Alias <%= post_set.artist.tag_alias_name %>
+ <% end %>
+ <% if post_set.artist.other_names.present? %>
+ - Other Names <%= link_to_artists(post_set.artist.other_names.split(/ /)) %>
+ <% end %>
+ <% if post_set.artist.group_name.present? %>
+ - Group <%= link_to_artist(post_set.artist.group_name) %>
+ <% end %>
+ <% if post_set.artist.members.any? %>
+ - Members <%= link_to_artists(post_set.artist.members.map(&:name)) %>
+ <% end %>
+ <% post_set.artist.urls.each do |url| %>
+ -
+ URL: <%= link_to h(url.to_s), h(url.to_s) %>
+ <% if CurrentUser.user.is_moderator? %>
+ (<%= link_to("mass edit", edit_moderator_tag_path(:antecedent => "-#{post_set.artist.name} source:#{ArtistUrl.normalize_for_search(url.to_s)}", :consequent => post_set.artist.name)) %>)
+ <% end %>
+
+ <% end %>
+
+
+ <%= artist_alias_and_implication_list(post_set.artist) %>
+
+ <%= link_to "View artist", artist_path(post_set.artist.id) %>
-
- <%= link_to "View wiki page", post_set.artist.wiki_page %>
<% end %>
-
-
-
- - Status <%= post_set.artist.status %>
- <% if post_set.artist.has_tag_alias? %>
- - Tag Alias <%= post_set.artist.tag_alias_name %>
- <% end %>
- <% if post_set.artist.other_names.present? %>
- - Other Names <%= link_to_artists(post_set.artist.other_names.split(/ /)) %>
- <% end %>
- <% if post_set.artist.group_name.present? %>
- - Group <%= link_to_artist(post_set.artist.group_name) %>
- <% end %>
- <% if post_set.artist.members.any? %>
- - Members <%= link_to_artists(post_set.artist.members.map(&:name)) %>
- <% end %>
- <% post_set.artist.urls.each do |url| %>
- -
- URL: <%= link_to h(url.to_s), h(url.to_s) %>
- <% if CurrentUser.user.is_moderator? %>
- (<%= link_to("mass edit", edit_moderator_tag_path(:antecedent => "-#{post_set.artist.name} source:#{ArtistUrl.normalize_for_search(url.to_s)}", :consequent => post_set.artist.name)) %>)
- <% end %>
-
- <% end %>
-
-
- <%= artist_alias_and_implication_list(post_set.artist) %>
-
- <%= link_to "View artist", artist_path(post_set.artist.id) %>
-
<% elsif post_set.has_wiki? %>
<% if post_set.wiki_page.other_names.present? %>
diff --git a/app/views/posts/partials/show/_notices.html.erb b/app/views/posts/partials/show/_notices.html.erb
index b3b61f41a..5fb158de8 100644
--- a/app/views/posts/partials/show/_notices.html.erb
+++ b/app/views/posts/partials/show/_notices.html.erb
@@ -8,7 +8,7 @@
<% if post.is_banned? %>
- This post was removed because it was requested by the artist
+ The artist requested removal of this page
<% end %>
diff --git a/app/views/static/access_denied.html.erb b/app/views/static/access_denied.html.erb
index 1b8aee37c..4791de831 100644
--- a/app/views/static/access_denied.html.erb
+++ b/app/views/static/access_denied.html.erb
@@ -1,5 +1,7 @@
Access Denied
+ You do not have permission to visit this page.
+
<%= link_to "Go back", :back, :rel => "prev" %>
<% content_for(:page_title) do %>
diff --git a/app/views/wiki_page_versions/diff.html.erb b/app/views/wiki_page_versions/diff.html.erb
index 09a177f7e..95ad20249 100644
--- a/app/views/wiki_page_versions/diff.html.erb
+++ b/app/views/wiki_page_versions/diff.html.erb
@@ -2,11 +2,15 @@
Wiki Page: <%= @thispage.title %>
- Showing differences between <%= compact_time @thispage.updated_at %> (<%= link_to_user @thispage.updater %>) and <%= compact_time @otherpage.updated_at %> (<%= link_to_user @otherpage.updater %>)
+ <% if @thispage.visible? %>
+ Showing differences between <%= compact_time @thispage.updated_at %> (<%= link_to_user @thispage.updater %>) and <%= compact_time @otherpage.updated_at %> (<%= link_to_user @otherpage.updater %>)
-
- <%= wiki_page_diff(@thispage, @otherpage) %>
-
+
+ <%= wiki_page_diff(@thispage, @otherpage) %>
+
+ <% else %>
+ The artist requested removal of this page.
+ <% end %>
diff --git a/app/views/wiki_page_versions/show.html.erb b/app/views/wiki_page_versions/show.html.erb
index 95a1639bf..917306945 100644
--- a/app/views/wiki_page_versions/show.html.erb
+++ b/app/views/wiki_page_versions/show.html.erb
@@ -13,7 +13,7 @@
<%= format_text(@wiki_page_version.body) %>
<% else %>
- This artist has requested removal of their information.
+ The artist has requested removal of this page.
<% end %>
diff --git a/app/views/wiki_pages/edit.html.erb b/app/views/wiki_pages/edit.html.erb
index 6f94ddadf..3bc0e7b43 100644
--- a/app/views/wiki_pages/edit.html.erb
+++ b/app/views/wiki_pages/edit.html.erb
@@ -4,7 +4,12 @@
Edit Wiki
- <%= render "form" %>
+
+ <% if @wiki_page.visible? %>
+ <%= render "form" %>
+ <% else %>
+ The artist requested removal of this page.
+ <% end %>
|