(no commit message)

diff --git a/importWs.php b/importWs.php
index c63e320ae50fb42cd753e9f67dd0d7959cb9e943..a6129bfb624ac767e64079fa1c822c20bc8e3425 100644 (file)
--- a/importWs.php
+++ b/importWs.php
@@ -3,9 +3,9 @@ include('inc/prepend.php');
 \r
 cubePHP::neverStop();\r
 \r
-$utilisateurs=false;\r
-$documents = true;\r
-$books = true;\r
+$utilisateurs = false;\r
+$documents = false;\r
+$books = false;\r
 $tables = array('books', 'book_pages', 'dashboard', 'devis', 'documents', 'document_pages', 'entreprises', 'factures', 'icones', 'langues', 'projets', 'signatures', 'taches', 'themes', 'timereport', 'utilisateurs');\r
 foreach($tables as $t) {\r
        $core->con->execute('ALTER TABLE ' . $t . ' DISABLE KEYS');\r
@@ -165,6 +165,7 @@ while ($r->fetch()) {
 // Import des thèmes\r
 $r = $core->con->select('SELECT * FROM ws.theme');\r
 while ($r->fetch()) {\r
+       //$r->iconSet = $r->iid;\r
        $c = $core->con->openCursor('themes');\r
        $c->theme_id = $r->tid;\r
        $c->icones = $r->iid;\r
@@ -217,16 +218,19 @@ if ($documents) {
                $c->insert();\r
                // TODO Copie des fichiers\r
                $docs[$r->did] = true;\r
+               if (!file_exists(dirname(__FILE__) . '/docs/' . $r->did)) {\r
+                       mkdir(dirname(__FILE__) . '/docs/' . $r->did, 0777, true);\r
+               }\r
        }\r
        // Importe les pages des documents\r
        $r = $core->con->select('SELECT * FROM ws.document_pages');\r
        while ($r->fetch()) {\r
-               $c = $core->con->openCursor('document_pages');\r
-               $c->document_id = $r->did;\r
-               $c->document_page = $r->dpid;\r
-               $c->text = $r->text;\r
-               $c->links = $r->links;\r
-               $c->insert();\r
+               if (!file_exists(dirname(__FILE__) . '/docs/' . $r->did . '/p' . $r->dpid . '.txt')) {\r
+                       file_put_contents(dirname(__FILE__) . '/docs/' . $r->did . '/p' . $r->dpid . '.txt', $r->text);\r
+               }\r
+               if (!file_exists(dirname(__FILE__) . '/docs/' . $r->did . '/p' . $r->dpid . '.csv')) {\r
+                       file_put_contents(dirname(__FILE__) . '/docs/' . $r->did . '/p' . $r->dpid . '.csv', $r->links);\r
+               }\r
        }\r
 } else {\r
        $r = $core->con->select('SELECT document_id FROM documents');\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index ae962496fd2324ff659c11695057e0718757406e..6dba93628c0ab12a156880a6869c49d83301ca3f 100644 (file)
--- 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,\r
                        'label' => __("Couleur du texte du moteur de recherche"), 'extra' => false, 'grade' => 3);\r
                /* */$this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
-                       'label' => __("Couleur du fond du loader"), 'extra' => false, 'grade' => 3);\r
+                       'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);\r
+               /* */$this->fields['loadingSecColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+                       'label' => __("Couleur secondaire"), 'extra' => false, 'grade' => 3);\r
                /* */$this->fields['bookShadeColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
                        'label' => __("Couleur de l'ombre sous le fluidbook"), 'extra' => false, 'grade' => 3);\r
                /* */$this->fields['bookShadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true,\r
@@ -71,46 +73,42 @@ class wsThemeParametres extends wsParametres {
                        'label' => __('Logo affiché au chargement'), 'extra' => false, 'grade' => 3,\r
                        'path' => 'themes/' . $this->parent->theme_id,\r
                        'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);\r
-               $this->fields['pagesBar'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
+               /* */$this->fields['pagesBar'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
                        'label' => __("Afficher la barre d'accès rapide aux pages"), 'extra' => true, 'grade' => 4);\r
                /* */$this->fields['shadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true,\r
                        'label' => __('Transparence des ombres et reflets sur les pages'), 'extra' => true, 'grade' => 4,\r
                        'min' => 0, 'max' => 100);\r
                /* */ $this->fields['pageReflection'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
                        'label' => __("Afficher le reflet sur la page"), 'extra' => true, 'grade' => 4);\r
-               $this->fields['usePageEdges'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
+               /* */$this->fields['usePageEdges'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
                        'label' => __("Afficher la bordure des pages"), 'extra' => true, 'grade' => 4);\r
                /* */ $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __('Couleur des flèches des boutons de navigation (page suivante, page précédente)'), 'extra' => true, 'grade' => 4);\r
-               $this->fields['pagesBarTxtColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
-                       'label' => __("Couleur des numéros de page de la barre d'accès rapide aux pages"), 'extra' => true, 'grade' => 4);\r
                /* */ $this->fields['sections'] = array('type' => 'textarea', 'default' => '', 'editable' => true,\r
                        'label' => __("Sections"), 'extra' => false, 'grade' => 4);\r
-               $this->fields['indexColors'] = array('type' => 'textarea', 'default' => '', 'editable' => true,\r
-                       'label' => __("Couleurs des pages de l'index"), 'extra' => true, 'grade' => 4);\r
                /* */$this->fields['displayPageNumber'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
                        'label' => __('Afficher les numéros de page'), 'extra' => false, 'grade' => 1);\r
-               $this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
+               /* */$this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
                        'label' => __('Intervertir la position des icônes et du logo'), 'extra' => false, 'grade' => 1);\r
 \r
                /* Regroupement des champs par formulaire */\r
 \r
                $this->forms['background'] = array('label' => __('Personnalisation du fond'),\r
-                       'fieldsnames' => array('backgroundColor','|', 'useBackgroundImage', 'backgroundImage', 'repeat'));\r
+                       'fieldsnames' => array('backgroundColor', '|', 'useBackgroundImage', 'backgroundImage', 'repeat'));\r
                $this->forms['bouton'] = array('label' => __('Personnalisation des boutons'),\r
                        'fieldsnames' => array('couleurA', 'arrowsColor'));\r
                $this->forms['icones'] = array('label' => __('Personnalisation des icônes'),\r
                        'fieldsnames' => array('iconSet', 'colorizeIcons', 'couleurI'));\r
                $this->forms['pagesbar'] = array('label' => __('Personnalisation de la barre des pages'),\r
-                       'fieldsnames' => array('pagesBar', 'sections', 'pagesBarTxtColor'));\r
+                       'fieldsnames' => array('pagesBar'));\r
                $this->forms['book'] = array('label' => __('Personnalisation du fluidbook'),\r
-                       'fieldsnames' => array('pageReflection','shadeAlpha','|', 'usePageEdges','|', 'bookShadeColor', 'bookShadeAlpha','|','displayPageNumber'));\r
+                       'fieldsnames' => array('pageReflection', 'shadeAlpha', '|', 'usePageEdges', '|', 'bookShadeColor', 'bookShadeAlpha', '|', 'displayPageNumber'));\r
                $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'),\r
-                       'fieldsnames' => array('menuColor','|', 'useMenuImage', 'menuImage','|','shadeOnMenu','|','invertMenuPosition'));\r
+                       'fieldsnames' => array('menuColor', '|', 'useMenuImage', 'menuImage', '|', 'shadeOnMenu', '|', 'invertMenuPosition'));\r
                $this->forms['menu'] = array('label' => __('Personnalisation des menus'),\r
                        'fieldsnames' => array('couleurB', 'subTextColor', 'subSelectColor', 'subTextSelectColor'));\r
                $this->forms['loader'] = array('label' => __('Personnalisation du loader'),\r
-                       'fieldsnames' => array('couleurL', 'logoLoader'));\r
+                       'fieldsnames' => array('couleurL', 'loadingSecColor', 'logoLoader'));\r
                $this->forms['logo'] = array('label' => __('Personnalisation du logo'),\r
                        'fieldsnames' => array('logo'));\r
                $this->forms['credits'] = array('label' => __('Personnalisation des crédits'),\r

diff --git a/inc/ws/Metier/class.ws.theme.php b/inc/ws/Metier/class.ws.theme.php
index 8f645b73bcda8732dd377b29ef9c430aa6f92af7..bdc04f57e140cf614e61d5f4231c5a3edb82b88b 100644 (file)
--- 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;\r
        const REPEAT = 1;\r
 \r
-       public static $files = array('background' => 'backgroundImg.jpg', 'menu' => 'menu_back.png', 'logo' => 'menu_clientLogo.png','logoLoader'=>'logoLoader.png');\r
+       public static $files = array('background' => 'backgroundImg.jpg', 'menu' => 'menu_back.png', 'logo' => 'menu_clientLogo.png', 'logoLoader' => 'logoLoader.png');\r
 \r
        protected $theme_id;\r
        protected $icones;\r

diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla
index a8a33525f43e9c161fb37598969e75df02a78991..835f3204c60801aa6d1cb4e3d4cb44bfe9c31446 100644 (file)
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 d35ae7844fea7f09ea5420b09b77017f2b29a1b1..37c6cf0eda373cdd9c33ca5eef885e3eebb4141a 100644 (file)
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 4169607d7a817efef181b868a4768535c085f9fd..ecabb126e174704c7ccd94b2a4060de0e3293807 100644 (file)
Binary files a/swf/_src/wsComposerComponents.swc and b/swf/_src/wsComposerComponents.swc differ