(no commit message)

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 62e26e463fe90db3e728a5ce0abd174aa42cfed6..97bee395d2329970da39fa28c0b83f9c9091e66b 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -14,7 +14,7 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
        define('DB_PASSWORD', 'valparaiso');\r
        define('DEV', true);\r
        define('WINDOWS', true);\r
-       define('FONT_PATH', 'C:/Windows/Fonts');\r
+       define('FONT_PATH', ROOT . '/fluidbook/fonts/');\r
        define('AS3_SOURCES', 'C:\Users\Vincent\Documents\Works\as3;C:\Users\Vincent\Documents\Works\cubeExtranet\swf\_src;C:\Users\Vincent\Documents\Works\as3-10');\r
 \r
        if (in_array($_SERVER['HTTP_HOST'], $localrel)) {\r
@@ -68,7 +68,7 @@ define('WS_ICONS', WS_FILES . '/icones');
 define('WS_THEMES', WS_FILES . '/themes');\r
 define('WS_CACHE', WS_FILES . '/cache');\r
 define('WS_COMPILE_ASSETS', WS_FILES . '/compile');\r
-define('WS_L10N',WS_FILES.'/l10n');\r
+define('WS_L10N', WS_FILES . '/l10n');\r
 // define('MINIMIZE_JS', false);\r
 define('WORKER_PREFIX', 'worker.');\r
 \r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index b75e79d00f48802ac7d29a654f4cd82a5bc3797c..ec732856b0424e81e8fca0d5923df02f086f9e21 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -94,13 +94,29 @@ class wsUrl {
                        $args[1] = 'fr';\r
                }\r
 \r
+               $allLangs = cubeLang::getCodes($core->user->lang);\r
+               $existingLangs = array();\r
+\r
+               $dao = new wsDAOLang($core->con);\r
+               $langs = $dao->selectAll();\r
+               foreach($langs as $lang) {\r
+                       if (!isset($allLangs[$lang->lang_id])) {\r
+                               continue;\r
+                       }\r
+                       $existingLangs[$lang->lang_id] = $allLangs[$lang->lang_id];\r
+\r
+                       unset($allLangs[$lang->lang_id]);\r
+               }\r
+\r
+               $langs = array(__('Langues configurées') => array_flip($existingLangs), __('Autres langues') => array_flip($allLangs));\r
+\r
                $res = extranetPage::barre();\r
                $res .= extranetPage::tMain(null, false);\r
 \r
                $res .= extranetPage::bh();\r
                $res .= '<form action="changeLang" method="post">';\r
                $res .= '<table class="liste">';\r
-               $res .= '<tr><td class="center">' . __('Sélectionnez la langue à configurer') . ' : ' . form::combo('lang', array_flip(cubeLang::getCodes($core->user->lang)), $args[1]) . ' </td></tr>';\r
+               $res .= '<tr><td class="center">' . __('Sélectionnez la langue à configurer') . ' : ' . form::combo('lang', $langs, $args[1]) . ' </td></tr>';\r
                $res .= '<tr class="odd"><td class="right"><a href="#" class="submit">' . $core->typo->Ajouter('OK') . '</a></td></tr>';\r
                $res .= '</table>';\r
                $res .= '</form>';\r
@@ -119,7 +135,6 @@ class wsUrl {
                global $core;\r
                $dao = new wsDAOLang($core->con);\r
                $lang = $dao->selectById($lang_id);\r
-               if(is_null($lang))\r
 \r
                $res = '<form action="saveLang" method="post">';\r
 \r
@@ -132,7 +147,7 @@ class wsUrl {
                $res .= extranetPage::bf();\r
 \r
                $res .= extranetPage::bh();\r
-               $res .= cubeLang::translationForm(FLUIDBOOK_SOURCES, $lang_id , null, 'liste', array(), $core->typo->Ajouter(__('Enregistrer')), $lang->traductions);\r
+               $res .= cubeLang::translationForm(FLUIDBOOK_SOURCES, $lang_id , null, 'liste', array(), '<a href="#" class="submit">' . $core->typo->Ajouter(__('Enregistrer')) . '</a>', $lang->traductions);\r
                $res .= extranetPage::bf();\r
                $res .= '</form>';\r
                return $res;\r
@@ -305,14 +320,17 @@ html{height:100%}' . "\n";
                return $res;\r
        }\r
 \r
-       public static function testAS()\r
+       public static function testAS($args)\r
        {\r
                global $core;\r
+               if (!isset($args[1])) {\r
+                       $args[1] = 2964;\r
+               }\r
                // cubePHP::neverStop();\r
                $dao = new wsDAOBook($core->con);\r
                header('Content-type: text/plain');\r
                ob_clean();\r
-               echo $dao->compile(2970, 3, false);\r
+               echo $dao->compile($args[1], 3, false);\r
                exit;\r
        }\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 7e941ae698614a8d13f08539b8e13ea4394d6eb4..d2fda521e9bbacd4f91e2d53d366b5f7e5cd309d 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -491,6 +491,9 @@ class wsDAOBook extends extranetDAO {
                $firstDoc = $daoDoc->selectById($pages[1]['document_id']);\r
                $size = $firstDoc->generalInfos['size'];\r
 \r
+               $daoLang = new wsDAOLang($this->con);\r
+               $lang = $daoLang->selectById($book->lang);\r
+\r
                $daoTheme = new wsDAOTheme($this->con);\r
                $theme = $daoTheme->getThemeOfBook($book_id, true);\r
 \r
@@ -570,8 +573,9 @@ class wsDAOBook extends extranetDAO {
                        $flex->addBitmap($iconsRoot . 'nav-' . $file . '.png', 'nav_' . $file);\r
                }\r
                // Fonts\r
-               $flex->addFont(FONT_PATH . '/FFFATLAN_0.TTF', 'CreditsFont', 'ASCII');\r
-               $flexLight->addFont(FONT_PATH . '/DIN Medium_0.ttf', 'GeneralFont', 'Latin');\r
+               $flex->addFont(FONT_PATH . '/' . $lang->font, 'GeneralFont', $lang->charset);\r
+               $flex->addFont(FONT_PATH . '/FluidbookCredits.ttf', 'CreditsFont', 'ASCII');\r
+               $flexLight->addFont(FONT_PATH . '/FluidbookLoader.ttf', 'LoaderFont', 'Numerals');\r
                $res .= $flex->compile() . "\n\n-------------------\n\n";\r
                $flexLight->addVariable('datasSize', filesize($compilerDir . '/FluidbookDatas.swf'));\r
                $res .= $flexLight->compile();\r

diff --git a/inc/ws/DAO/class.ws.dao.lang.php b/inc/ws/DAO/class.ws.dao.lang.php
index fbda98d310b057f83946632aaee1845d0e44a675..9ee5b1b4b097c79ef2788e2740254c5c237a66c3 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.lang.php
+++ b/inc/ws/DAO/class.ws.dao.lang.php
@@ -30,7 +30,7 @@ class wsDAOLang extends extranetDAO {
 \r
        public function selectAll()\r
        {\r
-               $r = $this->con->select('SELECT * FROM langues ORDER BY public DESC,(CHAR_LENGTH(lang_id)=2) DESC, nom ASC');\r
+               $r = $this->con->select('SELECT * FROM langues ORDER BY public DESC,(CHAR_LENGTH(lang_id)=2) DESC');\r
                return $this->factory($r);\r
        }\r
 \r