added branding staff, changed default fallback to new welcome

common/djangoapps/student/views.py

@@ -260,7 +260,7 @@ def register_user(request, extra_context=None):
     if extra_context is not None:
         context.update(extra_context)
 
-    return render_to_response('register.html', context)
+    return render_to_response('university_profile/edge.html', context)
 
 
 @login_required
@@ -414,7 +414,7 @@ def change_enrollment(request):
 
 @ensure_csrf_cookie
 def accounts_login(request, error=""):
-    return render_to_response('login.html', {'error': error})
+    return render_to_response('university_profile/edge.html', {'error': error})
 
 # Need different levels of logging
 @ensure_csrf_cookie

lms/djangoapps/branding/__init__.py

@@ -33,12 +33,11 @@ def get_university(domain=None):
     Return the university name specified for the domain, or None
     if no university was specified
     """
-#    if not settings.MITX_FEATURES['SUBDOMAIN_BRANDING'] or domain is None:
-#        return None
+    if not settings.MITX_FEATURES['SUBDOMAIN_BRANDING'] or domain is None:
+        return None
 
     subdomain = pick_subdomain(domain, settings.SUBDOMAIN_BRANDING.keys())
-#    return settings.SUBDOMAIN_BRANDING.get(subdomain)
-    return 'edge'
+    return settings.SUBDOMAIN_BRANDING.get(subdomain)
 
 
 def get_logo_url(domain=None):

lms/envs/common.py

@@ -64,7 +64,7 @@ MITX_FEATURES = {
     # When True, will override certain branding with university specific values
     # Expects a SUBDOMAIN_BRANDING dictionary that maps the subdomain to the
     # university to use for branding purposes
-    'SUBDOMAIN_BRANDING': False,
+    'SUBDOMAIN_BRANDING': True,
 
     'FORCE_UNIVERSITY_DOMAIN': False,  # set this to the university domain to use, as an override to HTTP_HOST
                                         # set to None to do no university selection

lms/static/sass/shared/_header.scss

@@ -2,7 +2,7 @@ header.global {
   border-bottom: 1px solid $m-gray;
   box-shadow: 0 1px 5px 0 rgba(0,0,0, 0.1);
   background: $header-bg;
-  height: 76px;
+  height: 96px;
   position: relative;
   width: 100%;
   z-index: 10;
@@ -23,6 +23,13 @@ header.global {
 
     a {
       display: block;
+      position: absolute;
+    }
+    span {
+      display: inline-block;
+      margin-left: 130px;
+      font-size: initial;
+      white-space: nowrap;
     }
   }