(no commit message)

diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js
index b784fec9ef6de9feea623ecf04816d2e78efcf1b..8f8d625be1291aeaf0b5d2a9875591ca54f8a8ce 100644 (file)
--- a/fluidbook/compile/_js/fluidbook.js
+++ b/fluidbook/compile/_js/fluidbook.js
@@ -134,6 +134,20 @@ function _isMobile(devices){
        return false;\r
 }\r
 \r
+function redirectPDF(){\r
+       window.location='data/document.pdf';\r
+}\r
+\r
+function redirectMobile(){\r
+       var get=parseGet();\r
+       var page='index.html';\r
+       if(get['widget']!=undefined && get['widget']=='1'){\r
+               page='widget.html';\r
+       }\r
+       window.location='m/'+page;\r
+}\r
+\r
+\r
 function wheel(event){\r
        var delta = 0;\r
        if (!event) /* For IE. */\r

diff --git a/fluidbook/compile/fluidbook.js b/fluidbook/compile/fluidbook.js
index deeb6ef9f04f311d8951bfe9f1c6336afac18175..a4e6c8314419b68d0bf01ea85ae6621a0576806b 100644 (file)
--- a/fluidbook/compile/fluidbook.js
+++ b/fluidbook/compile/fluidbook.js
@@ -69,6 +69,8 @@ function getCookie(nom)
        }\r
        return null;\r
 }\r
+\r
+\r
 function setCookie(nom, valeur)\r
 {\r
        var argv=setCookie.arguments;\r

diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index 2925fffeeb047751c70b784f96dc83d7e41e244f..388ebfbbe6b1a55c5a51780073634b6a8b2c0938 100644 (file)
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -17,7 +17,6 @@
                <style type="text/css" media="print">*{ visibility: hidden; display: none }</style>\r
                <script type="text/javascript" src="fluidbook.js?junk=$junk"></script>\r
                <script type="text/javascript">FB_DEFAULT_LANG='$lang';</script>\r
-               $redirectScript\r
                $ga\r
                <script type="text/javascript">\r
                        if(isMobile()){\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index cdb64c6c97874535a94a78de13f0cb953ee45ce8..a048a334caae611e928b5687d2a04c08cc2b0a57 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -127,7 +127,7 @@ class wsUrl {
                        }\r
                        if ($book->version > 1 || $droits->admin) {\r
                                if ($droits->admin) {\r
-                                       $res .= '<td class="bouton"><a href="#" class="openContextMenu" rel="' . $context_view_id . '" rev="' . $book->book_id . '§' . $book->hash . '">' . $btVoir . '</a></td>';\r
+                                       $res .= '<td class="bouton"><a href="#" class="openContextMenu" rel="' . $context_view_id . '" rev="' . $book->book_id . '§' . $book->hash . '§' . TIME . '">' . $btVoir . '</a></td>';\r
                                } else {\r
                                        $viewURL = SITE_PATH . 'viewer/' . $book->book_id . '_' . $book->hash;\r
                                        if ($book->parametres->version == 1) {\r
@@ -233,11 +233,12 @@ class wsUrl {
                global $core;\r
 \r
                if (wsDroits::admin()) {\r
-                       $viewers = array('viewer' => array('title' => __('Version Flash'), 'icon' => cubeMedia::image(IMG . '/flash.png')),\r
-                               'viewerh' => array('title' => __('Version HTML5'), 'icon' => cubeMedia::image(IMG . '/html5.png')),\r
-                               'vieweru' => array('title' => __('Version Flash') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/flashbug.png')),\r
-                               'viewerht' => array('title' => __('Version HTML5') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/html5bug.png')),\r
-                               'viewer1' => array('title' => __('Version 1'), 'icon' => cubeMedia::image(IMG . '/flash.png'))\r
+                       $viewers = array(array('version' => 'viewer', 'title' => __('Version Flash'), 'icon' => cubeMedia::image(IMG . '/flash.png')),\r
+                               array('version' => 'viewerh', 'title' => __('Version HTML5'), 'icon' => cubeMedia::image(IMG . '/html5.png')),\r
+                               array('version' => 'vieweru', 'title' => __('Version Flash') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/flashbug.png')),\r
+                               array('version' => 'viewerhu', 'title' => __('Version HTML5') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/html5bug.png')),\r
+                               array('version' => 'viewerhu', 'title' => __('Widget HTML5'), 'icon' => cubeMedia::image(IMG . '/html5bug.png'), 'file' => 'widget.html', 'pattern' => '$1_$2_$3'),\r
+                               array('version' => 'viewer1', 'title' => __('Version 1'), 'icon' => cubeMedia::image(IMG . '/flash.png'))\r
                        );\r
                }\r
 \r
@@ -245,8 +246,14 @@ class wsUrl {
                $res .= '<ul>';\r
                $res .= '<li class="head">' . __("Sélectionnez la version") . '</li>';\r
                if (isset($viewers)) {\r
-                       foreach ($viewers as $v => $infos) {\r
-                               $res .= '<li><a class="popupFSBar" rel="toolbar=yes" rev="' . $v . '_$1" href="' . SITE_PATH . $v . '/$1_$2/">' . $infos['icon'] . $infos['title'] . '</a></li>';\r
+                       foreach ($viewers as $infos) {\r
+                               if (!isset($infos['file'])) {\r
+                                       $infos['file'] = '';\r
+                               }\r
+                               if (!isset($infos['pattern'])) {\r
+                                       $infos['pattern'] = '$1_$2';\r
+                               }\r
+                               $res .= '<li><a class="popupFSBar" rel="toolbar=yes" rev="' . $infos['version'] . '_$1" href="' . SITE_PATH . $infos['version'] . '/' . $infos['pattern'] . '/' . $infos['file'] . '">' . $infos['icon'] . $infos['title'] . '</a></li>';\r
                        }\r
                }\r
                $res .= '</ul></div>';\r
@@ -671,18 +678,21 @@ html{height:100%}' . "\n";
 \r
        public static function viewerhu($args) {\r
                global $core;\r
-               \r
+\r
                commonDroits::min(5);\r
                $args = cubePage::getArgs($args);\r
+               if (!isset($args[1])) {\r
+                       $args[1] = '';\r
+               }\r
 \r
-               $dao=new wsDAOBook($core->con);\r
+               $dao = new wsDAOBook($core->con);\r
                $e = explode('_', $args[0]);\r
                $dao->compile($e[0], 'html5');\r
                $time = self::getHTML5CacheTime($e[0]);\r
 \r
                if (count($e) == 2 || $e[2] != $time) {\r
                        $e[2] = $time;\r
-                       http::redirect(SITE_PATH . 'viewerhu/' . implode('_', $e) . '/');\r
+                       http::redirect(SITE_PATH . 'viewerhu/' . implode('_', $e) . '/' . $args[1]);\r
                        exit;\r
                }\r
 \r
@@ -813,7 +823,7 @@ html{height:100%}' . "\n";
                }\r
 \r
                fb($version);\r
-               $dao->compile($book_id, (string)$version);\r
+               $dao->compile($book_id, (string) $version);\r
 \r
                $daoTheme = new wsDAOTheme($core->con);\r
                $theme = $daoTheme->selectById($book->theme, 'themes');\r

diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index ffba9ef1b26dd126e63b1f2d0c0778bd7652950e..af63fd3214f1938d48129e556664885303dba240 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -68,11 +68,11 @@ class wsPackagerHTML extends wsPackager {
                        $favicon = '<link rel="shortcut icon" href="data/fluidbook.ico">';\r
                }\r
 \r
-               $redirectPDF = 'window.location="data/document.pdf";';\r
+               $redirectPDF = 'redirectPDF();';\r
                if ($this->book->parametres->mobileVersion == 'pdf') {\r
                        $redirectMobile = $redirectPDF;\r
                } else {\r
-                       $redirectMobile = 'window.location="m/index.html";';\r
+                       $redirectMobile = 'redirectMobile();';\r
                        $this->prepareHTML5();\r
                }\r
 \r