esp/esp/utils/web.py

@@ -80,7 +80,7 @@ def render_to_response(template, request, context, content_type=None, use_reques
         template = [ template ]
 
     section = request.path.split('/')[1]
-
+    
     context.update(esp_context_stuff())
 
     # create nav bar list

esp/esp/web/views/main.py

@@ -55,7 +55,6 @@
 from esp.utils.no_autocookie import disable_csrf_cookie_update
 
 from django.views.decorators.cache import cache_control
-from django.conf import settings
 
 try:
     from cStringIO import StringIO
@@ -141,7 +140,7 @@ def contact(request, section='esp'):
     """
     from esp.dbmail.models import send_mail
     # if not set up, immediately redirect
-    if not Tag.getTag('contact_form_enabled'):
+    if not Tag.getBooleanTag('contact_form_enabled'):
         return HttpResponseRedirect("/contact.html")
 
     if 'success' in request.GET:

esp/public/media/scripts/customforms_response.js

@@ -95,7 +95,8 @@ var createGrid=function(form_data){
     $j.each(form_data['questions'], function(index, val) {
         //  Substitute in custom formatter defined above in order to link to uploaded files.
         if (val[2] == "file") {
-            $j("#jqGrid_" + val[0] + " div").prepend("<a title='Bulk Download All Files' href='/customforms/bulkdownloadfiles?form_id="+$j('#form_id').val()+"&question_name="+val[0]+"'><span class='ui-icon  ui-icon-circle-arrow-s'></span></a> ");
+            $j("#download-legend").show();
+            $j("#jqGrid_" + val[0] + " div").append(" <a title='Bulk Download All Files' href='/customforms/bulkdownloadfiles?form_id="+$j('#form_id').val()+"&question_name="+val[0]+"'><span style='font-size: 14px;' class='glyphicon glyphicon-download-alt'</span></a>");
             $j("#jqGrid_" + val[0] + " div a").click(function(e) {
                 e.stopPropagation();
             });

esp/templates/contact_qsd.html

@@ -6,12 +6,13 @@
 {% block content %}
 
 {% load render_qsd %}
+{% load getTag %}
 
 {% 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>.
+If your question is still not answered, please contact us {% if "contact_form_enabled"|getBooleanTag %}via <b><a href="/contact/contact">our contact form</a></b>{% else %} via email at <b><a href="mailto:{{ settings.DEFAULT_EMAIL_ADDRESSES.default }}">{{ settings.DEFAULT_EMAIL_ADDRESSES.default }}</a></b>{% endif %}.
 </p>
 
 {% end_inline_qsd_block %}

esp/templates/customforms/view_results.html

@@ -3,6 +3,7 @@
 {% block fulltitle %}Form responses{% endblock %}
 
 {% block stylesheets %}
+    {{ block.super }}
 	<link href="https://ajax.aspnetcdn.com/ajax/jquery.ui/{{ settings.JQUERY_UI_VERSION }}/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <link rel="stylesheet" type="text/css" href="/media/styles/jquery-ui/ui.jqgrid.css" />
     <link rel="stylesheet" type="text/css" href="/media/styles/customforms-responses.css" />
@@ -24,6 +25,7 @@ <h2>{{form.title}} (ID# {{ form.id }})</h2>
 			<div id="jqGridPager"></div>
 		</div>
 		<br/><br/>
+        <p id="download-legend" hidden><span style="font-size: 14px;" class="glyphicon glyphicon-download-alt"></span>: Download Files as Zip Folder</p>
 		<p><a href="/customforms/exceldata/{{form.id}}/">Download as Excel</a></p>
 		<script type="text/javascript" src="/media/scripts/customforms_response.js"></script>	
 {% endblock %}