dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better help display (#868)

Browse Source
This commit is contained in:
Xavier Guimard 2017-02-02 12:42:18 +00:00
parent 71b9b98cbb
commit 44c8aaae06
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemonldap-ng-manager/site/static/languages/en.json
View File

@ -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",

2
lemonldap-ng-manager/site/static/languages/fr.json
View File

@ -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",

32
lemonldap-ng-manager/site/templates/notifications.tpl
View File

@ -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>