Merge branch...

Merge branch '91-mettre-un-champ-deroulant-avec-recherche-lors-de-la-connection-d-un-user-sur-une-entite' into 'master'

Resolve "Mettre un champ déroulant avec recherche lors de la connection d'un user  sur une entité"

See merge request web-DPO/web-DPO!96

app/View/Layouts/login.ctp

@@ -25,17 +25,20 @@
 
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <?php
-            echo $this->Html->script('/js/jquery/dist/jquery.min.js');
-            echo $this->Html->script('/js/bootstrap/dist/js/bootstrap.min.js');    
-        
+            //JS
+            echo $this->Html->script('jquery/dist/jquery.min.js'); 
+            echo $this->Html->script('bootstrap/dist/js/bootstrap.min.js');
+            echo $this->Html->script('chosen/chosen.jquery.min.js');
+            echo $this->Html->script('main.js');
+            
+            //CSS 
+            echo $this->Html->css('/js/chosen/chosen.min.css');
+            echo $this->Html->css('/js/bootstrap/dist/css/bootstrap-theme.min.css');
             echo $this->Html->css('/js/bootstrap/dist/css/bootstrap.min.css');
+            echo $this->Html->css('/js/chosen/chosen.min.css');
+            echo $this->Html->css('main.css');
+            echo $this->Html->css('/js/jquery-ui/themes/base/jquery-ui.css');
             echo $this->Html->css('/js/components-font-awesome/css/font-awesome.min.css');
-        
-//            echo $this->Html->script('jquery-1.11.0.min');
-//            echo $this->Html->script('bootstrap.min.js');
-
-//            echo $this->Html->css('bootstrap.min.css');
-//            echo $this->Html->css('font-awesome.min.css');
         ?>
 
         <style>

app/View/Organisations/selectorganisation.ctp

@@ -25,17 +25,19 @@
                 //Champ Séléctionner une entité *
                 echo $this->WebcilForm->input('Organisation.organisationcible', [
                     'id' => 'organisationcible', 
-                    'options' => $orgaListe, 
+                    'options' => $orgaListe,
+                    'class' => 'usersDeroulant transformSelect form-control',
                     'empty' => true, 
                     'required' => true, 
-                    'placeholder' => false
+                    'placeholder' => false,
+                    'data-placeholder' => ' ',
                 ]);
             ?>
         </div>
 
         <div class="row form-horizontal form-group buffer-top" style="margin-top: 24px;">
             <?php
-                echo $this->Form->button('<i class="fa fa-sign-in fa-fw"><!----></i>' . ' ' . __d('user','user.btnConnexion'), [
+                echo $this->WebcilForm->button('<i class="fa fa-sign-in fa-fw"><!----></i>' . ' ' . __d('user','user.btnConnexion'), [
                     'type' => 'submit',
                     'class' => 'pull-right btn btn-primary'
                 ]);