Created new widgets:

  - logo.html -> widget for logo.
  - ask_button.html -> widget for ask button
  - main_menu.html -> widget for the main menu.
  - meta_nav.html -> widget for meta navigation.
  - search_bar.html -> search bar widget.
  - user_navigation.html -> user navigation header

Fixed a typo in secondary header.

11 files changed, 48 insertions, 46 deletions

diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index 60022a14..cd62173b 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -297,7 +297,7 @@ h1 {
     }
 }
 
-#secundaryHeader{ /* Div containing Home button, scope navigation, search form and ask button, check blocks/secondary_header.html */
+#secondaryHeader{ /* Div containing Home button, scope navigation, search form and ask button, check blocks/secondary_header.html */
     height:55px;
     background:#e9e9e1;
     border-bottom:#d3d3c2 1px solid;
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html
index c5c05679..3336e77f 100644
--- a/askbot/skins/default/templates/base.html
+++ b/askbot/skins/default/templates/base.html
@@ -18,7 +18,7 @@
         {% include "blocks/system_messages.html" %}
         {% include "custom_header.html" ignore missing %}
         {% include "blocks/header.html" %} {# Logo, user tool navigation and meta navitation #}
-        {% include "blocks/secundary_header.html" %} {# Scope selector, search input and ask button #}
+        {% include "blocks/secondary_header.html" %} {# Scope selector, search input and ask button #}
         <div class="content-wrapper">
             {% block body %}
             {% endblock %}
diff --git a/askbot/skins/default/templates/blocks/header.html b/askbot/skins/default/templates/blocks/header.html
index 042fe115..9e7066f7 100644
--- a/askbot/skins/default/templates/blocks/header.html
+++ b/askbot/skins/default/templates/blocks/header.html
@@ -3,33 +3,14 @@
 {% import "macros/user_macros.html" as user_macros %}
 <div id="header">
     <div class="content-wrapper">
-        {% if settings.SHOW_LOGO %}
-        <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 %}
+        
         <div id="userToolsNav">
-            {% include "blocks/user_navigation.html" %}
+            {% include "widgets/user_navigation.html" %}
             {{settings.CUSTOM_HEADER}}
         </div>
-        
+            {% include "widgets/logo.html" %}
         <div id="metaNav">
-            <a 
-                id="navTags"
-                href="{% url tags %}"
-                {% if active_tab == 'tags' %}class="on"{% endif %}
-            >{% trans %}tags{% endtrans %}</a>
-            <a 
-                id="navUsers"
-                href="{% url users %}"
-                {% if active_tab == 'users' %}class="on"{% endif %}
-            >{% trans %}users{% endtrans %}</a>
-            <a 
-                id="navBadges"
-                href="{% url badges %}"
-                {% if active_tab == 'badges' %}class="on"{% endif %}
-            >{% trans %}badges{% endtrans %}</a>
+            {% include "widgets/meta_nav.html" %}
         </div>
         <div class="clean"></div>
     </div>
diff --git a/askbot/skins/default/templates/blocks/secondary_header.html b/askbot/skins/default/templates/blocks/secondary_header.html
new file mode 100644
index 00000000..df2825e3
--- /dev/null
+++ b/askbot/skins/default/templates/blocks/secondary_header.html
@@ -0,0 +1,12 @@
+<!-- template secondary_header.html -->
+<div id="secondaryHeader">
+    <div class="content-wrapper">
+        <a id="homeButton" href="{% url questions %}"></a>
+        <div id="scopeWrapper">
+            {% include "widgets/main_menu.html" %}            
+            {% include "widgets/search_bar.html" %} {# include search form widget #}
+        </div>
+        {% include "widgets/ask_button.html" %}            
+        <div class="clean"></div>
+    </div>
+</div>
diff --git a/askbot/skins/default/templates/blocks/secundary_header.html b/askbot/skins/default/templates/blocks/secundary_header.html
deleted file mode 100644
index 6b0e0878..00000000
--- a/askbot/skins/default/templates/blocks/secundary_header.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- template secundary_header.html -->
-
-<div id="secundaryHeader">
-    <div class="content-wrapper">
-        <a id="homeButton" href="{% url questions %}"></a>
-        <div id="scopeWrapper">
-            <a class="scope-selector {% if scope == 'all' %}on{% endif %}"
-            href="{% url questions %}?scope=all" title="{% trans %}see all questions{% endtrans %}">ALL</a>
-            <a class="scope-selector {% if scope == 'unanswered' %}on{% endif %}"
-            href="{% url questions %}?scope=unanswered&amp;sort=answers-asc" title="{% trans %}see unanswered questions{% endtrans %}">UNANSWERED</a>
-            {% if request.user.is_authenticated() %} 
-                <a class="scope-selector {% if scope == 'favorite' %}on{% endif %}"
-                href="{% url questions %}?scope=favorite" title="{% trans %}see your followed questions{% endtrans %}">FOLLOWED</a>
-            {% endif %}
-            
-            {% include "blocks/input_bar.html" %} {# include search form block #}
-        </div>
-        <a id="askButton" href="{% url ask %}">{% trans %}ask a question{% endtrans %}</a>
-        <div class="clean"></div>
-    </div>
-</div>
diff --git a/askbot/skins/default/templates/widgets/ask_button.html b/askbot/skins/default/templates/widgets/ask_button.html
new file mode 100644
index 00000000..61f4b3cd
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/ask_button.html
@@ -0,0 +1 @@
+<a id="askButton" href="{% url ask %}">{% trans %}ask a question{% endtrans %}</a>
diff --git a/askbot/skins/default/templates/widgets/logo.html b/askbot/skins/default/templates/widgets/logo.html
new file mode 100644
index 00000000..d0d67db8
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/logo.html
@@ -0,0 +1,6 @@
+{% if settings.SHOW_LOGO %}
+  <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 %}
diff --git a/askbot/skins/default/templates/widgets/main_menu.html b/askbot/skins/default/templates/widgets/main_menu.html
new file mode 100644
index 00000000..ef3aadb3
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/main_menu.html
@@ -0,0 +1,8 @@
+<a class="scope-selector {% if scope == 'all' %}on{% endif %}"
+href="{% url questions %}?scope=all" title="{% trans %}see all questions{% endtrans %}">ALL</a>
+<a class="scope-selector {% if scope == 'unanswered' %}on{% endif %}"
+href="{% url questions %}?scope=unanswered&amp;sort=answers-asc" title="{% trans %}see unanswered questions{% endtrans %}">UNANSWERED</a>
+{% if request.user.is_authenticated() %} 
+  <a class="scope-selector {% if scope == 'favorite' %}on{% endif %}"
+  href="{% url questions %}?scope=favorite" title="{% trans %}see your followed questions{% endtrans %}">FOLLOWED</a>
+{% endif %}
diff --git a/askbot/skins/default/templates/widgets/meta_nav.html b/askbot/skins/default/templates/widgets/meta_nav.html
new file mode 100644
index 00000000..b459b025
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/meta_nav.html
@@ -0,0 +1,15 @@
+<a 
+  id="navTags"
+  href="{% url tags %}"
+  {% if active_tab == 'tags' %}class="on"{% endif %}
+>{% trans %}tags{% endtrans %}</a>
+<a 
+  id="navUsers"
+  href="{% url users %}"
+  {% if active_tab == 'users' %}class="on"{% endif %}
+>{% trans %}users{% endtrans %}</a>
+<a 
+  id="navBadges"
+  href="{% url badges %}"
+  {% if active_tab == 'badges' %}class="on"{% endif %}
+>{% trans %}badges{% endtrans %}</a>
diff --git a/askbot/skins/default/templates/blocks/input_bar.html b/askbot/skins/default/templates/widgets/search_bar.html
index 55917fbc..55917fbc 100644
--- a/askbot/skins/default/templates/blocks/input_bar.html
+++ b/askbot/skins/default/templates/widgets/search_bar.html
diff --git a/askbot/skins/default/templates/blocks/user_navigation.html b/askbot/skins/default/templates/widgets/user_navigation.html
index 537b615d..537b615d 100644
--- a/askbot/skins/default/templates/blocks/user_navigation.html
+++ b/askbot/skins/default/templates/widgets/user_navigation.html