Correctly inform user that a deletion ALSO deletes children.

TODO.md

@@ -5,11 +5,11 @@ Not implemented - will be ASAP
  * Notification system **Almost done** (email notifications)
  * Simple user account handling: login/register etc. **Done**
  * Implement notifications, revision log messages and user messages thoroughly
- * Attachment plugin **Almost done** (needs to be able to add attachments from other articles.. a simple search function)
+ * Attachment plugin **Done**
  * Image plugin
  * Example plugin
  * Bot editing detection. Don't let anyone edit more than once every other minute.
- * Article deletion
+ * Article deletion **Done**
  * Key-value meta data
  * Index views for urlpaths
  * Searching
@@ -17,7 +17,7 @@ Not implemented - will be ASAP
  * View source for read-only articles + locked status
  * Global moderator permission **Almost done** (need to add grant form for users with *grant* permissions)
  * Are you sure you wanna leave this page?
- * requirements.txt : are the `>` really correct???
+ * Special view for deleted articles w/ restore button
  
 Ideas
 =====

wiki/decorators.py

@@ -5,7 +5,6 @@ from django.http import HttpResponse, HttpResponseNotFound
 from django.utils import simplejson as json
 
 from wiki.core.exceptions import NoRootURL
-from django.contrib.contenttypes.models import ContentType
 
 def json_view(func):
     def wrap(request, *args, **kwargs):

wiki/templates/wiki/delete.html

@@ -20,9 +20,9 @@
       
     {% if delete_children %}
 
-      <p class="lead">{% trans "You are deleting an article. This means that its children will loose their connection to the rest of the tree and moved to Lost and Found. Only do this if you know what you're doing." %}</p>
+      <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 orphans" %}</h2>
+      <h2>{% trans "Articles that will be deleted" %}</h2>
       
       <ul>
         {% for child in delete_children %}