diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 598c9f4f5e..20a06652e8 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 0000000000..d0f3c8b39f --- /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 f4c61ef136..baf1f7cbd0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -37,17 +37,7 @@