Merge pull request #8788 from edx/mattdrayer/eliminate-base-distinguished

mattdrayer/eliminate-base-distinguished: Switch back to honor/verified

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(

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

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

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

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 {

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'/>
 </head>
 
-<body class="layout-accomplishment view-valid-accomplishment ${dir_rtl} ${document_body_class} certificate certificate-${course_mode_class}" data-view="valid-accomplishment">
+<body class="layout-accomplishment view-valid-accomplishment ${dir_rtl} certificate certificate-${course_mode_class}" data-view="valid-accomplishment">
 
     <div class="wrapper-view" dir="${dir_rtl}">