From 85676af9b5efcb257d16af95d87cab0024952861 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Thu, 9 Jun 2011 08:36:39 +0000 Subject: [PATCH] --- fluidbook/compile/_zinc/FluidbookMAC.zinc | Bin 711 -> 0 bytes fluidbook/compile/_zinc/FluidbookWIN.zinc | Bin 848 -> 780 bytes fluidbook/compile/autorun.inf | 2 +- fluidbook/tools/fwstk.jar | Bin 17418654 -> 17418655 bytes .../Controlleur/class.extranet.url.php | 4 ++-- inc/ws/Controlleur/class.ws.url.php | 12 ++++++------ inc/ws/Metier/class.ws.book.parametres.php | 4 ++-- .../packager/class.ws.packager.mac.exe.php | 1 + inc/ws/Util/packager/class.ws.packager.php | 5 +++++ .../packager/class.ws.packager.win.cd.php | 3 ++- .../packager/class.ws.packager.win.exe.php | 1 + .../packager/class.ws.packager.win.inst.php | 1 + 12 files changed, 21 insertions(+), 12 deletions(-) delete mode 100644 fluidbook/compile/_zinc/FluidbookMAC.zinc diff --git a/fluidbook/compile/_zinc/FluidbookMAC.zinc b/fluidbook/compile/_zinc/FluidbookMAC.zinc deleted file mode 100644 index 938a5350171d90a99591af7d56996862c7c9348e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 711 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 LDJ0ujDOT)%z+sy| delta 28393 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 RoyHRb`>ObtS-$$}{{X|b+wK4W diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php index 22793f99e..9e777ad5e 100644 --- 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) { $class = 'empty-field'; $default_id = ''; - $default = __('Entrez le nom du revendeur ou de l\'administrateur'); + $default = __("Entrez le nom du revendeur ou de l'administrateur"); } else { $class = ''; $default_id = $client->ws_admin; @@ -1523,7 +1523,7 @@ class extranetUrl { $res .= ''; $res .= ''; $res .= '
' . __("Traduction de l'application en anglais") . '
'; - $res .= cubeLang::translationForm(array(ROOT . '/inc/extranet', FLASH_SOURCES), 'en' , ROOT . '/l10n', '', array(), '' . $core->typo->BoutonOK('Enregistrer') . ''); + $res .= cubeLang::translationForm(array(ROOT . '/inc/extranet',ROOT . '/inc/ws', COMPOSER_SOURCES), 'en' , ROOT . '/l10n', '', array(), '' . $core->typo->BoutonOK('Enregistrer') . ''); $res .= ''; $res .= commonPage::bf(); $res .= commonPage::bMain(); diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 1f96de1cc..5feea0e3f 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -37,7 +37,7 @@ class wsUrl { cubePage::contextMenu(); $droits = wsDroits::getDroits(); - + commonDroits::min(1); $settings = is_null($settings) ? $core->user->getSettings('books') : $settings; $change = is_null($dashboard) ? 'Books' : 'Dashboard/' . $dashboard; @@ -284,7 +284,7 @@ class wsUrl { $tab = cubeLang::getTranslationsList(PLAYER_SOURCES, array('php', 'as'), array(), $lang->traductions); - + $s->setCellValueByColumnAndRow(0, 1, 'ID', true); $s->setCellValueByColumnAndRow(1, 1, 'English', true); $s->setCellValueByColumnAndRow(2, 1, $lang_name, true); @@ -608,7 +608,7 @@ html{height:100%}' . "\n"; $wmode = isset($args[1]) ? $args[1] : ''; $e = explode('_', $args[0]); - $newurl=null; + $newurl = null; if (count($e) == 2 || $e[2] < TIME - 10) { $e[2] = TIME; http::redirect(SITE_PATH . 'viewer/' . implode('_', $e) . '/' . $wmode); @@ -622,7 +622,7 @@ html{height:100%}' . "\n"; self::checkDocumentVersionOfBook($book_id); wsSecureSWF::checkProtectedSWF(); - echo self::commonViewer($book_id, $e[1], false, $wmode,$newurl); + echo self::commonViewer($book_id, $e[1], false, $wmode, $newurl); } public static function commonViewer($book_id, $hash, $standalone = false, $wmode = 'default') { @@ -1042,7 +1042,7 @@ html{height:100%}' . "\n"; if ($entreprise_id == 'new' || !$client->ws_admin) { $class = 'empty-field'; $default_id = ''; - $default = __('Entrez le nom du revendeur ou de l\'administrateur'); + $default = __("Entrez le nom du revendeur ou de l'administrateur"); } else { $class = ''; $default_id = $client->ws_admin; @@ -1257,7 +1257,7 @@ html{height:100%}' . "\n"; if (!is_null($demandeur->ws_admin) && !in_array($demandeur->ws_admin, $administrateurs)) { // Si déjà géré par un revendeur $revendeur = $daoUtilisateur->selectById($demandeur->ws_admin, 'utilisateurs_entreprise'); - $actions[__('Je confie la demande à ' . $revendeur->rs . ' (' . $revendeur->prenom . ' ' . $revendeur->nom . ')')] = $demandeur->ws_admin; + $actions[__('Je confie la demande à') . ' ' . $revendeur->rs . ' (' . $revendeur->prenom . ' ' . $revendeur->nom . ')'] = $demandeur->ws_admin; } else { $liste = $daoUtilisateur->selectWSRevendeursFacturables(); $revendeurs = array(); diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index a86908cf6..6bf26674a 100644 --- 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 { // . // . $this->fields['friend'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Envoyer à un ami')); - $this->fields['email_title'] = array('type' => 'text', 'default' => __('%name% vous invite à découvrir %title%'), 'editable' => true, 'label' => __("Titre de l'email \"Envoyer à un ami\"")); - $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\"")); + $this->fields['email_title'] = array('type' => 'text', 'default' => __('%name% vous invite à découvrir %title%'), 'editable' => true, 'label' => __("Titre de l'email").' "'.__('Envoyer à un ami').'"'); + $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').'"'); $this->fields['email_editable'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Permettre au lecteur de modifier le corps de l'email")); $this->fields['askAcknowledge'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Demander au destinataire un accusé de réception"), 'grade' => 3); $this->fields['facebook'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Facebook')); 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 d93ec19ff..d1c1279d5 100644 --- 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 { $this->copyFluidbookFiles(); $this->copyOtherFiles(array('Fluidbook.app.zip')); + $this->moveDatasSWF(); } public function makePackage() diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php index 7bd07a24b..c71d1a614 100644 --- 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(); } } + + protected function moveDatasSWF(){ + rename($this->vdir.'/FluidbookDatas.swf',$this->vdir.'/data/FluidbookDatas.swf'); + rename($this->vdir.'/FluidbookDatasLight.swf',$this->vdir.'/data/FluidbookDatasLight.swf'); + } public function __destruct() { 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 d70a06b91..883db767f 100644 --- 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 { { parent::preparePackage(); - $this->copyOtherFiles(array('fluidbook.ico', 'autorun.inf')); + $this->copyOtherFiles(array('fluidbook.ico'=>'data/fluidbook.ico', 'autorun.inf')); $this->replaceAutorun(); + $this->moveDatasSWF(); } public function replaceAutorun() 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 2ebd4e4fe..7491f1d80 100644 --- 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 { $this->copyFluidbookFiles(); $this->copyOtherFiles(array('Fluidbook.exe' => $this->exeName)); + $this->moveDatasSWF(); } public function makePackage() 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 d5f9b8720..d03b6879f 100644 --- 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 { $this->copyFluidbookFiles(); $this->copyOtherFiles(array('Fluidbook.exe' => $this->exeName)); + $this->moveDatasSWF(); $this->makeNSI(); } -- 2.39.5