diff --git a/cms/envs/common.py b/cms/envs/common.py index a8c293b57f..1040dc4105 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -99,10 +99,10 @@ for namespace, template_dirs in lms.envs.common.MAKO_TEMPLATES.iteritems(): TEMPLATE_DIRS = MAKO_TEMPLATES['main'] -MITX_ROOT_URL = '' +EDX_ROOT_URL = '' -LOGIN_REDIRECT_URL = MITX_ROOT_URL + '/signin' -LOGIN_URL = MITX_ROOT_URL + '/signin' +LOGIN_REDIRECT_URL = EDX_ROOT_URL + '/signin' +LOGIN_URL = EDX_ROOT_URL + '/signin' TEMPLATE_CONTEXT_PROCESSORS = ( diff --git a/cms/templates/base.html b/cms/templates/base.html index 37b25b1919..129a80890a 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -20,7 +20,7 @@ - + <%static:css group='style-vendor'/> <%static:css group='style-app'/> diff --git a/common/djangoapps/edxmako/shortcuts.py b/common/djangoapps/edxmako/shortcuts.py index c2b56ffc39..6cecb409e9 100644 --- a/common/djangoapps/edxmako/shortcuts.py +++ b/common/djangoapps/edxmako/shortcuts.py @@ -77,7 +77,7 @@ def render_to_string(template_name, dictionary, context=None, namespace='main'): # collapse context_instance to a single dictionary for mako context_dictionary = {} 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 # In various testing contexts, there might not be a current request context. diff --git a/common/djangoapps/edxmako/template.py b/common/djangoapps/edxmako/template.py index d515425b16..43ac057a27 100644 --- a/common/djangoapps/edxmako/template.py +++ b/common/djangoapps/edxmako/template.py @@ -54,7 +54,7 @@ class Template(MakoTemplate): for d in context_instance: context_dictionary.update(d) 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['marketing_link'] = marketing_link diff --git a/lms/djangoapps/lms_migration/migrate.py b/lms/djangoapps/lms_migration/migrate.py index d028ce8e5a..18d9a51017 100644 --- a/lms/djangoapps/lms_migration/migrate.py +++ b/lms/djangoapps/lms_migration/migrate.py @@ -118,7 +118,7 @@ def manage_modulestores(request, reload_dir=None, commit_id=None): html += '
    ' for cdir, course in def_ms.courses.items(): html += '
  1. %s (%s)
    2. ' % ( - settings.MITX_ROOT_URL, + settings.EDX_ROOT_URL, escape(cdir), escape(cdir), course.location.url() diff --git a/lms/djangoapps/multicourse/views.py b/lms/djangoapps/multicourse/views.py index c48c4477e4..7f313373a8 100644 --- a/lms/djangoapps/multicourse/views.py +++ b/lms/djangoapps/multicourse/views.py @@ -4,11 +4,11 @@ from edxmako.shortcuts import render_to_response from multicourse import multicourse_settings -def mitxhome(request): +def edxhome(request): ''' Home page (link from main header). List of courses. ''' 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: context = {'courseinfo': multicourse_settings.COURSE_SETTINGS} - return render_to_response("mitxhome.html", context) + return render_to_response("edXhome.html", context) return info(request) diff --git a/lms/envs/common.py b/lms/envs/common.py index 7dbcb1cd46..9f86c546b7 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -310,10 +310,10 @@ RSS_TIMEOUT = 600 STATIC_GRAB = False DEV_CONTENT = True -MITX_ROOT_URL = '' +EDX_ROOT_URL = '' -LOGIN_REDIRECT_URL = MITX_ROOT_URL + '/accounts/login' -LOGIN_URL = MITX_ROOT_URL + '/accounts/login' +LOGIN_REDIRECT_URL = EDX_ROOT_URL + '/accounts/login' +LOGIN_URL = EDX_ROOT_URL + '/accounts/login' COURSE_NAME = "6.002_Spring_2012" COURSE_NUMBER = "6.002x" @@ -321,7 +321,7 @@ COURSE_TITLE = "Circuits and Electronics" ### 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 diff --git a/lms/templates/footer.html b/lms/templates/footer.html index 394c679b6f..caff83bace 100644 --- a/lms/templates/footer.html +++ b/lms/templates/footer.html @@ -48,27 +48,27 @@ diff --git a/lms/templates/login_modal.html b/lms/templates/login_modal.html index 676f352467..fb425a11c3 100644 --- a/lms/templates/login_modal.html +++ b/lms/templates/login_modal.html @@ -36,7 +36,7 @@

    % if settings.FEATURES.get('AUTH_USE_OPENID'):

    - ${_('login via openid')} + ${_('login via openid')}

    % endif diff --git a/lms/templates/main.html b/lms/templates/main.html index 2d001ffe65..a2395db4ed 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -62,7 +62,7 @@ - + % if not course: diff --git a/lms/templates/main_django.html b/lms/templates/main_django.html index a20d489d8b..9190ddab92 100644 --- a/lms/templates/main_django.html +++ b/lms/templates/main_django.html @@ -25,7 +25,7 @@ - + diff --git a/lms/templates/mktg_iframe.html b/lms/templates/mktg_iframe.html index 338f49240c..ea1b00f1ad 100644 --- a/lms/templates/mktg_iframe.html +++ b/lms/templates/mktg_iframe.html @@ -8,7 +8,7 @@ <%block name="title"> - + <%static:css group='style-vendor'/> diff --git a/lms/templates/stripped-main.html b/lms/templates/stripped-main.html index 28166dbd97..f2e8545e96 100644 --- a/lms/templates/stripped-main.html +++ b/lms/templates/stripped-main.html @@ -24,7 +24,7 @@ - +