(no commit message)

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 8f5514d4cea1164dcd3b6df324af06c467d5af37..ebd47eb7655960e9376a3fae0db5af0133c3cadc 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -57,8 +57,8 @@ if (in_array($_SERVER['HTTP_HOST'], $ws)) {
        define('TITLE', 'Extranet Cubedesigners');\r
 }\r
 // Workshop\r
-define('THEMES', WEBROOT . '/themes/');\r
-define('ICONS', WEBROOT . '/icones/');\r
+define('THEMES', WEBROOT . '/fluidbook/themes/');\r
+define('ICONS', WEBROOT . '/fluidbook/icones/');\r
 define('WS_STATS', 'http://stats.fluidbook.com/');\r
 define('WS_FILES', ROOT . '/fluidbook');\r
 define('WS_BOOKS', WS_FILES . '/books');\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 190d0e8e05b45a54187c058d76481f7ce947c1ba..c2c215ed3ea3a65dc191d9dc2727a79ba076eb30 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -543,8 +543,7 @@ class wsDAOBook extends extranetDAO {
                }\r
                // Fonts\r
                $flex->addFont(FONT_PATH . '/FFFATLAN_0.TTF', 'CreditsFont', 'ASCII');\r
-               $flex->addFont(FONT_PATH . '/DIN Medium_0.ttf', 'GeneralFont', 'Latin');\r
-               $flexLight->addFont(FONT_PATH . '/DIN Medium_0.ttf', 'GeneralFontLight', 'Numerals');\r
+               $flexLight->addFont(FONT_PATH . '/DIN Medium_0.ttf', 'GeneralFont', 'Latin');\r
                $res .= $flex->compile() . "\n\n-------------------\n\n";\r
                $flexLight->addVariable('datasSize', filesize($compilerDir . '/FluidbookDatas.swf'));\r
                $res .= $flexLight->compile();\r