From 573496df733d3feae02b70be7d00cb4fb023bdcb Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Wed, 22 Jul 2015 11:35:49 +0000
Subject: [PATCH] Fix display of AD and shepherd names, and also fix the
 respective mailto: links.

Commit ready for merge.
 - Legacy-Id: 9852
---
 ietf/templates/doc/search/search_result_row.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html
index 075c4ae97..f03ecfe3e 100644
--- a/ietf/templates/doc/search/search_result_row.html
+++ b/ietf/templates/doc/search/search_result_row.html
@@ -87,9 +87,9 @@
   {% if ad_name == None or ad_name != doc.ad.plain_name %}
     <td class="ad">
       {% if doc.ad %}
-        <div><a title="AD" href="mailto:doc.ad.email.address">{{ doc.ad }}</a></div>
+        <a title="AD" href="mailto:{{ doc.ad.email_address|urlencode }}">{{ doc.ad }}</a><br>
       {% endif %}
-      {% if doc.shepherd %}<a title="Shepherd" href="{{doc.shepherd}}"><small class="text-muted">{{doc.shepherd|emailwrap|default:""}}</small></a>{% endif %}
+      {% if doc.shepherd %}<a title="Shepherd" href="mailto:{{doc.shepherd}}"><small class="text-muted">{{doc.shepherd.person.name}}</small></a>{% endif %}
     </td>
   {% else %}
      <td></td>