From 44c8aaae066050c8a58ba97c3ef47892c1106157 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Thu, 2 Feb 2017 12:42:18 +0000
Subject: [PATCH] Better help display (#868)

---
 .../site/static/languages/en.json             |  2 +-
 .../site/static/languages/fr.json             |  2 +-
 .../site/templates/notifications.tpl          | 32 +++++++++++++++----
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/lemonldap-ng-manager/site/static/languages/en.json b/lemonldap-ng-manager/site/static/languages/en.json
index d12a588cc..5b0f2f68c 100644
--- a/lemonldap-ng-manager/site/static/languages/en.json
+++ b/lemonldap-ng-manager/site/static/languages/en.json
@@ -32,7 +32,7 @@
 "ADPwdExpireWarning": "Password expire warning",
 "ADPwdMaxAge": "Password max age",
 "advancedParams": "Advanced parameters",
-"allowedMarkups": "XML allowed markups:",
+"allowedMarkups": "Allowed markups:",
 "apacheParams": "Apache parameters",
 "apacheAuthnLevel": "Authentication level",
 "application": "Application",
diff --git a/lemonldap-ng-manager/site/static/languages/fr.json b/lemonldap-ng-manager/site/static/languages/fr.json
index eb54582f9..35738d854 100644
--- a/lemonldap-ng-manager/site/static/languages/fr.json
+++ b/lemonldap-ng-manager/site/static/languages/fr.json
@@ -32,7 +32,7 @@
 "ADPwdExpireWarning": "Avertissement avant expiration du mot de passe",
 "ADPwdMaxAge": "Âge maximal du mot de passe",
 "advancedParams": "Paramètres avancés",
-"allowedMarkups": "Balises XML autorisées :",
+"allowedMarkups": "Balises autorisées :",
 "apacheParams": "Paramètres Apache",
 "apacheAuthnLevel": "Niveau d'authentification",
 "application": "Application",
diff --git a/lemonldap-ng-manager/site/templates/notifications.tpl b/lemonldap-ng-manager/site/templates/notifications.tpl
index d1faf9906..df80cdb76 100644
--- a/lemonldap-ng-manager/site/templates/notifications.tpl
+++ b/lemonldap-ng-manager/site/templates/notifications.tpl
@@ -111,16 +111,34 @@
           <tr>
             <th><span trspan="XMLcontent" /></th>
             <td>
+              <textarea rows=5 class="form-control" ng-model="form.xml"></textarea>
               <div class="alert alert-info">
                 <p><span trspan="allowedMarkups" /></p>
-                <ul>
-                  <li>&lt;title&gt;...&lt;/title&gt;</li>
-                  <li>&lt;subtitle&gt;...&lt;/subtitle&gt;</li>
-                  <li>&lt;text&gt;...&lt;/text&gt;</li>
-                  <li>&lt;check&gt;...&lt;/check&gt;</li>
-                </ul>
+                <table border="0">
+                 <thead>
+                  <tr><th>JSON</th><th>XML</th></tr>
+                 </thead>
+                 <tbody><tr>
+                  <td>
+                    <pre>
+{
+  "title":    "...",
+  "subtitle": "...",
+  "text":     "...",
+  "check": [ "...", "..." ]
+}
+                    </pre>
+                  </td>
+                  <td>
+                    <ul>
+                      <li>&lt;title&gt;...&lt;/title&gt;</li>
+                      <li>&lt;subtitle&gt;...&lt;/subtitle&gt;</li>
+                      <li>&lt;text&gt;...&lt;/text&gt;</li>
+                      <li>&lt;check&gt;...&lt;/check&gt;</li>
+                    </ul>
+                  </td>
+                </tr></tbody></table>
               </div>
-              <textarea rows=5 class="form-control" ng-model="form.xml"></textarea>
             </td>
           </tr>
         </table>