From 8dcba2737acb85edbdd848c62570c3d053b2e356 Mon Sep 17 00:00:00 2001 From: Tyler Hallada Date: Tue, 16 Jan 2018 11:42:08 -0500 Subject: [PATCH 1/3] If SFE enabled, hide sidebar and upload button --- cms/templates/asset_index.html | 109 ++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 51 deletions(-) diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html index 5161bb75c8..9d21d5e370 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -42,71 +42,78 @@ - ${_("Files & Uploads")} -
- -
+ % if not waffle_flag_enabled: +
+ +
+ % endif
-
- % if waffle_flag_enabled: - <%static:studiofrontend page="AssetsPage" lang="en"> - { - "course": { - "id": "${context_course.id | n, js_escaped_string}", - "name": "${context_course.display_name_with_default | n, js_escaped_string}", - "url_name": "${context_course.location.name | n, js_escaped_string}", - "org": "${context_course.location.org | n, js_escaped_string}", - "num": "${context_course.location.course | n, js_escaped_string}", - "display_course_number": "${context_course.display_coursenumber | n, js_escaped_string}", - "revision": "${context_course.location.revision | n, js_escaped_string}" - }, - "help_tokens": { - "files": "${get_online_help_info(online_help_token())['doc_url'] | n, js_escaped_string}" - }, - "upload_settings": { - "max_file_size_in_mbs": ${max_file_size_in_mbs|n, dump_js_escaped_json} - } + % if waffle_flag_enabled: + <%static:studiofrontend page="AssetsPage" lang="en"> + { + "course": { + "id": "${context_course.id | n, js_escaped_string}", + "name": "${context_course.display_name_with_default | n, js_escaped_string}", + "url_name": "${context_course.location.name | n, js_escaped_string}", + "org": "${context_course.location.org | n, js_escaped_string}", + "num": "${context_course.location.course | n, js_escaped_string}", + "display_course_number": "${context_course.display_coursenumber | n, js_escaped_string}", + "revision": "${context_course.location.revision | n, js_escaped_string}" + }, + "help_tokens": { + "files": "${get_online_help_info(online_help_token())['doc_url'] | n, js_escaped_string}" + }, + "upload_settings": { + "max_file_size_in_mbs": ${max_file_size_in_mbs|n, dump_js_escaped_json} } - - % else: -
- % endif + } +

${_("Loading")}

-
- - + % endif
From 9ee82fd872a1c67c5999911d02622282932eca55 Mon Sep 17 00:00:00 2001 From: Tyler Hallada Date: Tue, 16 Jan 2018 13:42:08 -0500 Subject: [PATCH 2/3] Upgrade SFE to 0.8.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2b30ee51b..67e3954ffa 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "dependencies": { "@edx/edx-bootstrap": "0.4.3", "@edx/paragon": "1.7.1", - "@edx/studio-frontend": "0.7.0", + "@edx/studio-frontend": "0.8.2", "babel-core": "6.26.0", "babel-loader": "6.4.1", "babel-plugin-transform-class-properties": "6.24.1", From a0700a648424fe1b235ed9e343ea3ab9efbc4073 Mon Sep 17 00:00:00 2001 From: Tyler Hallada Date: Tue, 16 Jan 2018 16:53:51 -0500 Subject: [PATCH 3/3] Upgrade SFE to 0.8.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 67e3954ffa..b6f55d9982 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "dependencies": { "@edx/edx-bootstrap": "0.4.3", "@edx/paragon": "1.7.1", - "@edx/studio-frontend": "0.8.2", + "@edx/studio-frontend": "0.8.3", "babel-core": "6.26.0", "babel-loader": "6.4.1", "babel-plugin-transform-class-properties": "6.24.1",