From 34addd8fa8805cc67aa2ee099ef0ea0376904008 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Tue, 2 Jun 2015 16:03:30 -0400
Subject: [PATCH] Group imports together in Mako templates
---
cms/templates/certificates.html | 6 ++---
cms/templates/course-create-rerun.html | 8 +++---
cms/templates/course_info.html | 10 +++----
cms/templates/error.html | 9 ++++---
cms/templates/group_configurations.html | 6 ++---
cms/templates/manage_users.html | 8 +++---
cms/templates/manage_users_lib.html | 8 +++---
cms/templates/register.html | 6 +++--
.../registration/activation_complete.html | 6 +++--
cms/templates/textbooks.html | 6 +++--
.../ux/reference/course-create-rerun.html | 6 +++--
cms/templates/widgets/footer.html | 6 +++--
cms/templates/widgets/sock.html | 6 +++--
common/templates/course_modes/choose.html | 7 ++---
common/templates/edxnotes_wrapper.html | 8 +++---
.../test_microsite/templates/footer.html | 10 ++++---
.../templates/static_templates/contact.html | 9 ++++---
.../templates/static_templates/faq.html | 9 ++++---
.../templates/static_templates/tos.html | 7 ++---
.../calculator/toggle_calculator.html | 6 +++--
lms/templates/ccx/_dashboard_ccx_listing.html | 6 ++---
lms/templates/ccx/coach_dashboard.html | 11 ++++----
lms/templates/chat/toggle_chat.html | 6 +++--
.../openended/open_ended_rubric.html | 8 +++---
.../courseware/course_navigation.html | 14 +++++-----
.../courseware/courseware-chromeless.html | 10 ++++---
lms/templates/courseware/courseware.html | 10 ++++---
lms/templates/courseware/gradebook.html | 6 +++--
lms/templates/courseware/info.html | 7 ++---
.../legacy_instructor_dashboard.html | 7 ++---
.../courseware/mktg_coming_soon.html | 11 ++++----
.../courseware/mktg_course_about.html | 11 ++++----
lms/templates/courseware/news.html | 2 +-
lms/templates/courseware/progress.html | 22 +++++----------
lms/templates/courseware/syllabus.html | 8 +++---
lms/templates/dashboard.html | 18 ++++++-------
.../_dashboard_status_verification.html | 7 +++--
.../_discussion_course_navigation.html | 6 +++--
.../discussion/_discussion_module.html | 6 +++--
.../discussion/_filter_dropdown.html | 6 +++--
.../discussion/_recent_active_posts.html | 6 +++--
lms/templates/discussion/_search_bar.html | 6 ++---
.../discussion/_underscore_templates.html | 9 ++++---
lms/templates/discussion/index.html | 12 +++++----
lms/templates/discussion/user_profile.html | 8 +++---
lms/templates/edxnotes/edxnotes.html | 8 +++---
lms/templates/edxnotes/toggle_notes.html | 8 +++---
lms/templates/email_change_successful.html | 7 ++---
lms/templates/emails_change_successful.html | 7 ++---
lms/templates/folditbasic.html | 3 +--
lms/templates/footer-edx-v2.html | 6 +++--
lms/templates/forgot_password_modal.html | 8 +++---
lms/templates/help_modal.html | 20 +++++++-------
lms/templates/index.html | 10 +++----
.../add_coupon_modal.html | 6 +++--
.../cohort_management.html | 10 ++++---
.../instructor_dashboard_2/e-commerce.html | 8 +++---
.../edit_coupon_modal.html | 6 +++--
.../generate_registarion_codes_modal.html | 6 +++--
.../instructor_dashboard_2.html | 7 ++---
.../instructor_dashboard_2/membership.html | 10 ++++---
.../instructor_dashboard_2/metrics.html | 6 +++--
.../set_course_mode_price_modal.html | 6 +++--
lms/templates/invalid_email_key.html | 3 +--
lms/templates/login.html | 12 +++++----
lms/templates/lti.html | 6 +++--
lms/templates/lti_form.html | 6 +++--
lms/templates/manage_user_standing.html | 6 +++--
.../modal/_modal-settings-language.html | 7 +++--
lms/templates/navigation-edx.html | 6 ++---
lms/templates/navigation.html | 8 +++---
lms/templates/notes.html | 7 +++--
lms/templates/register-shib.html | 19 +++++++------
lms/templates/register.html | 27 +++++++++----------
.../registration/activation_complete.html | 7 ++---
.../registration/activation_invalid.html | 7 ++---
.../shoppingcart/billing_details.html | 6 +++--
.../shoppingcart/download_report.html | 10 ++++---
lms/templates/shoppingcart/error.html | 9 +++----
lms/templates/shoppingcart/receipt.html | 2 +-
.../shoppingcart/shopping_cart_flow.html | 8 +++---
lms/templates/signup_modal.html | 16 +++++------
lms/templates/staff_problem_info.html | 6 +++--
.../student_account/account_settings.html | 12 +++++----
lms/templates/student_profile/index.html | 7 ++---
.../student_profile/learner_profile.html | 11 ++++----
.../student_profile/third_party_auth.html | 6 +++--
lms/templates/survey/survey.html | 11 ++++----
lms/templates/sysadmin_dashboard.html | 8 +++---
lms/templates/verify_student/face_upload.html | 6 +++--
.../verify_student/photo_reverification.html | 7 ++---
.../reverification_confirmation.html | 7 ++---
.../reverification_window_expired.html | 7 ++---
93 files changed, 433 insertions(+), 339 deletions(-)
diff --git a/cms/templates/certificates.html b/cms/templates/certificates.html
index 6cfbaaf3c8c..ee6f1786e66 100644
--- a/cms/templates/certificates.html
+++ b/cms/templates/certificates.html
@@ -1,10 +1,10 @@
<%inherit file="base.html" />
<%def name="online_help_token()"><% return "certificates" %></%def>
<%namespace name='static' file='static_content.html'/>
-<%! import json %>
<%!
- from contentstore import utils
- from django.utils.translation import ugettext as _
+import json
+from contentstore import utils
+from django.utils.translation import ugettext as _
%>
<%block name="title">${_("Course Certificates")}</%block>
diff --git a/cms/templates/course-create-rerun.html b/cms/templates/course-create-rerun.html
index 456d09cb263..44f828192fd 100644
--- a/cms/templates/course-create-rerun.html
+++ b/cms/templates/course-create-rerun.html
@@ -1,8 +1,10 @@
<%inherit file="base.html" />
<%def name="online_help_token()"><% return "course_rerun" %></%def>
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.template.defaultfilters import escapejs %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from django.template.defaultfilters import escapejs
+%>
<%block name="title">${_("Create a Course Rerun of:")}</%block>
<%block name="bodyclass">is-signedin view-course-create view-course-create-rerun</%block>
diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html
index e9825ea4004..bbb5e12d720 100644
--- a/cms/templates/course_info.html
+++ b/cms/templates/course_info.html
@@ -1,11 +1,11 @@
-<%!
- from django.utils.translation import ugettext as _
- from django.template.defaultfilters import escapejs
-%>
<%inherit file="base.html" />
<%def name="online_help_token()"><% return "updates" %></%def>
<%namespace name='static' file='static_content.html'/>
-<%! import json %>
+<%!
+import json
+from django.utils.translation import ugettext as _
+from django.template.defaultfilters import escapejs
+%>
<!-- TODO decode course # from context_course into title -->
<%block name="title">${_("Course Updates")}</%block>
diff --git a/cms/templates/error.html b/cms/templates/error.html
index 09bb830fa62..99191a3d4dd 100644
--- a/cms/templates/error.html
+++ b/cms/templates/error.html
@@ -1,6 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
<%inherit file="base.html" />
-<%! from django.core.urlresolvers import reverse %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from django.conf import settings
+%>
<%block name="bodyclass">error</%block>
<%block name="title">
% if error == '404':
@@ -11,8 +14,6 @@
</%block>
<%!
-from django.conf import settings
-
if settings.TENDER_DOMAIN:
help_link_start = '<a href="http://{domain}/discussion/new" class="show-tender" title="{title}">'.format(
domain=settings.TENDER_DOMAIN,
diff --git a/cms/templates/group_configurations.html b/cms/templates/group_configurations.html
index 74e36954832..865c8959d60 100644
--- a/cms/templates/group_configurations.html
+++ b/cms/templates/group_configurations.html
@@ -2,10 +2,10 @@
<%def name="content_groups_help_token()"><% return "content_groups" %></%def>
<%def name="experiment_group_configurations_help_token()"><% return "group_configurations" %></%def>
<%namespace name='static' file='static_content.html'/>
-<%! import json %>
<%!
- from contentstore import utils
- from django.utils.translation import ugettext as _
+import json
+from contentstore import utils
+from django.utils.translation import ugettext as _
%>
<%block name="title">${_("Group Configurations")}</%block>
diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html
index 64f3601c509..2a898fc9b9f 100644
--- a/cms/templates/manage_users.html
+++ b/cms/templates/manage_users.html
@@ -1,7 +1,9 @@
-<%! import json %>
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
<%inherit file="base.html" />
+<%!
+import json
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%def name="online_help_token()"><% return "team_course" %></%def>
<%block name="title">${_("Course Team Settings")}</%block>
<%block name="bodyclass">is-signedin course users view-team</%block>
diff --git a/cms/templates/manage_users_lib.html b/cms/templates/manage_users_lib.html
index 2d40585775a..7c8ed187a1c 100644
--- a/cms/templates/manage_users_lib.html
+++ b/cms/templates/manage_users_lib.html
@@ -1,7 +1,9 @@
-<%! import json %>
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
<%inherit file="base.html" />
+<%!
+import json
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%def name="online_help_token()"><% return "team_library" %></%def>
<%block name="title">${_("Library User Access")}</%block>
<%block name="bodyclass">is-signedin course users view-team</%block>
diff --git a/cms/templates/register.html b/cms/templates/register.html
index 609dbc141e1..0ff00241791 100644
--- a/cms/templates/register.html
+++ b/cms/templates/register.html
@@ -1,7 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
<%inherit file="base.html" />
<%def name="online_help_token()"><% return "register" %></%def>
-<%! from django.core.urlresolvers import reverse %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="title">${_("Sign Up")}</%block>
<%block name="bodyclass">not-signedin view-signup</%block>
diff --git a/cms/templates/registration/activation_complete.html b/cms/templates/registration/activation_complete.html
index 92a0e180f75..242547e6f09 100644
--- a/cms/templates/registration/activation_complete.html
+++ b/cms/templates/registration/activation_complete.html
@@ -1,6 +1,8 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
<%inherit file="../base.html" />
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%namespace name='static' file='../static_content.html'/>
diff --git a/cms/templates/textbooks.html b/cms/templates/textbooks.html
index 55712d7a3bb..6fe1f5ac888 100644
--- a/cms/templates/textbooks.html
+++ b/cms/templates/textbooks.html
@@ -1,8 +1,10 @@
<%inherit file="base.html" />
<%def name="online_help_token()"><% return "textbooks" %></%def>
<%namespace name='static' file='static_content.html'/>
-<%! import json %>
-<%! from django.utils.translation import ugettext as _ %>
+<%!
+import json
+from django.utils.translation import ugettext as _
+%>
<%block name="title">${_("Textbooks")}</%block>
<%block name="bodyclass">is-signedin course view-textbooks</%block>
diff --git a/cms/templates/ux/reference/course-create-rerun.html b/cms/templates/ux/reference/course-create-rerun.html
index 0757969a5ef..527b08004aa 100644
--- a/cms/templates/ux/reference/course-create-rerun.html
+++ b/cms/templates/ux/reference/course-create-rerun.html
@@ -4,8 +4,10 @@
<%include file="_note-usage.html" />
</%block>
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="title">[template] Create a Course Rerun of HarvardX SW12.2x T2_2014</%block>
<%block name="bodyclass">is-signedin view-course-create view-course-create-rerun</%block>
diff --git a/cms/templates/widgets/footer.html b/cms/templates/widgets/footer.html
index ae758805574..4ddfd3763bd 100644
--- a/cms/templates/widgets/footer.html
+++ b/cms/templates/widgets/footer.html
@@ -1,5 +1,7 @@
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.utils.translation import ugettext as _ %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<div class="wrapper-footer wrapper">
<footer class="primary" role="contentinfo">
diff --git a/cms/templates/widgets/sock.html b/cms/templates/widgets/sock.html
index 96556748916..55f588d4e29 100644
--- a/cms/templates/widgets/sock.html
+++ b/cms/templates/widgets/sock.html
@@ -1,5 +1,7 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%page args="online_help_token"/>
<div class="wrapper-sock wrapper">
<ul class="list-actions list-cta">
diff --git a/common/templates/course_modes/choose.html b/common/templates/course_modes/choose.html
index 8e75a5c4e66..f252c6cf2a8 100644
--- a/common/templates/course_modes/choose.html
+++ b/common/templates/course_modes/choose.html
@@ -1,7 +1,8 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
-
<%inherit file="../main.html" />
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="bodyclass">register verification-process step-select-track ${'is-upgrading' if upgrade else ''}</%block>
<%block name="pagetitle">
diff --git a/common/templates/edxnotes_wrapper.html b/common/templates/edxnotes_wrapper.html
index ac5dc09ab13..d549bb68a4e 100644
--- a/common/templates/edxnotes_wrapper.html
+++ b/common/templates/edxnotes_wrapper.html
@@ -1,6 +1,8 @@
-<%! import json %>
-<%! from django.utils.translation import ugettext as _ %>
-<%! from student.models import anonymous_id_for_user %>
+<%!
+import json
+from django.utils.translation import ugettext as _
+from student.models import anonymous_id_for_user
+%>
<%
if user:
params.update({'user': anonymous_id_for_user(user, None)})
diff --git a/common/test/test_microsites/test_microsite/templates/footer.html b/common/test/test_microsites/test_microsite/templates/footer.html
index de7e55e47cb..66ea6e55516 100644
--- a/common/test/test_microsites/test_microsite/templates/footer.html
+++ b/common/test/test_microsites/test_microsite/templates/footer.html
@@ -1,9 +1,11 @@
## mako
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.utils.translation import ugettext as _ %>
-<%! from microsite_configuration import microsite %>
-
<%namespace name='static' file='static_content.html'/>
+<%!
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+from microsite_configuration import microsite
+%>
+
<div class="wrapper wrapper-footer">
<footer>
diff --git a/common/test/test_microsites/test_microsite/templates/static_templates/contact.html b/common/test/test_microsites/test_microsite/templates/static_templates/contact.html
index dcdc953f86c..749e9b88480 100644
--- a/common/test/test_microsites/test_microsite/templates/static_templates/contact.html
+++ b/common/test/test_microsites/test_microsite/templates/static_templates/contact.html
@@ -1,8 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
-<%namespace name='static' file='../static_content.html'/>
-
<%inherit file="../main.html" />
+<%namespace name='static' file='../static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="title"><title>${_("Contact {platform_name}").format(platform_name=settings.PLATFORM_NAME)}</title></%block>
diff --git a/common/test/test_microsites/test_microsite/templates/static_templates/faq.html b/common/test/test_microsites/test_microsite/templates/static_templates/faq.html
index 4621b30323c..fd1b0724df4 100644
--- a/common/test/test_microsites/test_microsite/templates/static_templates/faq.html
+++ b/common/test/test_microsites/test_microsite/templates/static_templates/faq.html
@@ -1,8 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
-<%namespace name='static' file='../static_content.html'/>
-
<%inherit file="../main.html" />
+<%namespace name='static' file='../static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="title"><title>${_("FAQ")}</title></%block>
diff --git a/common/test/test_microsites/test_microsite/templates/static_templates/tos.html b/common/test/test_microsites/test_microsite/templates/static_templates/tos.html
index 1c51496b179..52a4ee28499 100644
--- a/common/test/test_microsites/test_microsite/templates/static_templates/tos.html
+++ b/common/test/test_microsites/test_microsite/templates/static_templates/tos.html
@@ -1,8 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
<%inherit file="../main.html" />
-
<%namespace name='static' file='../static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="pagetitle">${_("Terms of Service")}</%block>
diff --git a/lms/templates/calculator/toggle_calculator.html b/lms/templates/calculator/toggle_calculator.html
index 073e7d2febf..de00734150c 100644
--- a/lms/templates/calculator/toggle_calculator.html
+++ b/lms/templates/calculator/toggle_calculator.html
@@ -1,5 +1,7 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<div class="calc-main">
<button title="${_('Open Calculator')}" aria-controls="calculator_wrapper" aria-expanded="false" class="calc utility-control-button">
diff --git a/lms/templates/ccx/_dashboard_ccx_listing.html b/lms/templates/ccx/_dashboard_ccx_listing.html
index e06e676ee15..1d58bddd45d 100644
--- a/lms/templates/ccx/_dashboard_ccx_listing.html
+++ b/lms/templates/ccx/_dashboard_ccx_listing.html
@@ -1,9 +1,9 @@
<%page args="ccx, membership, course, show_courseware_link, is_course_blocked" />
-<%! from django.utils.translation import ugettext as _ %>
<%!
- from django.core.urlresolvers import reverse
- from courseware.courses import course_image_url, get_course_about_section
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from courseware.courses import course_image_url, get_course_about_section
%>
<%
ccx_switch_target = reverse('switch_active_ccx', args=[course.id.to_deprecated_string(), ccx.id])
diff --git a/lms/templates/ccx/coach_dashboard.html b/lms/templates/ccx/coach_dashboard.html
index 6dbdc6edfaf..86e778ab844 100644
--- a/lms/templates/ccx/coach_dashboard.html
+++ b/lms/templates/ccx/coach_dashboard.html
@@ -1,8 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
-
<%inherit file="/main.html" />
<%namespace name='static' file='/static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="pagetitle">${_("CCX Coach Dashboard")}</%block>
<%block name="nav_skip">#ccx-coach-dashboard-content</%block>
@@ -30,7 +31,7 @@
</form>
</section>
%endif
-
+
%if ccx:
<ul class="instructor-nav">
<li class="nav-item">
@@ -78,7 +79,7 @@
var url = document.URL,
hashbang = url.indexOf('#!');
if (hashbang != -1) {
- var selector = '.instructor-nav a[data-section=' +
+ var selector = '.instructor-nav a[data-section=' +
url.substr(hashbang + 2) + ']';
$(selector).click();
}
diff --git a/lms/templates/chat/toggle_chat.html b/lms/templates/chat/toggle_chat.html
index fcc72911e65..86f327eb064 100644
--- a/lms/templates/chat/toggle_chat.html
+++ b/lms/templates/chat/toggle_chat.html
@@ -1,5 +1,7 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<div id="chat-wrapper">
<div id="chat-toggle" class="closed">
diff --git a/lms/templates/combinedopenended/openended/open_ended_rubric.html b/lms/templates/combinedopenended/openended/open_ended_rubric.html
index 199f1992452..b2a8ac56bb6 100644
--- a/lms/templates/combinedopenended/openended/open_ended_rubric.html
+++ b/lms/templates/combinedopenended/openended/open_ended_rubric.html
@@ -1,6 +1,8 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.utils.translation import ungettext%>
-<% from random import randint %>
+<%!
+from django.utils.translation import ugettext as _
+from django.utils.translation import ungettext
+from random import randint
+%>
<form class="rubric-template" id="inputtype_${id}" xmlns="http://www.w3.org/1999/html">
<div class="visibility-control visibility-control-rubric">
<div class="inner">
diff --git a/lms/templates/courseware/course_navigation.html b/lms/templates/courseware/course_navigation.html
index 6c78313fa31..c5911912e40 100644
--- a/lms/templates/courseware/course_navigation.html
+++ b/lms/templates/courseware/course_navigation.html
@@ -1,5 +1,12 @@
## mako
-<%! from django.utils.translation import ugettext as _ %>
+<%!
+from django.utils.translation import ugettext as _
+from courseware.tabs import get_course_tab_list
+from courseware.views import notification_image_for_tab
+from django.core.urlresolvers import reverse
+from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_user_partition
+from student.models import CourseEnrollment
+%>
<%page args="active_page=None" />
<%
@@ -12,11 +19,6 @@ def url_class(is_active):
return "active"
return ""
%>
-<%! from courseware.tabs import get_course_tab_list %>
-<%! from courseware.views import notification_image_for_tab %>
-<%! from django.core.urlresolvers import reverse %>
-<%! from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_user_partition %>
-<%! from student.models import CourseEnrollment %>
<%
cohorted_user_partition = get_cohorted_user_partition(course.id)
show_preview_menu = staff_access and active_page in ['courseware', 'info']
diff --git a/lms/templates/courseware/courseware-chromeless.html b/lms/templates/courseware/courseware-chromeless.html
index 831b0637046..45966c6c731 100644
--- a/lms/templates/courseware/courseware-chromeless.html
+++ b/lms/templates/courseware/courseware-chromeless.html
@@ -1,9 +1,11 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.template.defaultfilters import escapejs %>
-<%! from microsite_configuration import page_title_breadcrumbs %>
-<%! from edxnotes.helpers import is_feature_enabled as is_edxnotes_enabled %>
<%inherit file="/main.html" />
<%namespace name='static' file='/static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.template.defaultfilters import escapejs
+from microsite_configuration import page_title_breadcrumbs
+from edxnotes.helpers import is_feature_enabled as is_edxnotes_enabled
+%>
<%def name="course_name()">
<% return _("{course_number} Courseware").format(course_number=course.display_number_with_default) %>
</%def>
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index ee228c08025..966a712ae63 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -1,9 +1,11 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.template.defaultfilters import escapejs %>
-<%! from microsite_configuration import page_title_breadcrumbs %>
-<%! from edxnotes.helpers import is_feature_enabled as is_edxnotes_enabled %>
<%inherit file="/main.html" />
<%namespace name='static' file='/static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.template.defaultfilters import escapejs
+from microsite_configuration import page_title_breadcrumbs
+from edxnotes.helpers import is_feature_enabled as is_edxnotes_enabled
+%>
<%def name="course_name()">
<% return _("{course_number} Courseware").format(course_number=course.display_number_with_default) %>
</%def>
diff --git a/lms/templates/courseware/gradebook.html b/lms/templates/courseware/gradebook.html
index a293267c724..562adabf9cc 100644
--- a/lms/templates/courseware/gradebook.html
+++ b/lms/templates/courseware/gradebook.html
@@ -1,7 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
<%inherit file="/main.html" />
-<%! from django.core.urlresolvers import reverse %>
<%namespace name='static' file='/static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="js_extra">
<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
diff --git a/lms/templates/courseware/info.html b/lms/templates/courseware/info.html
index 6b26e981dbc..6a56da3ddeb 100644
--- a/lms/templates/courseware/info.html
+++ b/lms/templates/courseware/info.html
@@ -1,8 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from courseware.courses import get_course_info_section %>
-
<%inherit file="../main.html" />
<%namespace name='static' file='../static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from courseware.courses import get_course_info_section
+%>
<%block name="pagetitle">${_("{course_number} Course Info").format(course_number=course.display_number_with_default)}</%block>
diff --git a/lms/templates/courseware/legacy_instructor_dashboard.html b/lms/templates/courseware/legacy_instructor_dashboard.html
index e80a7ee2df4..c5becea045f 100644
--- a/lms/templates/courseware/legacy_instructor_dashboard.html
+++ b/lms/templates/courseware/legacy_instructor_dashboard.html
@@ -2,11 +2,12 @@
## We are no longer supporting this file or accepting changes into it. ##
## Please see lms/templates/instructor for instructor dashboard templates ##
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
-
<%inherit file="../main.html" />
<%namespace name='static' file='/static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="pagetitle">${_("Legacy Instructor Dashboard")}</%block>
<%block name="nav_skip">#instructor-dashboard-content</%block>
diff --git a/lms/templates/courseware/mktg_coming_soon.html b/lms/templates/courseware/mktg_coming_soon.html
index 8ef8875776a..6781eb9386b 100644
--- a/lms/templates/courseware/mktg_coming_soon.html
+++ b/lms/templates/courseware/mktg_coming_soon.html
@@ -1,11 +1,10 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%!
- from django.core.urlresolvers import reverse
- from courseware.courses import course_image_url, get_course_about_section
-%>
<%namespace name='static' file='../static_content.html'/>
-
<%inherit file="../mktg_iframe.html" />
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from courseware.courses import course_image_url, get_course_about_section
+%>
<%block name="pagetitle">${_("About {course_id}").format(course_id=course_id) | h}</%block>
diff --git a/lms/templates/courseware/mktg_course_about.html b/lms/templates/courseware/mktg_course_about.html
index 044db3f00ea..d0eb011cd05 100644
--- a/lms/templates/courseware/mktg_course_about.html
+++ b/lms/templates/courseware/mktg_course_about.html
@@ -1,11 +1,10 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%!
- from django.core.urlresolvers import reverse
- from courseware.courses import course_image_url, get_course_about_section
-%>
<%namespace name='static' file='../static_content.html'/>
-
<%inherit file="../mktg_iframe.html" />
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from courseware.courses import course_image_url, get_course_about_section
+%>
<%block name="pagetitle">${_("About {course_number}").format(course_number=course.display_number_with_default) | h}</%block>
diff --git a/lms/templates/courseware/news.html b/lms/templates/courseware/news.html
index fa848c00369..706292f569e 100644
--- a/lms/templates/courseware/news.html
+++ b/lms/templates/courseware/news.html
@@ -1,6 +1,6 @@
-<%! from django.utils.translation import ugettext as _ %>
<%inherit file="main.html" />
<%namespace name='static' file='../static_content.html'/>
+<%! from django.utils.translation import ugettext as _ %>
<%block name="bodyclass">courseware news</%block>
<%block name="pagetitle">${_("News - MITx 6.002x")}</%block>
diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html
index 0af84bcbc8e..2c01db80a81 100644
--- a/lms/templates/courseware/progress.html
+++ b/lms/templates/courseware/progress.html
@@ -1,10 +1,12 @@
-<%!
- from django.utils.translation import ugettext as _
- from django.core.urlresolvers import reverse
-%>
<%inherit file="/main.html" />
<%namespace name='static' file='/static_content.html'/>
-
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from util.date_utils import get_time_display
+from django.conf import settings
+from django.utils.http import urlquote_plus
+%>
<%block name="headextra">
<%static:css group='style-course-vendor'/>
@@ -17,16 +19,6 @@
<%block name="pagetitle">${_("{course_number} Progress").format(course_number=course.display_number_with_default) | h}</%block>
<%block name="nav_skip">#course-info-progress</%block>
-<%!
- from django.core.urlresolvers import reverse
-%>
-
-<%!
-from util.date_utils import get_time_display
-from django.conf import settings
-from django.utils.http import urlquote_plus
-%>
-
<%block name="js_extra">
<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.stack.js')}"></script>
diff --git a/lms/templates/courseware/syllabus.html b/lms/templates/courseware/syllabus.html
index 302e14a0bb6..c2763b22909 100644
--- a/lms/templates/courseware/syllabus.html
+++ b/lms/templates/courseware/syllabus.html
@@ -1,6 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
<%inherit file="/main.html" />
<%namespace name='static' file='/static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from courseware.courses import get_course_syllabus_section
+%>
<%block name="headextra">
<%static:css group='style-course-vendor'/>
@@ -10,9 +13,6 @@
<%block name="pagetitle">${_("{course.display_number_with_default} Course Info").format(course=course) | h}</%block>
<%include file="/courseware/course_navigation.html" args="active_page='syllabus'" />
-<%!
- from courseware.courses import get_course_syllabus_section
-%>
<section class="container">
<div class="syllabus_wrapper">
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 3aa8a4b36ab..7c55e21be23 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -1,11 +1,12 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.template import RequestContext %>
-<%! import third_party_auth %>
-<%! from third_party_auth import pipeline %>
-<%! from microsite_configuration import microsite %>
-
+<%inherit file="main.html" />
+<%namespace name='static' file='static_content.html'/>
<%!
- from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+from django.template import RequestContext
+import third_party_auth
+from third_party_auth import pipeline
+from microsite_configuration import microsite
+from django.core.urlresolvers import reverse
%>
<%
@@ -13,9 +14,6 @@
cert_name_long = settings.CERT_NAME_LONG
%>
-<%inherit file="main.html" />
-
-<%namespace name='static' file='static_content.html'/>
<%block name="pagetitle">${_("Dashboard")}</%block>
<%block name="bodyclass">view-dashboard is-authenticated</%block>
diff --git a/lms/templates/dashboard/_dashboard_status_verification.html b/lms/templates/dashboard/_dashboard_status_verification.html
index 93e9ef28489..160a2ef93e3 100644
--- a/lms/templates/dashboard/_dashboard_status_verification.html
+++ b/lms/templates/dashboard/_dashboard_status_verification.html
@@ -1,10 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%namespace name='static' file='../static_content.html'/>
<%!
- from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
%>
-<%namespace name='static' file='../static_content.html'/>
-
%if verification_status == 'approved':
<li class="status status-verification is-accepted">
<span class="title status-title">${_("ID Verification Status")}</span>
diff --git a/lms/templates/discussion/_discussion_course_navigation.html b/lms/templates/discussion/_discussion_course_navigation.html
index 0d20d2222df..a84154c5506 100644
--- a/lms/templates/discussion/_discussion_course_navigation.html
+++ b/lms/templates/discussion/_discussion_course_navigation.html
@@ -1,6 +1,8 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django_comment_client.permissions import has_permission %>
<%inherit file="../courseware/course_navigation.html" />
+<%!
+from django.utils.translation import ugettext as _
+from django_comment_client.permissions import has_permission
+%>
<%block name="extratabs">
% if has_permission(user, 'create_thread', course.id):
diff --git a/lms/templates/discussion/_discussion_module.html b/lms/templates/discussion/_discussion_module.html
index d8eb3ac6ef0..8789a7492da 100644
--- a/lms/templates/discussion/_discussion_module.html
+++ b/lms/templates/discussion/_discussion_module.html
@@ -1,6 +1,8 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django_comment_client.permissions import has_permission %>
<%include file="_underscore_templates.html" />
+<%!
+from django.utils.translation import ugettext as _
+from django_comment_client.permissions import has_permission
+%>
<div class="discussion-module" data-discussion-id="${discussion_id | h}">
<a class="discussion-show control-button" href="javascript:void(0)" data-discussion-id="${discussion_id | h}" role="button"><span class="show-hide-discussion-icon"></span><span class="button-text">${_("Show Discussion")}</span></a>
diff --git a/lms/templates/discussion/_filter_dropdown.html b/lms/templates/discussion/_filter_dropdown.html
index eecff463b11..76f58f93263 100644
--- a/lms/templates/discussion/_filter_dropdown.html
+++ b/lms/templates/discussion/_filter_dropdown.html
@@ -1,5 +1,7 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! import json %>
+<%!
+from django.utils.translation import ugettext as _
+import json
+%>
<%def name="render_dropdown(map)">
% for child in map["children"]:
diff --git a/lms/templates/discussion/_recent_active_posts.html b/lms/templates/discussion/_recent_active_posts.html
index a8760879f28..eddc5072a02 100644
--- a/lms/templates/discussion/_recent_active_posts.html
+++ b/lms/templates/discussion/_recent_active_posts.html
@@ -1,5 +1,7 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! import django_comment_client.helpers as helpers %>
+<%!
+from django.utils.translation import ugettext as _
+import django_comment_client.helpers as helpers
+%>
% if recent_active_threads:
<article class="discussion-sidebar-following sidebar-module">
diff --git a/lms/templates/discussion/_search_bar.html b/lms/templates/discussion/_search_bar.html
index f1ff3197b6f..a3f4d262946 100644
--- a/lms/templates/discussion/_search_bar.html
+++ b/lms/templates/discussion/_search_bar.html
@@ -1,6 +1,6 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from urllib import urlencode %>
-<%
+<%!
+from django.utils.translation import ugettext as _
+from urllib import urlencode
def merge(dic1, dic2):
return dict(dic1.items() + dic2.items())
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index 66f1404fa8b..f7ec63a6558 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -1,8 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.template.defaultfilters import escapejs %>
-<%! from django_comment_client.permissions import has_permission %>
-
<%namespace name='static' file='../static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.template.defaultfilters import escapejs
+from django_comment_client.permissions import has_permission
+%>
## IMPORTANT: In order to keep js tests valid and relevant, please be sure to update the appropriate HTML in
## common/static/coffee/spec/discussion_spec_helper.coffee is changed and regenerated, whenever this one changes.
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html
index f26fea64e14..9586ba3cef4 100644
--- a/lms/templates/discussion/index.html
+++ b/lms/templates/discussion/index.html
@@ -1,10 +1,12 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! import django_comment_client.helpers as helpers %>
-<%! from django.template.defaultfilters import escapejs %>
-<%! from django.core.urlresolvers import reverse %>
-
<%inherit file="../main.html" />
<%namespace name='static' file='../static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+import django_comment_client.helpers as helpers
+from django.template.defaultfilters import escapejs
+from django.core.urlresolvers import reverse
+%>
+
<%block name="bodyclass">discussion</%block>
<%block name="pagetitle">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}</%block>
<%block name="nav_skip">#discussion-container</%block>
diff --git a/lms/templates/discussion/user_profile.html b/lms/templates/discussion/user_profile.html
index fae5d837bfc..4a227371943 100644
--- a/lms/templates/discussion/user_profile.html
+++ b/lms/templates/discussion/user_profile.html
@@ -1,8 +1,10 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.template.defaultfilters import escapejs %>
-
<%inherit file="../main.html" />
<%namespace name='static' file='../static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.template.defaultfilters import escapejs
+%>
+
<%block name="bodyclass">discussion</%block>
<%block name="pagetitle">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}</%block>
diff --git a/lms/templates/edxnotes/edxnotes.html b/lms/templates/edxnotes/edxnotes.html
index 7b4ec8db1bd..5c604b7e35e 100644
--- a/lms/templates/edxnotes/edxnotes.html
+++ b/lms/templates/edxnotes/edxnotes.html
@@ -1,7 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! import json %>
-<%namespace name='static' file='/static_content.html'/>
<%inherit file="/main.html" />
+<%namespace name='static' file='/static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+import json
+%>
<%block name="bodyclass">view-student-notes is-in-course course</%block>
<%block name="pagetitle">${_("Student Notes")}</%block>
diff --git a/lms/templates/edxnotes/toggle_notes.html b/lms/templates/edxnotes/toggle_notes.html
index 449a757c5fb..463106d479e 100644
--- a/lms/templates/edxnotes/toggle_notes.html
+++ b/lms/templates/edxnotes/toggle_notes.html
@@ -1,6 +1,8 @@
-<%! import json %>
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
+<%!
+import json
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%page args="course"/>
<%
diff --git a/lms/templates/email_change_successful.html b/lms/templates/email_change_successful.html
index 1fae9739319..764e58576f9 100644
--- a/lms/templates/email_change_successful.html
+++ b/lms/templates/email_change_successful.html
@@ -1,7 +1,8 @@
-<%! from django.utils.translation import ugettext as _ %>
-
-<%! from django.core.urlresolvers import reverse %>
<%inherit file="main.html" />
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<section class="container activation">
diff --git a/lms/templates/emails_change_successful.html b/lms/templates/emails_change_successful.html
index da622c696aa..0b65dff2858 100644
--- a/lms/templates/emails_change_successful.html
+++ b/lms/templates/emails_change_successful.html
@@ -1,7 +1,8 @@
-<%! from django.utils.translation import ugettext as _ %>
-
-<%! from django.core.urlresolvers import reverse %>
<%inherit file="main.html" />
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<section class="container activation">
diff --git a/lms/templates/folditbasic.html b/lms/templates/folditbasic.html
index e5073751bbc..909ffb3b01d 100644
--- a/lms/templates/folditbasic.html
+++ b/lms/templates/folditbasic.html
@@ -1,6 +1,5 @@
-<%! from django.utils.translation import ugettext as _ %>
-
<%!
+from django.utils.translation import ugettext as _
from util.date_utils import get_default_time_display
%>
<div class="folditbasic">
diff --git a/lms/templates/footer-edx-v2.html b/lms/templates/footer-edx-v2.html
index 042c06b849e..2a611519cbe 100644
--- a/lms/templates/footer-edx-v2.html
+++ b/lms/templates/footer-edx-v2.html
@@ -1,8 +1,10 @@
## mako
## TODO (ECOM-1339): Delete this template once the V3 footer is enabled
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.utils.translation import ugettext as _ %>
<%namespace name='static' file='static_content.html'/>
+<%!
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+%>
## WARNING: These files are specific to edx.org and are not used in installations outside of that domain. Open edX users will want to use the file "footer.html" for any changes or overrides.
<div class="wrapper wrapper-footer edx-footer edx-footer-new">
<footer id="footer-global" class="footer-global" role="contentinfo" aria-label="Footer">
diff --git a/lms/templates/forgot_password_modal.html b/lms/templates/forgot_password_modal.html
index 9868d7e8b9f..c5141354de2 100644
--- a/lms/templates/forgot_password_modal.html
+++ b/lms/templates/forgot_password_modal.html
@@ -1,7 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from microsite_configuration import microsite %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from microsite_configuration import microsite
+%>
-<%! from django.core.urlresolvers import reverse %>
<section id="forgot-password-modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Password Reset')}">
<div class="inner-wrapper">
<button class="close-modal">
diff --git a/lms/templates/help_modal.html b/lms/templates/help_modal.html
index 233d3a623f7..eea5f51683d 100644
--- a/lms/templates/help_modal.html
+++ b/lms/templates/help_modal.html
@@ -1,13 +1,15 @@
-<%! from django.utils.translation import ugettext as _ %>
-
<%namespace name='static' file='static_content.html'/>
-<%! from datetime import datetime %>
-<%! import pytz %>
-<%! from django.conf import settings %>
-<%! from django.core.urlresolvers import reverse %>
-<%! from xmodule.tabs import CourseTabList %>
-<%! from microsite_configuration import microsite %>
-<%! platform_name = microsite.get_value("platform_name", settings.PLATFORM_NAME) %>
+
+<%!
+from datetime import datetime
+import pytz
+from django.conf import settings
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from xmodule.tabs import CourseTabList
+from microsite_configuration import microsite
+platform_name = microsite.get_value("platform_name", settings.PLATFORM_NAME)
+%>
% if settings.FEATURES.get('ENABLE_FEEDBACK_SUBMISSION', False):
diff --git a/lms/templates/index.html b/lms/templates/index.html
index 817b990eddb..a50038f2536 100644
--- a/lms/templates/index.html
+++ b/lms/templates/index.html
@@ -1,10 +1,10 @@
-<%! from django.utils.translation import ugettext as _ %>
-
-<%! from django.core.urlresolvers import reverse %>
<%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/>
-
-<%! from microsite_configuration import microsite %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from microsite_configuration import microsite
+%>
<%
homepage_overlay_html = microsite.get_value('homepage_overlay_html')
diff --git a/lms/templates/instructor/instructor_dashboard_2/add_coupon_modal.html b/lms/templates/instructor/instructor_dashboard_2/add_coupon_modal.html
index 590b873c08b..437430bc30c 100644
--- a/lms/templates/instructor/instructor_dashboard_2/add_coupon_modal.html
+++ b/lms/templates/instructor/instructor_dashboard_2/add_coupon_modal.html
@@ -1,5 +1,7 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%page args="section_data"/>
<section id="add-coupon-modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Add Coupon')}">
<div class="inner-wrapper">
diff --git a/lms/templates/instructor/instructor_dashboard_2/cohort_management.html b/lms/templates/instructor/instructor_dashboard_2/cohort_management.html
index 0b3ca814cd2..70705960e85 100644
--- a/lms/templates/instructor/instructor_dashboard_2/cohort_management.html
+++ b/lms/templates/instructor/instructor_dashboard_2/cohort_management.html
@@ -1,8 +1,10 @@
-<%! from django.utils.translation import ugettext as _ %>
<%page args="section_data"/>
-<%! from courseware.courses import get_studio_url %>
-<%! from microsite_configuration import microsite %>
-<%! from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_user_partition %>
+<%!
+from django.utils.translation import ugettext as _
+from courseware.courses import get_studio_url
+from microsite_configuration import microsite
+from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_user_partition
+%>
<div class="cohort-management"
diff --git a/lms/templates/instructor/instructor_dashboard_2/e-commerce.html b/lms/templates/instructor/instructor_dashboard_2/e-commerce.html
index 9caf18669ce..22c8c41b297 100644
--- a/lms/templates/instructor/instructor_dashboard_2/e-commerce.html
+++ b/lms/templates/instructor/instructor_dashboard_2/e-commerce.html
@@ -1,6 +1,8 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from datetime import datetime, timedelta %>
-<%! import pytz %>
+<%!
+from django.utils.translation import ugettext as _
+from datetime import datetime, timedelta
+import pytz
+%>
<%page args="section_data"/>
<%include file="add_coupon_modal.html" args="section_data=section_data" />
<%include file="edit_coupon_modal.html" args="section_data=section_data" />
diff --git a/lms/templates/instructor/instructor_dashboard_2/edit_coupon_modal.html b/lms/templates/instructor/instructor_dashboard_2/edit_coupon_modal.html
index 0314d263705..b5d0ad08c5b 100644
--- a/lms/templates/instructor/instructor_dashboard_2/edit_coupon_modal.html
+++ b/lms/templates/instructor/instructor_dashboard_2/edit_coupon_modal.html
@@ -1,5 +1,7 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%page args="section_data"/>
<section id="edit-coupon-modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Edit Coupon')}">
<div class="inner-wrapper">
diff --git a/lms/templates/instructor/instructor_dashboard_2/generate_registarion_codes_modal.html b/lms/templates/instructor/instructor_dashboard_2/generate_registarion_codes_modal.html
index c35693dc6a4..13da13800ab 100644
--- a/lms/templates/instructor/instructor_dashboard_2/generate_registarion_codes_modal.html
+++ b/lms/templates/instructor/instructor_dashboard_2/generate_registarion_codes_modal.html
@@ -1,5 +1,7 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%page args="section_data"/>
<section id="registration_code_generation_modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Generate Registration Code Modal')}">
<div class="inner-wrapper">
diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
index 0a8871f317b..9c99e039656 100644
--- a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
+++ b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
@@ -1,8 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
-
<%inherit file="/main.html" />
<%namespace name='static' file='/static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
## ----- Tips on adding something to the new instructor dashboard -----
## 1. add your input element, e.g. in instructor_dashboard2/data_download.html
diff --git a/lms/templates/instructor/instructor_dashboard_2/membership.html b/lms/templates/instructor/instructor_dashboard_2/membership.html
index aa4255036c1..ec6b8ef9f1f 100644
--- a/lms/templates/instructor/instructor_dashboard_2/membership.html
+++ b/lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -1,8 +1,10 @@
-<%! from django.utils.translation import ugettext as _ %>
<%page args="section_data"/>
-<%! from courseware.courses import get_studio_url %>
-<%! from microsite_configuration import microsite %>
-<%! from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_user_partition %>
+<%!
+from django.utils.translation import ugettext as _
+from courseware.courses import get_studio_url
+from microsite_configuration import microsite
+from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_user_partition
+%>
<script type="text/template" id="member-list-widget-template">
<div class="member-list-widget">
diff --git a/lms/templates/instructor/instructor_dashboard_2/metrics.html b/lms/templates/instructor/instructor_dashboard_2/metrics.html
index 9b43bb90537..7aae9338ae1 100644
--- a/lms/templates/instructor/instructor_dashboard_2/metrics.html
+++ b/lms/templates/instructor/instructor_dashboard_2/metrics.html
@@ -1,5 +1,7 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.template.defaultfilters import escapejs %>
+<%!
+from django.utils.translation import ugettext as _
+from django.template.defaultfilters import escapejs
+%>
<%page args="section_data"/>
diff --git a/lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html b/lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html
index b7c40f38f80..4e7a6d96bce 100644
--- a/lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html
+++ b/lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html
@@ -1,5 +1,7 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%page args="section_data"/>
<section id="set-course-mode-price-modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Set Course Mode Price')}">
<div class="inner-wrapper">
diff --git a/lms/templates/invalid_email_key.html b/lms/templates/invalid_email_key.html
index 5fdcdb4b124..b0d9c188e40 100644
--- a/lms/templates/invalid_email_key.html
+++ b/lms/templates/invalid_email_key.html
@@ -1,6 +1,5 @@
-<%! from django.utils.translation import ugettext as _ %>
-
<%inherit file="main.html" />
+<%! from django.utils.translation import ugettext as _ %>
<section class="container activation">
diff --git a/lms/templates/login.html b/lms/templates/login.html
index 1b80af903d8..9fa02f1eae0 100644
--- a/lms/templates/login.html
+++ b/lms/templates/login.html
@@ -1,11 +1,13 @@
<%inherit file="main.html" />
-<%! from microsite_configuration import microsite %>
<%namespace name='static' file='static_content.html'/>
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.utils.translation import ugettext as _ %>
-<%! import third_party_auth %>
-<%! from third_party_auth import provider, pipeline %>
+<%!
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+import third_party_auth
+from third_party_auth import provider, pipeline
+from microsite_configuration import microsite
+%>
<%block name="pagetitle">${_("Log into your {platform_name} Account").format(platform_name=platform_name)}</%block>
diff --git a/lms/templates/lti.html b/lms/templates/lti.html
index aac47165059..5cfa6685931 100644
--- a/lms/templates/lti.html
+++ b/lms/templates/lti.html
@@ -1,5 +1,7 @@
-<%! import json %>
-<%! from django.utils.translation import ugettext as _ %>
+<%!
+import json
+from django.utils.translation import ugettext as _
+%>
<h2 class="problem-header">
## Translators: "External resource" means that this learning module is hosted on a platform external to the edX LMS
diff --git a/lms/templates/lti_form.html b/lms/templates/lti_form.html
index bf269a7b469..d141c4e2a06 100644
--- a/lms/templates/lti_form.html
+++ b/lms/templates/lti_form.html
@@ -1,5 +1,7 @@
-<%! import json %>
-<%! from django.utils.translation import ugettext as _ %>
+<%!
+import json
+from django.utils.translation import ugettext as _
+%>
<!DOCTYPE HTML>
<html>
<head>
diff --git a/lms/templates/manage_user_standing.html b/lms/templates/manage_user_standing.html
index f7cb08069db..0e096504b5e 100644
--- a/lms/templates/manage_user_standing.html
+++ b/lms/templates/manage_user_standing.html
@@ -1,7 +1,9 @@
<%inherit file="main.html" />
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.utils.translation import ugettext as _ %>
+<%!
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+%>
<h2>${_("Manage student accounts")}</h2>
<form action="${reverse('disable_account_ajax')}" method="post" data-remote="true" class="manage-accounts-form">
diff --git a/lms/templates/modal/_modal-settings-language.html b/lms/templates/modal/_modal-settings-language.html
index da739966a3f..265a201908f 100644
--- a/lms/templates/modal/_modal-settings-language.html
+++ b/lms/templates/modal/_modal-settings-language.html
@@ -1,10 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%namespace name='static' file='../static_content.html'/>
<%!
- from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
%>
-<%namespace name='static' file='../static_content.html'/>
-
<section id="change_language" class="modal modal-settings-language" aria-hidden="true">
<div class="inner-wrapper" role="dialog" aria-labelledby="change_language_title">
<button class="close-modal">
diff --git a/lms/templates/navigation-edx.html b/lms/templates/navigation-edx.html
index bd45e95dafa..55a2615a3d3 100644
--- a/lms/templates/navigation-edx.html
+++ b/lms/templates/navigation-edx.html
@@ -5,15 +5,15 @@
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
+from microsite_configuration import microsite
+from microsite_configuration.templatetags.microsite import platform_name
+
# App that handles subdomain specific branding
import branding
# app that handles site status messages
from status.status import get_site_status_msg
%>
-<%! from microsite_configuration import microsite %>
-<%! from microsite_configuration.templatetags.microsite import platform_name %>
-
## Provide a hook for themes to inject branding on top.
<%block name="navigation_top" />
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index 76f66505cf1..6cfd7757b59 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -5,16 +5,16 @@
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
+from microsite_configuration import microsite
+from microsite_configuration.templatetags.microsite import platform_name
+from ccx.overrides import get_current_ccx
+
# App that handles subdomain specific branding
import branding
# app that handles site status messages
from status.status import get_site_status_msg
%>
-<%! from microsite_configuration import microsite %>
-<%! from microsite_configuration.templatetags.microsite import platform_name %>
-<%! from ccx.overrides import get_current_ccx %>
-
## Provide a hook for themes to inject branding on top.
<%block name="navigation_top" />
diff --git a/lms/templates/notes.html b/lms/templates/notes.html
index 34b4da61b9b..137a85f9028 100644
--- a/lms/templates/notes.html
+++ b/lms/templates/notes.html
@@ -1,12 +1,11 @@
-<%! from django.utils.translation import ugettext as _ %>
-
+<%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/>
${static.css(group='style-vendor-tinymce-content', raw=True)}
${static.css(group='style-vendor-tinymce-skin', raw=True)}
${static.css(group='style-xmodule-annotations', raw=True)}
-<%inherit file="main.html" />
<%!
- from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
%>
<%block name="headextra">
diff --git a/lms/templates/register-shib.html b/lms/templates/register-shib.html
index 2eafbe5f7c1..712e2d98568 100644
--- a/lms/templates/register-shib.html
+++ b/lms/templates/register-shib.html
@@ -1,16 +1,15 @@
-<%! from django.utils.translation import ugettext as _ %>
-
<%inherit file="main.html" />
-
<%namespace name='static' file='static_content.html'/>
<%namespace file='main.html' import="login_query"/>
-
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.utils import html %>
-<%! from django_countries import countries %>
-<%! from student.models import UserProfile %>
-<%! from datetime import date %>
-<%! import calendar %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from django.utils import html
+from django_countries import countries
+from student.models import UserProfile
+from datetime import date
+import calendar
+%>
<%block name="pagetitle">${_("Preferences for {platform_name}").format(platform_name=settings.PLATFORM_NAME)}</%block>
diff --git a/lms/templates/register.html b/lms/templates/register.html
index d9d0d7e91d8..be979a38874 100644
--- a/lms/templates/register.html
+++ b/lms/templates/register.html
@@ -1,20 +1,19 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from microsite_configuration import microsite %>
-
<%inherit file="main.html" />
-
<%namespace name='static' file='static_content.html'/>
<%namespace file='main.html' import="login_query"/>
-
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.utils import html %>
-<%! from django_countries import countries %>
-<%! from django.utils.translation import ugettext as _ %>
-<%! from student.models import UserProfile %>
-<%! from datetime import date %>
-<%! import third_party_auth %>
-<%! from third_party_auth import pipeline, provider %>
-<%! import calendar %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from django.utils import html
+from django_countries import countries
+from django.utils.translation import ugettext as _
+from microsite_configuration import microsite
+from student.models import UserProfile
+from datetime import date
+import third_party_auth
+from third_party_auth import pipeline, provider
+import calendar
+%>
<%block name="pagetitle">${_("Register for {platform_name}").format(platform_name=platform_name)}</%block>
diff --git a/lms/templates/registration/activation_complete.html b/lms/templates/registration/activation_complete.html
index 95f508d1328..217f83af94f 100644
--- a/lms/templates/registration/activation_complete.html
+++ b/lms/templates/registration/activation_complete.html
@@ -1,8 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
<%inherit file="../main.html" />
-
<%namespace name='static' file='../static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<section class="container activation">
diff --git a/lms/templates/registration/activation_invalid.html b/lms/templates/registration/activation_invalid.html
index edeede84e7a..9744ccdce58 100644
--- a/lms/templates/registration/activation_invalid.html
+++ b/lms/templates/registration/activation_invalid.html
@@ -1,8 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
<%inherit file="../main.html" />
-
<%namespace name='static' file='../static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<section class="container activation">
diff --git a/lms/templates/shoppingcart/billing_details.html b/lms/templates/shoppingcart/billing_details.html
index af5cd63646a..4645f7cd83e 100644
--- a/lms/templates/shoppingcart/billing_details.html
+++ b/lms/templates/shoppingcart/billing_details.html
@@ -1,6 +1,8 @@
<%inherit file="shopping_cart_flow.html" />
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="billing_details_highlight"><li class="active" >${_('Billing Details')}</li></%block>
<%block name="confirmation_highlight"></%block>
diff --git a/lms/templates/shoppingcart/download_report.html b/lms/templates/shoppingcart/download_report.html
index 3e2e0761381..6e855a6ddca 100644
--- a/lms/templates/shoppingcart/download_report.html
+++ b/lms/templates/shoppingcart/download_report.html
@@ -1,7 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.conf import settings %>
<%inherit file="../main.html" />
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from django.conf import settings
+%>
<%block name="pagetitle">${_("Download CSV Reports")}</%block>
@@ -34,7 +36,7 @@
<br/>
%endif
-
+
%if ("certificate_status" or "university_revenue_share") in settings.FEATURES['ENABLED_PAYMENT_REPORTS']:
<p>${_("These reports are delimited alphabetically by university name. i.e., generating a report with 'Start Letter' A and 'End Letter' C will generate reports for all universities starting with A, B, and C.")}</p>
<label for="start_letter">${_("Start Letter: ")}</label>
diff --git a/lms/templates/shoppingcart/error.html b/lms/templates/shoppingcart/error.html
index 3de03f415ba..e0fb8a35466 100644
--- a/lms/templates/shoppingcart/error.html
+++ b/lms/templates/shoppingcart/error.html
@@ -1,11 +1,10 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
-
<%inherit file="../main.html" />
-
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="pagetitle">${_("Payment Error")}</%block>
-
<section class="container">
<p><h1>${_("There was an error processing your order!")}</h1></p>
${error_html}
diff --git a/lms/templates/shoppingcart/receipt.html b/lms/templates/shoppingcart/receipt.html
index 8fa0dad6396..2e4c3bb1f43 100644
--- a/lms/templates/shoppingcart/receipt.html
+++ b/lms/templates/shoppingcart/receipt.html
@@ -4,8 +4,8 @@ from django.utils.translation import ugettext as _
from django.utils.translation import ungettext
from django.core.urlresolvers import reverse
from courseware.courses import course_image_url, get_course_about_section, get_course_by_id
+from microsite_configuration import microsite
%>
-<%! from microsite_configuration import microsite %>
<%block name="billing_details_highlight">
% if order_type == 'business':
diff --git a/lms/templates/shoppingcart/shopping_cart_flow.html b/lms/templates/shoppingcart/shopping_cart_flow.html
index 19584ef51f4..4c6feee7ec7 100644
--- a/lms/templates/shoppingcart/shopping_cart_flow.html
+++ b/lms/templates/shoppingcart/shopping_cart_flow.html
@@ -1,11 +1,11 @@
+<%inherit file="../main.html" />
+<%namespace name='static' file='/static_content.html'/>
<%!
from django.utils.translation import ugettext as _
+from django.conf import settings
+from microsite_configuration import microsite
%>
-<%inherit file="../main.html" />
-<%namespace name='static' file='/static_content.html'/>
<%block name="pagetitle">${_("Shopping cart")}</%block>
-<%! from django.conf import settings %>
-<%! from microsite_configuration import microsite %>
<%block name="headextra">
<script type="text/javascript" src="${static.url('js/shoppingcart/shoppingcart.js')}"></script>
</%block>
diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html
index befe237a732..49f0b30946a 100644
--- a/lms/templates/signup_modal.html
+++ b/lms/templates/signup_modal.html
@@ -1,12 +1,12 @@
-<%! from django.utils.translation import ugettext as _ %>
-
<%namespace name='static' file='static_content.html'/>
-<%! from django.conf import settings %>
-<%! from django.core.urlresolvers import reverse %>
-<%! from django_countries import countries %>
-<%! from student.models import UserProfile %>
-<%! from datetime import date %>
-<%! import calendar %>
+<%!
+from django.conf import settings
+from django.core.urlresolvers import reverse
+from django_countries import countries
+from student.models import UserProfile
+from datetime import date
+import calendar
+%>
<section id="signup-modal" class="modal signup-modal">
<div class="inner-wrapper">
diff --git a/lms/templates/staff_problem_info.html b/lms/templates/staff_problem_info.html
index f486bfc6f65..f6be75e07a9 100644
--- a/lms/templates/staff_problem_info.html
+++ b/lms/templates/staff_problem_info.html
@@ -1,6 +1,8 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.template.defaultfilters import escapejs %>
<%namespace name='static' file='/static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.template.defaultfilters import escapejs
+%>
## The JS for this is defined in xqa_interface.html
${block_content}
diff --git a/lms/templates/student_account/account_settings.html b/lms/templates/student_account/account_settings.html
index 7b3fed68bb8..b52600414df 100644
--- a/lms/templates/student_account/account_settings.html
+++ b/lms/templates/student_account/account_settings.html
@@ -1,8 +1,10 @@
-<%! import json %>
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.conf import settings %>
-<%! from django.utils.translation import ugettext as _ %>
-<%! from microsite_configuration import microsite %>
+<%!
+import json
+from django.core.urlresolvers import reverse
+from django.conf import settings
+from django.utils.translation import ugettext as _
+from microsite_configuration import microsite
+%>
<!--<%namespace name='static' file='/static_content.html'/>-->
diff --git a/lms/templates/student_profile/index.html b/lms/templates/student_profile/index.html
index b217302e7b4..2982add373e 100644
--- a/lms/templates/student_profile/index.html
+++ b/lms/templates/student_profile/index.html
@@ -1,8 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! import third_party_auth %>
<%namespace name='static' file='/static_content.html'/>
-
<%inherit file="../main.html" />
+<%!
+from django.utils.translation import ugettext as _
+import third_party_auth
+%>
<%block name="pagetitle">${_("Student Profile")}</%block>
diff --git a/lms/templates/student_profile/learner_profile.html b/lms/templates/student_profile/learner_profile.html
index ae6451d6441..bdc45300847 100644
--- a/lms/templates/student_profile/learner_profile.html
+++ b/lms/templates/student_profile/learner_profile.html
@@ -1,10 +1,11 @@
-<%! import json %>
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.utils.translation import ugettext as _ %>
-<%! from openedx.core.lib.json_utils import EscapedEdxJSONEncoder %>
-
<%inherit file="/main.html" />
<%namespace name='static' file='/static_content.html'/>
+<%!
+import json
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+from openedx.core.lib.json_utils import EscapedEdxJSONEncoder
+%>
<%block name="pagetitle">${_("Learner Profile")}</%block>
<%block name="nav_skip">#u-field-select-account_privacy</%block>
diff --git a/lms/templates/student_profile/third_party_auth.html b/lms/templates/student_profile/third_party_auth.html
index 33c948d3fda..051ecd19b2b 100644
--- a/lms/templates/student_profile/third_party_auth.html
+++ b/lms/templates/student_profile/third_party_auth.html
@@ -1,5 +1,7 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from third_party_auth import pipeline %>
+<%!
+from django.utils.translation import ugettext as _
+from third_party_auth import pipeline
+%>
<li class="controls--account">
<span class="title">
diff --git a/lms/templates/survey/survey.html b/lms/templates/survey/survey.html
index cc8a125e39a..6ffd8986ba7 100644
--- a/lms/templates/survey/survey.html
+++ b/lms/templates/survey/survey.html
@@ -1,11 +1,10 @@
-<%! from django.utils.translation import ugettext as _ %>
-
<%inherit file="../main.html" />
-
<%namespace name='static' file='../static_content.html'/>
-
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.utils import html %>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from django.utils import html
+%>
<%block name="pagetitle">${_("User Survey")}</%block>
diff --git a/lms/templates/sysadmin_dashboard.html b/lms/templates/sysadmin_dashboard.html
index b12733a9249..4d4ec8bba88 100644
--- a/lms/templates/sysadmin_dashboard.html
+++ b/lms/templates/sysadmin_dashboard.html
@@ -1,7 +1,9 @@
<%inherit file="/main.html" />
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.utils.translation import ugettext as _ %>
<%namespace name='static' file='/static_content.html'/>
+<%!
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+%>
<%block name="headextra">
<%static:css group='style-course'/>
@@ -55,7 +57,7 @@ textarea {
<h2 class="instructor-nav">
<a href="${reverse('sysadmin')}" class="${modeflag.get('users')}">${_('Users')}</a>
<a href="${reverse('sysadmin_courses')}" class="${modeflag.get('courses')}">${_('Courses')}</a>
- <a href="${reverse('sysadmin_staffing')}" class="${modeflag.get('staffing')}">${_('Staffing and Enrollment')}</a>
+ <a href="${reverse('sysadmin_staffing')}" class="${modeflag.get('staffing')}">${_('Staffing and Enrollment')}</a>
## Translators: refers to http://git-scm.com/docs/git-log
<a href="${reverse('gitlogs')}">${_('Git Logs')}</a>
</h2>
diff --git a/lms/templates/verify_student/face_upload.html b/lms/templates/verify_student/face_upload.html
index c58801dc5d2..0a5b2546dae 100644
--- a/lms/templates/verify_student/face_upload.html
+++ b/lms/templates/verify_student/face_upload.html
@@ -1,6 +1,8 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
<%inherit file="../main.html" />
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="bodyclass">register verification photos</%block>
diff --git a/lms/templates/verify_student/photo_reverification.html b/lms/templates/verify_student/photo_reverification.html
index 61108d6fd36..66170e7452c 100644
--- a/lms/templates/verify_student/photo_reverification.html
+++ b/lms/templates/verify_student/photo_reverification.html
@@ -1,8 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
-
<%inherit file="../main.html" />
<%namespace name='static' file='/static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="bodyclass">register verification-process is-not-verified step-photos</%block>
<%block name="pagetitle">${_("Re-Verification")}</%block>
diff --git a/lms/templates/verify_student/reverification_confirmation.html b/lms/templates/verify_student/reverification_confirmation.html
index 6ca02f12488..c1d09eb9579 100644
--- a/lms/templates/verify_student/reverification_confirmation.html
+++ b/lms/templates/verify_student/reverification_confirmation.html
@@ -1,8 +1,9 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
-
<%inherit file="../main.html" />
<%namespace name='static' file='/static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="bodyclass">register verification-process is-not-verified step-confirmation</%block>
<%block name="pagetitle">${_("Re-Verification Submission Confirmation")}</%block>
diff --git a/lms/templates/verify_student/reverification_window_expired.html b/lms/templates/verify_student/reverification_window_expired.html
index 6ae08c894ef..05a109682ab 100644
--- a/lms/templates/verify_student/reverification_window_expired.html
+++ b/lms/templates/verify_student/reverification_window_expired.html
@@ -1,8 +1,9 @@
-
-<%! from django.utils.translation import ugettext as _ %>
-<%! from django.core.urlresolvers import reverse %>
<%inherit file="../main.html" />
<%namespace name='static' file='/static_content.html'/>
+<%!
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+%>
<%block name="bodyclass">register verification-process is-not-verified step-confirmation</%block>
<%block name="pagetitle">${_("Re-Verification Failed")}</%block>
--
GitLab