Merge branch 'master' of https://github.com/edx/edx-platform

AUTHORS

@@ -107,3 +107,25 @@ Matt Drayer <mattdrayer@edx.org>
 Cristian Salamea <cristian.salamea@iaen.edu.ec>
 Graham Lowe <graham.lowe@gmail.com>
 Matt Bachmann <bachmann.matt@gmail.com>
+Dave St.Germain <dstgermain@edx.org>
+Usman Khalid <symbolist@users.noreply.github.com>
+John Kern <kern3020@gmail.com>
+John Orr <jorr@google.com>
+Mark Hoeber <hoeber@edx.org>
+Waheed Ahmed <waheed.ahmed@arbisoft.com>
+Javier Orts Peñarrocha <jorts@upv.es>
+Stephen Sanchez <steve@edx.org>
+Jim Abramson <jsa@edx.org>
+Chris Rossi <chris@archimedeanco.com>
+Carson Gee <x@carsongee.com>
+Oleg Marshev <oleh.marshev@gmail.com>
+Sylvia Pearce <spearce@edx.org>
+Olga Stroilova <olga@edx.org>
+Paul-Olivier Dehaye <pdehaye@gmail.com>
+Feanil Patel <feanil@edx.org>
+Zubair Afzal <zubair.afzal@arbisoft.com>
+Juho Kim <juhokim@edx.org>
+Alison Hodges <ahodges@edx.org>
+Jane Manning <jmanning@gmail.com>
+Toddi Norum <toddi@edx.org>
+Xavier Antoviaque <xavier@antoviaque.org>

cms/envs/aws.py

@@ -150,6 +150,9 @@ TECH_SUPPORT_EMAIL = ENV_TOKENS.get('TECH_SUPPORT_EMAIL', TECH_SUPPORT_EMAIL)
 
 COURSES_WITH_UNSAFE_CODE = ENV_TOKENS.get("COURSES_WITH_UNSAFE_CODE", [])
 
+# Theme overrides
+THEME_NAME = ENV_TOKENS.get('THEME_NAME', None)
+
 #Timezone overrides
 TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE)
 

lms/templates/login.html

@@ -7,14 +7,14 @@
 
 <%block name="pagetitle">${_("Log into your {platform_name} Account").format(platform_name=platform_name)}</%block>
 
+<%block name="bodyclass">view-login</%block>
+
 <%block name="js_extra">
   <script type="text/javascript">
     $(function() {
 
-      var view_name = 'view-login';
-
       // adding js class for styling with accessibility in mind
-      $('body').addClass('js').addClass(view_name);
+      $('body').addClass('js');
 
       // show forgot password modal UI if URL contains matching DOM ID
       if ($.deparam.fragment()['forgot-password-modal'] !== undefined) {

lms/templates/register-shib.html

@@ -14,14 +14,14 @@
 
 <%block name="pagetitle">${_("Preferences for {platform_name}").format(platform_name=settings.PLATFORM_NAME)}</%block>
 
+<%block name="bodyclass">view-register</%block>
+
 <%block name="js_extra">
   <script type="text/javascript">
     $(function() {
 
-      var view_name = 'view-register';
-
       // adding js class for styling with accessibility in mind
-      $('body').addClass('js').addClass(view_name);
+      $('body').addClass('js');
 
       // new window/tab opening
       $('a[rel="external"], a[class="new-vp"]')

lms/templates/register.html

@@ -16,14 +16,14 @@
 
 <%block name="pagetitle">${_("Register for {platform_name}").format(platform_name=platform_name)}</%block>
 
+<%block name="bodyclass">view-register</%block>
+
 <%block name="js_extra">
   <script type="text/javascript">
     $(function() {
 
-      var view_name = 'view-register';
-
       // adding js class for styling with accessibility in mind
-      $('body').addClass('js').addClass(view_name);
+      $('body').addClass('js');
 
       // new window/tab opening
       $('a[rel="external"], a[class="new-vp"]')

lms/templates/registration/password_reset_complete.html

@@ -23,10 +23,8 @@
   <script type="text/javascript">
     $(function() {
 
-      var view_name = 'view-passwordreset';
-
       // adding js class for styling with accessibility in mind
-      $('body').addClass('js').addClass(view_name);
+      $('body').addClass('js');
 
       // new window/tab opening
       $('a[rel="external"], a[class="new-vp"]')

lms/templates/registration/password_reset_confirm.html

@@ -27,10 +27,8 @@
   <script type="text/javascript">
     $(function() {
 
-      var view_name = 'view-passwordreset';
-
       // adding js class for styling with accessibility in mind
-      $('body').addClass('js').addClass(view_name);
+      $('body').addClass('js');
 
       // new window/tab opening
       $('a[rel="external"], a[class="new-vp"]')