]> _ Git - cubeextranet.git/commitdiff
projects / cubeextranet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 28518ab)
(no commit message)
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 22 Feb 2012 17:00:30 +0000 (17:00 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 22 Feb 2012 17:00:30 +0000 (17:00 +0000)
fluidbook/compile/index.html patch | blob | history
inc/ws/Metier/class.ws.book.parametres.php patch | blob | history
inc/ws/Util/packager/class.ws.packager.html.php patch | blob | history

diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index 6db528074f3da206407e43557999f9e37377d2d5..f5df8db3f8800bfe5b2b7b9b89cd93c56f5f5d89 100644 (file)
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -16,12 +16,7 @@
                <script type="text/javascript" src="fluidbook.js?junk=$junk"></script>\r
                <script type="text/javascript">FB_DEFAULT_LANG='$lang';</script>\r
                $redirectScript\r
-       </head>\r
-       <body style="background-color:#$bgcolor" onload="this.focus();">\r
-               <div id="fluidbook">\r
-                       <div style="padding:20px;text-align:center;"><a href="http://get.adobe.com/flashplayer/" target="_blank"><img style="border:0;" src="$pathToGetflash" alt="" width="734" height="409" /></a></div>\r
-                       <div style="padding:20px;">$alt</div>\r
-               </div>\r
+               $ga\r
                <script type="text/javascript">\r
                        if(isMobile()){\r
                                $redirectMobile\r
@@ -31,6 +26,11 @@
                                swfobject.embedSWF("$pathToIndex?junk=$junk", "fluidbook", "100%", "100%", "$flashversion","", getFlashvars($junk),     {"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});\r
                        }\r
                </script>\r
-               $ga\r
+       </head>\r
+       <body style="background-color:#$bgcolor" onload="this.focus();">\r
+               <div id="fluidbook">\r
+                       <div style="padding:20px;text-align:center;"><a href="http://get.adobe.com/flashplayer/" target="_blank"><img style="border:0;" src="$pathToGetflash" alt="" width="734" height="409" /></a></div>\r
+                       <div style="padding:20px;">$alt</div>\r
+               </div>\r
        </body>\r
 </html>
\ 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 0af27b6ecbab4f0bddb1fb526d7574a0da78d2a5..825ab16a8ae25b55e37a6294fc8b0d6ea7214cd2 100644 (file)
--- 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);\r
                $this->fields['stats_score'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Afficher les scores dans les rapports'), 'grade' => 5);\r
                $this->fields['googleAnalytics'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics'), 'size' => 10);\r
+               $this->fields['googleAnalyticsCustom'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics personnalisé'));\r
                $this->forms['stats'] = array('label' => __('Statistiques'),\r
-                       'fieldsnames' => array('stats', 'stats_score', '|', 'googleAnalytics'));\r
+                       'fieldsnames' => array('stats', 'stats_score', '|', 'googleAnalytics','googleAnalyticsCustom'));\r
                // .\r
                $swfFilter = new stdClass();\r
                $swfFilter->name = __('Animation SWF') . ' (*.swf)';\r
diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 444aca1ac760769f1ec7938baa54228c4856e96b..7fb481a7fddf67802eec9ee930a4adf34c546a1a 100644 (file)
--- 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);\r
 \r
                $ga = '';\r
-               if ($this->book->parametres->googleAnalytics != '') {\r
+               if ($this->book->parametres->googleAnalyticsCustom) {\r
+                       $ga=$this->book->parametres->googleAnalyticsCustom;\r
+               } elseif ($this->book->parametres->googleAnalytics != '') {\r
                        $variables = array('Language' => array('value' => 'getLang()', 'valueAsJS' => true, 'scope' => 2));\r
                        $ga = cubePage::googleAnalytics(explode(',', $this->book->parametres->googleAnalytics), true, $variables);\r
                }\r
@@ -192,7 +194,7 @@ class wsPackagerHTML extends wsPackager {
                $dest = realpath($dest);\r
                $lines = array();\r
                $lines[] = 'CACHE MANIFEST';\r
-               $lines[] = '# '.date('Y-m-d H:i:s');\r
+               $lines[] = '# ' . date('Y-m-d H:i:s');\r
                $lines[] = '';\r
                $lines[] = 'CACHE:';\r
                $lines[] = 'index.html';\r
Unnamed repository; edit this file 'description' to name the repository.