From f8b835f232b3945bd11162c39b8d006ae1aae6fd Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Fri, 13 Mar 2015 14:17:51 -0400 Subject: [PATCH] certificates: pruning default asset references --- ...0_certificatehtmlviewconfiguration_data.py | 63 ++++++++----------- .../certificates/tests/factories.py | 19 ++---- .../certificates/_assets-primary.html | 2 - 3 files changed, 31 insertions(+), 53 deletions(-) diff --git a/lms/djangoapps/certificates/migrations/0020_certificatehtmlviewconfiguration_data.py b/lms/djangoapps/certificates/migrations/0020_certificatehtmlviewconfiguration_data.py index abe3a14256..794e016e9a 100644 --- a/lms/djangoapps/certificates/migrations/0020_certificatehtmlviewconfiguration_data.py +++ b/lms/djangoapps/certificates/migrations/0020_certificatehtmlviewconfiguration_data.py @@ -12,42 +12,33 @@ class Migration(DataMigration): Bootstraps the HTML view template with some default configuration parameters """ json_config = """{ - "default": { - "accomplishment_class_append": "accomplishment--certificate--honorcode", - "certificate_verify_url_prefix": "https://verify-test.edx.org/cert/", - "certificate_verify_url_suffix": "/verify.html", - "company_about_url": "http://www.edx.org/about-us", - "company_courselist_url": "http://www.edx.org/course-list", - "company_careers_url": "http://www.edx.org/jobs", - "company_contact_url": "http://www.edx.org/contact-us", - "platform_name": "edX", - "company_privacy_url": "http://www.edx.org/edx-privacy-policy", - "company_tos_url": "http://www.edx.org/edx-terms-service", - "company_verified_certificate_url": "http://www.edx.org/verified-certificate", - "document_script_src_modernizr": "https://verify-test.edx.org/v2/static/js/vendor/modernizr-2.6.2.min.js", - "document_stylesheet_url_normalize": "https://verify-test.edx.org/v2/static/css/vendor/normalize.css", - "document_stylesheet_url_fontawesome": "https://verify-test.edx.org/v2/static/css/vendor/font-awesome.css", - "document_stylesheet_url_application": "https://verify-test.edx.org/v2/static/css/style-application.css", - "logo_src": "https://verify-test.edx.org/v2/static/images/logo-edx.svg", - "logo_url": "http://www.edx.org" - }, - "honor": { - "certificate_type": "Honor Code", - "document_body_class_append": "is-honorcode" - }, - "verified": { - "certificate_type": "Verified", - "document_body_class_append": "is-idverified" - }, - "xseries": { - "certificate_type": "XSeries", - "document_body_class_append": "is-xseries", - "document_script_src_modernizr": "https://verify-test.edx.org/xseries/static/js/vendor/modernizr-2.6.2.min.js", - "document_stylesheet_url_normalize": "https://verify-test.edx.org/xseries/static/css/vendor/normalize.css", - "document_stylesheet_url_fontawesome": "https://verify-test.edx.org/xseries/static/css/vendor/font-awesome.css", - "document_stylesheet_url_application": "https://verify-test.edx.org/xseries/static/css/style-application.css", - "logo_src": "https://verify-test.edx.org/xseries/static/images/logo-edx.svg" - } + { + "default": { + "accomplishment_class_append": "accomplishment--certificate", + "certificate_verify_url_prefix": "https://verify-test.edx.org/cert/", + "certificate_verify_url_suffix": "/verify.html", + "company_about_url": "http://www.edx.org/about-us", + "platform_name": "edX", + "company_privacy_url": "http://www.edx.org/edx-privacy-policy", + "company_tos_url": "http://www.edx.org/edx-terms-service", + "company_verified_certificate_url": "http://www.edx.org/verified-certificate", + "document_stylesheet_url_application": "/static/certificates/css/style-application.css", + "logo_src": "/static/certificates/images/logo-edx.svg", + "logo_url": "http://www.edx.org" + }, + "honor": { + "certificate_type": "Honor Code", + "document_body_class_append": "is-honorcode" + }, + "verified": { + "certificate_type": "Verified", + "document_body_class_append": "is-idverified" + }, + "xseries": { + "certificate_type": "XSeries", + "document_body_class_append": "is-xseries" + } +} }""" orm.CertificateHtmlViewConfiguration.objects.create( configuration=json_config, diff --git a/lms/djangoapps/certificates/tests/factories.py b/lms/djangoapps/certificates/tests/factories.py index 7280405030..c244ac9d04 100644 --- a/lms/djangoapps/certificates/tests/factories.py +++ b/lms/djangoapps/certificates/tests/factories.py @@ -24,22 +24,16 @@ class CertificateHtmlViewConfigurationFactory(DjangoModelFactory): enabled = True configuration = """{ "default": { - "accomplishment_class_append": "accomplishment--certificate--honorcode", + "accomplishment_class_append": "accomplishment--certificate", "certificate_verify_url_prefix": "https://verify-test.edx.org/cert/", "certificate_verify_url_suffix": "/verify.html", "company_about_url": "http://www.edx.org/about-us", - "company_courselist_url": "http://www.edx.org/course-list", - "company_careers_url": "http://www.edx.org/jobs", - "company_contact_url": "http://www.edx.org/contact-us", "platform_name": "edX", "company_privacy_url": "http://www.edx.org/edx-privacy-policy", "company_tos_url": "http://www.edx.org/edx-terms-service", "company_verified_certificate_url": "http://www.edx.org/verified-certificate", - "document_script_src_modernizr": "https://verify-test.edx.org/v2/static/js/vendor/modernizr-2.6.2.min.js", - "document_stylesheet_url_normalize": "https://verify-test.edx.org/v2/static/css/vendor/normalize.css", - "document_stylesheet_url_fontawesome": "https://verify-test.edx.org/v2/static/css/vendor/font-awesome.css", - "document_stylesheet_url_application": "https://verify-test.edx.org/v2/static/css/style-application.css", - "logo_src": "https://verify-test.edx.org/v2/static/images/logo-edx.svg", + "document_stylesheet_url_application": "/static/certificates/css/style-application.css", + "logo_src": "/static/certificates/images/logo-edx.svg", "logo_url": "http://www.edx.org" }, "honor": { @@ -52,11 +46,6 @@ class CertificateHtmlViewConfigurationFactory(DjangoModelFactory): }, "xseries": { "certificate_type": "XSeries", - "document_body_class_append": "is-xseries", - "document_script_src_modernizr": "https://verify-test.edx.org/xseries/static/js/vendor/modernizr-2.6.2.min.js", - "document_stylesheet_url_normalize": "https://verify-test.edx.org/xseries/static/css/vendor/normalize.css", - "document_stylesheet_url_fontawesome": "https://verify-test.edx.org/xseries/static/css/vendor/font-awesome.css", - "document_stylesheet_url_application": "https://verify-test.edx.org/xseries/static/css/style-application.css", - "logo_src": "https://verify-test.edx.org/xseries/static/images/logo-edx.svg" + "document_body_class_append": "is-xseries" } }""" diff --git a/lms/templates/certificates/_assets-primary.html b/lms/templates/certificates/_assets-primary.html index 69a5ae2a5b..a890b5531b 100644 --- a/lms/templates/certificates/_assets-primary.html +++ b/lms/templates/certificates/_assets-primary.html @@ -1,3 +1 @@ - -