Ticket #5405: 5405-1.diff

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

@@ -15 +15 @@
 
 {% block content %}
 <div id="content-main">
-<h1>{{ summary|escape }}</h1>
+<h1>{{ name|escape }}</h1>
+<h2 class="subhead">{% if summary %}
+  {% trans summary %}
+{% endif %}</h2>
 
-{% if description %}
-  <p>{% filter escape|linebreaksbr %}{% trans description %}{% endfilter %}</p>
+{% if body %}
+  <p>{% trans body %}</p>
 {% endif %}
 
+<h2>{{ fieldsheading|escape }}</h2>
 <div class="module">
 <table class="model">
 <thead>

django/contrib/admindocs/views.py

@@ -173 +173 @@
 
     opts = model._meta
 
+    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)
+
     # Gather fields/field descriptions.
     fields = []
     for field in opts.fields:
@@ -227 +235 @@
 
     return render_to_response('admin_doc/model_detail.html', {
         'name': '%s.%s' % (opts.app_label, opts.object_name),
-        'summary': _("Fields on %s objects") % opts.object_name,
-        'description': model.__doc__,
+        'summary': title,
+        'fieldsheading': _("Fields on %s objects") % opts.object_name,
         'fields': fields,
+        'body': body,
+        'meta': metadata,
     }, context_instance=RequestContext(request))
 model_detail = staff_member_required(model_detail)