Group imports together in Mako templates

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>

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>

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>

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,

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>

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>

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>

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>

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'/>
 

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>

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>

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">

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">

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">

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)})

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>

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>
 

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>
 

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>
 

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">

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])

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();
     }

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">

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">

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']

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>

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>

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>

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>
 

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>

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>
 

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>
 

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>
 

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>

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">

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>

lms/templates/dashboard/_dashboard_status_verification.html

@@ -1,9 +1,8 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%!
-  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
+%>
 
 %if verification_status == 'approved':
 <li class="status status-verification is-accepted">

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):

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>

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"]:

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">

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())

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.

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>

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>
 

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>

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"/>
 
 <%

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">
 

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">
 

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">

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">

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">

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):
 

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')

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">

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"

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" />

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">

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">

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

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">

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"/>
 

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">

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">
 

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>
 

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

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>

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">

lms/templates/modal/_modal-settings-language.html

@@ -1,9 +1,8 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%!
-  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
+%>
 
 <section id="change_language" class="modal modal-settings-language" aria-hidden="true">
   <div class="inner-wrapper" role="dialog" aria-labelledby="change_language_title">

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" />
 

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" />
 

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">

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>
 

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>
 

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">
 

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">
 

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>

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>

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}

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':

lms/templates/shoppingcart/shopping_cart_flow.html

@@ -1,11 +1,11 @@
-<%!
-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 django.conf import settings
+from microsite_configuration import microsite
+%>
 <%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>

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">

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}

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'/>-->
 

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>
 

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>

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">

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>
 

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>

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>
 

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>

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>

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>