(no commit message)

diff --git a/fluidbook/compile/_zinc/FluidbookMAC.zinc b/fluidbook/compile/_zinc/FluidbookMAC.zinc
deleted file mode 100644 (file)
index 938a535..0000000
Binary files a/fluidbook/compile/_zinc/FluidbookMAC.zinc and /dev/null differ

diff --git a/fluidbook/compile/_zinc/FluidbookWIN.zinc b/fluidbook/compile/_zinc/FluidbookWIN.zinc
index d4cb6ab71ee97eeab6720ebd7251a06503ca7af1..9c6a16780e535d05438d58b4b7cc0b83f3818e79 100644 (file)
Binary files a/fluidbook/compile/_zinc/FluidbookWIN.zinc and b/fluidbook/compile/_zinc/FluidbookWIN.zinc differ

diff --git a/fluidbook/compile/autorun.inf b/fluidbook/compile/autorun.inf
index 40ffc03f1eb1a66213693709ddd010a9470b4ad3..c78003e87fe990e5712706df85f2cdc83d4d79ba 100644 (file)
--- a/fluidbook/compile/autorun.inf
+++ b/fluidbook/compile/autorun.inf
@@ -1,5 +1,5 @@
 [autorun]\r
 label=$title\r
-icon=fluidbook.ico\r
+icon=data/fluidbook.ico\r
 open=$exe\r
 action=$title
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk.jar b/fluidbook/tools/fwstk.jar
index 15683c1865198a0c539c411590e4a80bdf1cdcf8..03c2c17861c67c92147316b85faebebeae4d5dc2 100644 (file)
Binary files a/fluidbook/tools/fwstk.jar and b/fluidbook/tools/fwstk.jar differ

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index 22793f99edb77f169bf49403f9ebcc22e40e35db..9e777ad5ed2f81eae00ea71e739d5b594ff7013d 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -169,7 +169,7 @@ class extranetUrl {
                if ($entreprise_id == 'new' || !$client->ws_admin) {\r
                        $class = 'empty-field';\r
                        $default_id = '';\r
-                       $default = __('Entrez le nom du revendeur ou de l\'administrateur');\r
+                       $default = __("Entrez le nom du revendeur ou de l'administrateur");\r
                } else {\r
                        $class = '';\r
                        $default_id = $client->ws_admin;\r
@@ -1523,7 +1523,7 @@ class extranetUrl {
                $res .= '<table class="liste">';\r
                $res .= '<tr><th>' . __("Traduction de l'application en anglais") . '</th><th></th></tr>';\r
                $res .= '</table>';\r
-               $res .= cubeLang::translationForm(array(ROOT . '/inc/extranet', FLASH_SOURCES), 'en' , ROOT . '/l10n', '', array(), '<a href="#" class="submit">' . $core->typo->BoutonOK('Enregistrer') . '</a>');\r
+               $res .= cubeLang::translationForm(array(ROOT . '/inc/extranet',ROOT . '/inc/ws', COMPOSER_SOURCES), 'en' , ROOT . '/l10n', '', array(), '<a href="#" class="submit">' . $core->typo->BoutonOK('Enregistrer') . '</a>');\r
                $res .= '</form>';\r
                $res .= commonPage::bf();\r
                $res .= commonPage::bMain();\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 1f96de1ccf89edbcfdc6dae1cf7d0c8bd2620e23..5feea0e3f4f01187c97d22e2b645fcc992823e40 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -37,7 +37,7 @@ class wsUrl {
                cubePage::contextMenu();\r
 \r
                $droits = wsDroits::getDroits();\r
-               \r
+\r
                commonDroits::min(1);\r
                $settings = is_null($settings) ? $core->user->getSettings('books') : $settings;\r
                $change = is_null($dashboard) ? 'Books' : 'Dashboard/' . $dashboard;\r
@@ -284,7 +284,7 @@ class wsUrl {
 \r
 \r
                $tab = cubeLang::getTranslationsList(PLAYER_SOURCES, array('php', 'as'), array(), $lang->traductions);\r
-               \r
+\r
                $s->setCellValueByColumnAndRow(0, 1, 'ID', true);\r
                $s->setCellValueByColumnAndRow(1, 1, 'English', true);\r
                $s->setCellValueByColumnAndRow(2, 1, $lang_name, true);\r
@@ -608,7 +608,7 @@ html{height:100%}' . "\n";
                $wmode = isset($args[1]) ? $args[1] : '';\r
 \r
                $e = explode('_', $args[0]);\r
-               $newurl=null;\r
+               $newurl = null;\r
                if (count($e) == 2 || $e[2] < TIME - 10) {\r
                        $e[2] = TIME;\r
                        http::redirect(SITE_PATH . 'viewer/' . implode('_', $e) . '/' . $wmode);\r
@@ -622,7 +622,7 @@ html{height:100%}' . "\n";
                self::checkDocumentVersionOfBook($book_id);\r
                wsSecureSWF::checkProtectedSWF();\r
 \r
-               echo self::commonViewer($book_id, $e[1], false, $wmode,$newurl);\r
+               echo self::commonViewer($book_id, $e[1], false, $wmode, $newurl);\r
        }\r
 \r
        public static function commonViewer($book_id, $hash, $standalone = false, $wmode = 'default') {\r
@@ -1042,7 +1042,7 @@ html{height:100%}' . "\n";
                        if ($entreprise_id == 'new' || !$client->ws_admin) {\r
                                $class = 'empty-field';\r
                                $default_id = '';\r
-                               $default = __('Entrez le nom du revendeur ou de l\'administrateur');\r
+                               $default = __("Entrez le nom du revendeur ou de l'administrateur");\r
                        } else {\r
                                $class = '';\r
                                $default_id = $client->ws_admin;\r
@@ -1257,7 +1257,7 @@ html{height:100%}' . "\n";
                if (!is_null($demandeur->ws_admin) && !in_array($demandeur->ws_admin, $administrateurs)) {\r
                        // Si déjà géré par un revendeur\r
                        $revendeur = $daoUtilisateur->selectById($demandeur->ws_admin, 'utilisateurs_entreprise');\r
-                       $actions[__('Je confie la demande à ' . $revendeur->rs . ' (' . $revendeur->prenom . ' ' . $revendeur->nom . ')')] = $demandeur->ws_admin;\r
+                       $actions[__('Je confie la demande à') . ' ' . $revendeur->rs . ' (' . $revendeur->prenom . ' ' . $revendeur->nom . ')'] = $demandeur->ws_admin;\r
                } else {\r
                        $liste = $daoUtilisateur->selectWSRevendeursFacturables();\r
                        $revendeurs = array();\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index a86908cf697667ce53cb615c09d6b5f49c38e13d..6bf26674a6d613f3ca321e2eb0e6a110f6a8c6a8 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -24,8 +24,8 @@ class wsBookParametres extends wsParametres {
                // .\r
                // .\r
                $this->fields['friend'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Envoyer à un ami'));\r
-               $this->fields['email_title'] = array('type' => 'text', 'default' => __('%name% vous invite à découvrir %title%'), 'editable' => true, 'label' => __("Titre de l'email \"Envoyer à un ami\""));\r
-               $this->fields['email_body'] = array('type' => 'textarea', 'default' => __('Veuillez cliquer sur le lien suivant : %link%'), 'editable' => true, 'label' => __("Corps de l'email \"Envoyer à un ami\""));\r
+               $this->fields['email_title'] = array('type' => 'text', 'default' => __('%name% vous invite à découvrir %title%'), 'editable' => true, 'label' => __("Titre de l'email").' "'.__('Envoyer à un ami').'"');\r
+               $this->fields['email_body'] = array('type' => 'textarea', 'default' => __('Veuillez cliquer sur le lien suivant : %link%'), 'editable' => true, 'label' =>  __("Corps de l'email").' "'.__('Envoyer à un ami').'"');\r
                $this->fields['email_editable'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Permettre au lecteur de modifier le corps de l'email"));\r
                $this->fields['askAcknowledge'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Demander au destinataire un accusé de réception"), 'grade' => 3);\r
                $this->fields['facebook'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Facebook'));\r

diff --git a/inc/ws/Util/packager/class.ws.packager.mac.exe.php b/inc/ws/Util/packager/class.ws.packager.mac.exe.php
index d93ec19ff9c3a22ca701258e8a3c46c8f813892d..d1c1279d51a94c7baebf54a81c9deeebcb17316b 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.mac.exe.php
+++ b/inc/ws/Util/packager/class.ws.packager.mac.exe.php
@@ -16,6 +16,7 @@ class wsPackagerMacEXE extends wsPackager {
 \r
                $this->copyFluidbookFiles();\r
                $this->copyOtherFiles(array('Fluidbook.app.zip'));\r
+               $this->moveDatasSWF();\r
        }\r
 \r
        public function makePackage()\r

diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index 7bd07a24b832529df16c6e00326b67b559044b7d..c71d1a614d44873924e4056aafce6d6dec8f2b02 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -164,6 +164,11 @@ class wsPackager {
                        $rm->execute();\r
                }\r
        }\r
+       \r
+       protected function moveDatasSWF(){\r
+               rename($this->vdir.'/FluidbookDatas.swf',$this->vdir.'/data/FluidbookDatas.swf');\r
+               rename($this->vdir.'/FluidbookDatasLight.swf',$this->vdir.'/data/FluidbookDatasLight.swf');\r
+       }\r
 \r
        public function __destruct()\r
        {\r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.cd.php b/inc/ws/Util/packager/class.ws.packager.win.cd.php
index d70a06b916ebfa6ad1faab734669276d22fe8bc3..883db767f397d2f9a9878ff255f5dec9aa68fd55 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.cd.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.cd.php
@@ -10,8 +10,9 @@ class wsPackagerWinCD extends wsPackagerWinEXE {
        {\r
                parent::preparePackage();\r
 \r
-               $this->copyOtherFiles(array('fluidbook.ico', 'autorun.inf'));\r
+               $this->copyOtherFiles(array('fluidbook.ico'=>'data/fluidbook.ico', 'autorun.inf'));\r
                $this->replaceAutorun();\r
+               $this->moveDatasSWF();\r
        }\r
 \r
        public function replaceAutorun()\r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.php b/inc/ws/Util/packager/class.ws.packager.win.exe.php
index 2ebd4e4fe5ed022b67ae1589c39539d041cc9364..7491f1d80baeb74662fe6c40c5659512eda69d4c 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.exe.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.exe.php
@@ -16,6 +16,7 @@ class wsPackagerWinEXE extends wsPackager {
 \r
                $this->copyFluidbookFiles();\r
                $this->copyOtherFiles(array('Fluidbook.exe' => $this->exeName));\r
+               $this->moveDatasSWF();\r
        }\r
 \r
        public function makePackage()\r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.inst.php b/inc/ws/Util/packager/class.ws.packager.win.inst.php
index d5f9b872025973d9e99d50a9c29fb20a0fdbadeb..d03b6879ffe342f53b0f5fce58b969aac022577a 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.inst.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.inst.php
@@ -14,6 +14,7 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
 \r
                $this->copyFluidbookFiles();\r
                $this->copyOtherFiles(array('Fluidbook.exe' => $this->exeName));\r
+               $this->moveDatasSWF();\r
 \r
                $this->makeNSI();\r
        }\r