Merge remote-tracking branch 'askbot/master' into wikipost

Conflicts:
	askbot/skins/old/templates/macros.html
	askbot/skins/old/templates/question.html
	askbot/skins/old/templates/reopen.html
	askbot/skins/old/templates/user_profile/user_stats.html

1 files changed, 0 insertions, 47 deletions

diff --git a/askbot/skins/old/templates/blocks/input_bar.html b/askbot/skins/old/templates/blocks/input_bar.html
deleted file mode 100644
index bed97eb4..00000000
--- a/askbot/skins/old/templates/blocks/input_bar.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% if active_tab != "ask" %}
-{% spaceless %}
-<div id="searchBar">
-    {# url action depends on which tab is active #}
-    <form 
-        {% if active_tab == "tags" %}
-            action="{% url tags %}" 
-        {% elif active_tab == "users" %}
-            action="{% url users %}" 
-        {% else %}
-            action="{% url questions %}" 
-        {% endif %}
-        method="get">
-            {# class was searchInput #}
-            <input 
-                {% if query %}
-                class="searchInputCancelable"
-                {% else %}
-                class="searchInput" 
-                {% endif %}
-                type="text" 
-                autocomplete="off"
-                value="{{ query|default_if_none('') }}" 
-                name="query" 
-                id="keywords"/>
-            {% if query %}{# query is only defined by questions view #}
-            <input type="button"
-                value="x"
-                name="reset_query"
-                {# todo - make sure it works on Enter keypress #}
-                onclick="window.location.href='{% url questions %}?reset_query=true'"
-                class="cancelSearchBtn"/>
-            {% endif %}
-            <input type="submit" value="{% trans %}search{% endtrans %}" name="search" class="searchBtn" />
-            {% if active_tab == "tags" %}
-                <input type="hidden" name="t" value="tag"/>
-            {% else %}
-                {% if active_tab == "users" %}
-                    <input type="hidden" name="t" value="user"/>
-                {% endif %}
-            {% endif %}
-    </form>
-</div>
-{% endspaceless %}
-{% else %}
-    {% include "blocks/ask_form.html" %}
-{% endif %}