diff --git a/lms/djangoapps/certificates/migrations/0020_certificatehtmlviewconfiguration_data.py b/lms/djangoapps/certificates/migrations/0020_certificatehtmlviewconfiguration_data.py
index ed0eac78d6..5ba8142ec3 100644
--- a/lms/djangoapps/certificates/migrations/0020_certificatehtmlviewconfiguration_data.py
+++ b/lms/djangoapps/certificates/migrations/0020_certificatehtmlviewconfiguration_data.py
@@ -23,15 +23,13 @@ class Migration(DataMigration):
"logo_src": "/static/certificates/images/logo.png",
"logo_url": "http://www.example.com"
},
- "base": {
- "certificate_type": "base",
+ "honor": {
+ "certificate_type": "Honor Code",
"certificate_title": "Certificate of Achievement",
- "document_body_class_append": "is-base"
},
- "distinguished": {
- "certificate_type": "distinguished",
- "certificate_title": "Distinguished Certificate of Achievement",
- "document_body_class_append": "is-distinguished"
+ "verified": {
+ "certificate_type": "Verified",
+ "certificate_title": "Verified Certificate of Achievement",
}
}
orm.CertificateHtmlViewConfiguration.objects.create(
diff --git a/lms/djangoapps/certificates/tests/factories.py b/lms/djangoapps/certificates/tests/factories.py
index 7a6a3ac6ba..b9107b3688 100644
--- a/lms/djangoapps/certificates/tests/factories.py
+++ b/lms/djangoapps/certificates/tests/factories.py
@@ -74,15 +74,15 @@ class CertificateHtmlViewConfigurationFactory(DjangoModelFactory):
},
"honor": {
"certificate_type": "Honor Code",
- "document_body_class_append": "is-honorcode"
+ "certificate_title": "Certificate of Achievement"
},
"verified": {
"certificate_type": "Verified",
- "document_body_class_append": "is-idverified"
+ "certificate_title": "Verified Certificate of Achievement"
},
"xseries": {
- "certificate_type": "XSeries",
- "document_body_class_append": "is-xseries"
+ "certificate_title": "XSeries Certificate of Achievement",
+ "certificate_type": "XSeries"
}
}"""
diff --git a/lms/djangoapps/certificates/tests/test_views.py b/lms/djangoapps/certificates/tests/test_views.py
index ea65a064f7..eccfb78e39 100644
--- a/lms/djangoapps/certificates/tests/test_views.py
+++ b/lms/djangoapps/certificates/tests/test_views.py
@@ -308,8 +308,7 @@ class MicrositeCertificatesViewsTests(ModuleStoreTestCase):
"company_about_title": "Microsite title"
},
"honor": {
- "certificate_type": "Honor Code",
- "document_body_class_append": "is-honorcode"
+ "certificate_type": "Honor Code"
}
}"""
@@ -343,8 +342,7 @@ class MicrositeCertificatesViewsTests(ModuleStoreTestCase):
"company_about_description": "This should not survive being overwritten by static content"
},
"honor": {
- "certificate_type": "Honor Code",
- "document_body_class_append": "is-honorcode"
+ "certificate_type": "Honor Code"
}
}"""
config = self._certificate_html_view_configuration(configuration_string=test_configuration_string)
@@ -377,7 +375,7 @@ class TrackShareRedirectTest(UrlResetMixin, ModuleStoreTestCase, EventTrackingTe
user=self.user, course_id=self.course.id, data={
'image': 'http://www.example.com/image.png',
'json': {'id': 'http://www.example.com/assertion.json'},
- 'issuer': 'http://www.example.com/issuer.json',
+ 'issuer': 'http://www.example.com/issuer.json'
},
)
@@ -402,7 +400,7 @@ class TrackShareRedirectTest(UrlResetMixin, ModuleStoreTestCase, EventTrackingTe
'assertion_image_url': 'http://www.example.com/image.png',
'user_id': self.user.id,
'issuer': 'http://www.example.com/issuer.json',
- 'enrollment_mode': 'honor',
+ 'enrollment_mode': 'honor'
},
},
self.get_event()
diff --git a/lms/djangoapps/certificates/tests/test_webview_views.py b/lms/djangoapps/certificates/tests/test_webview_views.py
index 2f7ad7b608..8e4e4d2577 100644
--- a/lms/djangoapps/certificates/tests/test_webview_views.py
+++ b/lms/djangoapps/certificates/tests/test_webview_views.py
@@ -98,7 +98,7 @@ class CertificatesViewsTests(ModuleStoreTestCase, EventTrackingTestCase):
'title': 'Signatory_Title ' + str(i),
'organization': 'Signatory_Organization ' + str(i),
'signature_image_path': '/static/certificates/images/demo-sig{}.png'.format(i),
- 'id': i,
+ 'id': i
} for i in xrange(signatory_count)
]
diff --git a/lms/static/certificates/images/bg-distinguished.png b/lms/static/certificates/images/bg-verified.png
similarity index 100%
rename from lms/static/certificates/images/bg-distinguished.png
rename to lms/static/certificates/images/bg-verified.png
diff --git a/lms/static/certificates/images/ico-base.png b/lms/static/certificates/images/ico-base.png
deleted file mode 100644
index 62e610b6e3..0000000000
Binary files a/lms/static/certificates/images/ico-base.png and /dev/null differ
diff --git a/lms/static/certificates/images/ico-base.svg b/lms/static/certificates/images/ico-base.svg
deleted file mode 100644
index de9303bf38..0000000000
--- a/lms/static/certificates/images/ico-base.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/lms/static/certificates/images/ico-distinguished.png b/lms/static/certificates/images/ico-distinguished.png
deleted file mode 100644
index 9563c7d1cc..0000000000
Binary files a/lms/static/certificates/images/ico-distinguished.png and /dev/null differ
diff --git a/lms/static/certificates/images/ico-distinguished.svg b/lms/static/certificates/images/ico-distinguished.svg
deleted file mode 100644
index 4bd1c6da72..0000000000
--- a/lms/static/certificates/images/ico-distinguished.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/lms/static/certificates/images/logo-edx.png b/lms/static/certificates/images/logo-edx.png
deleted file mode 100644
index 52c0c58d02..0000000000
Binary files a/lms/static/certificates/images/logo-edx.png and /dev/null differ
diff --git a/lms/static/certificates/images/logo-edx.svg b/lms/static/certificates/images/logo-edx.svg
deleted file mode 100644
index a167235d1f..0000000000
--- a/lms/static/certificates/images/logo-edx.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/lms/static/certificates/sass/_components.scss b/lms/static/certificates/sass/_components.scss
index 3653fa4e23..60aa626cf2 100644
--- a/lms/static/certificates/sass/_components.scss
+++ b/lms/static/certificates/sass/_components.scss
@@ -456,8 +456,7 @@
}
// certificate - base + honor
-.layout-accomplishment.certificate-honor,
-.layout-accomplishment.certificate-base {
+.layout-accomplishment.certificate-honor {
.introduction {
margin-bottom: 0;
@@ -482,8 +481,7 @@
}
// certificate - distinguished + verified
-.layout-accomplishment.certificate-verified,
-.layout-accomplishment.certificate-distinguished {
+.layout-accomplishment.certificate-verified {
.introduction {
margin-bottom: spacing-vertical(base);
@@ -494,7 +492,7 @@
}
.accomplishment-rendering {
- background: palette(grayscale, white-t) url('#{$static-path}/images/bg-distinguished.png') center no-repeat;
+ background: palette(grayscale, white-t) url('../images/bg-verified.png') center no-repeat;
background-size: 65%;
.deco-corner-tl {
diff --git a/lms/templates/certificates/accomplishment-base.html b/lms/templates/certificates/accomplishment-base.html
index 5c3c9f4741..1414fce639 100644
--- a/lms/templates/certificates/accomplishment-base.html
+++ b/lms/templates/certificates/accomplishment-base.html
@@ -5,7 +5,6 @@
# set doc language direction
from django.utils.translation import get_language_bidi
dir_rtl = 'rtl' if get_language_bidi() else 'ltr'
-document_body_class = document_body_class_append if document_body_class_append else ''
course_mode_class = course_mode if course_mode else ''
%>
@@ -21,7 +20,7 @@ course_mode_class = course_mode if course_mode else ''
<%static:css group='style-certificates'/>
-
+