Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
54e5e3d3
Commit
54e5e3d3
authored
Apr 10, 2013
by
John Jarvis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding the EDX_MKTG feature flag and links back to the marketing site
parent
7102c23d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
6 deletions
+15
-6
lms/djangoapps/branding/views.py
+2
-0
lms/envs/aws.py
+1
-0
lms/templates/navigation.html
+12
-6
No files found.
lms/djangoapps/branding/views.py
View file @
54e5e3d3
...
...
@@ -22,6 +22,8 @@ def index(request):
if
settings
.
MITX_FEATURES
.
get
(
'AUTH_USE_MIT_CERTIFICATES'
):
from
external_auth.views
import
ssl_login
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'
))
if
university
is
None
:
...
...
lms/envs/aws.py
View file @
54e5e3d3
...
...
@@ -80,6 +80,7 @@ META_UNIVERSITIES = ENV_TOKENS.get('META_UNIVERSITIES', {})
COMMENTS_SERVICE_URL
=
ENV_TOKENS
.
get
(
"COMMENTS_SERVICE_URL"
,
''
)
COMMENTS_SERVICE_KEY
=
ENV_TOKENS
.
get
(
"COMMENTS_SERVICE_KEY"
,
''
)
CERT_QUEUE
=
ENV_TOKENS
.
get
(
"CERT_QUEUE"
,
'test-pull'
)
MKTG_URLS
=
ENV_TOKENS
.
get
(
'MKTG_URLS'
,
{})
############################## SECURE AUTH ITEMS ###############
# Secret things: passwords, access keys, etc.
...
...
lms/templates/navigation.html
View file @
54e5e3d3
...
...
@@ -45,12 +45,16 @@ site_status_msg = get_site_status_msg(course_id)
% endif
% if user.is_authenticated():
<ol
class=
"left nav-global authenticated"
>
<li
class=
"nav-global-01"
>
% 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>
</ol>
<ol
class=
"user"
>
<li
class=
"primary"
>
<a
href=
"${reverse('dashboard')}"
class=
"user-link"
>
...
...
@@ -69,18 +73,20 @@ site_status_msg = get_site_status_msg(course_id)
% else:
<ol
class=
"left nav-global"
>
% if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
<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
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
class=
"nav-global-03"
>
<a
href=
"
#
"
>
Schools
</a>
<a
href=
"
${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('SCHOOLS')}
"
>
Schools
</a>
</li>
% endif
% if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']:
<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>
% endif
</ol>
...
...
@@ -88,7 +94,7 @@ site_status_msg = get_site_status_msg(course_id)
<ol
class=
"right nav-courseware"
>
<li
class=
"nav-courseware-01"
>
% 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
</li>
</ol>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment