diff --git a/assets/js/test.js b/assets/js/test.js
deleted file mode 100644
index 95fa2079c9c84b4b9d73e46bd655d347a104f850..0000000000000000000000000000000000000000
--- a/assets/js/test.js
+++ /dev/null
@@ -1 +0,0 @@
-alert("test.js");
\ No newline at end of file
diff --git a/views/default/directoryjs.php b/views/default/directoryjs.php
index 59382bbc06200bedbe149bd7e44f1a715ad5e648..9da895c151455d263dd892fd226b333285c0115b 100755
--- a/views/default/directoryjs.php
+++ b/views/default/directoryjs.php
@@ -318,9 +318,18 @@ afazdazazdzada
                   array("typeSelected"=>$typeSelected,
                         ));
         ?>
+<<<<<<< HEAD
         <?php $col = 8; 
           echo '<div>Ajout des services sur le circuit <span id="headerServices"></span></div>';
          ?>
+=======
+
+        <?php $col = ( !in_array($typeSelected, 
+                       array("classified","products","services","circuits","events","vote","all","place") )) ? 10 : 8; ?>
+        
+        <?php if(Yii::app()->params["CO2DomainName"] == "terla"){ $col = 8; } ?>
+        
+>>>>>>> a759dd8a283f289d0cdeb9b95603554747aee778
         <div class="col-sm-<?php echo $col ?>" id="dropdown_search"></div>
       <?php } ?>
   </div>
@@ -364,7 +373,7 @@ var headerParams = {
 
   "products"    : { color: "orange",   icon: "shopping-basket",   name: trad.products },
   "services"    : { color: "orange",   icon: "sun-o",   name: trad.services },
-  "circuits"    : { color: "orange",   icon: "ravelry",   name: trad.ravelry },
+  "circuits"    : { color: "orange",   icon: "ravelry",   name: trad.circuits },
 }
 
 if( typeof themeObj != "undefined" && typeof themeObj.headerParams != "undefined" )
diff --git a/views/default/index.php b/views/default/index.php
deleted file mode 100644
index e69404a0d0ec2f24c1c36b973ea161f932584bb6..0000000000000000000000000000000000000000
--- a/views/default/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Hello worl
\ No newline at end of file