From: vincent@cubedesigners.com Date: Thu, 16 Dec 2010 15:17:01 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6f32654016044f39f58f21b90eb7a8512fae5f19;p=cubeextranet.git --- diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index f9c93616e..5ceb91e27 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -128,8 +128,8 @@ html{height:100%}' . "\n"; global $meta; define('MINIMIZE_JS', false); - define('MINIMIZE_CSS',false); - define('JQUERY',false); + define('MINIMIZE_CSS', false); + define('JQUERY', false); $args = cubePage::getArgs($args); @@ -155,14 +155,11 @@ html{height:100%}' . "\n"; $webcompile = WEBROOT . '/fluidbook/compile/'; $standard = 'XHTML 1.0 Transitional'; - $css=$js=array(); + $css = $js = array(); $css[] = $webcompile . 'style.css'; - // $fv = array('base' => WEBROOT . '/fluidbook/books/final/' . $e[0]); $fv = array(); - - cubePage::swfobject(2); cubePage::swfaddress(); $js[] = $webcompile . 'fluidbook.js'; @@ -182,6 +179,14 @@ html{height:100%}' . "\n"; $res .= ''; $res .= ''; $res .= cubeMedia::flash2($webcompile . 'index.swf?junk=' . TIME, '100%', '100%', $fv, 'fluidbook', '', 10, '#ffffff', '', true); + + $gacodes = array(GA); + if ($book->parametres->googleAnalytics != '') { + $gacodes[] = $book->parametres->googleAnalytics; + } + + $res.=cubePage::googleAnalytics($gacodes,false); + $res .= ''; $res .= ''; diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 49550537f..178c5d85e 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -81,7 +81,7 @@ class wsBookParametres extends wsParametres { $this->fields['googleAnalytics'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics'), 'size' => 10, 'extra' => true, 'grade' => 1); $this->fields['stats_score'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Affiche le score dans les statistiques'), 'extra' => false, 'grade' => 1); $this->forms['stats'] = array('label' => __('Statistiques'), - 'fieldsnames' => array('stats', 'statsWeborama')); + 'fieldsnames' => array('stats','googleAnalytics', 'statsWeborama')); // . $this->fields['displayChaptersAtStart'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Afficher le sommaire au chargement de la publication"), 'extra' => true, 'grade' => 4); $this->fields['chaptersPosition'] = array('type' => 'combo',