Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to latest version of django-wiki with lots of deletion fixes. Removed child article list until it can be styled.

Browse Source
This commit is contained in:
Bridger Maxwell
2012-08-21 22:23:40 -04:00
parent 41831654ee
commit 82d414690b
3 changed files with 4 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/templates/wiki/article.html
View File

@@ -16,9 +16,12 @@
{% if selected_tab != "edit" %}
<h1>{{ article.current_revision.title }}</h1>
{% comment %}
This has been disabled until we can style it.
{% if urlpath %}
<a href="{% url 'wiki:dir' path=urlpath.path %}">Show all children</a>
{% endif %}
{% endcomment %}
{% endif %}
{% block wiki_contents_tab %}

62
lms/templates/wiki/delete.html
View File

@@ -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 %}
<h1 class="page-header">{% trans "Delete" %} "{{ article.current_revision.title }}"</h1>
{% if cannot_delete_root %}
<p class="lead">{% trans "You cannot delete a root article." %}</p>
<p><a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}">{% trans "Go back" %}</a></p>
{% else %}
{% if cannot_delete_children %}
<p class="alert alert-error"><strong>{% 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." %}</strong></p>
{% endif %}
{% if delete_children %}
<p class="lead">{% 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!" %}</p>
<h2>{% trans "Articles that will be deleted" %}</h2>
<ul>
{% for child in delete_children %}
<li><a href="{% url 'wiki:get' article_id=child.article.id %}" target="_blank">{{ child.article }}</a></li>
{% if delete_children_more %}
<li><em>{% trans "...and more!" %}</em></li>
{% endif %}
{% endfor %}
</ul>
{% endif %}
{% if not cannot_delete_children %}
<p class="lead">{% trans "You are deleting an article. Please confirm." %}</p>
<form method="POST" class="form-horizontal">
{% wiki_form delete_form %}
<script type="text/javascript">
$('#id_revision').val('{{ article.current_revision.id }}');
</script>
<div class="form-actions">
<a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-large">
<span class="icon-circle-arrow-left"></span>
{% trans "Go back" %}
</a>
<button type="submit" name="save_changes" class="btn btn-danger btn-large">
<span class="icon-plus"></span>
{% trans "Delete article" %}
</button>
</div>
</form>
{% endif %}
{% endif %}
{% endblock %}

2
repo-requirements.txt
View File

@@ -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