Merge factors type for authentication

templates/login/choose_second_factor.html

@@ -4,13 +4,15 @@
 <div>
     <p>You need to validate a second factor to complete your login.</p>
 
-    {% for factor in factors %}
-    <p>
-        <a class="btn btn-primary btn-lg" href="{{ factor.login_url(_p.redirect_uri) }}" style="width: 100%;">
-            {{ factor.name }} <br/>
-            <small>{{ factor.type_str() }}</small>
-        </a>
-    </p>
+    {% for factor in user.get_distinct_factors_types() %}
+    <a class="btn btn-primary btn-lg" href="{{ factor.login_url(_p.redirect_uri) }}" style="width: 100%; display: flex;">
+        <img src="{{ factor.type_image() }}" alt="Factor icon" style="margin-right: 1em;" />
+        <div style="text-align: left;">
+            {{ factor.type_str() }} <br/>
+            <small style="font-size: 0.7em;">{{ factor.description_str() }}</small>
+        </div>
+    </a>
+    <br />
     {% endfor %}
 </div>