From 6761be0b29facb1da7d37a15d01cbdb3dd8645c1 Mon Sep 17 00:00:00 2001 From: caseylitton Date: Thu, 30 Jun 2016 13:53:05 -0700 Subject: [PATCH 1/2] Add name and email to Authors --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index b3e49f38bb..df0628bc2c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -274,3 +274,4 @@ Sofiya Semenova Alisan Tang Kevin Kim Albert St. Aubin Jr. +Casey Litton From a6e028c6b4aec96d721b5c775fee8b2b1a33b547 Mon Sep 17 00:00:00 2001 From: caseylitton Date: Fri, 24 Jun 2016 12:05:50 -0700 Subject: [PATCH 2/2] Add flag allow toggle logistration footer --- lms/djangoapps/student_account/views.py | 5 ++++- lms/envs/common.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lms/djangoapps/student_account/views.py b/lms/djangoapps/student_account/views.py index 758e5bbc77..959f51becb 100644 --- a/lms/djangoapps/student_account/views.py +++ b/lms/djangoapps/student_account/views.py @@ -122,7 +122,10 @@ def login_and_registration_form(request, initial_mode="login"): 'responsive': True, 'allow_iframing': True, 'disable_courseware_js': True, - 'disable_footer': True, + 'disable_footer': not get_themed_value( + 'ENABLE_COMBINED_LOGIN_REGISTRATION_FOOTER', + settings.FEATURES['ENABLE_COMBINED_LOGIN_REGISTRATION_FOOTER'] + ), } return render_to_response('student_account/login_and_register.html', context) diff --git a/lms/envs/common.py b/lms/envs/common.py index 378c43a7a9..662f27154a 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -262,6 +262,7 @@ FEATURES = { # Enable the combined login/registration form 'ENABLE_COMBINED_LOGIN_REGISTRATION': False, + 'ENABLE_COMBINED_LOGIN_REGISTRATION_FOOTER': False, # Enable organizational email opt-in 'ENABLE_MKTG_EMAIL_OPT_IN': False,