From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Sat, 9 Apr 2011 15:56:23 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b47fcddaf4d3db343b5ecb230c79f4321549fa94;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ca43df93a..61986ff86 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -145,6 +145,9 @@ class wsUrl {
 		$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'));
+		if (wsDroits::admin()) {
+			$versions['html5'] = array('title' => __('Version HTML5 (&alpha;)'), 'icon' => cubeMedia::silk('page_white_world.png'));
+		}
 
 		$res = '<div class="contextMenu downbookContextMenu" id="' . $id . '">';
 		$res .= '<ul>';
@@ -587,7 +590,7 @@ html{height:100%}' . "\n";
 		global $core;
 		commonDroits::min(5);
 
-		$dao=new wsDAODocument($core->con);
+		$dao = new wsDAODocument($core->con);
 		header('Content-type: text/plain');
 		ob_clean();
 		echo $dao->putLinksFromCSV($args[1]);
diff --git a/inc/ws/Util/class.ws.swf2html.php b/inc/ws/Util/class.ws.swf2html.php
index f7b67bc82..f2ff41eda 100644
--- a/inc/ws/Util/class.ws.swf2html.php
+++ b/inc/ws/Util/class.ws.swf2html.php
@@ -127,6 +127,15 @@ class wsSWF2HTMLParagraph extends wsSWF2HTMLTag {
 		$this->matrix = new wsSWF2HTMLMatrix();
 	}
 
+	public function __get($varname)
+	{
+		if ($varname == 'left') {
+			return $this->matrix->tx;
+		} elseif ($varname == 'top') {
+			return $this->matrix->ty;
+		}
+	}
+
 	public function addLine($line)
 	{
 		$line = parent::addLine($line);
diff --git a/inc/ws/Util/packager/_common.php b/inc/ws/Util/packager/_common.php
index e5bca614a..17aca9b37 100644
--- a/inc/ws/Util/packager/_common.php
+++ b/inc/ws/Util/packager/_common.php
@@ -1,6 +1,7 @@
 <?php
 $__autoload['wsPackager'] = dirname(__FILE__) . '/class.ws.packager.php';
 $__autoload['wsPackagerHTML'] = dirname(__FILE__) . '/class.ws.packager.html.php';
+$__autoload['wsPackagerHTML5'] = dirname(__FILE__) . '/class.ws.packager.html5.php';
 $__autoload['wsPackagerWinEXE'] = dirname(__FILE__) . '/class.ws.packager.win.exe.php';
 $__autoload['wsPackagerWinCD'] = dirname(__FILE__) . '/class.ws.packager.win.cd.php';
 $__autoload['wsPackagerMacEXE'] = dirname(__FILE__) . '/class.ws.packager.mac.exe.php';
diff --git a/inc/ws/Util/packager/class.ws.packager.html5.php b/inc/ws/Util/packager/class.ws.packager.html5.php
new file mode 100644
index 000000000..445925059
--- /dev/null
+++ b/inc/ws/Util/packager/class.ws.packager.html5.php
@@ -0,0 +1,137 @@
+<?php
+class wsPackagerHTML5 extends wsPackager {
+	protected $layouts = array();
+
+	protected $cssSize = array();
+	protected $cssColor = array();
+	protected $cssOpacity = array();
+	protected $cssFont = array();
+
+	protected $div = array();
+	protected $css = array();
+
+	public function __construct($book_id)
+	{
+		parent::__construct($book_id);
+		$this->version = 'html5';
+	}
+
+	protected function preparePackage()
+	{
+		parent::preparePackage();
+
+		foreach($this->pages as $page => $infos) {
+		fb($infos);
+			$file = WS_DOCS . '/' . $infos['document_id'] . '/html/' . $infos['document_page'] . '.obj';
+			fb($file);
+			if (file_exists($file)) {
+				$this->layouts[$page] = unserialize(file_get_contents($file));
+			}
+		}
+
+		$this->createHTML();
+	}
+
+	protected function createHTML()
+	{
+		foreach($this->layouts as $page => $infos) {
+			$this->div[$page] = array();
+			foreach($infos->tags as $tag) {
+				if ($tag instanceof wsSWF2HTMLFont) {
+					$this->addFont($tag, $infos);
+				} else if ($tag instanceof wsSWF2HTMLParagraph) {
+					$this->addParagraph($tag, $this->div[$page]);
+				}
+			}
+		}
+		file_put_contents($this->vdir . 'style.css', implode("\n", $this->css));
+		foreach($this->div as $n => $page) {
+			file_put_contents($this->vdir . 'p' . $n . '.html', $this->writePage($page));
+		}
+	}
+
+	protected function writePage($page)
+	{
+		$res = '';
+		foreach($page as $div) {
+			$res .= $this->writeDiv($div);
+		}
+		return $res;
+	}
+
+	protected function writeDiv($div)
+	{
+		$res = '<div style="left:' . $div['left'] . 'px;top:' . $div['top'] . 'px;">';
+		foreach($div['span'] as $span) {
+			$res .= $this->writeSpan($span);
+		}
+		$res .= '</div>';
+		return $res;
+	}
+
+	protected function writeSpan($span)
+	{
+		$res = '<span ';
+		$res .= 'style="left:' . $span['left'] . 'px;top:' . $span['top'] . '" ';
+		$res .= 'class="c' . $span['color'] . ' s' . $span['size'] . ' f' . $span['font'] . '"';
+		$res .= '>';
+		$res .= htmlentities($span['text']);
+		$res .= '</span>';
+		return $res;
+	}
+
+	protected function addFont($tag)
+	{
+	}
+
+	protected function addParagraph($tag, $div)
+	{
+		$d = array('span' => array(), 'left' => $tag->left, 'right' => $tag->right);
+		foreach($tag->textes as $text) {
+			$d['span'][] = $this->addText($text);
+		}
+		$div[] = $d;
+	}
+
+	protected function addCSSText($text)
+	{
+		return array('text' => $text->text,
+			'color' => $this->getCSSColor($text->color),
+			'size' => $this->getCSSSize($text->size),
+			'font' => $this->getCSSFont($text->font),
+			'left' => $text->left,
+			'right' => $text->right);
+	}
+
+	protected function getCSSSize($size)
+	{
+		return $this->getIndex($size, $this->cssSize);
+	}
+
+	protected function getCSSFont($font, $page)
+	{
+		$fontname = $page->fonts[$font]->name;
+		return $this->getIndex($fontname, $this->cssFont);
+	}
+
+	protected function getCSSColor($color)
+	{
+		return $this->getIndex($color, $this->cssColor);
+	}
+
+	protected function getIndex($value, $tab)
+	{
+		if (isset($tab[$value])) {
+			return $tab[$value];
+		}
+		$res = count($tab);
+		$tab[$value] = $res;
+		return $res;
+	}
+
+	public function __destruct(){
+
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index 7bcd01c90..965fa3cb4 100644
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -19,6 +19,8 @@ class wsPackager {
 			$packager = new wsPackagerWinINST($book_id);
 		} elseif ($version == 'mac-exe') {
 			$packager = new wsPackagerMacEXE($book_id);
+		} elseif ($version == 'html5') {
+			$packager = new wsPackagerHTML5($book_id);
 		}
 
 		return $packager->makePackage();