LMS theming for Stanford 6/11/13 launch

.gitignore

@@ -27,6 +27,7 @@ conf/locale/en/LC_MESSAGES/*.po
 !messages.po
 lms/static/sass/*.css
 lms/static/sass/application.scss
+lms/static/sass/course.scss
 cms/static/sass/*.css
 lms/lib/comment_client/python
 nosetests.xml

common/djangoapps/mitxmako/shortcuts.py

@@ -41,7 +41,9 @@ def marketing_link(name):
         return settings.MKTG_URLS.get('ROOT') + settings.MKTG_URLS.get(name)
     # only link to the old pages when the marketing site isn't on
     elif not settings.MITX_FEATURES.get('ENABLE_MKTG_SITE') and name in link_map:
-        return reverse(link_map[name])
+        # don't try to reverse disabled marketing links
+        if link_map[name] is not None:
+            return reverse(link_map[name])
     else:
         log.warning("Cannot find corresponding link for name: {name}".format(name=name))
         return '#'

common/djangoapps/student/views.py

@@ -1194,6 +1194,10 @@ def accept_name_change(request):
 def _get_news(top=None):
     "Return the n top news items on settings.RSS_URL"
 
+    # Don't return anything if we're in a themed site
+    if settings.MITX_FEATURES["USE_CUSTOM_THEME"]:
+        return None
+
     feed_data = cache.get("students_index_rss_feed_data")
     if feed_data is None:
         if hasattr(settings, 'RSS_URL'):

lms/envs/aws.py

@@ -99,6 +99,8 @@
 with open(ENV_ROOT / CONFIG_PREFIX + "env.json") as env_file:
     ENV_TOKENS = json.load(env_file)
 
+PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME)
+
 SITE_NAME = ENV_TOKENS['SITE_NAME']
 SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN')
 
@@ -119,11 +121,18 @@
 DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS.get('DEFAULT_FEEDBACK_EMAIL', DEFAULT_FEEDBACK_EMAIL)
 ADMINS = ENV_TOKENS.get('ADMINS', ADMINS)
 SERVER_EMAIL = ENV_TOKENS.get('SERVER_EMAIL', SERVER_EMAIL)
+TECH_SUPPORT_EMAIL = ENV_TOKENS.get('TECH_SUPPORT_EMAIL', TECH_SUPPORT_EMAIL)
+CONTACT_EMAIL = ENV_TOKENS.get('CONTACT_EMAIL', CONTACT_EMAIL)
+BUGS_EMAIL = ENV_TOKENS.get('BUGS_EMAIL', BUGS_EMAIL)
 
 #Theme overrides
 THEME_NAME = ENV_TOKENS.get('THEME_NAME', None)
 if not THEME_NAME is None:
     enable_theme(THEME_NAME)
+    FAVICON_PATH = 'themes/%s/images/favicon.ico' % THEME_NAME
+
+# Marketing link overrides
+MKTG_URL_LINK_MAP.update(ENV_TOKENS.get('MKTG_URL_LINK_MAP', {}))
 
 #Timezone overrides
 TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE)

lms/envs/common.py

@@ -31,6 +31,9 @@
 from .discussionsettings import *
 
 ################################### FEATURES ###################################
+# The display name of the platform to be used in templates/emails/etc.
+PLATFORM_NAME = "edX"
+
 COURSEWARE_ENABLED = True
 ENABLE_JASMINE = False
 
@@ -315,6 +318,9 @@
 DEFAULT_FROM_EMAIL = 'registration@edx.org'
 DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org'
 SERVER_EMAIL = 'devops@edx.org'
+TECH_SUPPORT_EMAIL = 'technical@edx.org'
+CONTACT_EMAIL = 'info@edx.org'
+BUGS_EMAIL = 'bugs@edx.org'
 ADMINS = (
     ('edX Admins', 'admin@edx.org'),
 )
@@ -330,6 +336,8 @@
     PROJECT_ROOT / "static",
 ]
 
+FAVICON_PATH = 'images/favicon.ico'
+
 # Locale/Internationalization
 TIME_ZONE = 'America/New_York'   # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 LANGUAGE_CODE = 'en'   # http://www.i18nguy.com/unicode/language-identifiers.html

lms/static/sass/_shame.scss

@@ -98,3 +98,16 @@
     }
   }
 }
+
+//--------------------------------------
+//   The Following is to enable themes to
+//   display H1s on login and register pages
+//--------------------------------------
+.view-login .introduction header h1,
+.view-register .introduction header h1 {
+  @include login_register_h1_style;
+}
+
+footer .references {
+  @include footer_references_style;
+}

lms/static/sass/application.scss.mako

@@ -4,6 +4,20 @@
 @import 'base/font_face';
 @import 'base/mixins';
 @import 'base/variables';
+
+## THEMING
+## -------
+## Set up this file to import an edX theme library if the environment
+## indicates that a theme should be used. The assumption is that the
+## theme resides outside of this main edX repository, in a directory
+## called themes/<theme-name>/, with its base Sass file in
+## themes/<theme-name>/static/sass/_<theme-name>.scss. That one entry
+## point can be used to @import in as many other things as needed.
+% if env.get('THEME_NAME') is not None:
+  // import theme's Sass overrides
+  @import '${env.get('THEME_NAME')}';
+% endif
+
 @import 'base/base';
 @import 'base/extends';
 @import 'base/animations';
@@ -36,16 +50,3 @@
 @import 'news';
 
 @import 'shame';
-
-## THEMING
-## -------
-## Set up this file to import an edX theme library if the environment
-## indicates that a theme should be used. The assumption is that the
-## theme resides outside of this main edX repository, in a directory
-## called themes/<theme-name>/, with its base Sass file in
-## themes/<theme-name>/static/sass/_<theme-name>.scss. That one entry
-## point can be used to @import in as many other things as needed.
-% if env.get('THEME_NAME') is not None:
-  // import theme's Sass overrides
-  @import '${env.get('THEME_NAME')}'
-% endif

lms/static/sass/base/_mixins.scss

@@ -42,3 +42,11 @@
   overflow: hidden;
   display: block;
 }
+
+
+//-----------------
+//  Theme Mixin Styles
+//-----------------
+@mixin login_register_h1_style {}
+
+@mixin footer_references_style {}

lms/static/sass/base/_variables.scss

@@ -62,11 +62,12 @@ $lighter-base-font-color: rgb(100,100,100);
 $text-color: $dark-gray;
 
 $body-bg: rgb(250,250,250);
+$container-bg: $white;
 $header-image: linear-gradient(-90deg, rgba(255,255,255, 1), rgba(230,230,230, 0.9));
-$header-bg: transparent;
+$header-bg: $white;
 $courseware-header-image: linear-gradient(top, #fff, #eee);
 $courseware-header-bg: transparent;
-$footer-bg: transparent;
+$footer-bg: $white;
 $courseware-footer-border: none;
 $courseware-footer-shadow: none;
 $courseware-footer-margin: 0px;
@@ -87,7 +88,7 @@ $dashboard-profile-header-color: transparent;
 $dashboard-profile-color: rgb(252,252,252);
 $dot-color: $light-gray;
 
-$content-wrapper-bg: rgb(255,255,255);
+$content-wrapper-bg: shade($body-bg, 2%);
 $course-bg-color: #d6d6d6;
 $course-bg-image: url(../images/bg-texture.png);
 
@@ -100,6 +101,7 @@ $border-color-3: rgb(100,100,100);
 $border-color-4: rgb(252,252,252);
 
 $link-color: $blue;
+$link-color-d1: $m-blue;
 $link-hover: $pink;
 $selection-color-1: $pink;
 $selection-color-2: #444;
@@ -118,9 +120,18 @@ $sidebar-active-image: linear-gradient(top, #e6e6e6, #d6d6d6);
 $form-bg-color: #fff;
 $modal-bg-color: rgb(245,245,245);
 
+//TOP HEADER IMAGE MARGIN
+$header_image_margin: -69px;
+
+//FOOTER MARGIN
+$footer_margin: ($baseline/4) 0 ($baseline*1.5) 0;
+
 //-----------------
 //  CSS BG Images
 //-----------------
 $homepage-bg-image: '../images/homepage-bg.jpg';
 
+$login-banner-image: '../images/bg-banner-login.png';
+$register-banner-image: '../images/bg-banner-register.png';
+
 $video-thumb-url: '../images/courses/video-thumb.jpg';

lms/static/sass/course.scss → lms/static/sass/course.scss.mako

@@ -4,6 +4,20 @@
 @import 'base/font_face';
 @import 'base/mixins';
 @import 'base/variables';
+
+## THEMING
+## -------
+## Set up this file to import an edX theme library if the environment
+## indicates that a theme should be used. The assumption is that the
+## theme resides outside of this main edX repository, in a directory
+## called themes/<theme-name>/, with its base Sass file in
+## themes/<theme-name>/static/sass/_<theme-name>.scss. That one entry
+## point can be used to @import in as many other things as needed.
+% if env.get('THEME_NAME') is not None:
+  // import theme's Sass overrides
+  @import '${env.get('THEME_NAME')}';
+% endif
+
 @import 'base/base';
 @import 'base/extends';
 @import 'base/animations';

lms/static/sass/course/layout/_courseware_header.scss

@@ -65,7 +65,7 @@ header.global.slim {
   height: auto;
   padding: 5px 0 10px 0;
   border-bottom: 1px solid $outer-border-color;
-  background: $white;
+  background: $header-bg;
 
   .guest .secondary {
     margin-right: 0;

lms/static/sass/course/layout/_footer.scss

@@ -1,5 +1,4 @@
 footer {
-	border: $courseware-footer-border;
 	box-shadow: $courseware-footer-shadow;
 	margin-top: $courseware-footer-margin;
 }