diff --git a/forum/skins/default/templates/opensearch.html b/forum/skins/default/templates/opensearch.html new file mode 100644 index 0000000..8ae23a9 --- /dev/null +++ b/forum/skins/default/templates/opensearch.html @@ -0,0 +1,7 @@ + + + {{ settings.APP_SHORT_NAME }} Search + Search {{ settings.APP_SHORT_NAME }} using your browser. + {{ settings.APP_KEYWORDS }} + + \ No newline at end of file diff --git a/forum/urls.py b/forum/urls.py index c038ea6..534bfcf 100644 --- a/forum/urls.py +++ b/forum/urls.py @@ -48,6 +48,7 @@ urlpatterns += patterns('', #url(r'^%s/$' % _('signin/'), 'django_authopenid.views.signin', name='signin'), url(r'^%s$' % _('about/'), app.meta.about, name='about'), url(r'^%s$' % _('faq/'), app.meta.faq, name='faq'), + url(r'^opensearch\.xml$', app.meta.opensearch, name='opensearch'), url(r'^%s$' % _('privacy/'), app.meta.privacy, name='privacy'), url(r'^%s$' % _('logout/'), app.meta.logout, name='logout'), url(r'^%s(?P\d+)/%s$' % (_('answers/'), _('edit/')), app.writers.edit_answer, name='edit_answer'), diff --git a/forum/views/meta.py b/forum/views/meta.py index ac97938..04cfe75 100644 --- a/forum/views/meta.py +++ b/forum/views/meta.py @@ -1,7 +1,7 @@ from itertools import groupby from django.shortcuts import render_to_response, get_object_or_404 from django.core.urlresolvers import reverse -from django.template import RequestContext +from django.template import RequestContext, loader from django.http import HttpResponseRedirect, HttpResponse from forum import settings from forum.forms import FeedbackForm @@ -28,6 +28,11 @@ def faq(request): return render_to_response('faq.html', {'text' : text}, context_instance=RequestContext(request)) + +def opensearch(request): + return render_to_response('opensearch.html', {'settings' : settings}, context_instance=RequestContext(request)) + + def feedback(request): if request.method == "POST": form = FeedbackForm(request.POST) diff --git a/forum/views/readers.py b/forum/views/readers.py index 90fdfb4..3efb554 100644 --- a/forum/views/readers.py +++ b/forum/views/readers.py @@ -91,6 +91,10 @@ def question_list(request, initial, list_description=_('questions'), sort=None, if page_title is None: page_title = _("Questions") + keywords = "" + if request.GET.get("q"): + keywords = request.GET.get("q").strip() + answer_count = Answer.objects.filter(deleted=None, parent__in=questions).count() answer_description = _("answers") @@ -98,6 +102,7 @@ def question_list(request, initial, list_description=_('questions'), sort=None, "questions" : questions, "questions_count" : questions.count(), "answer_count" : answer_count, + "keywords" : keywords, #"tags_autocomplete" : _get_tags_cache_json(), "list_description": list_description, "answer_description": answer_description, diff --git a/forum_modules/OpenSearch/__init__.py b/forum_modules/OpenSearch/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/forum_modules/OpenSearch/settings.py b/forum_modules/OpenSearch/settings.py deleted file mode 100644 index 0c89ae8..0000000 --- a/forum_modules/OpenSearch/settings.py +++ /dev/null @@ -1,21 +0,0 @@ -from forum.settings.base import Setting, SettingSet -from django.forms.widgets import Textarea -from forum import settings as django_settings - -OPEN_SEARCH_SET = SettingSet('OpenSearch', 'OpenSearch', "Set up the open_search.xml file.", 3000) - -OPEN_SEARCH_FILE = Setting('OPEN_SEARCH_FILE', -(""" - - - %s Web Search - Use %s to search the Web. - %s - - -""" % (django_settings.APP_SHORT_NAME, django_settings.APP_URL, django_settings.APP_KEYWORDS, django_settings.APP_URL)), -OPEN_SEARCH_SET, -dict(label = "open_search.xml file", - help_text = "The open_search.xml file.", - widget=Textarea(attrs={'rows': '20', 'cols' : '70'}))) \ No newline at end of file diff --git a/forum_modules/OpenSearch/urls.py b/forum_modules/OpenSearch/urls.py deleted file mode 100644 index 38f1693..0000000 --- a/forum_modules/OpenSearch/urls.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.conf.urls.defaults import * -from django.http import HttpResponse -import settings - -urlpatterns = patterns('', - (r'^open_search.xml$', lambda r: HttpResponse(settings.OPEN_SEARCH_FILE.value)), -)