Ticket #5405: 5405-2.diff

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

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

django/contrib/admindocs/views.py

@@ -196 +196 @@
 
     opts = model._meta
 
+    title, description, metadata = utils.parse_docstring(model.__doc__)
+    if title:
+      title = utils.parse_rst(title, 'model', _('model:') + model_name)
+    if description:
+      description = utils.parse_rst(description, '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:
@@ -266 +274 @@
     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,
+        'description': description,
+        'meta': metadata,
         'fields': fields,
     }, context_instance=RequestContext(request))