Update usages to ace_common

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

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
 
 

lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html

-{% 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 @@
             </div>
 
             {% 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 %}
                 <img src="{{ ga_tracking_pixel_url }}" alt="" role="presentation" aria-hidden="true" style="display: block;"/>

lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/head.html

-{% extends 'schedules/edx_ace/common/base_head.html' %}
+{% extends 'ace_common/edx_ace/common/base_head.html' %}

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

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

openedx/core/djangoapps/ace_common/templatetags/ace.py

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

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)
 

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,

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
 

openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.html

-{% 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 @@
             </p>
 
             {% 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"%}
         </td>
     </tr>
 </table>

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

openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/head.html

-{% extends 'schedules/edx_ace/common/base_head.html' %}
+{% extends 'ace_common/edx_ace/common/base_head.html' %}

openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.html

-{% 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 @@
             </p>
 
             {% 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"%}
         </td>
     </tr>
 </table>

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

openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/head.html

-{% extends 'schedules/edx_ace/common/base_head.html' %}
+{% extends 'ace_common/edx_ace/common/base_head.html' %}

openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.html

-{% 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 @@
             </p>
 
             {% 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"%}
         </td>
     </tr>
 </table>

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

openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/head.html

-{% extends 'schedules/edx_ace/common/base_head.html' %}
+{% extends 'ace_common/edx_ace/common/base_head.html' %}

openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html

-{% extends 'schedules/edx_ace/common/base_body.html' %}
+{% extends 'ace_common/edx_ace/common/base_body.html' %}
 {% load i18n %}
 {% load static %}
 {% load ace %}