Add contact form tag; add default contact.html page; fix up FAQ page

esp/esp/tagdict/__init__.py

@@ -507,6 +507,13 @@
         'category': 'theme',
         'is_setting': False,
     },
+    'contact_form_enabled': {
+        'is_boolean': True,
+        'help_text': 'Should the contact form at /contact/contact be enabled?',
+        'default': False,
+        'category': 'manage',
+        'is_setting': True,
+    },
 }
 
 # Any tag used with Tag.getProgramTag()

esp/esp/urls.py

@@ -120,7 +120,8 @@
 
 # Specific .html pages that have defaults
 urlpatterns += [
-    url(r'^faq', TemplateView.as_view(template_name='faq.html'), name='FAQ'),
+    url(r'^(faq|faq\.html)$', main.FAQView.as_view(), name='FAQ'),
+    url(r'^(contact|contact\.html)$', main.ContactUsView.as_view(), name='Contact Us'),
 ]
 
 urlpatterns += [

esp/esp/utils/web.py

@@ -43,6 +43,8 @@
 from esp.middleware import ESPError
 from esp.themes.controllers import ThemeController
 from esp.program.models import Program
+from esp.web.views.navBar import makeNavBar
+from esp.tagdict.models import Tag
 from django.conf import settings
 import django.shortcuts
 
@@ -59,14 +61,9 @@ def get_from_id(id, module, strtype = 'object', error = True):
         return None
     return foundobj
 
-def render_to_response(template, request, context, content_type=None, use_request_context=True):
-    from esp.web.views.navBar import makeNavBar
-    from esp.tagdict.models import Tag
-
-    if isinstance(template, (basestring,)):
-        template = [ template ]
+def esp_context_stuff():
+    context = {}
 
-    section = request.path.split('/')[1]
     tc = ThemeController()
     context['theme'] = tc.get_template_settings()
     context['current_theme_version'] = Tag.getTag("current_theme_version")
@@ -76,6 +73,15 @@ def render_to_response(template, request, context, content_type=None, use_reques
     context['settings'] = settings
 
     context['current_programs'] = Program.current_programs()
+    return context
+
+def render_to_response(template, request, context, content_type=None, use_request_context=True):
+    if isinstance(template, (basestring,)):
+        template = [ template ]
+
+    section = request.path.split('/')[1]
+
+    context.update(esp_context_stuff())
 
     # create nav bar list
     if not 'navbar_list' in context:

esp/esp/web/views/main.py

@@ -32,39 +32,29 @@
   Phone: 617-379-0178
   Email: [email protected]
 """
-from esp.qsd.views import qsd
-from django.core.exceptions import PermissionDenied
 from django.contrib.sites.models import Site
 from esp.users.models import ESPUser, Permission
 from django.http import Http404, HttpResponseRedirect, HttpResponse
 from django.utils.datastructures import MultiValueDict
 from django.template import loader
+from django.views.generic.base import TemplateView
 from esp.middleware.threadlocalrequest import AutoRequestContext as Context
 
-from Cookie import SimpleCookie
-
 import datetime
 import re
 import json
 
 from esp.dbmail.models import MessageRequest
 from esp.web.models import NavBarCategory
-from esp.utils.web import render_to_response
+from esp.utils.web import render_to_response, esp_context_stuff
 from esp.web.views.navBar import makeNavBar
 from esp.web.views.archives import archive_handlers
 from esp.middleware import ESPError
 from esp.web.forms.contact_form import ContactForm
 from esp.tagdict.models import Tag
 from esp.utils.no_autocookie import disable_csrf_cookie_update
-from esp.utils.query_utils import nest_Q
 
 from django.views.decorators.cache import cache_control
-from django.core.mail import mail_admins
-from django.conf import settings
-
-from django.views.decorators.csrf import csrf_exempt
-
-from pprint import pprint
 
 try:
     from cStringIO import StringIO
@@ -134,11 +124,24 @@ def archives(request, selection, category = None, options = None):
 
     return render_to_response('users/construction', request, {})
 
+class DefaultQSDView(TemplateView):
+    def get_context_data(self, **kwargs):
+        return esp_context_stuff()
+
+class FAQView(DefaultQSDView):
+    template_name = "faq.html"
+
+class ContactUsView(DefaultQSDView):
+    template_name = "contact_qsd.html"
+
 def contact(request, section='esp'):
     """
     This view should take an email and post to those people.
     """
     from esp.dbmail.models import send_mail
+    # if not set up, immediately redirect
+    if not Tag.getTag('contact_form_enabled'):
+        return HttpResponseRedirect("/contact.html")
 
     if 'success' in request.GET:
         return render_to_response('contact_success.html', request, {})

esp/templates/contact_qsd.html

@@ -0,0 +1,18 @@
+{% extends "main.html" %}
+
+{% block title %}Contact Us{% endblock %}
+{% block content_title %}Contact Us{% endblock %}
+
+{% block content %}
+
+{% load render_qsd %}
+
+{% inline_qsd_block "contact" %}
+
+<p>
+For general communication, please email us at <b><a href="mailto:{{ settings.DEFAULT_EMAIL_ADDRESSES.default }}">{{ settings.DEFAULT_EMAIL_ADDRESSES.default }}</a></b>.
+Before contacting us with a question or concern, please check our <b><a href="/faq.html">FAQ page</a></b>.
+</p>
+
+{% end_inline_qsd_block %}
+{% endblock %}