diff --git a/lms/templates/wiki/article.html b/lms/templates/wiki/article.html index 57b97edc6b..b524eb8d06 100644 --- a/lms/templates/wiki/article.html +++ b/lms/templates/wiki/article.html @@ -16,9 +16,12 @@ {% if selected_tab != "edit" %}
{% trans "You cannot delete a root article." %}
- - {% else %} - - {% if cannot_delete_children %} - -{% trans "You cannot delete this article because you do not have permission to delete articles with children. Try to remove the children manually one-by-one." %}
- - {% endif %} - - {% if delete_children %} - -{% trans "You are deleting an article. This means that its children will be deleted as well. If you choose to purge, children will also be purged!" %}
- -{% trans "You are deleting an article. Please confirm." %}
- - - {% endif %} - - {% endif %} - -{% endblock %} - diff --git a/repo-requirements.txt b/repo-requirements.txt index 8fc80ab9b3..5e385ec3e6 100644 --- a/repo-requirements.txt +++ b/repo-requirements.txt @@ -1,5 +1,5 @@ -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline --e git://github.com/benjaoming/django-wiki.git@221fca1#egg=django-wiki +-e git://github.com/benjaoming/django-wiki.git@32416cd1e#egg=django-wiki -e common/lib/capa -e common/lib/xmodule