diff --git a/lms/templates/honor.html b/lms/templates/static_templates/honor.html similarity index 98% rename from lms/templates/honor.html rename to lms/templates/static_templates/honor.html index cfdefb5465..97b9d16a51 100644 --- a/lms/templates/honor.html +++ b/lms/templates/static_templates/honor.html @@ -1,4 +1,4 @@ -<%inherit file="marketing.html" /> +<%inherit file="../marketing.html" />
diff --git a/lms/templates/jobs.html b/lms/templates/static_templates/jobs.html similarity index 97% rename from lms/templates/jobs.html rename to lms/templates/static_templates/jobs.html index 97211d6eae..330dd38903 100644 --- a/lms/templates/jobs.html +++ b/lms/templates/static_templates/jobs.html @@ -1,6 +1,6 @@ -<%namespace name='static' file='static_content.html'/> +<%namespace name='static' file='../static_content.html'/> -<%inherit file="main.html" /> +<%inherit file="../main.html" />

Want to change the future of education?

diff --git a/lms/templates/mitx-overview.html b/lms/templates/static_templates/mitx-overview.html similarity index 100% rename from lms/templates/mitx-overview.html rename to lms/templates/static_templates/mitx-overview.html diff --git a/lms/templates/mitx_global.html b/lms/templates/static_templates/mitx_global.html similarity index 100% rename from lms/templates/mitx_global.html rename to lms/templates/static_templates/mitx_global.html diff --git a/lms/templates/privacy.html b/lms/templates/static_templates/privacy.html similarity index 99% rename from lms/templates/privacy.html rename to lms/templates/static_templates/privacy.html index 715578b36a..6c3ecb8c16 100644 --- a/lms/templates/privacy.html +++ b/lms/templates/static_templates/privacy.html @@ -1,4 +1,4 @@ -<%inherit file="marketing.html" /> +<%inherit file="../marketing.html" />
diff --git a/lms/templates/server-down.html b/lms/templates/static_templates/server-down.html similarity index 90% rename from lms/templates/server-down.html rename to lms/templates/static_templates/server-down.html index 4b55c3fd20..478f197a79 100644 --- a/lms/templates/server-down.html +++ b/lms/templates/static_templates/server-down.html @@ -1,4 +1,4 @@ -<%inherit file="main.html" /> +<%inherit file="../main.html" />

Currently the edX servers are down

diff --git a/lms/templates/server-error.html b/lms/templates/static_templates/server-error.html similarity index 90% rename from lms/templates/server-error.html rename to lms/templates/static_templates/server-error.html index 145e64eb1d..be450eadff 100644 --- a/lms/templates/server-error.html +++ b/lms/templates/static_templates/server-error.html @@ -1,4 +1,4 @@ -<%inherit file="main.html" /> +<%inherit file="../main.html" />

There has been an error on the edX servers

diff --git a/lms/templates/server-overloaded.html b/lms/templates/static_templates/server-overloaded.html similarity index 90% rename from lms/templates/server-overloaded.html rename to lms/templates/static_templates/server-overloaded.html index f5859d0e70..7f4dc6f236 100644 --- a/lms/templates/server-overloaded.html +++ b/lms/templates/static_templates/server-overloaded.html @@ -1,4 +1,4 @@ -<%inherit file="main.html" /> +<%inherit file="../main.html" />

Currently the MITx servers are overloaded

diff --git a/lms/templates/tos.html b/lms/templates/static_templates/tos.html similarity index 99% rename from lms/templates/tos.html rename to lms/templates/static_templates/tos.html index c76dd13143..172a498ab1 100644 --- a/lms/templates/tos.html +++ b/lms/templates/static_templates/tos.html @@ -1,4 +1,4 @@ -<%inherit file="marketing.html" /> +<%inherit file="../marketing.html" />
diff --git a/lms/templates/university_profile.html b/lms/templates/static_templates/university_profile.html similarity index 81% rename from lms/templates/university_profile.html rename to lms/templates/static_templates/university_profile.html index 9bf9038cdd..854ff23a17 100644 --- a/lms/templates/university_profile.html +++ b/lms/templates/static_templates/university_profile.html @@ -1,6 +1,6 @@ -<%inherit file="main.html" /> +<%inherit file="../main.html" /> -<%namespace name='static' file='static_content.html'/> +<%namespace name='static' file='../static_content.html'/>
diff --git a/lms/urls.py b/lms/urls.py index dec0b2bcb4..0c0e90cf34 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -12,10 +12,6 @@ if settings.DEBUG: urlpatterns = ('', url(r'^$', 'student.views.index', name="root"), # Main marketing page, or redirect to courseware - url(r'^about$', 'student.views.about', name="about_edx"), - url(r'^university_profile$', 'student.views.university_profile', name="university_profile"), - url(r'^jobs$', 'student.views.jobs', name="jobs"), - url(r'^help$', 'student.views.help', name="help_edx"), url(r'^dashboard$', 'student.views.dashboard', name="dashboard"), url(r'^change_email$', 'student.views.change_email_request'), url(r'^email_confirm/(?P[^/]*)$', 'student.views.confirm_email_change'), @@ -48,6 +44,21 @@ urlpatterns = ('', name='auth_password_reset_done'), ## Feedback url(r'^send_feedback$', 'util.views.send_feedback'), + + + + #Semi-static views (these need to be rendered and have the login bar, but don't change) + url(r'^404$', 'static_template_view.views.render', {'template': '404'}, name="404"), + url(r'^about$', 'static_template_view.views.render', {'template': 'about'}, name="about_edx"), + url(r'^university_profile$', 'static_template_view.views.render', {'template': 'university_profile'}, name="university_profile"), + url(r'^jobs$', 'static_template_view.views.render', {'template': 'jobs'}, name="jobs"), + url(r'^help$', 'static_template_view.views.render', {'template': 'help'}, name="help_edx"), + + #TODO: Convert these pages to the new edX layout + # 'tos.html', + # 'privacy.html', + # 'honor.html', + # 'copyright.html', ) if settings.PERFSTATS: