Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Bootstrap theme colors and fonts in old stylesheets

Browse Source 
LEARNER-2977

Fixes
This commit is contained in:
Andy Armstrong
2017-10-20 17:14:40 -04:00
parent dde4ee003f
commit ae1c760ea4
191 changed files with 1711 additions and 1354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
openedx/core/djangoapps/dark_lang/templates/dark_lang/preview-language-fragment.html
View File

@@ -8,24 +8,34 @@
from django.utils.translation import ugettext as _
%>
<h3>
${_("Preview Language Setting")}
</h3>
<div >
<form class="form" action="${request.path}" method="post">
<fieldset class="form-group">
<div class="field">
<label class="field-label">${_("Language Code")}
<input class="field-input input-text" type="text" name="preview_language"
placeholder="${_('e.g. en for English')}" />
</label>
</div>
</fieldset>
<div class="form-actions">
<button class="btn btn-primary" type="submit" name="action" value="set_preview_language">${_("Submit")}</button>
<button class="btn btn-secondary" type="submit" name="action" value="reset_preview_language">${_("Reset")}</button>
<%block name="content">
<div class="page-content-container">
<header class="page-header">
<div class="page-header-main">
<nav aria-label="Theming Administration" class="sr-is-focusable" tabindex="-1">
<h3>${_("Preview Language Setting")}</h3>
</nav>
</div>
</header>
<div class="page-content">
<div class="page-content-main">
<form class="form" action="${request.path}" method="post">
<fieldset class="form-group">
<div class="field">
<label class="field-label">${_("Language Code")}
<input class="field-input input-text" type="text" name="preview_language"
placeholder="${_('e.g. en for English')}" />
</label>
</div>
</fieldset>
<div class="form-actions">
<button class="btn btn-primary" type="submit" name="action" value="set_preview_language">${_("Submit")}</button>
<button class="btn btn-secondary" type="submit" name="action" value="reset_preview_language">${_("Reset")}</button>
</div>
<input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }"/>
</form>
<input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }"/>
</form>
</div>
</div>
</div>
</%block>

64
openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
View File

@@ -9,33 +9,43 @@ from django.utils.translation import ugettext as _
from openedx.core.djangoapps.theming.helpers import get_themes
%>
<h3>
${_("Theming Administration")}
</h3>
<div>
<form class="form" action="${request.path}" method="post">
<div class="form-group">
<label>${_("Preview Theme")}
<select class="form-control" name="preview_theme">
<%
all_themes = list(get_themes())
all_themes.sort(key=lambda x: x.theme_dir_name)
current_theme_name = request.site_theme.theme_dir_name if request.site_theme else None
%>
% for theme in all_themes:
<% theme_name = theme.theme_dir_name %>
<option value="${theme_name}"${' selected=selected' if theme_name == current_theme_name else ''}>${theme_name}</option>
% endfor
</select>
</label>
<%block name="content">
<div class="page-content-container">
<header class="page-header">
<div class="page-header-main">
<nav aria-label="Theming Administration" class="sr-is-focusable" tabindex="-1">
<h3>${_("Theming Administration")}</h3>
</nav>
</div>
<div class="form-actions">
<button class="btn btn-primary" type="submit" name="action" value="set_preview_theme">${_("Submit")}</button>
<button class="btn btn-secondary" type="submit" name="action" value="reset_preview_theme">${_("Reset")}</button>
</header>
<div class="page-content">
<div class="page-content-main">
<form class="form" action="${request.path}" method="post">
<div class="form-group">
<label>${_("Preview Theme")}
<select class="form-control" name="preview_theme">
<%
all_themes = list(get_themes())
all_themes.sort(key=lambda x: x.theme_dir_name)
current_theme_name = request.site_theme.theme_dir_name if request.site_theme else None
%>
% for theme in all_themes:
<% theme_name = theme.theme_dir_name %>
<option value="${theme_name}"${' selected=selected' if theme_name == current_theme_name else ''}>${theme_name}</option>
% endfor
</select>
</label>
</div>
<div class="form-actions">
<button class="btn btn-primary" type="submit" name="action" value="set_preview_theme">${_("Submit")}</button>
<button class="btn btn-secondary" type="submit" name="action" value="reset_preview_theme">${_("Reset")}</button>
</div>
<input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }"/>
</form>
<p>See also <a href="/admin">Django admin</a> for more theming settings.</p>
</div>
<input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }"/>
</form>
<p>See also <a href="/admin">Django admin</a> for more theming settings.</p>
</div>
</div>
</%block>

1
openedx/core/djangoapps/theming/tests/test_helpers.py
View File

@@ -22,6 +22,7 @@ class TestHelpers(TestCase):
Tests template paths are returned from enabled theme.
"""
expected_themes = [
Theme('dark-theme', 'dark-theme', get_theme_base_dir('dark-theme')),
Theme('edge.edx.org', 'edge.edx.org', get_theme_base_dir('edge.edx.org')),
Theme('edx.org', 'edx.org', get_theme_base_dir('edx.org')),
Theme('open-edx', 'open-edx', get_theme_base_dir('open-edx')),