Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12541 from edx/robrap/fix-imports

Browse Source 
Fix import order for HTML, Text.
This commit is contained in:
Robert Raposa
2016-05-25 15:23:08 -04:00
parent e613b7f460 addb5bf634
commit ebf89d63e9
33 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/templates/404.html
View File

@@ -1,7 +1,7 @@
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%inherit file="base.html" />
<%block name="title">${_("Page Not Found")}</%block>

2
cms/templates/500.html
View File

@@ -1,6 +1,6 @@
<%page expression_filter="h"/>
<%!
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
from django.utils.translation import ugettext as _
%>
<%inherit file="base.html" />

2
cms/templates/asset_index.html
View File

@@ -4,7 +4,7 @@
<%!
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
%>
<%block name="title">${_("Files & Uploads")}</%block>

2
cms/templates/container.html
View File

@@ -15,7 +15,7 @@ from contentstore.views.helpers import xblock_studio_url, xblock_type_display_na
from openedx.core.djangolib.js_utils import (
dump_js_escaped_json, js_escaped_string
)
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%block name="title">${xblock.display_name_with_default} ${xblock_type_display_name(xblock)}</%block>

2
cms/templates/course_outline.html
View File

@@ -8,7 +8,7 @@ from django.utils.translation import ugettext as _
from openedx.core.djangolib.js_utils import dump_js_escaped_json
from contentstore.utils import reverse_usage_url
from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%block name="title">${_("Course Outline")}</%block>
<%block name="bodyclass">is-signedin course view-outline</%block>

2
cms/templates/group_configurations.html
View File

@@ -9,7 +9,7 @@ from django.utils.translation import ugettext as _
from openedx.core.djangolib.js_utils import (
dump_js_escaped_json, js_escaped_string
)
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%block name="title">${_("Group Configurations")}</%block>

2
cms/templates/index.html
View File

@@ -2,7 +2,7 @@
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%inherit file="base.html" />

2
lms/djangoapps/instructor/views/instructor_dashboard.py
View File

@@ -53,7 +53,7 @@ from class_dashboard.dashboard_data import get_section_display_name, get_array_s
from .tools import get_units_with_due_date, title_or_url
from opaque_keys.edx.locations import SlashSeparatedCourseKey
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
log = logging.getLogger(__name__)

4
lms/templates/api_admin/status.html
View File

@@ -5,7 +5,7 @@
from django.utils.translation import ugettext as _
from openedx.core.djangoapps.api_admin.models import ApiAccessRequest
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<div id="api-access-wrapper">
@@ -45,7 +45,7 @@ from openedx.core.djangolib.markup import Text, HTML
<div class="api-form-container">
<form id="api-form-fields" method="post" class="api-form">
<input type="hidden" id="csrf_token" name="csrfmiddlewaretoken" value="${csrf_token}">
${form.as_p() | n}
${form.as_p() | n, decode.utf8}
<input id="api-access-submit" type="submit" value="${_('Generate API client credentials')}"/>
</form>
</div>

2
lms/templates/ccx/enrollment.html
View File

@@ -1,7 +1,7 @@
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<div class="batch-enrollment" style="float:left;width:50%">

2
lms/templates/courseware/accordion.html
View File

@@ -5,7 +5,7 @@
from util.date_utils import get_time_display
from django.utils.translation import ugettext as _
from django.conf import settings
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%def name="make_chapter(chapter)">

2
lms/templates/courseware/info.html
View File

@@ -7,7 +7,7 @@ from django.utils.translation import ugettext as _
from courseware.courses import get_course_info_section, get_course_date_summary
from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%block name="pagetitle">${_("{course_number} Course Info").format(course_number=course.display_number_with_default)}</%block>

2
lms/templates/courseware/welcome-back.html
View File

@@ -1,7 +1,7 @@
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<h2>${chapter_module.display_name_with_default}</h2>

6
lms/templates/dashboard.html
View File

@@ -8,7 +8,7 @@ from django.template import RequestContext
import third_party_auth
from third_party_auth import pipeline
from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%
@@ -63,13 +63,13 @@ from openedx.core.djangolib.markup import Text, HTML
<div class="dashboard-notifications" tabindex="-1">
%if message:
<section class="dashboard-banner">
${message | n, unicode}
${message | n, decode.utf8}
</section>
%endif
%if enrollment_message:
<section class="dashboard-banner">
${enrollment_message | n, unicode}
${enrollment_message | n, decode.utf8}
</section>
%endif
</div>

2
lms/templates/dashboard/_dashboard_certificate_information.html
View File

@@ -2,7 +2,7 @@
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
from course_modes.models import CourseMode
%>
<%namespace name='static' file='../static_content.html'/>

2
lms/templates/dashboard/_dashboard_course_listing.html
View File

@@ -9,7 +9,7 @@ from django.core.urlresolvers import reverse
from course_modes.models import CourseMode
from course_modes.helpers import enrollment_mode_display
from openedx.core.djangolib.js_utils import dump_js_escaped_json
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
from student.helpers import (
VERIFY_STATUS_NEED_TO_VERIFY,
VERIFY_STATUS_SUBMITTED,

2
lms/templates/dashboard/_dashboard_xseries_info.html
View File

@@ -1,7 +1,7 @@
<%page expression_filter="h" args="program_data, enrollment_mode, display_category" />
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%namespace name='static' file='../static_content.html'/>
<div class="message message-status is-shown credit-message">

4
lms/templates/edxnotes/edxnotes.html
View File

@@ -5,7 +5,7 @@
<%!
from django.utils.translation import ugettext as _
from edxnotes.helpers import NoteJSONEncoder
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string
%>
@@ -113,7 +113,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str
<%static:require_module module_name="js/edxnotes/views/page_factory" class_name="NotesPageFactory">
NotesPageFactory({
disabledTabs: ${disabled_tabs | n, dump_js_escaped_json},
notes: ${dump_js_escaped_json(notes, NoteJSONEncoder) | n},
notes: ${dump_js_escaped_json(notes, NoteJSONEncoder) | n, decode.utf8},
notesEndpoint: ${notes_endpoint | n, dump_js_escaped_json},
pageSize: ${page_size | n, dump_js_escaped_json},
debugMode: ${debug | n, dump_js_escaped_json}

2
lms/templates/help_modal.html
View File

@@ -8,7 +8,7 @@ from django.conf import settings
from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse
from openedx.core.djangolib.js_utils import js_escaped_string
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
from xmodule.tabs import CourseTabList
%>

4
lms/templates/index.html
View File

@@ -5,7 +5,7 @@
from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<main id="main" aria-label="Content" tabindex="-1">
@@ -15,7 +15,7 @@ from openedx.core.djangolib.markup import Text, HTML
<div class="title">
<div class="heading-group">
% if homepage_overlay_html:
${homepage_overlay_html|n}
${homepage_overlay_html | n, decode.utf8}
% else:
## Translators: 'Open edX' is a registered trademark, please keep this untranslated. See http://open.edx.org for more information.
<h1>${Text(_(u"Welcome to the Open edX{registered_trademark} platform!")).format(registered_trademark=HTML("<sup style='font-size: 65%'>&reg;</sup>"))}</h1>

2
lms/templates/provider/authorize.html
View File

@@ -6,7 +6,7 @@
from django.utils.translation import ugettext as _
from provider.templatetags.scope import scopes
from django.core.urlresolvers import reverse
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%inherit file="../main.html"/>

2
lms/templates/registration/password_reset_complete.html
View File

@@ -4,7 +4,7 @@
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%inherit file="../main.html"/>

2
lms/templates/registration/password_reset_confirm.html
View File

@@ -4,7 +4,7 @@
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%inherit file="../main.html"/>

2
lms/templates/static_templates/404.html
View File

@@ -2,7 +2,7 @@
<%namespace name='static' file='../static_content.html'/>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%inherit file="../main.html" />

2
lms/templates/static_templates/embargo.html
View File

@@ -1,7 +1,7 @@
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%inherit file="../main.html" />

2
lms/templates/static_templates/server-down.html
View File

@@ -1,7 +1,7 @@
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%inherit file="../main.html" />

2
lms/templates/static_templates/server-error.html
View File

@@ -2,7 +2,7 @@
<%namespace name='static' file='../static_content.html'/>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%inherit file="../main.html" />

2
lms/templates/static_templates/server-overloaded.html
View File

@@ -1,7 +1,7 @@
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%inherit file="../main.html" />

2
lms/templates/unsubscribe.html
View File

@@ -1,6 +1,6 @@
<%page expression_filter="h"/>
<%!
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
from django.conf import settings

2
lms/templates/verify_student/pay_and_verify.html
View File

@@ -3,7 +3,7 @@
import json
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
from lms.djangoapps.verify_student.views import PayAndVerifyView
%>
<%namespace name='static' file='../static_content.html'/>

2
openedx/core/djangolib/markup.py
View File

@@ -23,7 +23,7 @@ def HTML(html): # pylint: disable=invalid-name
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
${Text(_("Write & send {start}email{end}")).format(
start=HTML("<a href='mailto:{}'>").format(user.email),

4
openedx/core/djangolib/tests/test_markup.py
View File

@@ -10,7 +10,7 @@ import ddt
from django.utils.translation import ugettext as _, ungettext
from mako.template import Template
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
@attr('shard_2')
@@ -60,7 +60,7 @@ class FormatHtmlTest(unittest.TestCase):
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
${Text(_(u"A & {BC}")).format(BC=HTML("B & C"))}
""",

6
themes/edx.org/lms/templates/dashboard.html
View File

@@ -10,7 +10,7 @@ from microsite_configuration import microsite
from django.core.urlresolvers import reverse
import json
from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
<%
@@ -65,13 +65,13 @@ from openedx.core.djangolib.markup import Text, HTML
<div class="dashboard-notifications" tabindex="-1">
%if message:
<section class="dashboard-banner">
${message | n, unicode}
${message | n, decode.utf8}
</section>
%endif
%if enrollment_message:
<section class="dashboard-banner">
${enrollment_message | n, unicode}
${enrollment_message | n, decode.utf8}
</section>
%endif
</div>