[#2302] only show title and description if no logo

ckan · Aug 3, 2012 · 1f40574 · 1f40574
1 parent 93b36f0
commit 1f40574
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/ckan/templates/header.html b/ckan/templates/header.html
@@ -5,13 +5,14 @@
   <div class="container">
     {# The .header-image class hides the main text and uses image replacement for the title #}
     <hgroup class="{{ g.header_class }}">
-      <h1>
-        {% if g.site_logo %}
-          <a class="logo" href="{{ h.url('home') }}"><img src="{{ h.url_for_static(g.site_logo) }}" alt="{{ g.site_title }} Logo" title="{{ g.site_title }} Logo" /></a>
-        {% endif %}
-        <a href="{{ h.url('home') }}">{{ g.site_title }}</a>
-      </h1>
-      {% if g.site_description %}<h2>{{ g.site_description }}</h2>{% endif %}
+      {% if g.site_logo %}
+        <a class="logo" href="{{ h.url('home') }}"><img src="{{ h.url_for_static(g.site_logo) }}" alt="{{ g.site_title }} Logo" title="{{ g.site_title }} Logo" /></a>
+      {% else %}
+        <h1>
+          <a href="{{ h.url('home') }}">{{ g.site_title }}</a>
+        </h1>
+        {% if g.site_description %}<h2>{{ g.site_description }}</h2>{% endif %}
+      {% endif %}
     </hgroup>
     <div class="content">
       {% if c.userobj %}