From dbdafb86f4a230cf2191d72490c5fc4ae5dafbee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Sep 2019 04:38:01 +0200
Subject: [PATCH] FIX Look and feel v10

---
 htdocs/adherents/ldap.php         | 23 ++++++++---------------
 htdocs/adherents/note.php         |  2 +-
 htdocs/adherents/subscription.php |  2 +-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 84bedb9adf0..db5cd04de22 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -83,10 +83,10 @@ if ($action == 'dolibarr2ldap')
  *	View
  */
 
-llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros');
-
 $form = new Form($db);
 
+llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros');
+
 $head = member_prepare_head($object);
 
 dol_fiche_head($head, 'ldap', $langs->trans("Member"), 0, 'user');
@@ -98,12 +98,12 @@ dol_banner_tab($object, 'rowid', $linkback);
 print '<div class="fichecenter">';
 
 print '<div class="underbanner clearboth"></div>';
-print '<table class="border centpercent">';
+print '<table class="border centpercent tableforfield">';
 
 // Login
-print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 
-// Password not crypted
+// If there is a link to password not crypted, we show value in database here so we can compare because it is shown nowhere else
 if (! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))
 {
 	print '<tr><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td>';
@@ -111,18 +111,11 @@ if (! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))
 	print "</tr>\n";
 }
 
-// Password crypted
-if (! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED))
-{
-	print '<tr><td>'.$langs->trans("LDAPFieldPasswordCrypted").'</td>';
-	print '<td class="valeur">'.$object->pass_crypted.'</td>';
-	print "</tr>\n";
-}
+$adht = new AdherentType($db);
+$adht->fetch($object->typeid);
 
 // Type
-print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$object->type."</td></tr>\n";
-
-$langs->load("admin");
+print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
 
 // LDAP DN
 print '<tr><td>LDAP '.$langs->trans("LDAPMemberDn").'</td><td class="valeur">'.$conf->global->LDAP_MEMBER_DN."</td></tr>\n";
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 07a902f0a3d..083c056a518 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -80,7 +80,7 @@ if ($id)
     print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
+	print '<table class="border centpercent tableforfield">';
 
     // Login
     if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 7dd5a8ce23a..909a5c69d40 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -478,7 +478,7 @@ if ($rowid > 0)
     print '<div class="fichehalfleft">';
 
     print '<div class="underbanner clearboth"></div>';
-    print '<table class="border" width="100%">';
+    print '<table class="border centpercent tableforfield">';
 
 	// Login
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))