(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.droits.php b/inc/ws/Controlleur/class.ws.droits.php
index 20eb4ab009cf42cab0d018da640700452d638d46..026ecca3e4856be2d9a43cf3c2397732fcf5eab1 100644 (file)
--- a/inc/ws/Controlleur/class.ws.droits.php
+++ b/inc/ws/Controlleur/class.ws.droits.php
@@ -72,7 +72,7 @@ class wsDroits {
        {\r
                global $core;\r
 \r
-               if(is_null($core->user)){\r
+               if(is_null($core) || is_null($core->user)){\r
                        $s='';\r
                }else{\r
                        $s=$core->user->getWSSignatures();\r

diff --git a/inc/ws/Util/packager/class.ws.packager.html5.php b/inc/ws/Util/packager/class.ws.packager.html5.php
index f27754d5e97e0b1f405c3b91b6e05c43a427cff3..0a5815b5d677dfcce6f59f8c264d14f8daf73897 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html5.php
+++ b/inc/ws/Util/packager/class.ws.packager.html5.php
@@ -59,12 +59,14 @@ class wsPackagerHTML5 extends wsPackager {
                mkdir($this->vdir . '/style', 0777, true);\r
                mkdir($this->vdir . '/contents', 0777, true);\r
                mkdir($this->vdir . '/images', 0777, true);\r
+               mkdir($this->vdir . '/data/images', 0777, true);\r
 \r
                foreach ($this->div as $n => $page) {\r
                        file_put_contents($this->vdir . '/contents/p' . $n . '.html', $this->writePage($page));\r
                }\r
                $this->writeFonts();\r
                $this->writeImages();\r
+               $this->writeTheme();\r
                file_put_contents($this->vdir . '/style/style.css', $this->writeCSS());\r
 \r
                file_put_contents($this->vdir . '/data/datas.js', $this->writeConfig());\r
@@ -86,6 +88,10 @@ class wsPackagerHTML5 extends wsPackager {
                }\r
        }\r
 \r
+       protected function writeTheme() {\r
+               // Icons\r
+       }\r
+\r
        protected function writeImages() {\r
 \r
                foreach (self::$resolutions as $r) {\r
@@ -182,7 +188,9 @@ class wsPackagerHTML5 extends wsPackager {
        protected function writeCSS() {\r
                $res = array();\r
 \r
-               $h = $this->book->parametres->height . 'px';\r
+\r
+               // General theme\r
+               $h = $this->t->parametres->height . 'px';\r
                $w2 = ($this->book->parametres->width * 2) . 'px';\r
                $w = $this->book->parametres->width . 'px';\r
 \r
@@ -192,6 +200,61 @@ class wsPackagerHTML5 extends wsPackager {
                $res[] = '.doublePage,#pages{width:' . $w2 . ';max-width:' . $w2 . ';height:' . $h . ';max-height:' . $h . '}';\r
                $res[] = '.page.right{left:' . $w . '}';\r
 \r
+               // Theme\r
+               // Background\r
+               $body = 'body{';\r
+               $body.='background-color:#' . $this->theme->parametres->backgroundColor . ';';\r
+               switch ($this->theme->parametres->repeat) {\r
+                       case wsTheme::REPEAT:\r
+                               $body.='background-repeat:repeat;';\r
+                               break;\r
+                       case wsTheme::NONE:\r
+                               $body.='background-repeat:no-repeat;';\r
+                               break;\r
+                       case wsTheme::RATIO:\r
+                               $body.='background-repeat:no-repeat;';\r
+                               break;\r
+                       case wsTheme::STRETCH:\r
+                               $body.='background-repeat:no-repeat;';\r
+                               $body.='background-size:100% 100%;';\r
+                               break;\r
+               }\r
+               if ($this->theme->parametres->backgroundImage != '') {\r
+                       copy($this->themeRoot . '/' . $this->theme->parametres->backgroundImage, $this->vdir . '/data/images/' . $this->theme->parametres->backgroundImage);\r
+                       $body.='background-image:url(../data/images/' . $this->theme->parametres->backgroundImage . ');';\r
+                       $body.='background-position:';\r
+\r
+\r
+                       switch ($this->theme->parametres->backgroundVAlign) {\r
+                               case wsTheme::TOP:\r
+                                       $body.='top';\r
+                                       break;\r
+                               case wsTheme::MIDDLE:\r
+                                       $body.='center';\r
+                                       break;\r
+                               case wsTheme::BOTTOM:\r
+                                       $body.='bottom';\r
+                                       break;\r
+                       }\r
+                       $body.=' ';\r
+                       switch ($this->theme->parametres->backgroundHAlign) {\r
+                               case wsTheme::LEFT:\r
+                                       $body.='left';\r
+                                       break;\r
+                               case wsTheme::CENTER:\r
+                                       $body.='center';\r
+                                       break;\r
+                               case wsTheme::RIGHT:\r
+                                       $body.='right';\r
+                                       break;\r
+                       }\r
+                       $body.=';';\r
+               }\r
+\r
+               $body.='}';\r
+               $res[] = $body;\r
+\r
+               // Pages styles\r
                foreach ($this->cssColor as $color => $index) {\r
                        $res[] = '.c' . $index . '{color:#' . $color . '}';\r
                }\r

diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index ca61d45c040542d7180adad9efb74b98e89ee2c6..b919885661d2a40ebdfca1d127fa05808e2a435f 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -9,6 +9,7 @@ class wsPackager {
        protected $theme;\r
        protected $version;\r
        protected $book_id;\r
+       protected $themeRoot;\r
 \r
        public static function package($book_id, $version) {\r
                if ($version == 'html') {\r
@@ -45,6 +46,7 @@ class wsPackager {
 \r
                $daoTheme = new wsDAOTheme($core->con);\r
                $this->theme = $daoTheme->getThemeOfBook($book_id, true);\r
+               $this->themeRoot = WS_THEMES . '/' . $this->theme->theme_id . '/';\r
        }\r
 \r
        protected function preparePackage() {\r