Ticket #17599: 17599-draft.patch

django/contrib/admindocs/views.py

@@ -193 +193 @@
     if model is None:
         raise Http404(_("Model %(model_name)r not found in app %(app_label)r") % {'model_name': model_name, 'app_label': app_label})
 
+    title, body, metadata = utils.parse_docstring(model.__doc__)
+    if title:
+        title = utils.parse_rst(title, 'model', _('model:') + model_name)
+    if body:
+        body = utils.parse_rst(body, 'model', _('model:') + model_name)
+    for key in metadata:
+        metadata[key] = utils.parse_rst(metadata[key], 'model', _('model:') + model_name)
+
     opts = model._meta
 
     # Gather fields/field descriptions.
@@ -265 +273 @@
     return render_to_response('admin_doc/model_detail.html', {
         'root_path': urlresolvers.reverse('admin:index'),
         'name': '%s.%s' % (opts.app_label, opts.object_name),
-        'summary': _("Fields on %s objects") % opts.object_name,
-        'description': model.__doc__,
+        'heading': _("Fields on %s objects") % opts.object_name,
+        'summary': title,
+        'body': body,
+        'meta': metadata,
         'fields': fields,
     }, context_instance=RequestContext(request))
 

django/contrib/admindocs/templates/admin_doc/model_detail.html

@@ -23 +23 @@
 
 {% block content %}
 <div id="content-main">
-<h1>{{ summary }}</h1>
+<h1>{{ name }}</h1>
 
-{% if description %}
-  <p>{% filter linebreaksbr %}{% trans description %}{% endfilter %}</p>
-{% endif %}
+<h2>{% trans "Description" %}</h2>
 
+<strong>{{ summary }}</strong>
+
+{{ body }}
+
+<h2>{% trans "Fields" %}</h2>
+
 <div class="module">
 <table class="model">
 <thead>