From 2b7bb1e6a2287fe5317949ceb7a0bad3511a33b6 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 22 Feb 2012 17:00:30 +0000 Subject: [PATCH] --- fluidbook/compile/index.html | 14 +++++++------- inc/ws/Metier/class.ws.book.parametres.php | 3 ++- inc/ws/Util/packager/class.ws.packager.html.php | 6 ++++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html index 6db528074..f5df8db3f 100644 --- a/fluidbook/compile/index.html +++ b/fluidbook/compile/index.html @@ -16,12 +16,7 @@ $redirectScript - - -
-
-
$alt
-
+ $ga - $ga + + +
+
+
$alt
+
\ No newline at end of file diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 0af27b6ec..825ab16a8 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -118,8 +118,9 @@ class wsBookParametres extends wsParametres { $this->fields['stats'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les statistiques Fluidbook'), 'grade' => 3); $this->fields['stats_score'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Afficher les scores dans les rapports'), 'grade' => 5); $this->fields['googleAnalytics'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics'), 'size' => 10); + $this->fields['googleAnalyticsCustom'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics personnalisé')); $this->forms['stats'] = array('label' => __('Statistiques'), - 'fieldsnames' => array('stats', 'stats_score', '|', 'googleAnalytics')); + 'fieldsnames' => array('stats', 'stats_score', '|', 'googleAnalytics','googleAnalyticsCustom')); // . $swfFilter = new stdClass(); $swfFilter->name = __('Animation SWF') . ' (*.swf)'; diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php index 444aca1ac..7fb481a7f 100644 --- a/inc/ws/Util/packager/class.ws.packager.html.php +++ b/inc/ws/Util/packager/class.ws.packager.html.php @@ -39,7 +39,9 @@ class wsPackagerHTML extends wsPackager { mkdir($this->vdir . '/pages/', 0777, true); $ga = ''; - if ($this->book->parametres->googleAnalytics != '') { + if ($this->book->parametres->googleAnalyticsCustom) { + $ga=$this->book->parametres->googleAnalyticsCustom; + } elseif ($this->book->parametres->googleAnalytics != '') { $variables = array('Language' => array('value' => 'getLang()', 'valueAsJS' => true, 'scope' => 2)); $ga = cubePage::googleAnalytics(explode(',', $this->book->parametres->googleAnalytics), true, $variables); } @@ -192,7 +194,7 @@ class wsPackagerHTML extends wsPackager { $dest = realpath($dest); $lines = array(); $lines[] = 'CACHE MANIFEST'; - $lines[] = '# '.date('Y-m-d H:i:s'); + $lines[] = '# ' . date('Y-m-d H:i:s'); $lines[] = ''; $lines[] = 'CACHE:'; $lines[] = 'index.html'; -- 2.39.5