Merge pull request #1839 from edx/db/mitx-root-url

MITX_ROOT_URL => EDX_ROOT_URL

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 = (

cms/templates/base.html

@@ -20,7 +20,7 @@
     </title>
 
     <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-app'/>

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.

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
 

lms/djangoapps/lms_migration/migrate.py

@@ -118,7 +118,7 @@ def manage_modulestores(request, reload_dir=None, commit_id=None):
     html += '<ol>'
     for cdir, course in def_ms.courses.items():
         html += '<li><a href="%s/migrate/reload/%s">%s</a> (%s)</li>' % (
-            settings.MITX_ROOT_URL,
+            settings.EDX_ROOT_URL,
             escape(cdir),
             escape(cdir),
             course.location.url()

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)

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
 

lms/templates/footer.html

@@ -48,27 +48,27 @@
         <ul>
           <li class="nav-social-01">
             <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>
           </li>
           <li class="nav-social-02">
             <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>
           </li>
           <li class="nav-social-03">
             <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>
           </li>
           <li class="nav-social-04">
             <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>
           </li>
           <li class="nav-social-05">
             <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>
           </li>
         </ul>

lms/templates/login_modal.html

@@ -36,7 +36,7 @@
       </p>
 % if settings.FEATURES.get('AUTH_USE_OPENID'):
       <p>
-      <a href="${MITX_ROOT_URL}/openid/login/">${_('login via openid')}</a>
+      <a href="${EDX_ROOT_URL}/openid/login/">${_('login via openid')}</a>
       </p>
 % endif
     </section>

lms/templates/main.html

@@ -62,7 +62,7 @@
     <script src="${static.url('js/html5shiv.js')}"></script>
   <![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" />
 
   % if not course:

lms/templates/main_django.html

@@ -25,7 +25,7 @@
   <script src="{% static 'js/html5shiv.js' %}"></script>
   <![endif]-->
 
-  <meta name="path_prefix" content="{{MITX_ROOT_URL}}">
+  <meta name="path_prefix" content="{{EDX_ROOT_URL}}">
 </head>
 
 <body class="{% block bodyclass %}{% endblock %}">

lms/templates/mktg_iframe.html

@@ -8,7 +8,7 @@
   <%block name="title"></%block>
 
   <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" />
 
   <%static:css group='style-vendor'/>

lms/templates/stripped-main.html

@@ -24,7 +24,7 @@
   <script src="${static.url('js/html5shiv.js')}"></script>
   <![endif]-->
 
-  <meta name="path_prefix" content="${MITX_ROOT_URL}">
+  <meta name="path_prefix" content="${EDX_ROOT_URL}">
 </head>
 
 <body class="<%block name='bodyclass'/>">