summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-06-13 02:24:05 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-06-13 02:24:05 -0400
commit8da392e21411548cef68afa625cbbe877df80c4b (patch)
tree1513ddab0040d4e3bfdfda5618875dcb3ea4b9d2
parent000133a094170aecd312d4680106106ab6b65dfd (diff)
downloadaskbot-8da392e21411548cef68afa625cbbe877df80c4b.tar.gz
askbot-8da392e21411548cef68afa625cbbe877df80c4b.tar.bz2
askbot-8da392e21411548cef68afa625cbbe877df80c4b.zip
added questions search to the user profile page
-rw-r--r--askbot/templates/meta/bottom_scripts.html6
-rw-r--r--askbot/templates/widgets/secondary_header.html2
2 files changed, 6 insertions, 2 deletions
diff --git a/askbot/templates/meta/bottom_scripts.html b/askbot/templates/meta/bottom_scripts.html
index 5c398358..f1180339 100644
--- a/askbot/templates/meta/bottom_scripts.html
+++ b/askbot/templates/meta/bottom_scripts.html
@@ -75,8 +75,10 @@
searchInput.focus();
putCursorAtEnd(searchInput);
}
-
- if (inArray(activeTab, ['questions', 'badges', 'ask']) && searchInput.length) {
+
+ var haveFullTextSearchTab = inArray(activeTab, ['questions', 'badges', 'ask']);
+ var haveUserProfilePage = $('body').hasClass('user-profile-page');
+ if ((haveUserProfilePage || haveFullTextSearchTab) && searchInput.length) {
var search = new FullTextSearch();
askbot['controllers'] = askbot['controllers'] || {};
askbot['controllers']['fullTextSearch'] = search;
diff --git a/askbot/templates/widgets/secondary_header.html b/askbot/templates/widgets/secondary_header.html
index f3f78fa7..69e5742c 100644
--- a/askbot/templates/widgets/secondary_header.html
+++ b/askbot/templates/widgets/secondary_header.html
@@ -10,6 +10,8 @@
<form
{% if active_tab == "tags" %}
action="{% url tags %}"
+ {% elif page_class == 'user-profile-page' %}
+ action="{% url questions %}" id="searchForm"
{% elif active_tab == "users" %}
action=""
{% else %}