Commit b32f2bc1 by David Baumgold

MITX_ROOT_URL => EDX_ROOT_URL

parent 1a585a88
...@@ -99,10 +99,10 @@ for namespace, template_dirs in lms.envs.common.MAKO_TEMPLATES.iteritems(): ...@@ -99,10 +99,10 @@ for namespace, template_dirs in lms.envs.common.MAKO_TEMPLATES.iteritems():
TEMPLATE_DIRS = MAKO_TEMPLATES['main'] TEMPLATE_DIRS = MAKO_TEMPLATES['main']
MITX_ROOT_URL = '' EDX_ROOT_URL = ''
LOGIN_REDIRECT_URL = MITX_ROOT_URL + '/signin' LOGIN_REDIRECT_URL = EDX_ROOT_URL + '/signin'
LOGIN_URL = MITX_ROOT_URL + '/signin' LOGIN_URL = EDX_ROOT_URL + '/signin'
TEMPLATE_CONTEXT_PROCESSORS = ( TEMPLATE_CONTEXT_PROCESSORS = (
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</title> </title>
<meta name="viewport" content="width=device-width,initial-scale=1"> <meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="path_prefix" content="${MITX_ROOT_URL}"> <meta name="path_prefix" content="${EDX_ROOT_URL}">
<%static:css group='style-vendor'/> <%static:css group='style-vendor'/>
<%static:css group='style-app'/> <%static:css group='style-app'/>
......
...@@ -77,7 +77,7 @@ def render_to_string(template_name, dictionary, context=None, namespace='main'): ...@@ -77,7 +77,7 @@ def render_to_string(template_name, dictionary, context=None, namespace='main'):
# collapse context_instance to a single dictionary for mako # collapse context_instance to a single dictionary for mako
context_dictionary = {} context_dictionary = {}
context_instance['settings'] = settings context_instance['settings'] = settings
context_instance['MITX_ROOT_URL'] = settings.MITX_ROOT_URL context_instance['EDX_ROOT_URL'] = settings.EDX_ROOT_URL
context_instance['marketing_link'] = marketing_link context_instance['marketing_link'] = marketing_link
# In various testing contexts, there might not be a current request context. # In various testing contexts, there might not be a current request context.
......
...@@ -54,7 +54,7 @@ class Template(MakoTemplate): ...@@ -54,7 +54,7 @@ class Template(MakoTemplate):
for d in context_instance: for d in context_instance:
context_dictionary.update(d) context_dictionary.update(d)
context_dictionary['settings'] = settings context_dictionary['settings'] = settings
context_dictionary['MITX_ROOT_URL'] = settings.MITX_ROOT_URL context_dictionary['EDX_ROOT_URL'] = settings.EDX_ROOT_URL
context_dictionary['django_context'] = context_instance context_dictionary['django_context'] = context_instance
context_dictionary['marketing_link'] = marketing_link context_dictionary['marketing_link'] = marketing_link
......
...@@ -118,7 +118,7 @@ def manage_modulestores(request, reload_dir=None, commit_id=None): ...@@ -118,7 +118,7 @@ def manage_modulestores(request, reload_dir=None, commit_id=None):
html += '<ol>' html += '<ol>'
for cdir, course in def_ms.courses.items(): for cdir, course in def_ms.courses.items():
html += '<li><a href="%s/migrate/reload/%s">%s</a> (%s)</li>' % ( html += '<li><a href="%s/migrate/reload/%s">%s</a> (%s)</li>' % (
settings.MITX_ROOT_URL, settings.EDX_ROOT_URL,
escape(cdir), escape(cdir),
escape(cdir), escape(cdir),
course.location.url() course.location.url()
......
...@@ -4,11 +4,11 @@ from edxmako.shortcuts import render_to_response ...@@ -4,11 +4,11 @@ from edxmako.shortcuts import render_to_response
from multicourse import multicourse_settings from multicourse import multicourse_settings
def mitxhome(request): def edxhome(request):
''' Home page (link from main header). List of courses. ''' ''' Home page (link from main header). List of courses. '''
if settings.DEBUG: if settings.DEBUG:
print "[djangoapps.multicourse.mitxhome] MITX_ROOT_URL = " + settings.MITX_ROOT_URL print "[djangoapps.multicourse.edxhome] EDX_ROOT_URL = " + settings.EDX_ROOT_URL
if settings.ENABLE_MULTICOURSE: if settings.ENABLE_MULTICOURSE:
context = {'courseinfo': multicourse_settings.COURSE_SETTINGS} context = {'courseinfo': multicourse_settings.COURSE_SETTINGS}
return render_to_response("mitxhome.html", context) return render_to_response("edXhome.html", context)
return info(request) return info(request)
...@@ -310,10 +310,10 @@ RSS_TIMEOUT = 600 ...@@ -310,10 +310,10 @@ RSS_TIMEOUT = 600
STATIC_GRAB = False STATIC_GRAB = False
DEV_CONTENT = True DEV_CONTENT = True
MITX_ROOT_URL = '' EDX_ROOT_URL = ''
LOGIN_REDIRECT_URL = MITX_ROOT_URL + '/accounts/login' LOGIN_REDIRECT_URL = EDX_ROOT_URL + '/accounts/login'
LOGIN_URL = MITX_ROOT_URL + '/accounts/login' LOGIN_URL = EDX_ROOT_URL + '/accounts/login'
COURSE_NAME = "6.002_Spring_2012" COURSE_NAME = "6.002_Spring_2012"
COURSE_NUMBER = "6.002x" COURSE_NUMBER = "6.002x"
...@@ -321,7 +321,7 @@ COURSE_TITLE = "Circuits and Electronics" ...@@ -321,7 +321,7 @@ COURSE_TITLE = "Circuits and Electronics"
### Dark code. Should be enabled in local settings for devel. ### Dark code. Should be enabled in local settings for devel.
ENABLE_MULTICOURSE = False # set to False to disable multicourse display (see lib.util.views.mitxhome) ENABLE_MULTICOURSE = False # set to False to disable multicourse display (see lib.util.views.edXhome)
WIKI_ENABLED = False WIKI_ENABLED = False
......
...@@ -48,27 +48,27 @@ ...@@ -48,27 +48,27 @@
<ul> <ul>
<li class="nav-social-01"> <li class="nav-social-01">
<a href="http://www.meetup.com/edX-Global-Community/" rel="external"> <a href="http://www.meetup.com/edX-Global-Community/" rel="external">
<img src="${MITX_ROOT_URL}/static/images/social/ico-social-meetup.png" alt="edX on Meetup" /> <img src="${EDX_ROOT_URL}/static/images/social/ico-social-meetup.png" alt="edX on Meetup" />
</a> </a>
</li> </li>
<li class="nav-social-02"> <li class="nav-social-02">
<a href="http://www.facebook.com/EdxOnline" rel="external"> <a href="http://www.facebook.com/EdxOnline" rel="external">
<img src="${MITX_ROOT_URL}/static/images/social/ico-social-facebook.png" alt="edX on Facebook" /> <img src="${EDX_ROOT_URL}/static/images/social/ico-social-facebook.png" alt="edX on Facebook" />
</a> </a>
</li> </li>
<li class="nav-social-03"> <li class="nav-social-03">
<a href="https://twitter.com/edXOnline" rel="external"> <a href="https://twitter.com/edXOnline" rel="external">
<img src="${MITX_ROOT_URL}/static/images/social/ico-social-twitter.png" alt="edX on Twitter" /> <img src="${EDX_ROOT_URL}/static/images/social/ico-social-twitter.png" alt="edX on Twitter" />
</a> </a>
</li> </li>
<li class="nav-social-04"> <li class="nav-social-04">
<a href="https://plus.google.com/108235383044095082735/posts" rel="external"> <a href="https://plus.google.com/108235383044095082735/posts" rel="external">
<img src="${MITX_ROOT_URL}/static/images/social/ico-social-google.png" alt="edX on Google+" /> <img src="${EDX_ROOT_URL}/static/images/social/ico-social-google.png" alt="edX on Google+" />
</a> </a>
</li> </li>
<li class="nav-social-05"> <li class="nav-social-05">
<a href="http://youtube.com/user/edxonline" rel="external"> <a href="http://youtube.com/user/edxonline" rel="external">
<img src="${MITX_ROOT_URL}/static/images/social/ico-social-youtube.png" alt="edX on YouTube" /> <img src="${EDX_ROOT_URL}/static/images/social/ico-social-youtube.png" alt="edX on YouTube" />
</a> </a>
</li> </li>
</ul> </ul>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</p> </p>
% if settings.FEATURES.get('AUTH_USE_OPENID'): % if settings.FEATURES.get('AUTH_USE_OPENID'):
<p> <p>
<a href="${MITX_ROOT_URL}/openid/login/">${_('login via openid')}</a> <a href="${EDX_ROOT_URL}/openid/login/">${_('login via openid')}</a>
</p> </p>
% endif % endif
</section> </section>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<script src="${static.url('js/html5shiv.js')}"></script> <script src="${static.url('js/html5shiv.js')}"></script>
<![endif]--> <![endif]-->
<meta name="path_prefix" content="${MITX_ROOT_URL}"> <meta name="path_prefix" content="${EDX_ROOT_URL}">
<meta name="google-site-verification" content="_mipQ4AtZQDNmbtOkwehQDOgCxUUV2fb_C0b6wbiRHY" /> <meta name="google-site-verification" content="_mipQ4AtZQDNmbtOkwehQDOgCxUUV2fb_C0b6wbiRHY" />
% if not course: % if not course:
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<script src="{% static 'js/html5shiv.js' %}"></script> <script src="{% static 'js/html5shiv.js' %}"></script>
<![endif]--> <![endif]-->
<meta name="path_prefix" content="{{MITX_ROOT_URL}}"> <meta name="path_prefix" content="{{EDX_ROOT_URL}}">
</head> </head>
<body class="{% block bodyclass %}{% endblock %}"> <body class="{% block bodyclass %}{% endblock %}">
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<%block name="title"></%block> <%block name="title"></%block>
<link rel="icon" type="image/x-icon" href="${static.url('images/favicon.ico')}" /> <link rel="icon" type="image/x-icon" href="${static.url('images/favicon.ico')}" />
<meta name="path_prefix" content="${MITX_ROOT_URL}" /> <meta name="path_prefix" content="${EDX_ROOT_URL}" />
<meta name="google-site-verification" content="_mipQ4AtZQDNmbtOkwehQDOgCxUUV2fb_C0b6wbiRHY" /> <meta name="google-site-verification" content="_mipQ4AtZQDNmbtOkwehQDOgCxUUV2fb_C0b6wbiRHY" />
<%static:css group='style-vendor'/> <%static:css group='style-vendor'/>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<script src="${static.url('js/html5shiv.js')}"></script> <script src="${static.url('js/html5shiv.js')}"></script>
<![endif]--> <![endif]-->
<meta name="path_prefix" content="${MITX_ROOT_URL}"> <meta name="path_prefix" content="${EDX_ROOT_URL}">
</head> </head>
<body class="<%block name='bodyclass'/>"> <body class="<%block name='bodyclass'/>">
......
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