fix contact_form urls + resolution

- the contact form url itself is still in core since it depends on core.views.AntiSpamContactFormView, but the contact_form_sent URL is hard-coded in its view to live in the root namespace. ugly
virtualcommons · Nov 1, 2016 · 1d2e656 · 1d2e656
1 parent 81b0efa
commit 1d2e656
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/vcweb/core/templates/base.html b/vcweb/core/templates/base.html
@@ -4,7 +4,7 @@
 {% load raven %}
 {% url 'about' as about %}
 {% url 'home' as home %}
-{% url 'contact_form' as contact %}
+{% url 'core:contact_form' as contact %}
 {% url 'core:dashboard' as dashboard %}
 {% url 'core:login' as login %}
 {% url 'core:logout' as logout %}
@@ -16,7 +16,7 @@
 {% url 'subjectpool:subjectpool_index' as subjectpool %}
 <!DOCTYPE html>
 <html lang="en">
-{% with jquery_version="1.12.0" bootstrap_version="3.3.6" bootswatch_version="3.3.6" fontawesome_version="4.5.0" knockout_version="3.4.0" ravenjs_version="1.1.19" %}
+{% with jquery_version="1.12.4" bootstrap_version="3.3.7" bootswatch_version="3.3.7" fontawesome_version="4.7.0" knockout_version="3.4.0" ravenjs_version="3.7.0" %}
 <head>
 {% block head %}
 <title>{% block title %}Virtual Commons Web Experiment{% endblock %}</title>
@@ -165,7 +165,7 @@ <h4 class="modal-title" id='bugModalLabel'>Report Bug</h4>
     <script src='{% static "js/ko/knockout.helper.js" %}'></script>
     <script src='{% static "js/common.js" %}'></script>
     {% if not DEBUG %}
-    <script src="//cdn.ravenjs.com/{{ravenjs_version}}/jquery,native/raven.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/raven.js/{{ravenjs_version}}/raven.min.js"></script>
     <script>
         var options = { tags: { git_commit: '{{ REVISION }}'} }
         Raven.config('{% sentry_public_dsn %}', options).install();

diff --git a/vcweb/core/urls.py b/vcweb/core/urls.py
@@ -82,8 +82,6 @@
     # url(r'api/login', participant_api_login, name='participant_api_login'),
     # url(r'api/logout', api_logout, name='api_logout'),
     url(r'^contact/$', views.AntiSpamContactFormView.as_view(), name='contact_form'),
-    url(r'^contact/sent/$', TemplateView.as_view(template_name='contact_form/contact_form_sent.html'),
-        name='contact_form_sent'),
 ]
 
 router = routers.DefaultRouter(trailing_slash=False)

diff --git a/vcweb/urls.py b/vcweb/urls.py
@@ -12,6 +12,8 @@
 urlpatterns = [
     url(r'^$', TemplateView.as_view(template_name='index.html'), name='home'),
     url(r'^about/$', TemplateView.as_view(template_name='index.html'), name='about'),
+    url(r'^contact/sent/$', TemplateView.as_view(template_name='contact_form/contact_form_sent.html'),
+        name='contact_form_sent'),
     url(r'^invalid-request$', TemplateView.as_view(template_name='invalid_request.html'),
         name='invalid_request'),
     url(r'^accounts/password/reset/$', auth_views.password_reset,