From: vincent@cubedesigners.com Date: Thu, 22 Apr 2010 13:23:18 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6841e7a2a94be7133b928a0b5a368b7bba42e5c0;p=cubeextranet.git --- diff --git a/importWs.php b/importWs.php index c63e320ae..a6129bfb6 100644 --- a/importWs.php +++ b/importWs.php @@ -3,9 +3,9 @@ include('inc/prepend.php'); cubePHP::neverStop(); -$utilisateurs=false; -$documents = true; -$books = true; +$utilisateurs = false; +$documents = false; +$books = false; $tables = array('books', 'book_pages', 'dashboard', 'devis', 'documents', 'document_pages', 'entreprises', 'factures', 'icones', 'langues', 'projets', 'signatures', 'taches', 'themes', 'timereport', 'utilisateurs'); foreach($tables as $t) { $core->con->execute('ALTER TABLE ' . $t . ' DISABLE KEYS'); @@ -165,6 +165,7 @@ while ($r->fetch()) { // Import des thèmes $r = $core->con->select('SELECT * FROM ws.theme'); while ($r->fetch()) { + //$r->iconSet = $r->iid; $c = $core->con->openCursor('themes'); $c->theme_id = $r->tid; $c->icones = $r->iid; @@ -217,16 +218,19 @@ if ($documents) { $c->insert(); // TODO Copie des fichiers $docs[$r->did] = true; + if (!file_exists(dirname(__FILE__) . '/docs/' . $r->did)) { + mkdir(dirname(__FILE__) . '/docs/' . $r->did, 0777, true); + } } // Importe les pages des documents $r = $core->con->select('SELECT * FROM ws.document_pages'); while ($r->fetch()) { - $c = $core->con->openCursor('document_pages'); - $c->document_id = $r->did; - $c->document_page = $r->dpid; - $c->text = $r->text; - $c->links = $r->links; - $c->insert(); + if (!file_exists(dirname(__FILE__) . '/docs/' . $r->did . '/p' . $r->dpid . '.txt')) { + file_put_contents(dirname(__FILE__) . '/docs/' . $r->did . '/p' . $r->dpid . '.txt', $r->text); + } + if (!file_exists(dirname(__FILE__) . '/docs/' . $r->did . '/p' . $r->dpid . '.csv')) { + file_put_contents(dirname(__FILE__) . '/docs/' . $r->did . '/p' . $r->dpid . '.csv', $r->links); + } } } else { $r = $core->con->select('SELECT document_id FROM documents'); diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php index ae962496f..6dba93628 100644 --- a/inc/ws/Metier/class.ws.theme.parametres.php +++ b/inc/ws/Metier/class.ws.theme.parametres.php @@ -25,7 +25,9 @@ class wsThemeParametres extends wsParametres { $this->fields['couleurS'] = array('type' => 'couleur', 'default' => '', 'editable' => true, 'label' => __("Couleur du texte du moteur de recherche"), 'extra' => false, 'grade' => 3); /* */$this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true, - 'label' => __("Couleur du fond du loader"), 'extra' => false, 'grade' => 3); + 'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3); + /* */$this->fields['loadingSecColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, + 'label' => __("Couleur secondaire"), 'extra' => false, 'grade' => 3); /* */$this->fields['bookShadeColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true, 'label' => __("Couleur de l'ombre sous le fluidbook"), 'extra' => false, 'grade' => 3); /* */$this->fields['bookShadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true, @@ -71,46 +73,42 @@ class wsThemeParametres extends wsParametres { 'label' => __('Logo affiché au chargement'), 'extra' => false, 'grade' => 3, 'path' => 'themes/' . $this->parent->theme_id, 'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id); - $this->fields['pagesBar'] = array('type' => 'boolean', 'default' => true, 'editable' => true, + /* */$this->fields['pagesBar'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Afficher la barre d'accès rapide aux pages"), 'extra' => true, 'grade' => 4); /* */$this->fields['shadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true, 'label' => __('Transparence des ombres et reflets sur les pages'), 'extra' => true, 'grade' => 4, 'min' => 0, 'max' => 100); /* */ $this->fields['pageReflection'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Afficher le reflet sur la page"), 'extra' => true, 'grade' => 4); - $this->fields['usePageEdges'] = array('type' => 'boolean', 'default' => true, 'editable' => true, + /* */$this->fields['usePageEdges'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Afficher la bordure des pages"), 'extra' => true, 'grade' => 4); /* */ $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, 'label' => __('Couleur des flèches des boutons de navigation (page suivante, page précédente)'), 'extra' => true, 'grade' => 4); - $this->fields['pagesBarTxtColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, - 'label' => __("Couleur des numéros de page de la barre d'accès rapide aux pages"), 'extra' => true, 'grade' => 4); /* */ $this->fields['sections'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __("Sections"), 'extra' => false, 'grade' => 4); - $this->fields['indexColors'] = array('type' => 'textarea', 'default' => '', 'editable' => true, - 'label' => __("Couleurs des pages de l'index"), 'extra' => true, 'grade' => 4); /* */$this->fields['displayPageNumber'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Afficher les numéros de page'), 'extra' => false, 'grade' => 1); - $this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true, + /* */$this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Intervertir la position des icônes et du logo'), 'extra' => false, 'grade' => 1); /* Regroupement des champs par formulaire */ $this->forms['background'] = array('label' => __('Personnalisation du fond'), - 'fieldsnames' => array('backgroundColor','|', 'useBackgroundImage', 'backgroundImage', 'repeat')); + 'fieldsnames' => array('backgroundColor', '|', 'useBackgroundImage', 'backgroundImage', 'repeat')); $this->forms['bouton'] = array('label' => __('Personnalisation des boutons'), 'fieldsnames' => array('couleurA', 'arrowsColor')); $this->forms['icones'] = array('label' => __('Personnalisation des icônes'), 'fieldsnames' => array('iconSet', 'colorizeIcons', 'couleurI')); $this->forms['pagesbar'] = array('label' => __('Personnalisation de la barre des pages'), - 'fieldsnames' => array('pagesBar', 'sections', 'pagesBarTxtColor')); + 'fieldsnames' => array('pagesBar')); $this->forms['book'] = array('label' => __('Personnalisation du fluidbook'), - 'fieldsnames' => array('pageReflection','shadeAlpha','|', 'usePageEdges','|', 'bookShadeColor', 'bookShadeAlpha','|','displayPageNumber')); + 'fieldsnames' => array('pageReflection', 'shadeAlpha', '|', 'usePageEdges', '|', 'bookShadeColor', 'bookShadeAlpha', '|', 'displayPageNumber')); $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'), - 'fieldsnames' => array('menuColor','|', 'useMenuImage', 'menuImage','|','shadeOnMenu','|','invertMenuPosition')); + 'fieldsnames' => array('menuColor', '|', 'useMenuImage', 'menuImage', '|', 'shadeOnMenu', '|', 'invertMenuPosition')); $this->forms['menu'] = array('label' => __('Personnalisation des menus'), 'fieldsnames' => array('couleurB', 'subTextColor', 'subSelectColor', 'subTextSelectColor')); $this->forms['loader'] = array('label' => __('Personnalisation du loader'), - 'fieldsnames' => array('couleurL', 'logoLoader')); + 'fieldsnames' => array('couleurL', 'loadingSecColor', 'logoLoader')); $this->forms['logo'] = array('label' => __('Personnalisation du logo'), 'fieldsnames' => array('logo')); $this->forms['credits'] = array('label' => __('Personnalisation des crédits'), diff --git a/inc/ws/Metier/class.ws.theme.php b/inc/ws/Metier/class.ws.theme.php index 8f645b73b..bdc04f57e 100644 --- a/inc/ws/Metier/class.ws.theme.php +++ b/inc/ws/Metier/class.ws.theme.php @@ -5,7 +5,7 @@ class wsTheme extends cubeMetier { const RATIO = 2; const REPEAT = 1; - public static $files = array('background' => 'backgroundImg.jpg', 'menu' => 'menu_back.png', 'logo' => 'menu_clientLogo.png','logoLoader'=>'logoLoader.png'); + public static $files = array('background' => 'backgroundImg.jpg', 'menu' => 'menu_back.png', 'logo' => 'menu_clientLogo.png', 'logoLoader' => 'logoLoader.png'); protected $theme_id; protected $icones; diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla index a8a33525f..835f3204c 100644 Binary files a/swf/_src/wsComposer.fla and b/swf/_src/wsComposer.fla differ diff --git a/swf/_src/wsComposerComponents.fla b/swf/_src/wsComposerComponents.fla index d35ae7844..37c6cf0ed 100644 Binary files a/swf/_src/wsComposerComponents.fla and b/swf/_src/wsComposerComponents.fla differ diff --git a/swf/_src/wsComposerComponents.swc b/swf/_src/wsComposerComponents.swc index 4169607d7..ecabb126e 100644 Binary files a/swf/_src/wsComposerComponents.swc and b/swf/_src/wsComposerComponents.swc differ