diff --git a/cms/envs/aws.py b/cms/envs/aws.py index c18884fe912b4db368eed426a1bcb52fc4ca4695..fdd732385edccfd767ca67cb22c990eb97f4f9bf 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -102,7 +102,7 @@ if STATIC_URL_BASE: STATIC_URL = STATIC_URL_BASE.encode('ascii') if not STATIC_URL.endswith("/"): STATIC_URL += "/" - STATIC_URL += EDX_PLATFORM_REVISION + "/" + STATIC_URL += 'studio/' # DEFAULT_COURSE_ABOUT_IMAGE_URL specifies the default image to show for courses that don't provide one DEFAULT_COURSE_ABOUT_IMAGE_URL = ENV_TOKENS.get('DEFAULT_COURSE_ABOUT_IMAGE_URL', DEFAULT_COURSE_ABOUT_IMAGE_URL) @@ -126,7 +126,7 @@ GITHUB_REPO_ROOT = ENV_TOKENS.get('GITHUB_REPO_ROOT', GITHUB_REPO_ROOT) STATIC_ROOT_BASE = ENV_TOKENS.get('STATIC_ROOT_BASE', None) if STATIC_ROOT_BASE: - STATIC_ROOT = path(STATIC_ROOT_BASE) / EDX_PLATFORM_REVISION + STATIC_ROOT = path(STATIC_ROOT_BASE) / 'studio' WEBPACK_LOADER['DEFAULT']['STATS_FILE'] = STATIC_ROOT / "webpack-stats.json" EMAIL_BACKEND = ENV_TOKENS.get('EMAIL_BACKEND', EMAIL_BACKEND) diff --git a/cms/envs/common.py b/cms/envs/common.py index b859640f3e7d2596c8bfaeca9c2d7c59296a7459..1ad53844f9e6a50fea9c95efcf4964efa820f218 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -612,8 +612,8 @@ if not EDX_PLATFORM_REVISION: EDX_PLATFORM_REVISION = 'unknown' # Static content -STATIC_URL = '/static/' + EDX_PLATFORM_REVISION + "/" -STATIC_ROOT = ENV_ROOT / "staticfiles" / EDX_PLATFORM_REVISION +STATIC_URL = '/static/studio/' +STATIC_ROOT = ENV_ROOT / "staticfiles" / 'studio' STATICFILES_DIRS = [ COMMON_ROOT / "static", @@ -829,6 +829,7 @@ PIPELINE_YUI_BINARY = 'yui-compressor' ################################# DJANGO-REQUIRE ############################### + # The baseUrl to pass to the r.js optimizer, relative to STATIC_ROOT. REQUIRE_BASE_URL = "./" diff --git a/cms/envs/yaml_config.py b/cms/envs/yaml_config.py index b8c9772c3bd1953d1fa1c35eb85c908edec4a859..b269d1fda65604e4c60e9e2ef575eb909061f20b 100644 --- a/cms/envs/yaml_config.py +++ b/cms/envs/yaml_config.py @@ -169,10 +169,10 @@ if STATIC_URL_BASE: STATIC_URL = STATIC_URL_BASE.encode('ascii') if not STATIC_URL.endswith("/"): STATIC_URL += "/" - STATIC_URL += EDX_PLATFORM_REVISION + "/" + STATIC_URL += 'studio/' if STATIC_ROOT_BASE: - STATIC_ROOT = path(STATIC_ROOT_BASE) / EDX_PLATFORM_REVISION + STATIC_ROOT = path(STATIC_ROOT_BASE) / 'studio' # Cache used for location mapping -- called many times with the same key/value