Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tahoe Tutor #230

Draft
wants to merge 2 commits into
base: juniper/main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import HTML, Text
from course_modes.models import CourseMode
from util.course import should_display_grade
from common.djangoapps.util.course import should_display_grade
%>
<%namespace name='static' file='../static_content.html'/>

Expand Down
4 changes: 2 additions & 2 deletions lms/templates/dashboard/_dashboard_course_listing.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string
from openedx.core.djangolib.markup import HTML, Text
from openedx.features.course_experience import course_home_url_name
from student.helpers import (
from common.djangoapps.student.helpers import (
VERIFY_STATUS_NEED_TO_VERIFY,
VERIFY_STATUS_SUBMITTED,
VERIFY_STATUS_RESUBMITTED,
Expand All @@ -21,7 +21,7 @@
VERIFY_STATUS_NEED_TO_REVERIFY,
DISABLE_UNENROLL_CERT_STATES,
)
from util.course import get_link_for_about_page, get_encoded_course_sharing_utm_params
from common.djangoapps.util.course import get_link_for_about_page, get_encoded_course_sharing_utm_params
%>

<%
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from openedx.core.djangolib.js_utils import dump_js_escaped_json
from openedx.core.djangolib.markup import HTML, Text
from openedx.features.course_experience import course_home_url_name
from student.helpers import (
from common.djangoapps.student.helpers import (
VERIFY_STATUS_NEED_TO_VERIFY,
VERIFY_STATUS_SUBMITTED,
VERIFY_STATUS_RESUBMITTED,
Expand All @@ -21,7 +21,7 @@
VERIFY_STATUS_NEED_TO_REVERIFY,
DISABLE_UNENROLL_CERT_STATES,
)
from util.course import get_link_for_about_page, get_encoded_course_sharing_utm_params
from common.djangoapps.util.course import get_link_for_about_page, get_encoded_course_sharing_utm_params
%>

<%
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<%!
from django.utils.translation import ugettext as _
from django.urls import reverse
from student.models import CourseEnrollment
from entitlements.models import CourseEntitlement
from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.entitlements.models import CourseEntitlement
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
%>

Expand Down
2 changes: 1 addition & 1 deletion lms/templates/footer-extra.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%! from django.contrib.staticfiles.templatetags.staticfiles import static %>
<%! from django.templatetags.static import static %>
## mako

<!-- Include jQuery -->
Expand Down
2 changes: 1 addition & 1 deletion lms/templates/head-extra.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<%namespace name='static' file='/static_content.html'/>
<%namespace file='/theme-variables.html' import="get_global_settings, get_brand_favicon" />
<%! from openedx.core.djangoapps.site_configuration.helpers import get_current_site_configuration, get_value %>
<%! from django.contrib.staticfiles.templatetags.staticfiles import static %>
<%! from django.templatetags.static import static %>
<%! from openedx.core.lib.courses import course_image_url %>
<% style_overrides_file = get_value('css_overrides_file') %>

Expand Down
2 changes: 1 addition & 1 deletion lms/templates/header/brand.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers

# App that handles subdomain specific branding
from branding import api as branding_api
from lms.djangoapps.branding import api as branding_api
%>

<h1 class="hd logo-header navbar-brand">
Expand Down
2 changes: 1 addition & 1 deletion lms/templates/header/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from openedx.core.djangolib.markup import HTML, Text

# App that handles subdomain specific branding
from branding import api as branding_api
from lms.djangoapps.branding import api as branding_api
from openedx.core.djangoapps.lang_pref.api import header_language_selector_is_enabled, released_languages
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers

Expand Down
1 change: 0 additions & 1 deletion lms/templates/header/navbar-logo-header.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from lms.djangoapps.ccx.overrides import get_current_ccx

# App that handles subdomain specific branding
from branding import api as branding_api
%>
<%namespace file='/theme-variables.html' import="get_global_settings, get_brand_logos" />

Expand Down
3 changes: 1 addition & 2 deletions lms/templates/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<% online_help_token = self.online_help_token() if hasattr(self, 'online_help_token') else None %>
<%!
import six
from branding import api as branding_api
from django.urls import reverse
from django.utils.http import urlquote_plus
from django.utils.translation import ugettext as _
Expand All @@ -24,7 +23,7 @@
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string
from openedx.core.release import RELEASE_LINE
from pipeline_mako import render_require_js_path_overrides
from common.djangoapps.pipeline_mako import render_require_js_path_overrides

%>
<!DOCTYPE html>
Expand Down
2 changes: 1 addition & 1 deletion lms/templates/theme-variables.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## mako
<%! from openedx.core.djangoapps.site_configuration.helpers import get_current_site_configuration, get_value %>
<%! from openedx.core.djangoapps.site_configuration.models import SiteConfiguration %>
<%! from django.contrib.staticfiles.templatetags.staticfiles import static %>
<%! from django.templatetags.static import static %>
<%! from django.utils.translation import ugettext as _ %>
<%! from datetime import datetime %>

Expand Down