diff --git a/app/views/articles/search/_meta.html.erb b/app/views/articles/search/_meta.html.erb index 01122c85a..752f3a311 100644 --- a/app/views/articles/search/_meta.html.erb +++ b/app/views/articles/search/_meta.html.erb @@ -1,5 +1,5 @@ <% title "Search Results" %> -/search" /> + diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb index 6ffb7f829..ae135a2f7 100644 --- a/app/views/articles/show.html.erb +++ b/app/views/articles/show.html.erb @@ -42,12 +42,12 @@ <% end %> <% if internal_navigation? %> - " /> + <% else %> <%= content_for :page_meta do %> - " /> + diff --git a/app/views/mailers/pro_membership_mailer/expiring_membership.html.erb b/app/views/mailers/pro_membership_mailer/expiring_membership.html.erb index 32b9104a4..f466f9f7d 100644 --- a/app/views/mailers/pro_membership_mailer/expiring_membership.html.erb +++ b/app/views/mailers/pro_membership_mailer/expiring_membership.html.erb @@ -1,6 +1,5 @@ -<% host = "#{ApplicationConfig['APP_PROTOCOL']}#{ApplicationConfig['APP_DOMAIN']}" %> -<% credits_url = url_for(host: host, controller: :credits, action: :index) %> -<% pro_membership_url = url_for(host: host, controller: :users, action: :edit, tab: "pro-membership") %> +<% credits_url = app_url(credits_path) %> +<% pro_membership_url = app_url(user_settings_path("pro-membership")) %>

Hi <%= @user.name %>, your Pro Membership will expire in <%= @days %> days on <%= @date.to_s(:long) %>!

diff --git a/app/views/mailers/pro_membership_mailer/expiring_membership.text.erb b/app/views/mailers/pro_membership_mailer/expiring_membership.text.erb index 2642f1e19..6677145f1 100644 --- a/app/views/mailers/pro_membership_mailer/expiring_membership.text.erb +++ b/app/views/mailers/pro_membership_mailer/expiring_membership.text.erb @@ -1,6 +1,5 @@ -<% host = "#{ApplicationConfig['APP_PROTOCOL']}#{ApplicationConfig['APP_DOMAIN']}" %> -<% credits_url = url_for(host: host, controller: :credits, action: :index) %> -<% pro_membership_url = url_for(host: host, controller: :users, action: :edit, tab: "pro-membership") %> +<% credits_url = app_url(credits_path) %> +<% pro_membership_url = app_url(user_settings_path("pro-membership")) %> Hi <%= @user.name %>, your Pro Membership will expire in <%= @days %> days on <%= @date.to_s(:long) %>! diff --git a/app/views/sitemaps/show.xml.erb b/app/views/sitemaps/show.xml.erb index 58ce1e0a0..e446de0a0 100644 --- a/app/views/sitemaps/show.xml.erb +++ b/app/views/sitemaps/show.xml.erb @@ -2,7 +2,7 @@ <% @articles.each do |path, last_comment_at| %> - <%= ApplicationConfig['APP_PROTOCOL'] %><%= ApplicationConfig['APP_DOMAIN'] %><%= path %> + <%= app_url(path) %> <%= last_comment_at.strftime("%F") %> <% end %> diff --git a/app/views/users/_org_admin.html.erb b/app/views/users/_org_admin.html.erb index 876d3cf38..edd9a37b3 100644 --- a/app/views/users/_org_admin.html.erb +++ b/app/views/users/_org_admin.html.erb @@ -52,9 +52,9 @@
  1. Sign up at - ">https://<%= ApplicationConfig["APP_DOMAIN"] %>
  2. + <%= app_url %>
  3. Navigate to - /settings/organization">https://<%= ApplicationConfig["APP_DOMAIN"] %>/settings/organization + <%= app_url(user_settings_path(:organization)) %>
  4. Paste the secret code below and click Join Organization
@@ -177,7 +177,7 @@

Call-to-action box

Customizable text that appears to the right of every post for your organization. - See an example from the /devteam/the-dev-badge-is-available-on-font-awesome-2ihe" target="_blank" rel="noopener">DEV Team. + See an example from the " target="_blank" rel="noopener">DEV Team.

diff --git a/app/views/users/_profile.html.erb b/app/views/users/_profile.html.erb index 0c44f672c..ec66b896b 100644 --- a/app/views/users/_profile.html.erb +++ b/app/views/users/_profile.html.erb @@ -4,7 +4,7 @@