Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NLA - v17 Theme merge #60

Closed
wants to merge 6 commits into from
Closed
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: 1 addition & 0 deletions nlatheme/__about__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "17.2.0.1"
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions tutorindigo/plugin.py → nlatheme/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,25 @@

# Theme templates
hooks.Filters.ENV_TEMPLATE_ROOTS.add_item(
pkg_resources.resource_filename("tutorindigo", "templates")
pkg_resources.resource_filename("nlatheme", "templates")
)
# This is where the theme is rendered in the openedx build directory
hooks.Filters.ENV_TEMPLATE_TARGETS.add_items(
[
("indigo", "build/openedx/themes"),
("nla-theme", "build/openedx/themes"),
],
)

# 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/"
r"nla-theme/lms/static/sass/partials/lms/theme/"
)

# init script: set theme automatically
with open(
os.path.join(
pkg_resources.resource_filename("tutorindigo", "templates"),
"indigo",
pkg_resources.resource_filename("nlatheme", "templates"),
"nla-theme",
"tasks",
"init.sh",
),
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$primary: #15376D;
$primary: #006666;
$primary-light: #F2F7F8;

// Theme fonts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</ol>
</nav>
</div>
<span class="copyright-site">Copyrights ©2023. All Rights Reserved.</span>
<span class="copyright-site" aria-label="legal">NLA lessons are all CC-BY-NC-SA.</span>
% endif
<div class="colophon">

Expand Down Expand Up @@ -116,7 +116,7 @@
</ol>
</nav>
</div>
<span class="copyright-site">Copyrights ©2023. All Rights Reserved.</span>
<span class="copyright-site" aria-label="legal">NLA lessons are all CC-BY-NC-SA.</span>
% endif
<div class="colophon">

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ from django.contrib.sites.models import Site
def assign_theme(domain):
site, _ = Site.objects.get_or_create(domain=domain)
if not site.themes.exists():
site.themes.create(theme_dir_name='indigo')
site.themes.create(theme_dir_name='nla-theme')

assign_theme('{{ LMS_HOST }}')
assign_theme('{{ LMS_HOST }}')
Expand Down
23 changes: 11 additions & 12 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def load_readme():
def load_about():
about = {}
with io.open(
os.path.join(HERE, "tutorindigo", "__about__.py"),
os.path.join(HERE, "nlatheme", "__about__.py"),
"rt",
encoding="utf-8",
) as f:
Expand All @@ -25,28 +25,27 @@ def load_about():


setup(
name="tutor-indigo",
name="nla-theme-tutor-plugin",
version=ABOUT["__version__"],
url="https://github.com/overhangio/tutor-indigo",
url="https://github.com/newliteraciesalliance/tutor-nla-theme",
project_urls={
"Documentation": "https://docs.tutor.edly.io/",
"Code": "https://github.com/overhangio/tutor-indigo",
"Issue tracker": "https://github.com/overhangio/tutor-indigo/issues",
"Community": "https://discuss.openedx.org",
"Code": "https://github.com/newliteraciesalliance/tutor-nla-theme",
"Issue tracker": "https://github.com/newliteraciesalliance/tutor-nla-theme/issues",
},
license="AGPLv3",
author="Overhang.IO",
author_email="contact@overhang.io",
maintainer="Edly",
maintainer_email="hina.khadim@arbisoft.com",
description="Indigo theme plugin for Tutor",
author="New Literacies Alliance",
author_email="newliteraciesalliance@gmail.com",
maintainer="K-State Libraries",
maintainer_email="libadm@ksu.edu",
description="NLA theme plugin for Tutor based on Indigo",
long_description=load_readme(),
packages=find_packages(exclude=["tests*"]),
include_package_data=True,
python_requires=">=3.8",
install_requires=["tutor>=17.0.0,<18.0.0", "tutor-mfe>=17.0.0,<18.0.0"],
extras_require={"dev": "tutor[dev]>=17.0.0,<18.0.0"},
entry_points={"tutor.plugin.v1": ["indigo = tutorindigo.plugin"]},
entry_points={"tutor.plugin.v1": ["nla-theme = nlatheme.plugin"]},
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down
1 change: 0 additions & 1 deletion tutorindigo/__about__.py

This file was deleted.

Binary file not shown.
Binary file removed tutorindigo/templates/indigo/lms/static/images/logo.png
Binary file not shown.
Loading