diff --git a/cms/templates/certificates.html b/cms/templates/certificates.html index 6cfbaaf3c8c25e92a7e47f14b6b915e94949c562..ee6f1786e6625f9e2929efd28c552498fa2ad819 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 456d09cb263e9fc1f7ba9720713e3b741a8bc283..44f828192fdaa637ad4583449dcb9c9f0a91d0a9 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 e9825ea4004fc93865bfd1f821a4bb6d0c031e0c..bbb5e12d720f77c939cc0bd1f939670d0975d137 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 09bb830fa62da418f84ea197fc7bc7ac8df85b33..99191a3d4dd59c4e071c96ffec19128c3e479744 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 74e369548324d1a37803e1124eab751b20a9c12c..865c8959d603385786664219d334fff94e7ac600 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 64f3601c509a07495192cc2f2620c6f7899a7966..2a898fc9b9f6e7e9b6e0712c66a44910c568fae7 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 2d40585775a56bc5f377556d699088d9f158995a..7c8ed187a1ce488282635de51954cff063af08fd 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 609dbc141e177314ea36c63d40d1a0230c645ab7..0ff002417917dbe571cf7a207c7786dcfb7b420f 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 92a0e180f755d4c4cf1f001c4e3be28f74e64d4e..242547e6f09c88d0d006b6d3ab6954fe489391c5 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 55712d7a3bb53e6e178ae2cf9679cdd1e693b720..6fe1f5ac8885e777718c4baa6b42d8cae0f25542 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 0757969a5efc696c6d7d959f8b8f3a3c76ea4274..527b08004aab7ba00d679f18ee3e746e3db24e44 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 ae758805574aedac2eafa218cc1205c1312147ab..4ddfd3763bdf713eb603b9fffd3d0176d9779606 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 965567489161f16f2a635a363dbd9b1a5a8bee60..55f588d4e2903b487ddc16c2658f3805d88314c1 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 8e75a5c4e66aaba1629c7c1dfaa8e0f7d45fbea3..f252c6cf2a8d6a01e221859af9f70f4a4d91d8c2 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 ac5dc09ab13ded6a859eea10c6b45665cb6ace59..d549bb68a4e4e3ffcb1a4a0a3baeae97a6d92d96 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 de7e55e47cb44b3a31a716b35e21f842e8ad84cf..66ea6e555167d0ecd1a18558c600ece232159502 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 dcdc953f86c6f0e51a48638d4212ca3229c6a33b..749e9b88480efdb22f2b6da09a794d87a957cd03 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 4621b30323c1e34822624b854f87e326d14dc339..fd1b0724df4a5aaa37eea964696fa26cc3513781 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 1c51496b17954bc925f5f00d280321af7b2e9b65..52a4ee2849930b0d060a5c7bab588879fc1f2e01 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 073e7d2febf071a4964362be37e6b14adb67bae5..de00734150cbbd68e140bdea65ca2b2eea0697a4 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 e06e676ee15aa66e6cb37ba2849f29f1b4d12617..1d58bddd45d9c9712e235444cc18cf4fd8fea662 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 6dbdc6edfaf9dd79226d93021de15e6d490923a2..86e778ab844b21bf2431048a5e9eef2c9fbcedcd 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 fcc72911e65d240e2460bbebef7ec82189c9996a..86f327eb064e2c4e2383c6557bf6cf0ed5182c0c 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 199f199245263f0c1d254393ebccfede71975e70..b2a8ac56bb69b0c84d31c0ca72b8ca37e328d6d8 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 6c78313fa31cde4ca88f1bba75fbc6c5667ff243..c5911912e40446ecaff9144d49e6fdf812fc23f9 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 831b0637046cc67afdb67ee2595b637194554280..45966c6c7317259e5c8c16475deddd062bc2386e 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 ee228c080255f7f7e7205d2c20229f848dc7333e..966a712ae63006052d2d51275bfd418440e2f016 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 a293267c724f5df91fd0ca7c003e705baa612ee5..562adabf9ccc91185a4084d64e1060c99c141099 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 6b26e981dbca9c05ead90f5a4b90c406d81a2972..6a56da3ddebc6397973bc146c9550a103ef8ef59 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 e80a7ee2df48badece22497ec2437292b55f1a1d..c5becea045fe6e514507c463b48b573f350a5f92 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 8ef8875776ac4d0e8ec8c638334c7fe40743bb1a..6781eb9386bea75e3b84f9888723678908245b59 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 044db3f00ea57b4534f03a2809d0d37f80b308a3..d0eb011cd053ca60b9339de74b5a6c5108c8d79d 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 fa848c00369de873388324906b16d2dea75953f8..706292f569e2e557af85e731a47824059b31cf39 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 0af84bcbc8e070975e543b06c54ca57a0ba4f893..2c01db80a81988ca5ec030c03bd212a9dd1fecc8 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 302e14a0bb66b1519e7fdae6e620341ae9dc892a..c2763b22909d9ff491e0800a744ef72fbf6cc788 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 3aa8a4b36ab4cf2f5cd6ae96a399cebed75fb218..7c55e21be2379d9ea9bc6aa970ed4cdb87d4ecd9 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 93e9ef28489af1b2ae5362779dbfbd2bd195c694..160a2ef93e3171f850c4e472f9ede719b1d1835e 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 0d20d2222df587f7db77b9273b2b0cfb659a5a0a..a84154c55069275496333961dca94526ec7b954c 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 d8eb3ac6ef0458bf5fc12540c2affb44331ed344..8789a7492da5507e9a6309194fe7e19c5024c7d6 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 eecff463b1155e7dda5391b1894fe1e3e77733c4..76f58f93263f8d6d14f775f0e35ccc61af23661d 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 a8760879f28b73bd4e13a8eeba630474e7ef22ee..eddc5072a02e12dbd5d9cd65bc0915def3e256c7 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 f1ff3197b6fdde4c90b57da2932235f7d6602f34..a3f4d2629465e5ed9826435cf34475879603d0ad 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 66f1404fa8b7f413057d90fa76ae61e64f570d7e..f7ec63a6558898926c7ea9851ac6066fab9aee53 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 f26fea64e14afc317e3def60268a79331979a7d6..9586ba3cef4c1c5b4759c0c3f1e8906b571ed1c6 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 fae5d837bfcd38e9e1d35db8757905ada4481b94..4a22737194358a64d7c646d197609f1cae79cf43 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 7b4ec8db1bdd02e16f7b2e098e9c567750e18d65..5c604b7e35ed5ad0e67a3ad39b9b7232bd19b11e 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 449a757c5fb62d9f2787b6dc2b63e93bb2578238..463106d479eb0585eb648188232ce75c39b16fdd 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 1fae9739319765dbe758ef3c2afc8ef23d3cf4aa..764e58576f905923d47d86142fc7ec98c3b3f690 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 da622c696aa94f5af2e882ac59af48096f455b10..0b65dff2858d13369212c65154a11aa0ac98c093 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 e5073751bbc272722f65fbbd0fce544ef9621f0d..909ffb3b01d628b321324e5ffea40919b3e12312 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 042c06b849e5b162d7dabcf836d9d519bdb0332d..2a611519cbe233854743f89d6405f0fae414f9c5 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 9868d7e8b9fe8aa5ff65ec9b09fe184d4091c3dd..c5141354de27cd3c19bcb4a222a456350f9de5d9 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 233d3a623f726906d6bf05c52f7092cf71036665..eea5f51683d848e012e99b5c3e60e4e271612133 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 817b990eddb0810c424898c5f64182ce2567e22f..a50038f253629307ff2a5b82627332b0d1b6960e 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 590b873c08b86e4cdac0fc1765377cf27cebd180..437430bc30c5e6018b815eab6b3aca32ee344893 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 0b3ca814cd2b4234dca5b7658d0af9136219ee85..70705960e85a59f050efae8a23dea8c2b001c193 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 9caf18669ce5c73c28eb2c8de7f11029849779c3..22c8c41b297d83b291331308e120a453f42131c0 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 0314d263705aeacdb561c4ace3257c8ddc301b5b..b5d0ad08c5bdc4b19391c93c85d5698130d56f3c 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 c35693dc6a4c69abfaace1b6333d324423b655c4..13da13800abe9089cba682b0c0c992310606a193 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 0a8871f317b9889a1fbe3b5b1cfc3c4e310b8cee..9c99e039656491757ae3a8a5beac9950e3dced0c 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 aa4255036c128d0d8ea4ec60bd50d297ee2fab7e..ec6b8ef9f1f561245fada3f1255ee968f3095bd8 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 9b43bb9053718004aceacdc3fb0003e5a9cb8a3e..7aae9338ae1a1a650aad02f2099550ba4b78ce14 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 b7c40f38f806addc7d8ab24dac82c23c6b8ff08e..4e7a6d96bce089feca450b1a9f1a48f8d9f639e6 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 5fdcdb4b124656055420418286e949d8180ff756..b0d9c188e40ca7a9b0a5d531edd50026b589f477 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 1b80af903d8e8990ed0016809bfde86508528ce9..9fa02f1eae007c744a5047f66d42905ca92bc0e2 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 aac471650599892b5349b7e12f149cd090ef5c9d..5cfa668593184e0ce098694d7a00e7350e42c2d1 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 bf269a7b4697820676e48c4c277924811749bc50..d141c4e2a06698ab4889f074865558f5ec27705f 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 f7cb08069dbd29f298cc25b04b069fb4755c246d..0e096504b5eaa7122ef7652936b1139a7e73a9af 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 da739966a3fcc8f4dddec9759ceeb2160ee576d8..265a201908f38d3391e64b4e30ba070a383c3724 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 bd45e95dafa69b7498f2be4bef4c6912b9f5d21f..55a2615a3d3b03ffee8ef0e00bbd248f424b0255 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 76f66505cf12a400f95bd5862366d10d17f42e47..6cfd7757b59faff9815bdaced44c69daa723e62a 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 34b4da61b9b51e8d8da854579671274a81e87753..137a85f902814832fbcc09ebbdd592628573e4b8 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 2eafbe5f7c146050965221707c1b04a25cca0193..712e2d9856815c3d1ea6af85c3a73e77f7f22ab2 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 d9d0d7e91d8158e9f0041643e25c53ef1c1826cc..be979a3887474d619595a66a2321c41879a35d03 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 95f508d132858dabfe127ea9700a4df576de9b9a..217f83af94f3b7a65d74ffda94e80bb43ab25429 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 edeede84e7a6ffba5ee828be6633365068802a2a..9744ccdce583baec8a7eb8127843786180f214bd 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 af5cd63646ad68e85ee4fc97d37753cf6b72478c..4645f7cd83e876a22ef3bb0318c821e11adcd95f 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 3e2e07613816e6be2e053d1e0e24d042b0f0aabe..6e855a6ddca3efe8753a6422d1c37a373aed4dd2 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 3de03f415ba7af9fac217c332aa1cfc4a7b24b2a..e0fb8a35466c81215b2c08180656da1b55489043 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 8fa0dad639625a0a6f9ad9b6a454bdc52bf46f8e..2e4c3bb1f43a0c141f4444a317f343cb39fa260b 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 19584ef51f4ec15e1d7185b533412f7e4a73b9ed..4c6feee7ec7042df151775b1d9d81af8c902bd30 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 befe237a732c70de80bdf6b6d0e1bc9fa383c3b6..49f0b30946a2e8f131f41fe5835214856f4b2b7a 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 f486bfc6f65fc02dd8560cdc36fe8bc573a9f9c9..f6be75e07a9a22026783dd912015de1b3b864332 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 7b3fed68bb8099c65ec3aee7371a392631ea2dc3..b52600414dfc43685f8ffe4d2754a358b326ad26 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 b217302e7b4210a2ddb9289adda83af4690da8b3..2982add373e0b9c596a8a8ca6cea1bbf16942651 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 ae6451d6441ef15b1e6028a0ff1417e151567eac..bdc453008474221d10bc4652dd273af5b6895f81 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 33c948d3fdac925f064757f80f985092596ed240..051ecd19b2b39bdceedbd356530e771496396942 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 cc8a125e39a1886121165432b3d159f1d806539c..6ffd8986ba7d0ff46b89c731ce19e1b929e1ade0 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 b12733a92495b756c4b0d3b11aa8fb09e40f8d5a..4d4ec8bba886e35248ff4c512ae8c365ae3a40af 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 c58801dc5d27a6f30fb9ec5e7aeda2b31c28f9d9..0a5b2546daedbbcc14df34b99a9d4079b4eb3186 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 61108d6fd368ef068b394b7370868a7ab471b284..66170e7452cf5b3bbd7c6183480934ffc66f40dd 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 6ca02f12488f0eb1a5f7089a068fb8cd4a38b6ab..c1d09eb9579777e4f51acc2d9f01389e30650a15 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 6ae08c894ef83e7765316e1e6e0e5a7130f51a78..05a109682ab71bacbf992727b82aa055fce605c3 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>