From 7ef443f7ce1a192b6d2f09493af5a368b71d81b9 Mon Sep 17 00:00:00 2001 From: Nimisha Asthagiri Date: Mon, 4 Dec 2017 18:11:40 -0500 Subject: [PATCH] Update usages to ace_common --- cms/envs/common.py | 1 + lms/djangoapps/discussion/tasks.py | 2 +- .../discussion/edx_ace/responsenotification/email/body.html | 4 ++-- .../discussion/edx_ace/responsenotification/email/head.html | 2 +- lms/djangoapps/discussion/tests/test_tasks.py | 2 +- lms/envs/common.py | 1 + openedx/core/djangoapps/ace_common/templatetags/ace.py | 4 ++-- .../core/djangoapps/ace_common/tests/test_templatetags.py | 6 +++--- openedx/core/djangoapps/ace_common/tests/test_tracking.py | 4 ++-- openedx/core/djangoapps/schedules/resolvers.py | 2 +- .../schedules/edx_ace/courseupdate/email/body.html | 6 +++--- .../templates/schedules/edx_ace/courseupdate/email/body.txt | 2 +- .../schedules/edx_ace/courseupdate/email/head.html | 2 +- .../schedules/edx_ace/recurringnudge_day10/email/body.html | 6 +++--- .../schedules/edx_ace/recurringnudge_day10/email/body.txt | 2 +- .../schedules/edx_ace/recurringnudge_day10/email/head.html | 2 +- .../schedules/edx_ace/recurringnudge_day3/email/body.html | 6 +++--- .../schedules/edx_ace/recurringnudge_day3/email/body.txt | 2 +- .../schedules/edx_ace/recurringnudge_day3/email/head.html | 2 +- .../schedules/edx_ace/upgradereminder/email/body.html | 2 +- .../schedules/edx_ace/upgradereminder/email/head.html | 2 +- .../{schedules => ace_common}/edx_ace/common/base_body.html | 0 .../edx_ace/common/return_to_course_cta.html | 0 .../schedules/edx_ace/recurringnudge_day3/email/body.txt | 2 +- 24 files changed, 33 insertions(+), 31 deletions(-) rename themes/red-theme/lms/templates/{schedules => ace_common}/edx_ace/common/base_body.html (100%) rename themes/red-theme/lms/templates/{schedules => ace_common}/edx_ace/common/return_to_course_cta.html (100%) diff --git a/cms/envs/common.py b/cms/envs/common.py index 24fa7cd7b2..b859640f3e 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -1118,6 +1118,7 @@ INSTALLED_APPS = [ 'openedx.core.djangoapps.waffle_utils', # Dynamic schedules + 'openedx.core.djangoapps.ace_common.apps.AceCommonConfig', 'openedx.core.djangoapps.schedules.apps.SchedulesConfig', # DRF filters diff --git a/lms/djangoapps/discussion/tasks.py b/lms/djangoapps/discussion/tasks.py index d725819019..ad268ec3db 100644 --- a/lms/djangoapps/discussion/tasks.py +++ b/lms/djangoapps/discussion/tasks.py @@ -20,7 +20,7 @@ from lms.djangoapps.django_comment_client.utils import permalink import lms.lib.comment_client as cc from openedx.core.djangoapps.content.course_overviews.models import CourseOverview -from openedx.core.djangoapps.schedules.template_context import get_base_template_context +from openedx.core.djangoapps.ace_common.template_context import get_base_template_context from openedx.core.lib.celery.task_utils import emulate_http_request diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html index 5aedd82535..5bdcdb9074 100644 --- a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html +++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html @@ -1,4 +1,4 @@ -{% extends 'schedules/edx_ace/common/base_body.html' %} +{% extends 'ace_common/edx_ace/common/base_body.html' %} {% load i18n %} {% load static %} @@ -19,7 +19,7 @@ {% trans "View discussion" as course_cta_text %} - {% include "schedules/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=post_link%} + {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=post_link%} {% block google_analytics_pixel %} diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/head.html b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/head.html index 588357ec65..366ada7ad9 100644 --- a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/head.html +++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/head.html @@ -1 +1 @@ -{% extends 'schedules/edx_ace/common/base_head.html' %} +{% extends 'ace_common/edx_ace/common/base_head.html' %} diff --git a/lms/djangoapps/discussion/tests/test_tasks.py b/lms/djangoapps/discussion/tests/test_tasks.py index 5573ca5a0c..985ff3f5c9 100644 --- a/lms/djangoapps/discussion/tests/test_tasks.py +++ b/lms/djangoapps/discussion/tests/test_tasks.py @@ -21,7 +21,7 @@ from lms.djangoapps.discussion.config.waffle import waffle, FORUM_RESPONSE_NOTIF from lms.djangoapps.discussion.signals.handlers import ENABLE_FORUM_NOTIFICATIONS_FOR_SITE_KEY from lms.djangoapps.discussion.tasks import _should_send_message from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory -from openedx.core.djangoapps.schedules.template_context import get_base_template_context +from openedx.core.djangoapps.ace_common.template_context import get_base_template_context from openedx.core.djangoapps.site_configuration.tests.factories import SiteConfigurationFactory from openedx.core.djangoapps.theming.middleware import CurrentSiteThemeMiddleware from openedx.core.djangoapps.waffle_utils.testutils import override_waffle_flag diff --git a/lms/envs/common.py b/lms/envs/common.py index 4c6da20741..de666c6b47 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -2331,6 +2331,7 @@ INSTALLED_APPS = [ 'database_fixups', 'openedx.core.djangoapps.waffle_utils', + 'openedx.core.djangoapps.ace_common.apps.AceCommonConfig', 'openedx.core.djangoapps.schedules.apps.SchedulesConfig', # Course Goals diff --git a/openedx/core/djangoapps/ace_common/templatetags/ace.py b/openedx/core/djangoapps/ace_common/templatetags/ace.py index d2beffa219..c9b6975ae4 100644 --- a/openedx/core/djangoapps/ace_common/templatetags/ace.py +++ b/openedx/core/djangoapps/ace_common/templatetags/ace.py @@ -1,10 +1,10 @@ -from urlparse import urlparse, parse_qs +from urlparse import urlparse from crum import get_current_request from django import template from django.utils.safestring import mark_safe -from openedx.core.djangoapps.schedules.tracking import CampaignTrackingInfo, GoogleAnalyticsTrackingPixel +from openedx.core.djangoapps.ace_common.tracking import CampaignTrackingInfo, GoogleAnalyticsTrackingPixel from openedx.core.djangolib.markup import HTML register = template.Library() diff --git a/openedx/core/djangoapps/ace_common/tests/test_templatetags.py b/openedx/core/djangoapps/ace_common/tests/test_templatetags.py index f223fc76c6..a517068cd8 100644 --- a/openedx/core/djangoapps/ace_common/tests/test_templatetags.py +++ b/openedx/core/djangoapps/ace_common/tests/test_templatetags.py @@ -6,13 +6,13 @@ from django.test import override_settings from mock import patch from edx_ace import Message, Recipient -from openedx.core.djangoapps.schedules.templatetags.ace import ( +from openedx.core.djangoapps.ace_common.templatetags.ace import ( ensure_url_is_absolute, with_link_tracking, google_analytics_tracking_pixel, _get_google_analytics_tracking_url ) -from openedx.core.djangoapps.schedules.tests.mixins import QueryStringAssertionMixin +from openedx.core.djangoapps.ace_common.tests.mixins import QueryStringAssertionMixin from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory from openedx.core.djangolib.testing.utils import CacheIsolationTestCase, skip_unless_lms from student.tests.factories import UserFactory @@ -41,7 +41,7 @@ class TestAbsoluteUrl(CacheIsolationTestCase): class EmailTemplateTagMixin(object): def setUp(self): - patcher = patch('openedx.core.djangoapps.schedules.templatetags.ace.get_current_request') + patcher = patch('openedx.core.djangoapps.ace_common.templatetags.ace.get_current_request') self.mock_get_current_request = patcher.start() self.addCleanup(patcher.stop) diff --git a/openedx/core/djangoapps/ace_common/tests/test_tracking.py b/openedx/core/djangoapps/ace_common/tests/test_tracking.py index 8acae97b49..e734f9f739 100644 --- a/openedx/core/djangoapps/ace_common/tests/test_tracking.py +++ b/openedx/core/djangoapps/ace_common/tests/test_tracking.py @@ -2,8 +2,8 @@ from unittest import TestCase from django.test import override_settings -from openedx.core.djangoapps.schedules.tests.mixins import QueryStringAssertionMixin -from openedx.core.djangoapps.schedules.tracking import ( +from openedx.core.djangoapps.ace_common.tests.mixins import QueryStringAssertionMixin +from openedx.core.djangoapps.ace_common.tracking import ( CampaignTrackingInfo, DEFAULT_CAMPAIGN_SOURCE, DEFAULT_CAMPAIGN_MEDIUM, diff --git a/openedx/core/djangoapps/schedules/resolvers.py b/openedx/core/djangoapps/schedules/resolvers.py index b2ace23c44..4edf290d27 100644 --- a/openedx/core/djangoapps/schedules/resolvers.py +++ b/openedx/core/djangoapps/schedules/resolvers.py @@ -19,7 +19,7 @@ from openedx.core.djangoapps.schedules.content_highlights import get_week_highli from openedx.core.djangoapps.schedules.exceptions import CourseUpdateDoesNotExist from openedx.core.djangoapps.schedules.models import Schedule, ScheduleExperience from openedx.core.djangoapps.schedules.utils import PrefixedDebugLoggerMixin -from openedx.core.djangoapps.schedules.template_context import get_base_template_context +from openedx.core.djangoapps.ace_common.template_context import get_base_template_context from openedx.core.djangoapps.site_configuration.models import SiteConfiguration from openedx.features.course_experience import course_home_url_name diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.html index 4be7dcd00e..3dd1a3b3a9 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.html +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.html @@ -1,4 +1,4 @@ -{% extends 'schedules/edx_ace/common/base_body.html' %} +{% extends 'ace_common/edx_ace/common/base_body.html' %} {% load i18n %} {% block preview_text %} @@ -31,9 +31,9 @@

{% trans "Resume your course now" as course_cta_text %} - {% include "schedules/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text%} + {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text%} - {% include "schedules/edx_ace/common/upsell_cta.html"%} + {% include "ace_common/edx_ace/common/upsell_cta.html"%} diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.txt b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.txt index eea8f8c70e..33b44c994e 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.txt +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.txt @@ -14,5 +14,5 @@ We want to let you know what you can look forward to in week {{ week_num }}: With self-paced courses, you learn on your own schedule. We encourage you to spend time with the course each week. Your focused attention will pay off in the end! {% endblocktrans %} -{% include "schedules/edx_ace/common/upsell_cta.txt"%} +{% include "ace_common/edx_ace/common/upsell_cta.txt"%} {% endautoescape %} diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/head.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/head.html index 588357ec65..366ada7ad9 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/head.html +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/head.html @@ -1 +1 @@ -{% extends 'schedules/edx_ace/common/base_head.html' %} +{% extends 'ace_common/edx_ace/common/base_head.html' %} diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.html index a50b8e11f8..b0d186bc2c 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.html +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.html @@ -1,4 +1,4 @@ -{% extends 'schedules/edx_ace/common/base_body.html' %} +{% extends 'ace_common/edx_ace/common/base_body.html' %} {% load i18n %} {% block preview_text %} @@ -36,9 +36,9 @@

{% trans "Keep learning" as course_cta_text %} - {% include "schedules/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text%} + {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text%} - {% include "schedules/edx_ace/common/upsell_cta.html"%} + {% include "ace_common/edx_ace/common/upsell_cta.html"%} diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.txt b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.txt index 8760535e3f..8a58cb909e 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.txt +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.txt @@ -14,5 +14,5 @@ {% endblocktrans %} {% trans "Keep learning" %} <{% with_link_tracking course_url %}> {% endif %} -{% include "schedules/edx_ace/common/upsell_cta.txt"%} +{% include "ace_common/edx_ace/common/upsell_cta.txt"%} {% endautoescape %} diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/head.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/head.html index 588357ec65..366ada7ad9 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/head.html +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/head.html @@ -1 +1 @@ -{% extends 'schedules/edx_ace/common/base_head.html' %} +{% extends 'ace_common/edx_ace/common/base_head.html' %} diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.html index d748594fc7..c47c2e7305 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.html +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.html @@ -1,4 +1,4 @@ -{% extends 'schedules/edx_ace/common/base_body.html' %} +{% extends 'ace_common/edx_ace/common/base_body.html' %} {% load i18n %} {% block preview_text %} @@ -36,9 +36,9 @@

{% trans "Start learning now" as course_cta_text %} - {% include "schedules/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text%} + {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text%} - {% include "schedules/edx_ace/common/upsell_cta.html"%} + {% include "ace_common/edx_ace/common/upsell_cta.html"%} diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.txt b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.txt index 1931edefec..fdf8f8be47 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.txt +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.txt @@ -16,5 +16,5 @@ {% trans "Start learning now" %} <{% with_link_tracking course_url %}> {% endif %} -{% include "schedules/edx_ace/common/upsell_cta.txt"%} +{% include "ace_common/edx_ace/common/upsell_cta.txt"%} {% endautoescape %} diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/head.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/head.html index 588357ec65..366ada7ad9 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/head.html +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/head.html @@ -1 +1 @@ -{% extends 'schedules/edx_ace/common/base_head.html' %} +{% extends 'ace_common/edx_ace/common/base_head.html' %} diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html index 5c1af75a7a..2b42a50de1 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html @@ -1,4 +1,4 @@ -{% extends 'schedules/edx_ace/common/base_body.html' %} +{% extends 'ace_common/edx_ace/common/base_body.html' %} {% load i18n %} {% load static %} {% load ace %} diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/head.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/head.html index 588357ec65..366ada7ad9 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/head.html +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/head.html @@ -1 +1 @@ -{% extends 'schedules/edx_ace/common/base_head.html' %} +{% extends 'ace_common/edx_ace/common/base_head.html' %} diff --git a/themes/red-theme/lms/templates/schedules/edx_ace/common/base_body.html b/themes/red-theme/lms/templates/ace_common/edx_ace/common/base_body.html similarity index 100% rename from themes/red-theme/lms/templates/schedules/edx_ace/common/base_body.html rename to themes/red-theme/lms/templates/ace_common/edx_ace/common/base_body.html diff --git a/themes/red-theme/lms/templates/schedules/edx_ace/common/return_to_course_cta.html b/themes/red-theme/lms/templates/ace_common/edx_ace/common/return_to_course_cta.html similarity index 100% rename from themes/red-theme/lms/templates/schedules/edx_ace/common/return_to_course_cta.html rename to themes/red-theme/lms/templates/ace_common/edx_ace/common/return_to_course_cta.html diff --git a/themes/red-theme/lms/templates/schedules/edx_ace/recurringnudge_day3/email/body.txt b/themes/red-theme/lms/templates/schedules/edx_ace/recurringnudge_day3/email/body.txt index 19b5365f08..3354bbdaae 100644 --- a/themes/red-theme/lms/templates/schedules/edx_ace/recurringnudge_day3/email/body.txt +++ b/themes/red-theme/lms/templates/schedules/edx_ace/recurringnudge_day3/email/body.txt @@ -17,4 +17,4 @@ This is the RED theme! {% trans "Start learning now" %} <{% with_link_tracking course_url %}> {% endif %} -{% include "schedules/edx_ace/common/upsell_cta.txt"%} +{% include "ace_common/edx_ace/common/upsell_cta.txt"%}