made the default skin work with and without the logo

3 files changed, 23 insertions, 9 deletions

diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index 5c8b9164..3e913bbf 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -225,9 +225,6 @@ body.user-messages {
 
 #userToolsNav {/* Navigation bar containing login link or user information, check widgets/user_navigation.html*/
     height: 20px;
-    position:absolute;
-    bottom: 0;
-    right:0px;
     padding-bottom:5px;
 
     a {
@@ -263,7 +260,7 @@ body.user-messages {
 }
 
 #metaNav {/* Top Navigation bar containing links for tags, people and badges, check widgets/header.html */
-    float:right;
+    float: right;/* for #header.with-logo it is modified */
 
     a {
         color: #e2e2ae;
@@ -312,6 +309,21 @@ body.user-messages {
     }
 }
 
+#header.with-logo #userToolsNav {
+    position:absolute;
+    bottom: 0;
+    right:0px;
+}
+
+#header.without-logo #userToolsNav {
+    float:left;
+    margin-top: 7px;
+}
+
+#header.without-logo #metaNav {
+    margin-bottom: 7px;
+}
+
 #secondaryHeader{ /* Div containing Home button, scope navigation, search form and ask button, check blocks/secondary_header.html */
     height:55px;
     background:#e9e9e1;
diff --git a/askbot/skins/default/templates/widgets/header.html b/askbot/skins/default/templates/widgets/header.html
index ad0ae4a2..d4e7d66a 100644
--- a/askbot/skins/default/templates/widgets/header.html
+++ b/askbot/skins/default/templates/widgets/header.html
@@ -1,13 +1,17 @@
 <!-- template header.html -->
 {% import "macros.html" as macros %}
-<div id="header">
+<div 
+    id="header"
+    class="{% if settings.SHOW_LOGO %}with-logo{% else %}without-logo{% endif %}"
+>
     <div class="content-wrapper">
-        
         <div id="userToolsNav">
             {% include "widgets/user_navigation.html" %}
             {{settings.CUSTOM_HEADER}}
         </div>
+        {% if settings.SHOW_LOGO %}
             {% include "widgets/logo.html" %}
+        {% endif %}
         <div id="metaNav">
             {% include "widgets/meta_nav.html" %}
         </div>
diff --git a/askbot/skins/default/templates/widgets/logo.html b/askbot/skins/default/templates/widgets/logo.html
index d0d67db8..6d4d86d2 100644
--- a/askbot/skins/default/templates/widgets/logo.html
+++ b/askbot/skins/default/templates/widgets/logo.html
@@ -1,6 +1,4 @@
-{% if settings.SHOW_LOGO %}
-  <a id="logo" href="{% url questions %}?start_over=true"><img 
+<a id="logo" href="{% url questions %}?start_over=true"><img 
     src="{{ settings.SITE_LOGO_URL|media }}" 
     title="{% trans %}back to home page{% endtrans %}"
     alt="{% trans site=settings.APP_SHORT_NAME %}{{site}} logo{% endtrans %}"/></a>
-{% endif %}