Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ pull_translations: clean_translations ## pull translations via atlas
make pull_plugin_translations
atlas pull $(ATLAS_OPTIONS) \
translations/edx-platform/conf/locale:conf/locale \
translations/studio-frontend/src/i18n/messages:conf/plugins-locale/studio-frontend
python manage.py lms compilemessages
python manage.py lms compilejsi18n
python manage.py cms compilejsi18n
Expand Down
2 changes: 0 additions & 2 deletions cms/envs/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1423,8 +1423,6 @@
XBLOCK_FS_STORAGE_BUCKET = None
XBLOCK_FS_STORAGE_PREFIX = None

STUDIO_FRONTEND_CONTAINER_URL = None

############################ Global Database Configuration #####################

DATABASE_ROUTERS = [
Expand Down
4 changes: 0 additions & 4 deletions cms/templates/container.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@
<%static:include path="common/templates/image-modal.underscore" />
</script>
<link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
% if not settings.STUDIO_FRONTEND_CONTAINER_URL:
<link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/common.min.css')}" />
<link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/editImageModal.min.css')}" />
% endif
</%block>

<%block name="page_bundle">
Expand Down
7 changes: 0 additions & 7 deletions cms/templates/container_chromeless.html
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,6 @@
<%static:include path="common/templates/image-modal.underscore" />
</script>
<link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
## The following stylesheets are included for studio-frontend debugging.
## Remove this as part of studio frontend deprecation.
## https://github.com/openedx/studio-frontend/issues/381
% if not settings.STUDIO_FRONTEND_CONTAINER_URL:
<link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/common.min.css')}" />
<link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/editImageModal.min.css')}" />
% endif
</head>

<body class="${static.dir_rtl()} is-signedin course container view-container lang_${LANGUAGE_CODE}">
Expand Down
4 changes: 0 additions & 4 deletions cms/templates/container_editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,6 @@
<%static:include path="common/templates/image-modal.underscore" />
</script>

% if not settings.STUDIO_FRONTEND_CONTAINER_URL:
<link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/common.min.css')}" />
<link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/editImageModal.min.css')}" />
% endif
<link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
% for _, resource in resources:
% if resource['kind'] == 'url' and resource['mimetype'] == 'text/css':
Expand Down
41 changes: 0 additions & 41 deletions common/djangoapps/pipeline_mako/helpers/studiofrontend.py

This file was deleted.

32 changes: 0 additions & 32 deletions common/djangoapps/pipeline_mako/templates/static_content.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import json
from django.contrib.staticfiles.storage import staticfiles_storage
from common.djangoapps.pipeline_mako import compressed_css, compressed_js
from common.djangoapps.pipeline_mako.helpers.studiofrontend import load_sfe_i18n_messages
from django.utils.translation import get_language_bidi
from mako.exceptions import TemplateLookupException
from common.djangoapps.edxmako.shortcuts import marketing_link
Expand Down Expand Up @@ -108,37 +107,6 @@

%>${source | n, decode.utf8}</%def>

<%def name="studiofrontend(entry)">
<%doc>
Loads a studio-frontend page, with the necessary context. Context is expected
as a dictionary in the body of this tag.
</%doc>
<%
body = capture(caller.body)
body_dict = json.loads(body)
locale = body_dict['lang']

messages = load_sfe_i18n_messages(locale)
%>
<script type="application/json" id="SFE_i18n_data">
{
"locale": "${ locale | n, decode.utf8}",
"messages": ${ messages | n, decode.utf8}
}
</script>
<script type="application/javascript" id='courseContext'>
var studioContext = ${ body | n, decode.utf8};
</script>
<div id="root" class="SFE"></div>
% if settings.STUDIO_FRONTEND_CONTAINER_URL:
<script type="text/javascript" src="${settings.STUDIO_FRONTEND_CONTAINER_URL}/${entry}.js"></script>
% else:
<script type="text/javascript" src="${url('common/js/vendor/runtime.min.js')}"></script>
<script type="text/javascript" src="${url('common/js/vendor/common.min.js')}"></script>
<script type="text/javascript" src="${url('common/js/vendor/{}.min.js'.format(entry))}"></script>
% endif
</%def>

<%def name="webpack(entry, extension=None, config='DEFAULT', attrs='')">
<%doc>
Loads Javascript onto your page from a Webpack-generated bundle.
Expand Down
51 changes: 0 additions & 51 deletions common/djangoapps/pipeline_mako/tests/test_studio_frontend.py

This file was deleted.

Loading
Loading