Etienne Pallier / labinvent

Commit 9c933d39bf68ff9134c5207b4ff710de1f5a9e59

Authored by Alexandre
1 parent 88de5683
Exists in master and in 3 other branches dev, dev-IRAP, dev-LATMOS

Version: 2.4.3.6 

Configurations / form - Visibilité infos ldap
			
Version majeure en cours (2.5): https://projects.irap.omp.eu/versions/99

ROADMAP: https://projects.irap.omp.eu/projects/labinvent/roadmap
Showing 5 changed files with 23 additions and 23 deletions   Show diff stats
Inline Side-by-side
README-LABINVENT.md
  Diff comments   View file @9c933d3
... ... @@ -51,9 +51,9 @@ Logiciel testé et validé sur les configurations suivantes :
51 51 VERSION ACTUELLE
52 52  
53 53 Date: 10/06/2016
54   -Version: 2.4.3.5
  54 +Version: 2.4.3.6
55 55  
56   -Bugfixes LDAP
  56 +Configurations / form - Visibilité infos ldap
57 57  
58 58 Version majeure en cours (2.5): https://projects.irap.omp.eu/versions/99
59 59  
... ...
src/Template/Configurations/edit.ctp
  Diff comments   View file @9c933d3
... ... @@ -10,16 +10,7 @@
10 10 echo $this->Form->input('mode_debug');
11 11  
12 12 echo $this->Form->input('hasPrinter', ['label' => 'Imprimante disponible']);
13   -
14   - echo $this->Form->input('use_ldap', ['label' => 'Utilisation du LDAP', 'onchange' => 'display_ldap();']);
15   - echo '<div id="ldap" style="margin: 0; padding: 0; ' . $disp . ';">';
16   - echo $this->Form->input('host_ldap', ['label' => 'Host du LDAP']);
17   - echo $this->Form->input('port_ldap', ['label' => 'Port du LDAP']);
18   - echo $this->Form->input('authentificationType_ldap', ['label' => 'Type d\'authentification du LDAP']);
19   - echo $this->Form->input('baseDn_ldap', ['label' => 'Base DN du LDAP']);
20   - echo $this->Form->input('filter_ldap', ['label' => 'Filtre du LDAP']);
21   - echo '</div>';
22   -
  13 +
23 14 echo $this->Form->input('labName', ['label' => 'Nom complet du Labo']);
24 15 echo $this->Form->input('labNameShort', ['label' => 'Nom court du Labo']);
25 16 echo $this->Form->input('labPresent', ['label' => 'Liaison présentation nom du Labo']);
... ... @@ -36,6 +27,15 @@
36 27 echo $this->Form->input('emailGuest3', ['label' => 'Mail guest 3']);
37 28 echo $this->Form->input('emailGuest4', ['label' => 'Mail guest 4']);
38 29 echo $this->Form->input('emailGuest5', ['label' => 'Mail guest 5']);
  30 +
  31 + echo $this->Form->input('use_ldap', ['label' => 'Utilisation du LDAP', 'onchange' => 'display_ldap();']);
  32 + echo '<div id="ldap" style="border-top: 1px solid #CCC; border-bottom: 1px solid #CCC; margin-bottom: 0; background: #EEE;">';
  33 + echo $this->Form->input('host_ldap', ['label' => 'Host du LDAP']);
  34 + echo $this->Form->input('port_ldap', ['label' => 'Port du LDAP']);
  35 + echo $this->Form->input('authentificationType_ldap', ['label' => 'Type d\'authentification du LDAP']);
  36 + echo $this->Form->input('baseDn_ldap', ['label' => 'Base DN du LDAP']);
  37 + echo $this->Form->input('filter_ldap', ['label' => 'Filtre du LDAP']);
  38 + echo '</div>';
39 39 ?>
40 40 </fieldset>
41 41 <?= $this->Form->submit(__('Valider')) ?>
... ...
src/Template/Configurations/view.ctp
  Diff comments   View file @9c933d3
... ... @@ -41,15 +41,7 @@
41 41 $local="Oui";
42 42 }
43 43  
44   - $displayElement(__('Utilisation du LDAP'), $ldap);
45   -
46   - if ($configuration->use_ldap):
47   - $displayElement(__('Host du LDAP'), h($configuration->host_ldap));
48   - $displayElement(__('Port du LDAP'), h($configuration->port_ldap));
49   - $displayElement(__('Type d\'authentification du LDAP'), h($configuration->authentificationType_ldap));
50   - $displayElement(__('Base DN du LDAP'), h($configuration->baseDn_ldap));
51   - $displayElement(__('Filtre du LDAP'), h($configuration->filter_ldap));
52   - endif;
  44 +
53 45  
54 46 $displayElement(__('Nom complet du Labo'), h($configuration->labName));
55 47 $displayElement(__('Nom court du Labo'), h($configuration->labNameShort));
... ... @@ -67,6 +59,15 @@
67 59 $displayElement(__('Mail guest 4'), h($configuration->emailGuest4));
68 60 $displayElement(__('Mail guest 5'), h($configuration->emailGuest5));
69 61  
  62 + $displayElement(__('Utilisation du LDAP'), $ldap);
  63 +
  64 + if ($configuration->use_ldap):
  65 + $displayElement(__('Host du LDAP'), h($configuration->host_ldap));
  66 + $displayElement(__('Port du LDAP'), h($configuration->port_ldap));
  67 + $displayElement(__('Type d\'authentification du LDAP'), h($configuration->authentificationType_ldap));
  68 + $displayElement(__('Base DN du LDAP'), h($configuration->baseDn_ldap));
  69 + $displayElement(__('Filtre du LDAP'), h($configuration->filter_ldap));
  70 + endif;
70 71 ?>
71 72  
72 73  
... ...
src/Template/Layout/default.ctp
  Diff comments   View file @9c933d3
... ... @@ -94,7 +94,7 @@ $cakeDescription = &#39;Labinvent 2.0&#39;;
94 94 </i></td>
95 95 <td id="version">
96 96 <!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) -->
97   - <font color="black">VERSION 2.4.3.5 (10/06/2016)</font>
  97 + <font color="black">VERSION 2.4.3.6 (10/06/2016)</font>
98 98 </td>
99 99 </tr>
100 100 </table>
... ...
webroot/css/inventirap.css
  Diff comments   View file @9c933d3
... ... @@ -121,7 +121,6 @@ div.actions h3 {
121 121 color:#777;
122 122 }
123 123  
124   -
125 124 /** Tables **/
126 125 table {
127 126 border-right:0;
... ...