Manually merge release into master

cms/envs/aws.py

@@ -191,7 +191,6 @@ ASSET_IGNORE_REGEX = ENV_TOKENS.get('ASSET_IGNORE_REGEX', ASSET_IGNORE_REGEX)
 # Theme overrides
 THEME_NAME = ENV_TOKENS.get('THEME_NAME', None)
 COMPREHENSIVE_THEME_DIR = path(ENV_TOKENS.get('COMPREHENSIVE_THEME_DIR', COMPREHENSIVE_THEME_DIR))
-THEME_CACHE_TIMEOUT = ENV_TOKENS.get('THEME_CACHE_TIMEOUT', THEME_CACHE_TIMEOUT)
 
 #Timezone overrides
 TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE)

cms/envs/bok_choy.py

@@ -59,9 +59,9 @@ STATIC_URL = "/static/"
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
 )
-STATICFILES_DIRS = [
+STATICFILES_DIRS = (
     (TEST_ROOT / "staticfiles" / "cms").abspath(),
-]
+)
 
 # Silence noisy logs
 import logging

cms/envs/common.py

@@ -61,13 +61,7 @@ from lms.envs.common import (
     # Django REST framework configuration
     REST_FRAMEWORK,
 
-    STATICI18N_OUTPUT_DIR,
-
-    # Dafault site id to use in case there is no site that matches with the request headers.
-    DEFAULT_SITE_ID,
-
-    # Cache time out settings for comprehensive theming system
-    THEME_CACHE_TIMEOUT,
+    STATICI18N_OUTPUT_DIR
 )
 from path import Path as path
 from warnings import simplefilter
@@ -350,9 +344,6 @@ MIDDLEWARE_CLASSES = (
 
     'codejail.django_integration.ConfigureCodeJailMiddleware',
 
-    # django current site middleware with default site
-    'django_sites_extensions.middleware.CurrentSiteWithDefaultMiddleware',
-
     # needs to run after locale middleware (or anything that modifies the request context)
     'edxmako.middleware.MakoMiddleware',
 
@@ -457,6 +448,7 @@ SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
 
 
 # Site info
+SITE_ID = 1
 SITE_NAME = "localhost:8001"
 HTTPS = 'on'
 ROOT_URLCONF = 'cms.urls'
@@ -528,7 +520,7 @@ STATICFILES_STORAGE = 'openedx.core.storage.ProductionStorage'
 # List of finder classes that know how to find static files in various locations.
 # Note: the pipeline finder is included to be able to discover optimized files
 STATICFILES_FINDERS = [
-    'openedx.core.djangoapps.theming.finders.ThemeFilesFinder',
+    'openedx.core.djangoapps.theming.finders.ComprehensiveThemeFinder',
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
     'pipeline.finders.PipelineFinder',

cms/envs/devstack.py

@@ -41,7 +41,7 @@ STATICFILES_STORAGE = 'openedx.core.storage.DevelopmentStorage'
 
 # Revert to the default set of finders as we don't want the production pipeline
 STATICFILES_FINDERS = [
-    'openedx.core.djangoapps.theming.finders.ThemeFilesFinder',
+    'openedx.core.djangoapps.theming.finders.ComprehensiveThemeFinder',
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 ]

cms/envs/devstack_optimized.py

@@ -38,6 +38,6 @@ STATIC_URL = "/static/"
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
 )
-STATICFILES_DIRS = [
+STATICFILES_DIRS = (
     (TEST_ROOT / "staticfiles" / "cms").abspath(),
-]
+)

cms/envs/test.py

@@ -30,8 +30,6 @@ from util.db import NoOpMigrationModules
 from lms.envs.test import (
     WIKI_ENABLED,
     PLATFORM_NAME,
-    SITE_ID,
-    DEFAULT_SITE_ID,
     SITE_NAME,
     DEFAULT_FILE_STORAGE,
     MEDIA_ROOT,
@@ -284,8 +282,6 @@ MICROSITE_CONFIGURATION = {
 MICROSITE_TEST_HOSTNAME = 'testmicrosite.testserver'
 MICROSITE_LOGISTRATION_HOSTNAME = 'logistration.testserver'
 
-TEST_THEME = COMMON_ROOT / "test" / "test-theme"
-
 # For consistency in user-experience, keep the value of this setting in sync with
 # the one in lms/envs/test.py
 FEATURES['ENABLE_DISCUSSION_SERVICE'] = False

cms/startup.py

@@ -17,7 +17,7 @@ from monkey_patch import (
 import xmodule.x_module
 import cms.lib.xblock.runtime
 
-from openedx.core.djangoapps.theming.core import enable_comprehensive_theming
+from openedx.core.djangoapps.theming.core import enable_comprehensive_theme
 
 
 def run():
@@ -30,7 +30,7 @@ def run():
     # Comprehensive theming needs to be set up before django startup,
     # because modifying django template paths after startup has no effect.
     if settings.COMPREHENSIVE_THEME_DIR:
-        enable_comprehensive_theming(settings.COMPREHENSIVE_THEME_DIR)
+        enable_comprehensive_theme(settings.COMPREHENSIVE_THEME_DIR)
 
     django.setup()
 

cms/static/sass/_build-v2.scss

@@ -1,9 +0,0 @@
-// ------------------------------
-// Studio: Shared Build Compile
-// Version 2 - introduces the Pattern Library
-
-
-// Configuration
-@import 'config';
-
-// Extensions

cms/static/sass/_build.scss

@@ -1,6 +1,5 @@
 // ------------------------------
 // Studio: Shared Build Compile
-// Version 1 styling (pre-Pattern Library)
 
 // About: Sass compile for Studio that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the studio-main-*.scss files.
 

cms/static/sass/_config.scss

@@ -1,7 +0,0 @@
-// ------------------------------
-// Studio configuration settings
-
-
-// ------------------------------
-// #VARIABLES
-// ------------------------------

cms/static/sass/studio-main-rtl.scss

@@ -17,4 +17,4 @@
 @import 'bourbon/bourbon'; // lib - bourbon
 @import 'vendor/bi-app/bi-app-rtl'; // set the layout for right to left languages
 
-@import 'build-v1'; // shared app style assets/rendering
+@import 'build'; // shared app style assets/rendering

cms/static/sass/studio-main-v2-rtl.scss

@@ -1,14 +0,0 @@
-// ------------------------------
-// Studio main styling
-// Version 2 - introduces the Pattern Library
-
-// NOTE: This is the right-to-left (RTL) configured style compile.
-// It should mirror main-ltr w/ the exception of bi-app references.
-
-
-// Load the RTL version of the edX Pattern Library
-$pattern-library-path: '../edx-pattern-library' !default;
-@import 'edx-pattern-library/pattern-library/sass/edx-pattern-library-rtl';
-
-// Load the shared build
-@import 'build-v2';

cms/static/sass/studio-main-v2.scss

@@ -1,14 +0,0 @@
-// ------------------------------
-// Studio main styling
-// Version 2 - introduces the Pattern Library
-
-// NOTE: This is the left-to-right (LTR) configured style compile.
-// It should mirror main-rtl w/ the exception of bi-app references.
-
-
-// Load the LTR version of the edX Pattern Library
-$pattern-library-path: '../edx-pattern-library' !default;
-@import 'edx-pattern-library/pattern-library/sass/edx-pattern-library-ltr';
-
-// Load the shared build
-@import 'build-v2';

cms/static/sass/studio-main.scss

@@ -1,5 +1,4 @@
-// Studio - css architecture
-// Version 1 styling (pre-Pattern Library)
+// studio - css architecture
 // ====================
 
 // Table of Contents
@@ -18,4 +17,4 @@
 @import 'bourbon/bourbon'; // lib - bourbon
 @import 'vendor/bi-app/bi-app-ltr'; // set the layout for left to right languages
 
-@import 'build-v1'; // shared app style assets/rendering
+@import 'build'; // shared app style assets/rendering

cms/templates/base.html

@@ -13,7 +13,6 @@ from openedx.core.djangolib.js_utils import (
     dump_js_escaped_json, js_escaped_string
 )
 %>
-
 <%page expression_filter="h"/>
 <!doctype html>
 <!--[if lte IE 9]><html class="ie9 lte9" lang="${LANGUAGE_CODE}"><![endif]-->
@@ -43,8 +42,7 @@ from openedx.core.djangolib.js_utils import (
     <%static:css group='style-vendor'/>
     <%static:css group='style-vendor-tinymce-content'/>
     <%static:css group='style-vendor-tinymce-skin'/>
-
-    <%static:css group='${self.attr.main_css}'/>
+    <%static:css group='style-main'/>
 
     <%include file="widgets/segment-io.html" />
 

cms/templates/ux/reference/index.html

@@ -24,7 +24,6 @@
                             <ul>
                                 <li><a href="container.html">Container page</a></li>
                                 <li><a href="unit.html">Unit page</a></li>
-                                <li><a href="pattern-library-test.html">Pattern Library test page</a></li>
                             </ul>
                         </section>
                     </li>