(no commit message)

diff --git a/importWs.php b/importWs.php
index 17b55f7d1ef209e1b57fdddcd323cd2adf783199..a175cb42f1a6ad9c72c48d1dac6c515dbb450188 100644 (file)
--- a/importWs.php
+++ b/importWs.php
@@ -6,8 +6,8 @@ cubePHP::neverStop();
 $utilisateurs = false;\r
 $documents = false;\r
 $books = false;\r
-$themes = false;\r
-$langues = true;\r
+$themes = true;\r
+$langues = false;\r
 \r
 $tables = array('books', 'book_pages', 'dashboard', 'devis', 'documents', 'document_pages', 'entreprises', 'factures', 'icones', 'langues', 'projets', 'signatures', 'taches', 'themes', 'timereport', 'utilisateurs', 'themes_droits');\r
 foreach($tables as $t) {\r
@@ -161,31 +161,28 @@ if ($themes) {
                $c->insert();\r
        }\r
        // Importe les jeux d'icones\r
-       $r = $core->con->select('SELECT * FROM ws.icones');\r
-       while ($r->fetch()) {\r
-               $c = $core->con->openCursor('icones');\r
-               $c->icone_id = $r->iid;\r
-               $c->nom = $r->titre;\r
-               $c->date = $r->date;\r
-               $c->proprietaire = getWsUser($r->proprietaire);\r
-               $c->couleur = '';\r
-               // TODO copier les fichiers du thème\r
-               $c->insert();\r
-       }\r
+       $c = $core->con->openCursor('icones');\r
+       $c->icone_id = 1;\r
+       $c->nom = 'Vectoriel';\r
+       $c->date = TIME;\r
+       $c->proprietaire = getWsUser(5);\r
+       $c->insert();\r
+\r
        // Import des thèmes\r
        $r = $core->con->select('SELECT * FROM ws.theme');\r
        $theme = new wsTheme();\r
        while ($r->fetch()) {\r
                $c = $core->con->openCursor('themes');\r
                $c->theme_id = $r->tid;\r
-               $c->icones = $r->iid;\r
+               $c->icones = 1;\r
                $c->proprietaire = getWsUser($r->proprietaire);\r
                $c->date = $r->date;\r
                $c->nom = $r->titre;\r
                $c->signature = $r->sigid;\r
                $parametres = new wsThemeParametres($theme);\r
                $parametres->fromRecord($r);\r
-               $parametres->iconSet = $r->iid;\r
+               $parametres->iconSet = 1;\r
+               $parametres->couleurI = oldIconesToColor($r->iid);\r
                $c->parametres = serialize($parametres);\r
                $c->insert();\r
        }\r
@@ -314,6 +311,14 @@ foreach($tables as $t) {
        $core->con->execute('ALTER TABLE ' . $t . ' ENABLE KEYS');\r
 }\r
 \r
+function oldIconesToColor($iid){\r
+       global $oldIconesColors;\r
+       if(!isset($oldIconesColors)){\r
+               $oldIconesColors=file('_doc/icones.txt');\r
+       }\r
+       return trim($oldIconesColors[$iid-1]);\r
+}\r
+\r
 function getWsUser($oldid)\r
 {\r
        global $ws2ext;\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 4e6577371ed458b7b6776cd877d514ba6cd7a412..ebb118cf4b8ad6b032b1a47cb4fee22203b19e31 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -96,6 +96,8 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Afficher le reflet sur la page"), 'extra' => true, 'grade' => 4);\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['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
+                       'label' => __("Intervertir le menu et le logo"), 'extra' => true, 'grade' => 4);\r
                $this->fields['pageEdgeColor'] = array('type' => 'couleur', 'default' => 'dddddd', 'editable' => true,\r
                        'label' => __('Couleur de la bordure'), 'extra' => true, 'grade' => 4);\r
                $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r