wait #4528 @1.5

diff --git a/inc/postconfig.inc.php b/inc/postconfig.inc.php
index f91acf13497257a3de8a60ca6ff687e02ccb78b8..0828106d7dff95cd96de6e55ac3b0163995db5cb 100644 (file)
--- a/inc/postconfig.inc.php
+++ b/inc/postconfig.inc.php
@@ -10,6 +10,7 @@ switch ($_SERVER['HTTP_HOST']) {
         $theme = 'studiofrance';\r
         break;\r
     case 'ysl.workshop.fluidbook.com':\r
+    case 'statistics.ysl-retailhandbook.com':\r
         $theme = 'ysl';\r
         break;\r
     default:\r

diff --git a/inc/prepend.php b/inc/prepend.php
index 1776fe2f0fc471f6d857185e66ee42c428a8f220..8bd3c328839a05a333ab870ad205933334c02ec8 100644 (file)
--- a/inc/prepend.php
+++ b/inc/prepend.php
@@ -51,14 +51,14 @@ if ($ws) {
                define('RAPPEL', __('Rappel des identifiants de connexion au Workshop Studio-France'));\r
                define('ASK_IDENT', __('Vous avez demandé la récupération de votre mot de passe sur le Workshop Studio-France'));\r
        }else if(THEME=='ysl'){\r
-        define('TITLE', '[MAP|EMULSION] ✕ SAINT LAURENT - Workshop');\r
-        define('FROM_EMAIL', 'saintlaurent@map-emulsion.com');\r
+        define('TITLE', '[MAP|EMULSION] ✕ SAINT LAURENT - Statistics');\r
+        define('FROM_EMAIL', 'ysl@map-emulsion.com');\r
         define('FROM_NAME', '[MAP|EMULSION]');\r
-        define('EMAIL_SUBJECT', '[MAP|EMULSION] Workshop');\r
-        define('TEAM_EMAIL', 'saintlaurent@map-emulsion.com');\r
+        define('EMAIL_SUBJECT', '[MAP|EMULSION] Statistics');\r
+        define('TEAM_EMAIL', 'ysl@map-emulsion.com');\r
         define('TEAM_NAME', __("[MAP|EMULSION] Team"));\r
-        define('RAPPEL', __('Rappel des identifiants de connexion au Workshop [MAP|EMULSION]'));\r
-        define('ASK_IDENT', __('Vous avez demandé la récupération de votre mot de passe sur le Workshop [MAP|EMULSION]'));\r
+        define('RAPPEL', __('Rappel des identifiants de connexion aux statistiques [MAP|EMULSION]'));\r
+        define('ASK_IDENT', __('Vous avez demandé la récupération de votre mot de passe pour les statistiques [MAP|EMULSION]'));\r
     }\r
 } elseif ($extranet) {\r
        define('MAIL_BCC', 'contact@cubedesigners.com');\r

diff --git a/inc/ws/Controlleur/class.ws.stats.php b/inc/ws/Controlleur/class.ws.stats.php
index d26d899f0409469ee2f6632a97e5774c1ed67bba..616b0dde7b1c03b7e4e125b034aa10796f8705b3 100644 (file)
--- a/inc/ws/Controlleur/class.ws.stats.php
+++ b/inc/ws/Controlleur/class.ws.stats.php
@@ -61,7 +61,7 @@ class wsStats
         self::$xls = new PHPExcel();\r
         if (self::$xls->getSheetCount() < 2) {\r
             wsMaintenance::fixStats([$bid]);\r
-        }else {\r
+        } else {\r
             self::$xls->removeSheetByIndex(0);\r
         }\r
 \r
@@ -780,7 +780,7 @@ class wsStats
                 $url = substr($url, 0, 30) . '...';\r
             }\r
 \r
-            $lines[] = array('<a href="' . $uurl . '" class="blank" title="' . $uurl . '">' . $url . '</a>', $nb);\r
+            $lines[] = array($url, $nb);\r
             $xlines[] = array($uurl, $nb);\r
         }\r
 \r

diff --git a/style/ws/ysl.css b/style/ws/ysl.css
index 7e495766e20cc24c7861b8be54b99cb254e8fefe..8733fa42b54b811077a1d10dd1fdcf05857be831 100644 (file)
--- a/style/ws/ysl.css
+++ b/style/ws/ysl.css
@@ -1,18 +1,18 @@
 #header {
   background: #202020;
 }
+#header a {
+  color: #fff;
+}
 #logo {
   position: relative;
   top: 23px;
   left: 3px;
 }
-a {
-  color: #fff;
-}
 .onglet:hover,
 .onglet.active {
   background: #fff;
-  color: #7b7b7b;
+  color: #7b7b7b !important;
 }
 .onglet {
   background: #121212;

diff --git a/style/ws/ysl.less b/style/ws/ysl.less
index de8783337ec149cd2af21787ab5ed0217fd59cf2..0027da43eaa6cdc14394258295770e81cf319e91 100644 (file)
--- a/style/ws/ysl.less
+++ b/style/ws/ysl.less
@@ -1,20 +1,20 @@
 #header {\r
   background: #202020;\r
+  a {\r
+    color: #fff\r
+  }\r
 }\r
 \r
+\r
 #logo{\r
   position: relative;\r
   top:23px;\r
   left:3px;\r
 }\r
 \r
-a {\r
-  color: #fff\r
-}\r
-\r
 .onglet:hover, .onglet.active {\r
   background: #fff;\r
-  color: #7b7b7b;\r
+  color: #7b7b7b !important;\r
 }\r
 \r
 .onglet {\r