diff options
author | Tomasz Zielinski <tomasz.zielinski@pyconsultant.eu> | 2011-12-04 22:22:22 +0100 |
---|---|---|
committer | Tomasz Zielinski <tomasz.zielinski@pyconsultant.eu> | 2011-12-04 22:22:22 +0100 |
commit | 9d7c831e827b43f85409ba63358fda68a7ef16e1 (patch) | |
tree | f173128077dbd4cd460de05891f9f118b4d39a1d /askbot/skins/old/templates/blocks/input_bar.html | |
parent | 1551aa335d143b0a9a6cbd475d2d0031e22b6bef (diff) | |
parent | b3f698253e1b6e0db2a21b756b04e50f40aa59e3 (diff) | |
download | askbot-9d7c831e827b43f85409ba63358fda68a7ef16e1.tar.gz askbot-9d7c831e827b43f85409ba63358fda68a7ef16e1.tar.bz2 askbot-9d7c831e827b43f85409ba63358fda68a7ef16e1.zip |
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
Diffstat (limited to 'askbot/skins/old/templates/blocks/input_bar.html')
-rw-r--r-- | askbot/skins/old/templates/blocks/input_bar.html | 47 |
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 %} |