From: vincent@cubedesigners.com Date: Thu, 7 Dec 2017 15:51:45 +0000 (+0000) Subject: try #1816 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=90a7714fcdfd5b379f6a017e572fe62b81a51bfa;p=ccgm.git try #1816 @0.5 --- diff --git a/.ovhconfig b/.ovhconfig index fb174a6..0393320 100644 --- a/.ovhconfig +++ b/.ovhconfig @@ -1,3 +1,3 @@ app.engine=php -app.engine.version=5.5 +app.engine.version=5.6 environement = development \ No newline at end of file diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini index 1e2c183..534c751 100644 --- a/framework/application/configs/application.ini +++ b/framework/application/configs/application.ini @@ -1,5 +1,5 @@ [base] -dev = true +dev = false minify.js = true minify.css = true @@ -8,7 +8,7 @@ bin.mysqldump = /usr/bin/mysqldump bin.mysql = /usr/bin/mysql bin.zip = /usr/bin/zip bin.unzip = /usr/bin/unzip -bin.imagemagick=convert +bin.imagemagick = convert bin.cp = /bin/cp bin.rm = /bin/rm @@ -17,7 +17,7 @@ appnamespace = "CCGM" timezone = 'Europe/Paris' session.lifetime = 31536000 ;1 year -session.domain=.ccgm.fr +session.domain = .ccgm.fr session.adapter = cache database.adapter = pdo_mysql @@ -29,10 +29,10 @@ database.params.dbname = ccgmzwgfweb seo.google = google93c0129ef18a399d.html seo.bing = 8986457D1D126C38A815027C839372DC -navigation.containers[]=0; -navigation.containers[]=-1; -navigation.containers[]=-2; -navigation.containers[]=-3; +navigation.containers[] = 0; +navigation.containers[] = -1; +navigation.containers[] = -2; +navigation.containers[] = -3; acl.perpage = false acl.roles[] = superadmin @@ -58,7 +58,7 @@ seo.universalAnalytics = UA-42799235-1 variant = 1 webhost = medecins.ccgm.fr -seo.robots=false +seo.robots = false seo.universalAnalytics = UA-42799235-2 [testing : production] diff --git a/less/carrousel.less b/less/carrousel.less index e5481c2..2eb2c8c 100644 --- a/less/carrousel.less +++ b/less/carrousel.less @@ -40,7 +40,7 @@ margin: 0 0 0 9px; } .slideshow .pagination li a { - background-image:url(../images/elements.png); + background-image:url("/images/elements.png"); background-position:-15px 0; width: 15px; height: 16px; diff --git a/less/intranetident.less b/less/intranetident.less index 2c5f936..a55e915 100644 --- a/less/intranetident.less +++ b/less/intranetident.less @@ -69,7 +69,7 @@ width:38px; border-radius: 3px; background-color:#0ea6db; - background-image: url(".images/arrow-nav-1.svg"); + background-image: url("/images/arrow-nav-1.svg"); background-position: 50% 50%; padding:0; } diff --git a/less/parcours.less b/less/parcours.less index 6b8522f..8d1ce3e 100644 --- a/less/parcours.less +++ b/less/parcours.less @@ -3,17 +3,17 @@ #etapes{ &[data-nb="6"]{ - background-image: url("../images/etapes6.png"); + background-image: url("/images/etapes6.png"); width:721px; height:477px; } &[data-nb="7"]{ - background-image: url("../images/etapes7.png"); + background-image: url("/images/etapes7.png"); width:709px; height:477px; } &.etoile{ - background-image: url("../images/etoile.png"); + background-image: url("/images/etoile.png"); width:420px; height:420px; margin: 240px 0px 200px 100px; diff --git a/less/rendezvous.less b/less/rendezvous.less index 553c30a..fef79dd 100644 --- a/less/rendezvous.less +++ b/less/rendezvous.less @@ -35,7 +35,7 @@ position:absolute; right:5px; top:5px; - background-image:url("../images/closeconf.png"); + background-image:url("/images/closeconf.png"); width:13px; height:13px; display: block;