Commit 54e5e3d3 by John Jarvis

Adding the EDX_MKTG feature flag and links back to the marketing site

parent 7102c23d
...@@ -22,6 +22,8 @@ def index(request): ...@@ -22,6 +22,8 @@ def index(request):
if settings.MITX_FEATURES.get('AUTH_USE_MIT_CERTIFICATES'): if settings.MITX_FEATURES.get('AUTH_USE_MIT_CERTIFICATES'):
from external_auth.views import ssl_login from external_auth.views import ssl_login
return ssl_login(request) return ssl_login(request)
if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
return redirect(settings.MKTG_URLS.get('ROOT'))
university = branding.get_university(request.META.get('HTTP_HOST')) university = branding.get_university(request.META.get('HTTP_HOST'))
if university is None: if university is None:
......
...@@ -80,6 +80,7 @@ META_UNIVERSITIES = ENV_TOKENS.get('META_UNIVERSITIES', {}) ...@@ -80,6 +80,7 @@ META_UNIVERSITIES = ENV_TOKENS.get('META_UNIVERSITIES', {})
COMMENTS_SERVICE_URL = ENV_TOKENS.get("COMMENTS_SERVICE_URL", '') COMMENTS_SERVICE_URL = ENV_TOKENS.get("COMMENTS_SERVICE_URL", '')
COMMENTS_SERVICE_KEY = ENV_TOKENS.get("COMMENTS_SERVICE_KEY", '') COMMENTS_SERVICE_KEY = ENV_TOKENS.get("COMMENTS_SERVICE_KEY", '')
CERT_QUEUE = ENV_TOKENS.get("CERT_QUEUE", 'test-pull') CERT_QUEUE = ENV_TOKENS.get("CERT_QUEUE", 'test-pull')
MKTG_URLS = ENV_TOKENS.get('MKTG_URLS', {})
############################## SECURE AUTH ITEMS ############### ############################## SECURE AUTH ITEMS ###############
# Secret things: passwords, access keys, etc. # Secret things: passwords, access keys, etc.
......
...@@ -45,12 +45,16 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -45,12 +45,16 @@ site_status_msg = get_site_status_msg(course_id)
% endif % endif
% if user.is_authenticated(): % if user.is_authenticated():
<ol class="left nav-global authenticated"> <ol class="left nav-global authenticated">
<li class="nav-global-01"> <li class="nav-global-01">
<a href="${reverse('courses')}">Find Courses</a> % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
<a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('COURSES')}">Find Courses</a>
% else:
<a href="${reverse('courses')}">Find Courses</a>
% endif
</li> </li>
</ol> </ol>
<ol class="user"> <ol class="user">
<li class="primary"> <li class="primary">
<a href="${reverse('dashboard')}" class="user-link"> <a href="${reverse('dashboard')}" class="user-link">
...@@ -69,18 +73,20 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -69,18 +73,20 @@ site_status_msg = get_site_status_msg(course_id)
% else: % else:
<ol class="left nav-global"> <ol class="left nav-global">
% if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
<li class="nav-global-01"> <li class="nav-global-01">
<a href="#">How it Works</a> <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('HOW_IT_WORKS')}">How it Works</a>
</li> </li>
<li class="nav-global-02"> <li class="nav-global-02">
<a href="${reverse('courses')}">Courses</a> <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('COURSES')}">Courses</a>
</li> </li>
<li class="nav-global-03"> <li class="nav-global-03">
<a href="#">Schools</a> <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('SCHOOLS')}">Schools</a>
</li> </li>
% endif
% if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']: % if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']:
<li class="nav-global-04"> <li class="nav-global-04">
<a class="cta cta-register" href="#">Register Now</a> <a class="cta cta-register" href="/register">Register Now</a>
</li> </li>
% endif % endif
</ol> </ol>
...@@ -88,7 +94,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -88,7 +94,7 @@ site_status_msg = get_site_status_msg(course_id)
<ol class="right nav-courseware"> <ol class="right nav-courseware">
<li class="nav-courseware-01"> <li class="nav-courseware-01">
% if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']: % if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']:
<a class="cta cta-login" href="#">Log in</a> <a class="cta cta-login" href="/login">Log in</a>
% endif % endif
</li> </li>
</ol> </ol>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment