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

Update usages to ace_common

Browse Source
This commit is contained in:
Nimisha Asthagiri
2017-12-04 18:11:40 -05:00
parent c6ee8eb68d
commit 7ef443f7ce
24 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openedx/core/djangoapps/ace_common/templatetags/ace.py
View File

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

6
openedx/core/djangoapps/ace_common/tests/test_templatetags.py
View File

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

4
openedx/core/djangoapps/ace_common/tests/test_tracking.py
View File

@@ -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,

2
openedx/core/djangoapps/schedules/resolvers.py
View File

@@ -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

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

@@ -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 @@
</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>

2
openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.txt
View File

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

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

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

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

@@ -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 @@
</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>

2
openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.txt
View File

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

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

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

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

@@ -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 @@
</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>

2
openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.txt
View File

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

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

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

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

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

2
openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/head.html
View File

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