From 9c933d39bf68ff9134c5207b4ff710de1f5a9e59 Mon Sep 17 00:00:00 2001
From: Alexandre Cases <alexandre.cases@etu.univ-tlse2.fr>
Date: Fri, 10 Jun 2016 20:07:16 +0200
Subject: [PATCH] Version: 2.4.3.6

---
 README-LABINVENT.md                  |  4 ++--
 src/Template/Configurations/edit.ctp | 20 ++++++++++----------
 src/Template/Configurations/view.ctp | 19 ++++++++++---------
 src/Template/Layout/default.ctp      |  2 +-
 webroot/css/inventirap.css           |  1 -
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/README-LABINVENT.md b/README-LABINVENT.md
index 7bbcecd..7e3cf0b 100755
--- a/README-LABINVENT.md
+++ b/README-LABINVENT.md
@@ -51,9 +51,9 @@ Logiciel testé et validé sur les configurations suivantes :
 VERSION ACTUELLE
 
 Date: 10/06/2016
-Version: 2.4.3.5
+Version: 2.4.3.6
 
-Bugfixes LDAP
+Configurations / form - Visibilité infos ldap
 			
 Version majeure en cours (2.5): https://projects.irap.omp.eu/versions/99
 
diff --git a/src/Template/Configurations/edit.ctp b/src/Template/Configurations/edit.ctp
index 965a6de..e6a5815 100644
--- a/src/Template/Configurations/edit.ctp
+++ b/src/Template/Configurations/edit.ctp
@@ -10,16 +10,7 @@
             echo $this->Form->input('mode_debug');
             
             echo $this->Form->input('hasPrinter', ['label' => 'Imprimante disponible']);
-             
-            echo $this->Form->input('use_ldap', ['label' => 'Utilisation du LDAP', 'onchange' => 'display_ldap();']);
-            echo '<div id="ldap" style="margin: 0; padding: 0; ' . $disp . ';">';
-           		echo $this->Form->input('host_ldap', ['label' => 'Host du LDAP']);
-            	echo $this->Form->input('port_ldap', ['label' => 'Port du LDAP']);
-            	echo $this->Form->input('authentificationType_ldap', ['label' => 'Type d\'authentification du LDAP']);
-            	echo $this->Form->input('baseDn_ldap', ['label' => 'Base DN du LDAP']);
-            	echo $this->Form->input('filter_ldap', ['label' => 'Filtre du LDAP']);
-            echo '</div>';
-            
+                         
             echo $this->Form->input('labName', ['label' => 'Nom complet du Labo']);
             echo $this->Form->input('labNameShort', ['label' => 'Nom court du Labo']);
             echo $this->Form->input('labPresent', ['label' => 'Liaison présentation nom du Labo']);
@@ -36,6 +27,15 @@
             echo $this->Form->input('emailGuest3', ['label' => 'Mail guest 3']);
             echo $this->Form->input('emailGuest4', ['label' => 'Mail guest 4']);
             echo $this->Form->input('emailGuest5', ['label' => 'Mail guest 5']);
+            
+            echo $this->Form->input('use_ldap', ['label' => 'Utilisation du LDAP', 'onchange' => 'display_ldap();']);
+            echo '<div id="ldap" style="border-top: 1px solid #CCC; border-bottom: 1px solid #CCC; margin-bottom: 0; background: #EEE;">';
+           		echo $this->Form->input('host_ldap', ['label' => 'Host du LDAP']);
+            	echo $this->Form->input('port_ldap', ['label' => 'Port du LDAP']);
+            	echo $this->Form->input('authentificationType_ldap', ['label' => 'Type d\'authentification du LDAP']);
+            	echo $this->Form->input('baseDn_ldap', ['label' => 'Base DN du LDAP']);
+            	echo $this->Form->input('filter_ldap', ['label' => 'Filtre du LDAP']);
+            echo '</div>';
         ?>
     </fieldset>
     <?= $this->Form->submit(__('Valider')) ?>
diff --git a/src/Template/Configurations/view.ctp b/src/Template/Configurations/view.ctp
index e63abd0..f3e7879 100644
--- a/src/Template/Configurations/view.ctp
+++ b/src/Template/Configurations/view.ctp
@@ -41,15 +41,7 @@
     	$local="Oui";
     }
     
-    $displayElement(__('Utilisation du LDAP'), $ldap);
-    
-    if ($configuration->use_ldap):
-    $displayElement(__('Host du LDAP'), h($configuration->host_ldap));
-    $displayElement(__('Port du LDAP'), h($configuration->port_ldap));
-    $displayElement(__('Type d\'authentification du LDAP'), h($configuration->authentificationType_ldap));
-    $displayElement(__('Base DN du LDAP'), h($configuration->baseDn_ldap));
-    $displayElement(__('Filtre du LDAP'), h($configuration->filter_ldap));
-    endif;
+
     
     $displayElement(__('Nom complet du Labo'), h($configuration->labName));
     $displayElement(__('Nom court du Labo'), h($configuration->labNameShort));
@@ -67,6 +59,15 @@
     $displayElement(__('Mail guest 4'), h($configuration->emailGuest4));
     $displayElement(__('Mail guest 5'), h($configuration->emailGuest5));
     
+    $displayElement(__('Utilisation du LDAP'), $ldap);
+    
+    if ($configuration->use_ldap):
+    	$displayElement(__('Host du LDAP'), h($configuration->host_ldap));
+    	$displayElement(__('Port du LDAP'), h($configuration->port_ldap));
+   		$displayElement(__('Type d\'authentification du LDAP'), h($configuration->authentificationType_ldap));
+    	$displayElement(__('Base DN du LDAP'), h($configuration->baseDn_ldap));
+   		$displayElement(__('Filtre du LDAP'), h($configuration->filter_ldap));
+    endif;
     ?>
         
         
diff --git a/src/Template/Layout/default.ctp b/src/Template/Layout/default.ctp
index a2a4caf..84aac9c 100755
--- a/src/Template/Layout/default.ctp
+++ b/src/Template/Layout/default.ctp
@@ -94,7 +94,7 @@ $cakeDescription = 'Labinvent 2.0';
 					</i></td>
 					<td id="version">
 						<!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) -->
-						<font color="black">VERSION 2.4.3.5 (10/06/2016)</font>
+						<font color="black">VERSION 2.4.3.6 (10/06/2016)</font>
 					</td>
 				</tr>
 			</table>
diff --git a/webroot/css/inventirap.css b/webroot/css/inventirap.css
index 747f2f4..d345199 100755
--- a/webroot/css/inventirap.css
+++ b/webroot/css/inventirap.css
@@ -121,7 +121,6 @@ div.actions h3 {
 	color:#777;
 }
 
-
 /** Tables **/
 table {
 	border-right:0;
--
libgit2 0.21.2