Commit a031322e authored by Théo GUILLON's avatar Théo GUILLON
Browse files

Merge branch '13-manque-placeholder-sur-la-configuration-ldap' into 'master'

Resolve "manque placeholder sur la configuration LDAP"

See merge request web-DPO/web-DPO!12
parents 21a08071 9998f500
......@@ -103,24 +103,45 @@ msgstr "Tableau des concordances :"
msgid "connecteur_ldap.champUsername"
msgstr "username"
msgid "connecteur_ldap.placeholderChampUsername"
msgstr "samaccountname"
msgid "connecteur_ldap.champNote"
msgstr "note"
msgid "connecteur_ldap.placeholderChampNote"
msgstr "info"
msgid "connecteur_ldap.champNom"
msgstr "nom"
msgid "connecteur_ldap.placeholderChampNom"
msgstr "sn"
msgid "connecteur_ldap.champPrenom"
msgstr "prenom"
msgid "connecteur_ldap.placeholderChampPrenom"
msgstr "givenname"
msgid "connecteur_ldap.champEmail"
msgstr "email"
msgid "connecteur_ldap.placeholderChampEmail"
msgstr "mail"
msgid "connecteur_ldap.champTelfixe"
msgstr "telfixe"
msgid "connecteur_ldap.placeholderChampTelfixe"
msgstr "telephonenumber"
msgid "connecteur_ldap.champTelmobile"
msgstr "telmobile"
msgid "connecteur_ldap.placeholderChampTelmobile"
msgstr "mobile"
msgid "connecteur_ldap.champActive"
msgstr "active"
......
......@@ -180,7 +180,7 @@ msgid "default.btnSend"
msgstr " Envoyer"
msgid "default.btnCancel"
msgstr " Annuler"
msgstr "Annuler"
msgid "default.btnAnnuler"
msgstr "Annuler"
......
......@@ -202,5 +202,16 @@
}
});
$('#type').change(function() {
var select = $(this),
selected = $(select).val();
if (selected === 'OpenLDAP') {
$("#username").val('uid');
} else {
$("#username").val('samaccountname');
}
});
});
</script>
......@@ -32,7 +32,7 @@
<td class="tdleft">
<div class="btn-group">
<?php
echo $this->Html->link('<i class="fa fa-pencil fa-lg"></i>', [
echo $this->Html->link($this->Html->tag('i','&nbsp;',['class' => 'fa fa-pencil fa-lg']), [
'controller' => $connecteur['controller'],
'action' => $connecteur['action']
], [
......
......@@ -118,7 +118,7 @@ class WebcilFormHelper extends FormHelper {
? $options[$button]
: [ 'i' => '', 'button' => 'btn-default-default' ];
$result .= $this->button("<i class=\"fa {$classes['i']} fa-lg\"></i> ".__m("default.btn{$button}"),
$result .= $this->button("<i class=\"fa {$classes['i']} fa-lg\">&nbsp;</i> ".__m("default.btn{$button}"),
[
'type' => 'submit',
'name' => 'submit',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment