Skip to content

Commit

Permalink
feat: upgrade to olive
Browse files Browse the repository at this point in the history
  • Loading branch information
regisb committed Dec 12, 2022
1 parent 375c784 commit 97c706f
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ variables:
TUTOR_PLUGIN: indigo
TUTOR_PYPI_PACKAGE: tutor-indigo
TUTOR_BUILD_IMAGE: openedx
OPENEDX_RELEASE: nutmeg
OPENEDX_RELEASE: olive
GITHUB_REPO: overhangio/tutor-indigo

include:
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Indigo is an elegant, customizable theme for `Open edX <https://open.edx.org>`__
.. image:: ./screenshots/01-landing-page.png
:alt: Platform landing page

**Note**: This version of the Indigo theme is compatible with the Nutmeg release of Open edX.
**Note**: This version of the Indigo theme is compatible with the Olive release of Open edX.

You can view the theme in action at https://demo.openedx.overhang.io.

Expand Down Expand Up @@ -60,11 +60,11 @@ Overriding the default "about", "contact", etc. static pages

By default, the ``/about`` and ``/contact`` pages contain a simple line of text: "This page left intentionally blank. Feel free to add your own content". This is of course unusable in production. In the following, we detail how to override just any of the static templates used in Open edX.

The static templates used by Open edX to render those pages are all stored in the `edx-platform/lms/templates/static_templates <https://github.com/edx/edx-platform/tree/open-release/nutmeg.master/lms/templates/static_templates>`__ folder. To override those templates, you should add your own in the following folder::
The static templates used by Open edX to render those pages are all stored in the `edx-platform/lms/templates/static_templates <https://github.com/edx/edx-platform/tree/open-release/olive.master/lms/templates/static_templates>`__ folder. To override those templates, you should add your own in the following folder::

ls tutorindigo/templates/indigo/lms/templates/static_templates"

For instance, edit the "donate.html" file in this directory. We can derive the content of this file from the contents of the `donate.html <https://github.com/edx/edx-platform/blob/open-release/nutmeg.master/lms/templates/static_templates/donate.html>`__ static template in edx-platform::
For instance, edit the "donate.html" file in this directory. We can derive the content of this file from the contents of the `donate.html <https://github.com/edx/edx-platform/blob/open-release/olive.master/lms/templates/static_templates/donate.html>`__ static template in edx-platform::

<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def load_about():
packages=find_packages(exclude=["tests*"]),
include_package_data=True,
python_requires=">=3.7",
install_requires=["tutor>=14.0.0,<15.0.0"],
install_requires=["tutor>=15.0.0,<16.0.0"],
entry_points={"tutor.plugin.v1": ["indigo = tutorindigo.plugin"]},
classifiers=[
"Development Status :: 3 - Alpha",
Expand Down
2 changes: 1 addition & 1 deletion tutorindigo/__about__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "14.0.0"
__version__ = "15.0.0"
4 changes: 3 additions & 1 deletion tutorindigo/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@
)

# Force the rendering of scss files, even though they are included in a "partials" directory
hooks.Filters.ENV_PATTERNS_INCLUDE.add_item(r"indigo/lms/static/sass/partials/lms/theme/")
hooks.Filters.ENV_PATTERNS_INCLUDE.add_item(
r"indigo/lms/static/sass/partials/lms/theme/"
)

# Load all configuration entries
hooks.Filters.CONFIG_DEFAULTS.add_items(
Expand Down
2 changes: 1 addition & 1 deletion tutorindigo/templates/indigo/lms/templates/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<%page expression_filter="h"/>
<%!
from django.urls import reverse
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from lms.djangoapps.branding.api import get_footer
from openedx.core.djangoapps.lang_pref.api import footer_language_selector_is_enabled
%>
Expand Down

0 comments on commit 97c706f

Please sign in to comment.