From: vincent@cubedesigners.com Date: Mon, 14 Oct 2013 16:12:34 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e0c0ea1ee6ca2e1f0de66aa78f4ad05d1c7a469b;p=cubeextranet.git --- diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 693078716..05ca9ec55 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -642,7 +642,7 @@ class wsUrl { $res .= commonPage::bf(); $res .= commonPage::bh(); - $res .= cubeLang::translationForm(array(__('Version Flash') => PLAYER_SOURCES, __('Version HTML5') => WS_COMPILE_ASSETS . '/_html5', __('Application') => WS_COMPILE_ASSETS . '/_html5app'), $lang_id, null, 'liste', array(), '' . $core->typo->Ajouter(__('Enregistrer')) . '', $lang->traductions); + $res .= cubeLang::translationForm(array(__('Version Flash') => PLAYER_SOURCES, __('Version HTML5') => WS_COMPILE_ASSETS . '/_html5', __('Compilateur HTML5') => ROOT . '/inc/ws/Util/html5', __('Application') => WS_COMPILE_ASSETS . '/_html5app'), $lang_id, null, 'liste', array(), '' . $core->typo->Ajouter(__('Enregistrer')) . '', $lang->traductions); $res .= commonPage::bf(); $res .= ''; return $res; diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php index 10da61d61..912911c4f 100644 --- a/inc/ws/Util/class.ws.links.php +++ b/inc/ws/Util/class.ws.links.php @@ -14,7 +14,7 @@ class wsLinks { public static function linksToExcel($links, $rulers, $pages = null) { $cols = array( - 'page' => __('Page de la publication'), 'left' => __('x'), 'top' => __('y'), 'width' => __('Largeur'), 'height' => __('Hauteur'), + 'page' => __('Page de la publication'), 'left' => __('x'), 'top' => __('y'), 'width' => __('Largeur'), 'height' => __('Hauteur'), 'rot' => __('Rotation'), 'type' => __('Type'), 'to' => __('Destination'), 'target' => __('Cible'), 'infobulle' => __('Infobulle'), 'numerotation' => __('Numérotation'), 'display_area' => __('Activer la surbrillance'), @@ -207,6 +207,9 @@ class wsLinks { $link = (array) $link; $link['page'] = $p; $link['id'] = $i; + if (!isset($link['rot'])) { + $link['rot'] = 0; + } $links[] = $link; } } diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php index 04ad4fcc2..c5f06d5f0 100644 --- a/inc/ws/Util/html5/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/class.ws.html5.compiler.php @@ -14,8 +14,8 @@ class wsHTML5Compiler { return new wsHTML5Compiler($book_id, 'stable', $phonegap, $phonegapVersion, $dir, $standalone, $appcache, $home); } else { return new wsHTML5CompilerDev($book_id, 'dev', $phonegap, $phonegapVersion, $dir, $standalone, $appcache, $home); - } - } + } + } protected static $resolutions = array(150, 300); protected $maxRes = 300; @@ -477,12 +477,9 @@ class wsHTML5Compiler { $cache = ''; if ($this->appcache) { $cache = ' manifest="cache.appcache"'; - } - - $script = ''; - if ($this->phonegap) { - //$script .= '' . "\n"; } + + $script = ''; $script .= '' . "\n"; $script .= '' . "\n"; $script .= '' . "\n"; @@ -496,6 +493,7 @@ class wsHTML5Compiler { } $print = $this->writePrint(); + $message = sprintf($this->__('Your browser is not up to date and is not able to run this publication. %sLearn more%s'), '', ''); $splash = ''; if ($this->theme->parametres->logoLoader) { @@ -506,13 +504,12 @@ class wsHTML5Compiler { } } - $vars = array('titre', 'credits', 'ga', 'style', 'script', 'pagesContents', 'description', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor'); + $vars = array('titre', 'credits', 'ga', 'style', 'script', 'pagesContents', 'description', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor', 'message'); foreach ($vars as $v) { $html = str_replace('', $$v, $html); } $scripts = array(); - //$scripts[] = ''; foreach ($this->debugJsFiles as $js) { $scripts[] = ''; } @@ -535,13 +532,13 @@ class wsHTML5Compiler { $thtml = $uhtml; - $vars = array('titre', 'credits', 'ga', 'style', 'script', 'pagesContents', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor'); + $vars = array('titre', 'credits', 'ga', 'style', 'script', 'pagesContents', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor', 'message'); foreach ($vars as $v) { $uhtml = str_replace('', $$v, $uhtml); } $script.="\n\t\t" . ''; - $vars = array('titre', 'credits', 'ga', 'style', 'script', 'print', 'hiddenContents', 'splash'); + $vars = array('titre', 'credits', 'ga', 'style', 'script', 'print', 'hiddenContents', 'splash', 'message'); foreach ($vars as $v) { $thtml = str_replace('', $$v, $thtml); } @@ -591,6 +588,14 @@ class wsHTML5Compiler { $this->config->filesInfos[$key] = $infos; } + protected function __($str) { + if (isset($this->config->l10n['default']->$str)) { + return $this->config->l10n['default']->$str; + } else { + return $str; + } + } + protected function writeLangs() { global $core; $daoLang = new wsDAOLang($core->con); diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php index ca9dfa691..b367dca78 100644 --- a/inc/ws/Util/html5/class.ws.html5.links.php +++ b/inc/ws/Util/html5/class.ws.html5.links.php @@ -23,6 +23,7 @@ class wsHTML5Link { public $display_area; public $infobulle; public $id; + public $rot; /** * @@ -214,6 +215,10 @@ class wsHTML5Link { $css = '#l_' . $this->id . '{'; $css.='left:' . $this->left * $this->getCssScale() . 'px;top:' . $this->top * $this->getCssScale() . 'px;'; $css.='width:' . $this->width * $this->getCssScale() . 'px;height:' . $this->height * $this->getCssScale() . 'px;'; + if ($this->rot) { + $css.= wsHTML5Compiler::writeCSSUA('transform', 'rotate(' . $this->rot . 'deg)'); + $css.= wsHTML5Compiler::writeCSSUA('transform-origin', '0% 0%'); + } $css.=$this->getCSS(); $css.='}'; return $css; @@ -675,6 +680,10 @@ class inpesPopinLink extends htmlMultimediaLink { $css = '#l_' . $this->id . '{'; $css.='left:' . $this->left * $this->getCssScale() . 'px;top:' . $this->top * $this->getCssScale() . 'px;'; $css.='width:' . $this->width * $this->getCssScale() . 'px;height:' . $this->height * $this->getCssScale() . 'px;'; + if ($this->rot) { + $css.= wsHTML5Compiler::writeCSSUA('transform', 'rotate(' . $this->rot . 'deg)'); + $css.= wsHTML5Compiler::writeCSSUA('transform-origin', '0% 0%'); + } $css.=$this->getCSS(); $css.='}'; return $css;