Bug 370606: Conclusive user match error doesn't include a line break - Patch by FrÃ...

diff --git a/skins/standard/global.css b/skins/standard/global.css
index bd558d5c517c876544411627951d9334686b79d3..fe5fd8b0b2bdca7fcceff7643751a74c0072ec0c 100644 (file)
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -310,6 +310,10 @@ dl dl > dt {
     padding-left: 1em;
 }
 
+div.user_match {
+    margin-bottom: 1em;
+}
+
 .box {
     border: 1px solid black;
     color: black;

diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 35ec93f74e81864dfe3b43c3dee30a00b36a9137..38ac8dd591477d1220b1924ae842572aa2e06f12 100644 (file)
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -85,6 +85,7 @@
       </td>
       <td align="left" valign="top">
           [% FOREACH query = field.value %]
+            <div class="user_match">
               <b>[% query.key FILTER html %]</b>
             [% IF query.value.users.size %]
                 [% IF query.value.users.size > 1 %]
@@ -123,7 +124,6 @@
                 [% ELSE %]
                   matched
                   <b>[% query.value.users.0.identity FILTER html %]</b>
-                  <br>
                 [% END %]
             [% ELSE %]
                 [% IF (query.key.length < 3) && !(Param('emailsuffix'))
@@ -134,6 +134,7 @@
                   <font color="#FF0000">did not match anything</font>
                 [% END %]
             [% END %]
+            </div>
         [% END %]
       </td>
     </tr>