From bcb034659527b5f927f4fe62ee6c2771f1eb8a1a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
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 598c9f4f5..20a06652e 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 000000000..d0f3c8b39
--- /dev/null
+++ b/app/views/application/_header.html.erb
@@ -0,0 +1,22 @@
+<header class="d-header">
+ <div class="container">
+ <div class="contents">
+ <div class="row">
+ <div class="title span13">
+ <a href="/">
+ <%- if application_logo_url.present? %>
+ <img src="<%= application_logo_url %>" alt="<%= SiteSetting.title %>" id="site-logo">
+ <%- else %>
+ <h2 id='site-text-logo'><%= SiteSetting.title %></h2>
+ <%- end %>
+ </a>
+ </div>
+ <% unless current_user %>
+ <div class='panel clearfix'>
+ <a href="/login" class='btn btn-primary btn-small'><i class="fa fa-user"></i><%= I18n.t('log_in') %></a>
+ </div>
+ <% end %>
+ </div>
+ </div>
+ </div>
+</header>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f4c61ef13..baf1f7cbd 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -37,17 +37,7 @@
<body>
<noscript data-path="<%= request.env['PATH_INFO'] %>">
- <header class="d-header">
- <div class="container">
- <div class="contents">
- <div class="row">
- <div class="title span13">
- <a href="/"><img src="<%= (mobile_view? && SiteSetting.mobile_logo_url) || SiteSetting.logo_url %>" alt="<%=SiteSetting.title%>" id="site-logo"></a>
- </div>
- </div>
- </div>
- </div>
- </header>
+ <%= render partial: 'header' %>
<div id="main-outlet" class="container">
<!-- preload-content: -->
<%= yield %>
diff --git a/app/views/layouts/no_ember.html.erb b/app/views/layouts/no_ember.html.erb
index e95092320..40b1ff305 100644
--- a/app/views/layouts/no_ember.html.erb
+++ b/app/views/layouts/no_ember.html.erb
@@ -15,29 +15,14 @@
<%= yield(:no_ember_head) %>
</head>
<body>
-<%- unless customization_disabled? %>
+ <%- unless customization_disabled? %>
<%= SiteCustomization.custom_header(session[:preview_style]) %>
-<%- end %>
-<section id='main'>
- <header class="d-header">
- <div class="container">
- <div class="contents">
- <div class="row">
- <div class="title span13">
- <a href="/"><img src="<%=SiteSetting.logo_url%>" alt="<%=SiteSetting.title%>" id="site-logo"></a>
- </div>
- <% unless current_user %>
- <div class='panel clearfix'>
- <a href="/login" class='btn btn-primary btn-small'><i class="fa fa-user"></i><%= I18n.t('log_in') %></a>
- </div>
- <% end %>
- </div>
- </div>
+ <%- end %>
+ <section id='main'>
+ <%= render partial: 'header' %>
+ <div id="main-outlet" class="<%= @container_class ? @container_class : 'container' %>">
+ <%= yield %>
</div>
- </header>
- <div id="main-outlet" class="<%= @container_class ? @container_class : 'container' %>">
- <%= yield %>
- </div>
-</section>
+ </section>
</body>
</html>