split main page into blocks

12 files changed, 292 insertions, 279 deletions

diff --git a/askbot/skins/default/media/js/live_search.js b/askbot/skins/default/media/js/live_search.js
index 965002f9..57621cd1 100644
--- a/askbot/skins/default/media/js/live_search.js
+++ b/askbot/skins/default/media/js/live_search.js
@@ -3,7 +3,7 @@ $(document).ready(function(){
     var query = $('input#keywords');
     var prev_text = $.trim(query.val());
     var running = false;
-    var q_list_sel = 'listA';//id of question listing div
+    var q_list_sel = 'question-list';//id of question listing div
 
     var refresh_x_button = function(){
         if ($.trim(query.val()).length > 0){
diff --git a/askbot/skins/default/templates/main_page.html b/askbot/skins/default/templates/main_page.html
new file mode 100644
index 00000000..d0cddc68
--- /dev/null
+++ b/askbot/skins/default/templates/main_page.html
@@ -0,0 +1,24 @@
+{% extends "two_column_body.html" %}
+{# 
+    this template is split into several
+    blocks that are included here
+    the blocks are within directory templates/main_page
+    relative to the skin directory
+
+    there is no html markup in this file
+#}
+<!-- questions.html -->
+{% block title %}{% spaceless %}{% trans %}Questions{% endtrans %}{% endspaceless %}{% endblock %}
+{% block content %}
+    {% include "main_page/tab_bar.html" %}
+    {% include "main_page/headline.html" %}
+    {% include "main_page/content.html" %}
+    {% include "main_page/paginator.html" %}
+{% endblock %}
+{% block sidebar %}
+    {% include "main_page/sidebar.html" %}
+{% endblock %}
+{% block endjs %}
+    {% include "main_page/javascript.html" %}
+{% endblock %}
+<!-- end questions.html -->
diff --git a/askbot/skins/default/templates/main_page/content.html b/askbot/skins/default/templates/main_page/content.html
new file mode 100644
index 00000000..72128cdc
--- /dev/null
+++ b/askbot/skins/default/templates/main_page/content.html
@@ -0,0 +1,17 @@
+{% import "macros.html" as macros %}
+<div id="question-list">
+{% cache 0 "questions" questions search_tags scope sort query context.page context.page_size language_code %}
+    {% for question in questions.object_list %}
+        {{macros.question_summary(question)}}
+    {% endfor %}
+{% endcache %}
+{# comment todo: fix css here #}
+{% if questions_count == 0 %}
+    {% include "main_page/nothing_found.html" %}
+{% else %}
+    <p class="evenMore" style="padding-left:9px">
+        {% trans %}Did not find what you were looking for?{% endtrans %} 
+        <a href="{% url ask %}">{% trans %}Please, post your question!{% endtrans %}</a>
+    </p>
+{% endif %}
+</div>
diff --git a/askbot/skins/default/templates/main_page/headline.html b/askbot/skins/default/templates/main_page/headline.html
new file mode 100644
index 00000000..ec6944d6
--- /dev/null
+++ b/askbot/skins/default/templates/main_page/headline.html
@@ -0,0 +1,50 @@
+{% if questions_count > 0 %}
+    <div style="clear:both">
+        <p class="rss">
+            (<a
+                href="{{settings.APP_URL}}/feeds/rss/"
+                title="{% trans %}subscribe to the questions feed{% endtrans %}"
+                >{% trans %}rss feed{% endtrans %}</a>)
+        </p>
+        <h1 id="question-count" class="search-result-summary">
+        {% if search_tags %}
+            {% trans cnt=questions_count, q_num=questions_count|intcomma %}{{q_num}} question, tagged{% pluralize %}{{q_num}} questions, tagged{% endtrans %}
+        {% else %}
+            {% trans cnt=questions_count, q_num=questions_count|intcomma %}{{q_num}} question{% pluralize %}{{q_num}} questions{% endtrans %}
+        {% endif %}
+        {% if author_name %}
+            {% trans %}with {{author_name}}'s contributions{% endtrans %}
+        {% endif %}
+        </h1>
+        {% spaceless %}
+        <div id="search-tags" class="tags">
+        {% if search_tags %}
+            {% for tag in search_tags %}
+                <span class="tag">{{tag}}</span>
+                <span class="delete-icon"></span>
+            {% endfor %}
+        {% endif %}
+        </div>
+        {% endspaceless %}
+        {% if author_name or search_tags or query %}
+            <p class="search-tips">{% trans %}Search tips:{% endtrans %}
+            {% if reset_method_count > 1 %}
+                {% if author_name %}
+                <a href="{% url questions %}?reset_author=true">{% trans %}reset author{% endtrans %}</a>
+                {% endif %}
+                {% if search_tags %}{% if author_name and query %}, {% elif author_name %}{% trans %} or {% endtrans %}{% endif %}
+                    <a href="{% url questions %}?reset_tags=true">{% trans %}reset tags{% endtrans %}</a>
+                {% endif %}
+                {% if query %}{% trans %} or {% endtrans %}
+                    <a href="{% url questions %}?start_over=true">{% trans %}start over{% endtrans %}</a>
+                {% endif %}
+            {% else %}
+                <a href="{% url questions %}?start_over=true">{% trans %}start over{% endtrans %}</a>
+            {% endif %}
+            {% trans %} - to expand, or dig in by adding more tags and revising the query.{% endtrans %}
+            </p>
+        {% else %}
+            <p class="search-tips">{% trans %}Search tip:{% endtrans %} {% trans %}add tags and a query to focus your search{% endtrans %}</p>
+        {% endif %}
+    </div>
+{% endif %}
diff --git a/askbot/skins/default/templates/main_page/javascript.html b/askbot/skins/default/templates/main_page/javascript.html
new file mode 100644
index 00000000..4f123004
--- /dev/null
+++ b/askbot/skins/default/templates/main_page/javascript.html
@@ -0,0 +1,27 @@
+<script type="text/javascript">
+    {% if request.user.is_authenticated() %}
+    var tags = {{ tags_autocomplete|safe }};
+    {% endif %}
+    var sortMethod = '{{sort}}';
+    var showSortByRelevance = {% if show_sort_by_relevance %}true{% else %}false{% endif %};
+    var minSearchWordLength = {{settings.MIN_SEARCH_WORD_LENGTH}};
+    $(document).ready(function(){
+        /*var on_tab = '#nav_questions';
+        $(on_tab).attr('className','on');*/
+        Hilite.exact = false;
+        Hilite.elementid = "question-list";
+        Hilite.debug_referrer = location.href;
+    });
+    askbot['urls']['mark_interesting_tag'] = scriptUrl + '{% trans %}mark-tag/{% endtrans %}{% trans %}interesting/{% endtrans %}';
+    askbot['urls']['mark_ignored_tag'] = scriptUrl + '{% trans %}mark-tag/{% endtrans %}{% trans %}ignored/{% endtrans %}';
+    askbot['urls']['unmark_tag'] = scriptUrl + '{% trans %}unmark-tag/{% endtrans %}';
+    askbot['urls']['command'] = '{% url "call_ajax" %}';
+    askbot['urls']['questions'] = '{% url "questions" %}';
+    askbot['urls']['question_url_template'] = scriptUrl + '{% trans %}question/{% endtrans %}{{ "{{QuestionID}}/" }}';
+    askbot['urls']['user_url_template'] = scriptUrl + '{% trans %}users/{% endtrans %}{{ "{{user_id}}" }}/{{ "{{slug}}" }}/';
+</script>
+<script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
+{% if request.user.is_authenticated() %}
+<script type='text/javascript' src='{{"/js/tag_selector.js"|media}}'></script>
+{% endif %}
+<script type="text/javascript" src="{{"/js/live_search.js"|media}}"></script>
diff --git a/askbot/skins/default/templates/main_page/nothing_found.html b/askbot/skins/default/templates/main_page/nothing_found.html
new file mode 100644
index 00000000..bc58fc27
--- /dev/null
+++ b/askbot/skins/default/templates/main_page/nothing_found.html
@@ -0,0 +1,31 @@
+{# todo: add tips to widen selection #}
+<p class="evenMore" style="padding-top:30px;text-align:center;">
+{% if scope == "unanswered" %}
+    {% trans %}There are no unanswered questions here{% endtrans %}
+{% endif %}
+{% if scope == "favorite" %}
+    {% trans %}No favorite questions here. {% endtrans %}
+    {% trans %}Please start (bookmark) some questions when you visit them{% endtrans %}
+{% endif %}
+</p>
+{% if query or search_tags or author_name %}
+<p class="evenMore" style="text-align:center">
+    {% trans %}You can expand your search by {% endtrans %}
+    {% if reset_method_count > 1 %}
+        {% if author_name %}
+        <a href="{% url questions %}?reset_author=true">{% trans %}resetting author{% endtrans %}</a>
+        {% endif %}
+        {% if search_tags %}{% if author_name and query %}, {% elif author_name %}{% trans %} or {% endtrans %}{% endif %}
+            <a href="{% url questions %}?reset_tags=true">{% trans %}resetting tags{% endtrans %}</a>
+        {% endif %}
+        {% if query %}{% trans %} or {% endtrans %}
+            <a href="{% url questions %}?start_over=true">{% trans %}starting over{% endtrans %}</a>
+        {% endif %}
+    {% else %}
+        <a href="{% url questions %}?start_over=true">{% trans %}starting over{% endtrans %}</a>
+    {% endif %}
+</p>
+{% endif %}
+<p class="evenMore" style="text-align:center">
+<a href="{% url ask %}">{% trans %}Please always feel free to ask your question!{% endtrans %}</a>
+</p>
diff --git a/askbot/skins/default/templates/main_page/paginator.html b/askbot/skins/default/templates/main_page/paginator.html
new file mode 100644
index 00000000..4a77060f
--- /dev/null
+++ b/askbot/skins/default/templates/main_page/paginator.html
@@ -0,0 +1,7 @@
+{% import "macros.html" as macros %}
+{% if questions_count > 10 %}{# todo: remove magic number #}
+    <div id="pager" class="pager">
+        {{ macros.paginator(context|setup_paginator, position='left') }}
+        {{ macros.pagesize_switch(context, position='right') }}
+    </div>
+{% endif %}
diff --git a/askbot/skins/default/templates/main_page/sidebar.html b/askbot/skins/default/templates/main_page/sidebar.html
new file mode 100644
index 00000000..5ea9af4f
--- /dev/null
+++ b/askbot/skins/default/templates/main_page/sidebar.html
@@ -0,0 +1,35 @@
+{% import "macros.html" as macros %}
+{% if contributors %}
+    {% cache 600 "contributors" contributors search_tags scope sort query context.page context.page_size language_code %}
+    <div id="contrib-users" class="boxC">
+    <h2>{% trans %}Contributors{% endtrans %}</h2>
+    {% spaceless %}
+        {% for person in contributors %}
+            {{ macros.gravatar(person,48) }}
+        {% endfor %}
+    {% endspaceless %}
+    </div>
+    {% endcache %}
+{% endif %}
+
+{% if request.user.is_authenticated() %} 
+   {% include "blocks/tag_selector.html" %}
+{% endif %}
+
+{% if tags %}
+    {% cache 0 "tags" tags search_tags scope sort query context.page context.page_size language_code %}
+    <div class="boxC">
+        <h2>{% trans %}Related tags{% endtrans %}</h2>
+        <div id="related-tags" class="tags">
+            {% for tag in tags %}
+                <a 
+                    rel="tag" 
+                    title="{% trans tag_name=tag.name %}see questions tagged '{{ tag_name }}'{% endtrans %}"  
+                    href="{% url questions %}?tags={{tag.name|urlencode}}">{{ tag.name }}</a>
+                <span class="tag-number">&#215; {{ tag.local_used_count|intcomma }}</span>
+                <br />
+            {% endfor %}
+        </div>
+    </div>
+    {% endcache %}
+{% endif %}
diff --git a/askbot/skins/default/templates/main_page/tab_bar.html b/askbot/skins/default/templates/main_page/tab_bar.html
new file mode 100644
index 00000000..2921da88
--- /dev/null
+++ b/askbot/skins/default/templates/main_page/tab_bar.html
@@ -0,0 +1,86 @@
+{% import "macros.html" as macros %}
+{% cache 600 "scope_sort_tabs" search_tags request.user scope sort query context.page context.page_size language_code %}
+<div class="tabBar">
+    <div class="tabsC">
+        <span class="label">{% trans %}In:{% endtrans %}</span>
+        <a id="all" 
+            class="{% if scope == 'all' %}on{% else %}off{% endif %}"
+            href="?scope=all" 
+            title="{% trans %}see all questions{% endtrans %}"
+        >{% trans %}all{% endtrans %}</a>
+        <a id="unanswered" 
+            class="{% if scope == 'unanswered' %}on{% else %}off{% endif %}"
+            href="?scope=unanswered&amp;sort=answers-asc" 
+            title="{% trans %}see unanswered questions{% endtrans %}"
+        >{% trans %}unanswered{% endtrans %}</a>
+        {% if request.user.is_authenticated() %} 
+        <a id="favorite" 
+            class="{% if scope == 'favorite' %}on{% else %}off{% endif %}"
+            href="?scope=favorite" 
+            title="{% trans %}see your favorite questions{% endtrans %}"
+        >{% trans %}favorite{% endtrans %}</a>
+        {% endif %}
+    </div>
+    <div id="sort_tabs" class="tabsA">
+        <span class="label">{% trans %}Sort by:{% endtrans %}</span>
+        {% if show_sort_by_relevance %}
+            {% set asc_relevance_tooltip = _('most relevant questions') %}
+            {% set desc_relevance_tooltip = _('click to see most relevant questions') %}
+            {% set relevance_label = _('relevance') %}
+            {% if query %}
+            <a id="by_relevance"
+                {% if sort == "relevance-desc" %}
+                    href="?sort=relevance-desc"
+                    class="on"
+                    title="{{asc_relevance_tooltip}}">{{relevance_label}} &#9660;
+                {% else %}
+                    href="?sort=relevance-desc"
+                    class="off"
+                    title="{{desc_relevance_tooltip}}">{{relevance_label}}
+                {% endif %}
+            </a>
+            {% endif %}
+            <script type="text/javascript">
+                var sortButtonData = sortButtonData || {};
+                sortButtonData['relevance'] = {
+                    asc_tooltip: "{{asc_relevance_tooltip}}",
+                    desc_tooltip: "{{desc_relevance_tooltip}}",
+                    label: "{{relevance_label}}",
+                };
+            </script>
+        {% endif %}
+        {{macros.reversible_sort_button(
+                button_sort_criterium = 'age',
+                label = _('by date'),
+                asc_tooltip = _('click to see the oldest questions'),
+                desc_tooltip = _('click to see the newest questions'),
+                current_sort_method = sort
+            )
+        }}
+        {{macros.reversible_sort_button(
+                button_sort_criterium = 'activity',
+                label = _('by activity'),
+                asc_tooltip = _('click to see the least recently updated questions'),
+                desc_tooltip = _('click to see the most recently updated questions'),
+                current_sort_method = sort
+            )
+        }}
+        {{macros.reversible_sort_button(
+                button_sort_criterium = 'answers',
+                label = _('by answers'),
+                asc_tooltip = _('click to see the least answered questions'),
+                desc_tooltip = _('click to see the most answered questions'),
+                current_sort_method = sort
+            )
+        }}
+        {{macros.reversible_sort_button(
+                button_sort_criterium = 'votes',
+                label = _('by votes'),
+                asc_tooltip = _('click to see least voted questions'),
+                desc_tooltip = _('click to see most voted questions'),
+                current_sort_method = sort
+            )
+        }}
+    </div>
+</div>
+{% endcache %}
diff --git a/askbot/skins/default/templates/questions.html b/askbot/skins/default/templates/questions.html
deleted file mode 100644
index 138b30c8..00000000
--- a/askbot/skins/default/templates/questions.html
+++ /dev/null
@@ -1,259 +0,0 @@
-{% extends "two_column_body.html" %}
-<!-- questions.html -->
-{% import "macros.html" as macros %}
-{% block title %}{% spaceless %}{% trans %}Questions{% endtrans %}{% endspaceless %}{% endblock %}
-{% block content %}
-{% cache 600 "scope_sort_tabs" search_tags request.user scope sort query context.page context.page_size language_code %}
-<div class="tabBar">
-    <div class="tabsC">
-        <span class="label">{% trans %}In:{% endtrans %}</span>
-        <a id="all" 
-            class="{% if scope == 'all' %}on{% else %}off{% endif %}"
-            href="?scope=all" 
-            title="{% trans %}see all questions{% endtrans %}"
-        >{% trans %}all{% endtrans %}</a>
-        <a id="unanswered" 
-            class="{% if scope == 'unanswered' %}on{% else %}off{% endif %}"
-            href="?scope=unanswered&amp;sort=answers-asc" 
-            title="{% trans %}see unanswered questions{% endtrans %}"
-        >{% trans %}unanswered{% endtrans %}</a>
-        {% if request.user.is_authenticated() %} 
-        <a id="favorite" 
-            class="{% if scope == 'favorite' %}on{% else %}off{% endif %}"
-            href="?scope=favorite" 
-            title="{% trans %}see your favorite questions{% endtrans %}"
-        >{% trans %}favorite{% endtrans %}</a>
-        {% endif %}
-    </div>
-    <div id="sort_tabs" class="tabsA">
-        <span class="label">{% trans %}Sort by:{% endtrans %}</span>
-        {% if show_sort_by_relevance %}
-            {% set asc_relevance_tooltip = _('most relevant questions') %}
-            {% set desc_relevance_tooltip = _('click to see most relevant questions') %}
-            {% set relevance_label = _('relevance') %}
-            {% if query %}
-            <a id="by_relevance"
-                {% if sort == "relevance-desc" %}
-                    href="?sort=relevance-desc"
-                    class="on"
-                    title="{{asc_relevance_tooltip}}">{{relevance_label}} &#9660;
-                {% else %}
-                    href="?sort=relevance-desc"
-                    class="off"
-                    title="{{desc_relevance_tooltip}}">{{relevance_label}}
-                {% endif %}
-            </a>
-            {% endif %}
-            <script type="text/javascript">
-                var sortButtonData = sortButtonData || {};
-                sortButtonData['relevance'] = {
-                    asc_tooltip: "{{asc_relevance_tooltip}}",
-                    desc_tooltip: "{{desc_relevance_tooltip}}",
-                    label: "{{relevance_label}}",
-                };
-            </script>
-        {% endif %}
-        {{macros.reversible_sort_button(
-                button_sort_criterium = 'age',
-                label = _('by date'),
-                asc_tooltip = _('click to see the oldest questions'),
-                desc_tooltip = _('click to see the newest questions'),
-                current_sort_method = sort
-            )
-        }}
-        {{macros.reversible_sort_button(
-                button_sort_criterium = 'activity',
-                label = _('by activity'),
-                asc_tooltip = _('click to see the least recently updated questions'),
-                desc_tooltip = _('click to see the most recently updated questions'),
-                current_sort_method = sort
-            )
-        }}
-        {{macros.reversible_sort_button(
-                button_sort_criterium = 'answers',
-                label = _('by answers'),
-                asc_tooltip = _('click to see the least answered questions'),
-                desc_tooltip = _('click to see the most answered questions'),
-                current_sort_method = sort
-            )
-        }}
-        {{macros.reversible_sort_button(
-                button_sort_criterium = 'votes',
-                label = _('by votes'),
-                asc_tooltip = _('click to see least voted questions'),
-                desc_tooltip = _('click to see most voted questions'),
-                current_sort_method = sort
-            )
-        }}
-    </div>
-</div>
-{% endcache %}
-{% if questions_count > 0 %}
-    <div style="clear:both">
-        <p class="rss">
-            (<a
-                href="{{settings.APP_URL}}/feeds/rss/"
-                title="{% trans %}subscribe to the questions feed{% endtrans %}"
-                >{% trans %}rss feed{% endtrans %}</a>)
-        </p>
-        <h1 id="question-count" class="search-result-summary">
-        {% if search_tags %}
-            {% trans cnt=questions_count, q_num=questions_count|intcomma %}{{q_num}} question, tagged{% pluralize %}{{q_num}} questions, tagged{% endtrans %}
-        {% else %}
-            {% trans cnt=questions_count, q_num=questions_count|intcomma %}{{q_num}} question{% pluralize %}{{q_num}} questions{% endtrans %}
-        {% endif %}
-        {% if author_name %}
-            {% trans %}with {{author_name}}'s contributions{% endtrans %}
-        {% endif %}
-        </h1>
-        {% spaceless %}
-        <div id="search-tags" class="tags">
-        {% if search_tags %}
-            {% for tag in search_tags %}
-                <span class="tag">{{tag}}</span>
-                <span class="delete-icon"></span>
-            {% endfor %}
-        {% endif %}
-        </div>
-        {% endspaceless %}
-        {% if author_name or search_tags or query %}
-            <p class="search-tips">{% trans %}Search tips:{% endtrans %}
-            {% if reset_method_count > 1 %}
-                {% if author_name %}
-                <a href="{% url questions %}?reset_author=true">{% trans %}reset author{% endtrans %}</a>
-                {% endif %}
-                {% if search_tags %}{% if author_name and query %}, {% elif author_name %}{% trans %} or {% endtrans %}{% endif %}
-                    <a href="{% url questions %}?reset_tags=true">{% trans %}reset tags{% endtrans %}</a>
-                {% endif %}
-                {% if query %}{% trans %} or {% endtrans %}
-                    <a href="{% url questions %}?start_over=true">{% trans %}start over{% endtrans %}</a>
-                {% endif %}
-            {% else %}
-                <a href="{% url questions %}?start_over=true">{% trans %}start over{% endtrans %}</a>
-            {% endif %}
-            {% trans %} - to expand, or dig in by adding more tags and revising the query.{% endtrans %}
-            </p>
-        {% else %}
-            <p class="search-tips">{% trans %}Search tip:{% endtrans %} {% trans %}add tags and a query to focus your search{% endtrans %}</p>
-        {% endif %}
-    </div>
-{% endif %}
-<div id="question-list">
-{% cache 0 "questions" questions search_tags scope sort query context.page context.page_size language_code %}
-    {% for question in questions.object_list %}
-        {{macros.question_summary(question)}}
-    {% endfor %}
-{% endcache %}
-        {# comment todo: fix css here #}
-        {% if questions_count == 0 %}
-            {# todo: add tips to widen selection #}
-            <p class="evenMore" style="padding-top:30px;text-align:center;">
-            {% if scope == "unanswered" %}
-                {% trans %}There are no unanswered questions here{% endtrans %}
-            {% endif %}
-            {% if scope == "favorite" %}
-                {% trans %}No favorite questions here. {% endtrans %}
-                {% trans %}Please start (bookmark) some questions when you visit them{% endtrans %}
-            {% endif %}
-            </p>
-            {% if query or search_tags or author_name %}
-            <p class="evenMore" style="text-align:center">
-                {% trans %}You can expand your search by {% endtrans %}
-                {% if reset_method_count > 1 %}
-                    {% if author_name %}
-                    <a href="{% url questions %}?reset_author=true">{% trans %}resetting author{% endtrans %}</a>
-                    {% endif %}
-                    {% if search_tags %}{% if author_name and query %}, {% elif author_name %}{% trans %} or {% endtrans %}{% endif %}
-                        <a href="{% url questions %}?reset_tags=true">{% trans %}resetting tags{% endtrans %}</a>
-                    {% endif %}
-                    {% if query %}{% trans %} or {% endtrans %}
-                        <a href="{% url questions %}?start_over=true">{% trans %}starting over{% endtrans %}</a>
-                    {% endif %}
-                {% else %}
-                    <a href="{% url questions %}?start_over=true">{% trans %}starting over{% endtrans %}</a>
-                {% endif %}
-            </p>
-            {% endif %}
-            <p class="evenMore" style="text-align:center">
-            <a href="{% url ask %}">{% trans %}Please always feel free to ask your question!{% endtrans %}</a>
-            </p>
-        {% else %}
-            <p class="evenMore" style="padding-left:9px">
-                {% trans %}Did not find what you were looking for?{% endtrans %} 
-                <a href="{% url ask %}">{% trans %}Please, post your question!{% endtrans %}</a>
-            </p>
-        {% endif %}
-</div>
-{% if questions_count > 10 %}{# todo: remove magic number #}
-    <div id="pager" class="pager">
-        {{ macros.paginator(context|setup_paginator, position='left') }}
-        {{ macros.pagesize_switch(context, position='right') }}
-    </div>
-{% endif %}
-{% endblock %}
-{% block sidebar %}
-    {% if contributors %}
-        {% cache 600 "contributors" contributors search_tags scope sort query context.page context.page_size language_code %}
-        <div id="contrib-users" class="boxC">
-        <h2>{% trans %}Contributors{% endtrans %}</h2>
-        {% spaceless %}
-            {% for person in contributors %}
-                {{ macros.gravatar(person,48) }}
-            {% endfor %}
-        {% endspaceless %}
-        </div>
-        {% endcache %}
-    {% endif %}
-
-    {% if request.user.is_authenticated() %} 
-       {% include "blocks/tag_selector.html" %}
-    {% endif %}
-
-    {% if tags %}
-        {% cache 0 "tags" tags search_tags scope sort query context.page context.page_size language_code %}
-        <div class="boxC">
-            <h2>{% trans %}Related tags{% endtrans %}</h2>
-            <div id="related-tags" class="tags">
-                {% for tag in tags %}
-                    <a 
-                        rel="tag" 
-                        title="{% trans tag_name=tag.name %}see questions tagged '{{ tag_name }}'{% endtrans %}"  
-                        href="{% url questions %}?tags={{tag.name|urlencode}}">{{ tag.name }}</a>
-                    <span class="tag-number">&#215; {{ tag.local_used_count|intcomma }}</span>
-                    <br />
-                {% endfor %}
-            </div>
-        </div>
-        {% endcache %}
-    {% endif %}
-{% endblock %}
-{% block endjs %}
-    <script type="text/javascript">
-        {% if request.user.is_authenticated() %}
-        var tags = {{ tags_autocomplete|safe }};
-        {% endif %}
-        var sortMethod = '{{sort}}';
-        var showSortByRelevance = {% if show_sort_by_relevance %}true{% else %}false{% endif %};
-        var minSearchWordLength = {{settings.MIN_SEARCH_WORD_LENGTH}};
-        $(document).ready(function(){
-            /*var on_tab = '#nav_questions';
-            $(on_tab).attr('className','on');*/
-            Hilite.exact = false;
-            Hilite.elementid = "question-list";
-            Hilite.debug_referrer = location.href;
-        });
-        askbot['urls']['mark_interesting_tag'] = scriptUrl + '{% trans %}mark-tag/{% endtrans %}{% trans %}interesting/{% endtrans %}';
-        askbot['urls']['mark_ignored_tag'] = scriptUrl + '{% trans %}mark-tag/{% endtrans %}{% trans %}ignored/{% endtrans %}';
-        askbot['urls']['unmark_tag'] = scriptUrl + '{% trans %}unmark-tag/{% endtrans %}';
-        askbot['urls']['command'] = '{% url "call_ajax" %}';
-        askbot['urls']['questions'] = '{% url "questions" %}';
-        askbot['urls']['question_url_template'] = scriptUrl + '{% trans %}question/{% endtrans %}{{ "{{QuestionID}}/" }}';
-        askbot['urls']['user_url_template'] = scriptUrl + '{% trans %}users/{% endtrans %}{{ "{{user_id}}" }}/{{ "{{slug}}" }}/';
-    </script>
-    <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
-    {% if request.user.is_authenticated() %}
-    <script type='text/javascript' src='{{"/js/tag_selector.js"|media}}'></script>
-    {% endif %}
-    <script type="text/javascript" src="{{"/js/live_search.js"|media}}"></script>
-{% endblock %}
-<!-- end questions.html -->
diff --git a/askbot/tests/page_load_tests.py b/askbot/tests/page_load_tests.py
index a4ef2547..33bcf933 100644
--- a/askbot/tests/page_load_tests.py
+++ b/askbot/tests/page_load_tests.py
@@ -56,7 +56,7 @@ class PageLoadTests(PageLoadTestCase):
         self.assertEqual(response.status_code, 200)
         self.failUnless(len(response.redirect_chain) == 1)
         self.failUnless(response.redirect_chain[0][0].endswith('/questions/'))
-        self.assertEquals(response.template.name, 'questions.html')
+        self.assertEquals(response.template.name, 'main_page.html')
 
     def proto_test_non_user_urls(self):
         """test all reader views thoroughly
@@ -82,67 +82,62 @@ class PageLoadTests(PageLoadTestCase):
         #todo: test different sort methods and scopes
         self.try_url(
                 'questions',
-                template='questions.html'
+                template='main_page.html'
             )
         self.try_url(
                 'questions',
                 data={'start_over':'true'},
-                template='questions.html'
+                template='main_page.html'
             )
         self.try_url(
                 'questions',
                 data={'scope':'unanswered'},
-                template='questions.html'
-            )
-        self.try_url(
-                'questions',
-                data={'scope':'all'},
-                template='questions.html'
+                template='main_page.html'
             )
         self.try_url(
                 'questions',
                 data={'scope':'favorite'},
-                template='questions.html'
+                template='main_page.html'
             )
         self.try_url(
                 'questions',
                 data={'scope':'unanswered', 'sort':'age-desc'},
-                template='questions.html'
+                template='main_page.html'
             )
         self.try_url(
                 'questions',
                 data={'scope':'unanswered', 'sort':'age-asc'},
-                template='questions.html'
+                template='main_page.html'
             )
         self.try_url(
                 'questions',
                 data={'scope':'unanswered', 'sort':'activity-desc'},
-                template='questions.html'
+                template='main_page.html'
             )
         self.try_url(
                 'questions',
                 data={'scope':'unanswered', 'sort':'activity-asc'},
-                template='questions.html'
+                template='main_page.html'
             )
         self.try_url(
                 'questions',
                 data={'sort':'answers-desc'},
-                template='questions.html'
+                template='main_page.html'
             )
         self.try_url(
                 'questions',
                 data={'sort':'answers-asc'},
-                template='questions.html'
+                template='main_page.html'
             )
         self.try_url(
                 'questions',
                 data={'sort':'votes-desc'},
-                template='questions.html'
+                template='main_page.html'
             )
         self.try_url(
                 'questions',
                 data={'sort':'votes-asc'},
-                template='questions.html'
+                template='main_page.html'
             )
         self.try_url(
                 'question',
diff --git a/askbot/views/readers.py b/askbot/views/readers.py
index 27fbfe78..a2f5584c 100644
--- a/askbot/views/readers.py
+++ b/askbot/views/readers.py
@@ -302,7 +302,7 @@ def questions(request):
     #ajax request is handled in a separate branch above
 
     #before = datetime.datetime.now()
-    template = ENV.get_template('questions.html')
+    template = ENV.get_template('main_page.html')
     response = HttpResponse(template.render(template_context))
     #after = datetime.datetime.now()
     #print after - before