From 9e913734324a2c99910dc18dd037a0eb00e6ce00 Mon Sep 17 00:00:00 2001 From: evazion Date: Thu, 6 Oct 2022 22:00:04 -0500 Subject: [PATCH] views: fix hardcoded references to Danbooru. --- app/views/favorite_groups/_form.html.erb | 4 ++-- app/views/posts/index.html.erb | 2 +- app/views/user_name_change_requests/new.html.erb | 2 +- app/views/users/edit.html.erb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/favorite_groups/_form.html.erb b/app/views/favorite_groups/_form.html.erb index ae4069218..b2a811928 100644 --- a/app/views/favorite_groups/_form.html.erb +++ b/app/views/favorite_groups/_form.html.erb @@ -4,9 +4,9 @@ <% if policy(@favorite_group).can_enable_privacy? %> <%= f.input :is_private, label: "Private", as: :boolean, hint: "Don't allow others to view this favgroup." %> <% elsif @favorite_group.is_private? %> - <%= f.input :is_private, label: "Private", as: :boolean, hint: "Don't allow others to view this favgroup. Warning: if you disable this, you can't re-enable it without ".html_safe + link_to("upgrading to Danbooru Gold", new_user_upgrade_path) + ". (".html_safe + link_to_wiki("learn more", "help:privacy_mode") + ")".html_safe %> + <%= f.input :is_private, label: "Private", as: :boolean, hint: "Don't allow others to view this favgroup. Warning: if you disable this, you can't re-enable it without ".html_safe + link_to("upgrading to Gold", new_user_upgrade_path) + ". (".html_safe + link_to_wiki("learn more", "help:privacy_mode") + ")".html_safe %> <% else %> - <%= f.input :is_private, label: "Private", as: :boolean, hint: link_to("Upgrade to Danbooru Gold to enable private favgroups", new_user_upgrade_path), input_html: { disabled: true } %> + <%= f.input :is_private, label: "Private", as: :boolean, hint: link_to("Upgrade to Gold to enable private favgroups", new_user_upgrade_path), input_html: { disabled: true } %> <% end %> <%= f.submit "Submit" %> <% end %> diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb index a58b56b18..958d1d187 100644 --- a/app/views/posts/index.html.erb +++ b/app/views/posts/index.html.erb @@ -185,7 +185,7 @@ <% end %> <% if @post_set.safe_posts.present? %> - <%= @post_set.safe_posts.size %> post(s) on this page were hidden by safe mode. Go to <%= link_to "Danbooru", "https://danbooru.donmai.us" %> or disable safe mode to view them (<%= link_to_wiki "learn more", "help:user_settings" %>).
+ <%= @post_set.safe_posts.size %> post(s) on this page were hidden by safe mode. Disable safe mode to view them (<%= link_to_wiki "learn more", "help:user_settings" %>).
<% end %> <% end %> diff --git a/app/views/user_name_change_requests/new.html.erb b/app/views/user_name_change_requests/new.html.erb index edddec7b0..3637b45b7 100644 --- a/app/views/user_name_change_requests/new.html.erb +++ b/app/views/user_name_change_requests/new.html.erb @@ -24,7 +24,7 @@
  • Names must be less than 25 characters long.
  • Names can't insult or impersonate other users.
  • Names are case-insensitive.
  • -
  • Your previous names will be visible on your profile to other Danbooru members, but they won't be visible to search engines.
  • +
  • Your previous names will be visible on your profile to logged-in users, but they won't be visible to search engines.
  • You can't change your name more than once per week.
  • diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 046ebfe7f..5d2c1caff 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -68,7 +68,7 @@ <% elsif @user.enable_private_favorites? %> <%= f.input :enable_private_favorites, label: "Private favorites and votes", as: :select, hint: "Make your favorites and upvotes private. (Warning: if you disable this, you can't re-enable it without ".html_safe + link_to("upgrading to a Gold account", new_user_upgrade_path) + " first. (".html_safe + link_to_wiki("learn more", "help:privacy_mode") + ")".html_safe, collection: { "No" => false, "Yes" => true }, include_blank: false %> <% else %> - <%= f.input :enable_private_favorites, label: "Private favorites and votes", as: :select, hint: link_to("Upgrade to Danbooru Gold to enable private favorites and upvotes", new_user_upgrade_path), collection: { "No" => false, "Yes" => true }, include_blank: false %> + <%= f.input :enable_private_favorites, label: "Private favorites and votes", as: :select, hint: link_to("Upgrade to Gold to enable private favorites and upvotes", new_user_upgrade_path), collection: { "No" => false, "Yes" => true }, include_blank: false %> <% end %> <%= f.input :disable_tagged_filenames, :as => :select, :hint => "Don't include tags in image filenames", :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false %> <%= f.input :disable_mobile_gestures, :as => :select, :hint => "Disable swipe left / swipe right gestures on mobile", :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false %>