From bcb034659527b5f927f4fe62ee6c2771f1eb8a1a Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 25 Feb 2015 11:35:47 -0500 Subject: [PATCH] FIX: Support text only logos when activating account. --- app/helpers/application_helper.rb | 4 ++++ app/views/application/_header.html.erb | 22 +++++++++++++++++++ app/views/layouts/application.html.erb | 12 +---------- app/views/layouts/no_ember.html.erb | 29 +++++++------------------- 4 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 app/views/application/_header.html.erb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 598c9f4f5e0..20a06652e80 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -137,6 +137,10 @@ module ApplicationHelper end end + def application_logo_url + @application_logo_url ||= (mobile_view? && SiteSetting.mobile_logo_url) || SiteSetting.logo_url + end + def login_path "#{Discourse::base_uri}/login" end diff --git a/app/views/application/_header.html.erb b/app/views/application/_header.html.erb new file mode 100644 index 00000000000..d0f3c8b39fc --- /dev/null +++ b/app/views/application/_header.html.erb @@ -0,0 +1,22 @@ +
+
+
+
+
+ + <%- if application_logo_url.present? %> + + <%- else %> + + <%- end %> + +
+ <% unless current_user %> +
+ <%= I18n.t('log_in') %> +
+ <% end %> +
+
+
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f4c61ef136e..baf1f7cbd0b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -37,17 +37,7 @@