From a7f12b0e2fdb5bff36a5985cc189187437bb7702 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Thu, 26 Jan 2012 15:26:35 +0000 Subject: [PATCH] --- fluidbook/compile/index.html | 2 +- inc/ws/Controlleur/class.ws.url.php | 6 +- inc/ws/Util/packager/_common.php | 1 + .../Util/packager/class.ws.packager.html.php | 16 +- inc/ws/Util/packager/class.ws.packager.php | 5 + inc/ws/Util/packager/class.ws.packager.v1.php | 219 ++++++++++++++++++ 6 files changed, 244 insertions(+), 5 deletions(-) create mode 100644 inc/ws/Util/packager/class.ws.packager.v1.php diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html index ee2b13952..6db528074 100644 --- a/fluidbook/compile/index.html +++ b/fluidbook/compile/index.html @@ -28,7 +28,7 @@ }else if(isBadMobile()){ $redirectPDF }else{ - swfobject.embedSWF("$pathToIndex?junk=$junk", "fluidbook", "100%", "100%", "10.0.22","", getFlashvars($junk), {"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"}); + swfobject.embedSWF("$pathToIndex?junk=$junk", "fluidbook", "100%", "100%", "$flashversion","", getFlashvars($junk), {"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"}); } $ga diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 3ed76706d..abe198ad7 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -164,13 +164,15 @@ class wsUrl { global $core; $versions = array(); - $versions['html'] = array('title' => __('Version online'), 'icon' => cubeMedia::silk('page_white_world.png')); + $versions['html'] = array('title' => __('Version online'), 'icon' => cubeMedia::silk('page_world.png')); + if (wsDroits::admin()) { + $versions['v1'] = array('title' => __('Version online') . ' - V1', 'icon' => cubeMedia::silk('page_white_world.png')); + } $versions['win-exe'] = array('title' => __('Version offline') . ' - ' . __('Executable Windows'), 'icon' => cubeMedia::silk('application_view_tile.png')); $versions['win-ins'] = array('title' => __('Version offline') . ' - ' . __('Installeur Auto-executable Windows'), 'icon' => cubeMedia::silk('application_view_tile.png')); $versions['mac-exe'] = array('title' => __('Version offline') . ' - ' . __('Exécutable Mac OS X'), 'icon' => cubeMedia::image(IMG . '/macos.png')); $versions['win-cd'] = array('title' => __('Version offline') . ' - ' . __('CD-ROM') . ' / ' . __('Clé USB'), 'icon' => cubeMedia::silk('cd.png')); - $res = '
'; $res .= '