diff --git a/dojo_plugin/pages/dojos.py b/dojo_plugin/pages/dojos.py index 5ffec5ce1..1047e6f9e 100644 --- a/dojo_plugin/pages/dojos.py +++ b/dojo_plugin/pages/dojos.py @@ -36,6 +36,7 @@ def listing(): "Advanced": [], "Topics": [], "Courses": [], + "Archive":[], "More Material": [], } for dojo in Dojos.viewable(user=user): @@ -49,6 +50,8 @@ def listing(): typed_dojos["Advanced"].append(dojo) elif dojo.type == "topic": typed_dojos["Topics"].append(dojo) + elif dojo.type == "archive": + typed_dojos["Archive"].append(dojo) elif dojo.type == "course": typed_dojos["Courses"].append(dojo) elif dojo.type == "hidden": diff --git a/dojo_theme/static/img/dojo/Coal_Badge.svg b/dojo_theme/static/img/dojo/Coal_Badge.svg new file mode 100644 index 000000000..8f0f52f4b --- /dev/null +++ b/dojo_theme/static/img/dojo/Coal_Badge.svg @@ -0,0 +1,8443 @@ + + + + diff --git a/dojo_theme/static/img/dojo/Forest_Badge.svg b/dojo_theme/static/img/dojo/Forest_Badge.svg new file mode 100644 index 000000000..cf3daaf67 --- /dev/null +++ b/dojo_theme/static/img/dojo/Forest_Badge.svg @@ -0,0 +1,7846 @@ + + + + diff --git a/dojo_theme/templates/dojo.html b/dojo_theme/templates/dojo.html index b03c72595..b46305f78 100644 --- a/dojo_theme/templates/dojo.html +++ b/dojo_theme/templates/dojo.html @@ -100,6 +100,6 @@

道馆排名

{% endblock %} {% block scripts %} - + {% endblock %} diff --git a/dojo_theme/templates/dojo_error.html b/dojo_theme/templates/dojo_error.html index 7961d9050..889488197 100644 --- a/dojo_theme/templates/dojo_error.html +++ b/dojo_theme/templates/dojo_error.html @@ -53,6 +53,6 @@

{{ module.name or module.id }}

{% endblock %} {% block scripts %} - + {% endblock %} diff --git a/dojo_theme/templates/dojos.html b/dojo_theme/templates/dojos.html index 34b2a2572..fe191ca5f 100644 --- a/dojo_theme/templates/dojos.html +++ b/dojo_theme/templates/dojos.html @@ -25,8 +25,9 @@

中级篇

{% elif type == "Advanced" %}

高级篇

神奇宝贝联盟大会

- + {% elif type == "Archive" %} +

归档

+

历史课程

{% endif %}
{% endfor %} + {% endblock %} {% block scripts %} diff --git a/dojo_theme/templates/module.html b/dojo_theme/templates/module.html index 30980b85b..ecbf35722 100644 --- a/dojo_theme/templates/module.html +++ b/dojo_theme/templates/module.html @@ -157,5 +157,5 @@

模块排名

{% block scripts %} - + {% endblock %}