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" %}

{{ article.current_revision.title }}

+ {% comment %} + This has been disabled until we can style it. {% if urlpath %} Show all children {% endif %} + {% endcomment %} {% endif %} {% block wiki_contents_tab %} diff --git a/lms/templates/wiki/delete.html b/lms/templates/wiki/delete.html deleted file mode 100644 index acabb79aad..0000000000 --- a/lms/templates/wiki/delete.html +++ /dev/null @@ -1,62 +0,0 @@ -{% extends "wiki/base.html" %} -{% load wiki_tags i18n sekizai_tags %} -{% load url from future %} - -{% block pagetitle %}{% trans "Delete article" %}{% endblock %} - -{% block wiki_contents %} -

{% trans "Delete" %} "{{ article.current_revision.title }}"

- - {% if cannot_delete_root %} -

{% trans "You cannot delete a root article." %}

-

{% trans "Go back" %}

- {% 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 "Articles that will be deleted" %}

- - - - {% endif %} - - {% if not cannot_delete_children %} -

{% trans "You are deleting an article. Please confirm." %}

- -
- {% wiki_form delete_form %} - -
- - - {% trans "Go back" %} - - -
-
- {% 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