Merge pull request #829 from OpenConext/feature/debug-page-move-icons…

…-to-front debug page: move icons to first column of table.
OpenConext · Feb 10, 2020 · 9a675d0 · 9a675d0
2 parents 2e42318 + 66e4484
commit 9a675d0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/languages/messages.en.php b/languages/messages.en.php
@@ -269,6 +269,7 @@
 
     'attributes' => 'Attributes',
     'validation' => 'Validation',
+    'remarks' => 'Remarks',
     'idp_debugging_mail_explain' => 'When requested by %suiteName%,
                                         use the "Mail to %suiteName%" button below
                                         to mail the information in this screen.',

diff --git a/languages/messages.nl.php b/languages/messages.nl.php
@@ -272,6 +272,7 @@
 
     'attributes' => 'Attributen',
     'validation' => 'Validatie',
+    'remarks' => 'Opmerkingen',
     'idp_debugging_mail_explain' => 'Indien gevraagd door %suiteName%,
                                         gebruik de "Mail naar %suiteName%" knop hieronder
                                         om de informatie op dit scherm naar %suiteName% beheer te e-mailen.',

diff --git a/languages/messages.pt.php b/languages/messages.pt.php
@@ -265,6 +265,7 @@
     'retry'                           => 'Tente novamente',
     'attributes' => 'Atributos',
     'validation' => 'Validação',
+    'remarks' => 'Observações',
     'idp_debugging_mail_explain' => 'Quando solicitado por %suiteName%,
                                         utilize o botão "Enviar Email a %suiteName%" em baixo
                                         para enviar o email com a informação deste ecrã.',

diff --git a/theme/material/templates/modules/Authentication/View/Proxy/debug-idp-response.html.twig b/theme/material/templates/modules/Authentication/View/Proxy/debug-idp-response.html.twig
@@ -112,6 +112,9 @@
                 <table class="comp-table">
                     <thead>
                     <tr>
+                        <th>
+                            {{ 'validation'|trans }}
+                        </th>
                         <th>
                             {{ 'suite_name'|trans }} Display Name
                         </th>
@@ -122,13 +125,27 @@
                             {{ 'value'|trans }}
                         </th>
                         <th>
-                            {{ 'validation'|trans }}
+                            {{ 'remarks'|trans }}
                         </th>
                     </tr>
                     </thead>
                     <tbody>
                     {% for attributeName, attributeValues in attributes %}
                         <tr>
+                            <td>
+                                {% if validationResult.isValid(attributeName) %}
+                                    <i class="c-icon c-icon-checkmark fa-check" alt="&#9989;"></i>
+                                {% else %}
+                                    {% if validationResult.errors(attributeName).length > 0 %}
+                                        <p class="error">
+                                            <i class="c-icon c-icon-error fa-exclamation"></i>
+                                        </p>
+                                    {% else %}
+                                        <p class="warning"><i class="c-icon c-icon-warning fa-exclamation"></i>
+                                        </p>
+                                    {% endif %}
+                                {% endif %}
+                            </td>
                             <td>
                                 {{ attributeName(attributeName, 'en') }}
                             </td>
@@ -147,23 +164,19 @@
                                 {% endif %}
                             </td>
                             <td>
-                                {% if validationResult.isValid(attributeName) %}
-                                    <i class="c-icon c-icon-checkmark fa-check" alt="&#9989;"></i>
-                                {% else %}
+                                {% if not validationResult.isValid(attributeName) %}
+                                <em>
                                     {% for error in validationResult.errors(attributeName) %}
-                                        <p class="error">
-                                            <i class="c-icon c-icon-error fa-exclamation"></i>
                                             {{ error[0]|trans({'%arg1%': error[1], '%arg2%': error[2], '%arg3%': error[3]}) }}
-                                        </p>
                                     {% endfor %}
                                     {% for warning in validationResult.warnings(attributeName) %}
-                                        <p class="warning"><i class="c-icon c-icon-warning fa-exclamation"></i>
                                            {{ warning[0]|trans({'%arg1%': warning[1], '%arg2%': warning[2], '%arg3%': warning[3]}) }}
-                                        </p>
                                     {% endfor %}
+                                 </em>
                                 {% endif %}
                             </td>
                         </tr>
+
                     {% endfor %}
                     </tbody>
                 </table>