From 8a9cf7e10e74a53f8743377da8bdf3257615b944 Mon Sep 17 00:00:00 2001
From: Robert Raposa <rraposa@edx.org>
Date: Thu, 6 Oct 2016 15:26:15 -0400
Subject: [PATCH 1/3] Move track.views to new urls.py

---
 common/djangoapps/track/urls.py | 21 +++++++++++++++++++++
 lms/urls.py                     |  5 +++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 common/djangoapps/track/urls.py

diff --git a/common/djangoapps/track/urls.py b/common/djangoapps/track/urls.py
new file mode 100644
index 0000000000..d4ccebceed
--- /dev/null
+++ b/common/djangoapps/track/urls.py
@@ -0,0 +1,21 @@
+"""
+URLs for track app
+"""
+
+from django.conf import settings
+from django.conf.urls import patterns, url
+
+urlpatterns = (
+    'track.views',
+
+    url(r'^event$', 'user_track'),
+    url(r'^segmentio/event$', 'segmentio.segmentio_event'),
+)
+
+if settings.FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
+    urlpatterns += (
+        url(r'^event_logs$', 'view_tracking_log'),
+        url(r'^event_logs/(?P<args>.+)$', 'view_tracking_log'),
+    )
+
+urlpatterns = patterns(*urlpatterns)
diff --git a/lms/urls.py b/lms/urls.py
index 964b66fe4c..219a0ed59b 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -32,9 +32,10 @@ urlpatterns = (
     url(r'^dashboard$', 'student.views.dashboard', name="dashboard"),
     url(r'^change_enrollment$', 'student.views.change_enrollment', name='change_enrollment'),
 
-    url(r'^event$', 'track.views.user_track'),
+    # Event tracking endpoints
+    url(r'', include('track.urls')),
+
     url(r'^performance$', 'openedx.core.djangoapps.performance.views.performance_log'),
-    url(r'^segmentio/event$', 'track.views.segmentio.segmentio_event'),
 
     # TODO: Is this used anymore? What is STATIC_GRAB?
     url(r'^t/(?P<template>[^/]*)$', 'static_template_view.views.index'),

From cd869d29a4b63b18960b548a178392ddfd99a35b Mon Sep 17 00:00:00 2001
From: Robert Raposa <rraposa@edx.org>
Date: Thu, 6 Oct 2016 16:27:15 -0400
Subject: [PATCH 2/3] Move performance.views to its own urls.py.

---
 lms/urls.py                                 |  3 ++-
 openedx/core/djangoapps/performance/urls.py | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 openedx/core/djangoapps/performance/urls.py

diff --git a/lms/urls.py b/lms/urls.py
index 219a0ed59b..2894083ed6 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -35,7 +35,8 @@ urlpatterns = (
     # Event tracking endpoints
     url(r'', include('track.urls')),
 
-    url(r'^performance$', 'openedx.core.djangoapps.performance.views.performance_log'),
+    # Performance endpoints
+    url(r'', include('openedx.core.djangoapps.performance.urls')),
 
     # TODO: Is this used anymore? What is STATIC_GRAB?
     url(r'^t/(?P<template>[^/]*)$', 'static_template_view.views.index'),
diff --git a/openedx/core/djangoapps/performance/urls.py b/openedx/core/djangoapps/performance/urls.py
new file mode 100644
index 0000000000..c90f688a5a
--- /dev/null
+++ b/openedx/core/djangoapps/performance/urls.py
@@ -0,0 +1,11 @@
+"""
+URLs for performance app
+"""
+
+from django.conf.urls import patterns, url
+
+urlpatterns = patterns(
+    'openedx.core.djangoapps.performance.views',
+
+    url(r'^performance$', 'performance_log'),
+)

From e7028c6eab7c928a12c42d62a7282d24cc9df08d Mon Sep 17 00:00:00 2001
From: Robert Raposa <rraposa@edx.org>
Date: Thu, 6 Oct 2016 16:58:27 -0400
Subject: [PATCH 3/3] Move static_template_view.views to its own urls.py.

---
 lms/djangoapps/static_template_view/urls.py | 57 +++++++++++++++++
 lms/urls.py                                 | 71 +--------------------
 2 files changed, 59 insertions(+), 69 deletions(-)
 create mode 100644 lms/djangoapps/static_template_view/urls.py

diff --git a/lms/djangoapps/static_template_view/urls.py b/lms/djangoapps/static_template_view/urls.py
new file mode 100644
index 0000000000..7ff4635666
--- /dev/null
+++ b/lms/djangoapps/static_template_view/urls.py
@@ -0,0 +1,57 @@
+"""
+URLs for static_template_view app
+"""
+
+from django.conf import settings
+from django.conf.urls import patterns, url
+
+urlpatterns = (
+    'static_template_view.views',
+
+    # TODO: Is this used anymore? What is STATIC_GRAB?
+    url(r'^t/(?P<template>[^/]*)$', 'index'),
+
+    # Semi-static views (these need to be rendered and have the login bar, but don't change)
+    url(r'^404$', 'render', {'template': '404.html'}, name="404"),
+    # display error page templates, for testing purposes
+    url(r'^404$', 'render_404'),  # Can this be deleted? Test test_404_microsites fails with this.
+    url(r'^500$', 'render_500'),
+
+    url(r'^blog$', 'render', {'template': 'blog.html'}, name="blog"),
+    url(r'^contact$', 'render', {'template': 'contact.html'}, name="contact"),
+    url(r'^donate$', 'render', {'template': 'donate.html'}, name="donate"),
+    url(r'^faq$', 'render', {'template': 'faq.html'}, name="faq"),
+    url(r'^help$', 'render', {'template': 'help.html'}, name="help_edx"),
+    url(r'^jobs$', 'render', {'template': 'jobs.html'}, name="jobs"),
+    url(r'^news$', 'render', {'template': 'news.html'}, name="news"),
+    url(r'^press$', 'render', {'template': 'press.html'}, name="press"),
+    url(r'^media-kit$', 'render', {'template': 'media-kit.html'}, name="media-kit"),
+    url(r'^copyright$', 'render', {'template': 'copyright.html'}, name="copyright"),
+
+    # Press releases
+    url(r'^press/([_a-zA-Z0-9-]+)$', 'render_press_release', name='press_release'),
+)
+
+# Only enable URLs for those marketing links actually enabled in the
+# settings. Disable URLs by marking them as None.
+for key, value in settings.MKTG_URL_LINK_MAP.items():
+    # Skip disabled URLs
+    if value is None:
+        continue
+
+    # These urls are enabled separately
+    if key == "ROOT" or key == "COURSES":
+        continue
+
+    # The MKTG_URL_LINK_MAP key specifies the template filename
+    template = key.lower()
+    if '.' not in template:
+        # Append STATIC_TEMPLATE_VIEW_DEFAULT_FILE_EXTENSION if
+        # no file extension was specified in the key
+        template = "%s.%s" % (template, settings.STATIC_TEMPLATE_VIEW_DEFAULT_FILE_EXTENSION)
+
+    # Make the assumption that the URL we want is the lowercased
+    # version of the map key
+    urlpatterns += (url(r'^%s$' % key.lower(), 'render', {'template': template}, name=value),)
+
+urlpatterns = patterns(*urlpatterns)
diff --git a/lms/urls.py b/lms/urls.py
index 2894083ed6..262132b65f 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -38,8 +38,8 @@ urlpatterns = (
     # Performance endpoints
     url(r'', include('openedx.core.djangoapps.performance.urls')),
 
-    # TODO: Is this used anymore? What is STATIC_GRAB?
-    url(r'^t/(?P<template>[^/]*)$', 'static_template_view.views.index'),
+    # Static template view endpoints like blog, faq, etc.
+    url(r'', include('static_template_view.urls')),
 
     url(r'^heartbeat$', include('openedx.core.djangoapps.heartbeat.urls')),
 
@@ -144,12 +144,6 @@ urlpatterns += (
     url(r'^support/', include('support.urls', app_name="support", namespace='support')),
 )
 
-# Semi-static views (these need to be rendered and have the login bar, but don't change)
-urlpatterns += (
-    url(r'^404$', 'static_template_view.views.render',
-        {'template': '404.html'}, name="404"),
-)
-
 # Favicon
 favicon_path = configuration_helpers.get_value('favicon_path', settings.FAVICON_PATH)  # pylint: disable=invalid-name
 urlpatterns += (url(
@@ -157,57 +151,6 @@ urlpatterns += (url(
     RedirectView.as_view(url=settings.STATIC_URL + favicon_path, permanent=True)
 ),)
 
-urlpatterns += (
-    url(r'^blog$', 'static_template_view.views.render',
-        {'template': 'blog.html'}, name="blog"),
-    url(r'^contact$', 'static_template_view.views.render',
-        {'template': 'contact.html'}, name="contact"),
-    url(r'^donate$', 'static_template_view.views.render',
-        {'template': 'donate.html'}, name="donate"),
-    url(r'^faq$', 'static_template_view.views.render',
-        {'template': 'faq.html'}, name="faq"),
-    url(r'^help$', 'static_template_view.views.render',
-        {'template': 'help.html'}, name="help_edx"),
-    url(r'^jobs$', 'static_template_view.views.render',
-        {'template': 'jobs.html'}, name="jobs"),
-    url(r'^news$', 'static_template_view.views.render',
-        {'template': 'news.html'}, name="news"),
-    url(r'^press$', 'static_template_view.views.render',
-        {'template': 'press.html'}, name="press"),
-    url(r'^media-kit$', 'static_template_view.views.render',
-        {'template': 'media-kit.html'}, name="media-kit"),
-    url(r'^copyright$', 'static_template_view.views.render',
-        {'template': 'copyright.html'}, name="copyright"),
-
-    # Press releases
-    url(r'^press/([_a-zA-Z0-9-]+)$', 'static_template_view.views.render_press_release', name='press_release'),
-)
-
-# Only enable URLs for those marketing links actually enabled in the
-# settings. Disable URLs by marking them as None.
-for key, value in settings.MKTG_URL_LINK_MAP.items():
-    # Skip disabled URLs
-    if value is None:
-        continue
-
-    # These urls are enabled separately
-    if key == "ROOT" or key == "COURSES":
-        continue
-
-    # The MKTG_URL_LINK_MAP key specifies the template filename
-    template = key.lower()
-    if '.' not in template:
-        # Append STATIC_TEMPLATE_VIEW_DEFAULT_FILE_EXTENSION if
-        # no file extension was specified in the key
-        template = "%s.%s" % (template, settings.STATIC_TEMPLATE_VIEW_DEFAULT_FILE_EXTENSION)
-
-    # Make the assumption that the URL we want is the lowercased
-    # version of the map key
-    urlpatterns += (url(r'^%s$' % key.lower(),
-                        'static_template_view.views.render',
-                        {'template': template}, name=value),)
-
-
 # Multicourse wiki (Note: wiki urls must be above the courseware ones because of
 # the custom tab catch-all)
 if settings.WIKI_ENABLED:
@@ -976,16 +919,6 @@ if 'debug_toolbar' in settings.INSTALLED_APPS:
         url(r'^__debug__/', include(debug_toolbar.urls)),
     )
 
-# Custom error pages
-handler404 = 'static_template_view.views.render_404'
-handler500 = 'static_template_view.views.render_500'
-
-# display error page templates, for testing purposes
-urlpatterns += (
-    url(r'^404$', handler404),
-    url(r'^500$', handler500),
-)
-
 # include into our URL patterns the HTTP REST API that comes with edx-proctoring.
 urlpatterns += (
     url(r'^api/', include('edx_proctoring.urls')),