diff --git a/app/assets/javascripts/manifest.json.erb b/app/assets/javascripts/manifest.json.erb index bf9a18b4d..acb5b1338 100644 --- a/app/assets/javascripts/manifest.json.erb +++ b/app/assets/javascripts/manifest.json.erb @@ -1,5 +1,5 @@ { - "name": "The DEV Community", + "name": "DEV Community", "short_name": "dev.to", "description": "Where programmers share ideas, experiences, and help each other grow.", "start_url": "/", diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index e86bee4b9..b6f57ba5c 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,11 +1,15 @@ class PagesController < ApplicationController # No authorization required for entirely public controller - before_action :set_cache_control_headers, only: [:rlyweb, :now, :events, :membership] + before_action :set_cache_control_headers, only: [:rlyweb, :now, :events, :membership, :survey] def now set_surrogate_key_header "now_page" end + def survey + set_surrogate_key_header "survey_page" + end + def about set_surrogate_key_header "about_page" end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a19b07cfb..807a3ba09 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -35,8 +35,13 @@ module ApplicationHelper end def title(page_title) - content_for(:title){ page_title } - page_title + derived_title = if page_title.include?("DEV") + page_title + else + page_title + " - DEV Community 👩‍💻👨‍💻" + end + content_for(:title){ derived_title } + derived_title end def icon(name, pixels = "20") diff --git a/app/views/articles/feed.rss.builder b/app/views/articles/feed.rss.builder index c285b94a1..90c7d0ba7 100644 --- a/app/views/articles/feed.rss.builder +++ b/app/views/articles/feed.rss.builder @@ -2,8 +2,8 @@ xml.instruct! :xml, :version => "1.0" xml.rss :version => "2.0" do xml.channel do - xml.title @user ? @user.name : "The DEV Community" - xml.author @user ? @user.name : "The DEV Community" + xml.title @user ? @user.name : "DEV Community" + xml.author @user ? @user.name : "DEV Community" xml.description @user ? @user.summary : "Where programmers share ideas and help each other grow." xml.link @user ? "https://dev.to" + @user.path : "https://dev.to" xml.language "en" diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb index da7fa150c..cad208fc4 100644 --- a/app/views/articles/index.html.erb +++ b/app/views/articles/index.html.erb @@ -20,7 +20,7 @@ <%= auto_discovery_link_tag(:rss, "https://dev.to/feed/#{@user.username}", {title: "The Practical Dev RSS Feed"}) %> <% elsif @tag.present? %> - <% title "#{@tag}#{ " - top this #{params[:timeframe]}" if params[:timeframe].present? } - The DEV Community" %> + <% title "#{@tag}#{ " - top this #{params[:timeframe]}" if params[:timeframe].present? }" %> @@ -47,7 +47,7 @@ <% end %> <% elsif @query.present? %> - <% title "DEV => Search Results" %> + <% title "Search Results" %> @@ -67,7 +67,11 @@ <% elsif @podcast_index %> <%= render "podcast_episodes/meta" %> <% else %> - <% title "The DEV Community#{ " - top this #{params[:timeframe]}" if params[:timeframe].present? }" %> + <% if params[:timeframe].present? %> + <% title "DEV Community 👩‍💻👨‍💻 - top posts this #{params[:timeframe]}" %> + <% else %> + <% title "DEV Community 👩‍💻👨‍💻 - Where software engineers connect, build their resumes, and grow." %> + <% end %> diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb index f5c7f9d67..125c29d00 100644 --- a/app/views/articles/show.html.erb +++ b/app/views/articles/show.html.erb @@ -78,7 +78,7 @@ - +
<% if !@article.published %> diff --git a/app/views/chat_channels/index.html.erb b/app/views/chat_channels/index.html.erb index b1479dde1..25b203994 100644 --- a/app/views/chat_channels/index.html.erb +++ b/app/views/chat_channels/index.html.erb @@ -1,5 +1,5 @@ -<% title "DEV Connect" %> +<% title "DEV Connect 👩‍💻 💬 👨‍💻" %> <%= content_for :page_meta do %> diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index d23063f2c..0d79695b6 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -2,7 +2,7 @@ diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5cfb7c15b..761b00e0a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -3,7 +3,7 @@ <% title = yield(:title) %> - <%= title || 'The DEV Community' %> + <%= title || 'DEV Community' %> <% if is_internal_navigation? %>