From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 26 Aug 2010 13:44:46 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b708baa2533c2255e239200aeb7bac44bbbc08b2;p=cubeextranet.git

---

diff --git a/importWs.php b/importWs.php
index 17b55f7d1..a175cb42f 100644
--- a/importWs.php
+++ b/importWs.php
@@ -6,8 +6,8 @@ cubePHP::neverStop();
 $utilisateurs = false;
 $documents = false;
 $books = false;
-$themes = false;
-$langues = true;
+$themes = true;
+$langues = false;
 
 $tables = array('books', 'book_pages', 'dashboard', 'devis', 'documents', 'document_pages', 'entreprises', 'factures', 'icones', 'langues', 'projets', 'signatures', 'taches', 'themes', 'timereport', 'utilisateurs', 'themes_droits');
 foreach($tables as $t) {
@@ -161,31 +161,28 @@ if ($themes) {
 		$c->insert();
 	}
 	// Importe les jeux d'icones
-	$r = $core->con->select('SELECT * FROM ws.icones');
-	while ($r->fetch()) {
-		$c = $core->con->openCursor('icones');
-		$c->icone_id = $r->iid;
-		$c->nom = $r->titre;
-		$c->date = $r->date;
-		$c->proprietaire = getWsUser($r->proprietaire);
-		$c->couleur = '';
-		// TODO copier les fichiers du thème
-		$c->insert();
-	}
+	$c = $core->con->openCursor('icones');
+	$c->icone_id = 1;
+	$c->nom = 'Vectoriel';
+	$c->date = TIME;
+	$c->proprietaire = getWsUser(5);
+	$c->insert();
+
 	// Import des thèmes
 	$r = $core->con->select('SELECT * FROM ws.theme');
 	$theme = new wsTheme();
 	while ($r->fetch()) {
 		$c = $core->con->openCursor('themes');
 		$c->theme_id = $r->tid;
-		$c->icones = $r->iid;
+		$c->icones = 1;
 		$c->proprietaire = getWsUser($r->proprietaire);
 		$c->date = $r->date;
 		$c->nom = $r->titre;
 		$c->signature = $r->sigid;
 		$parametres = new wsThemeParametres($theme);
 		$parametres->fromRecord($r);
-		$parametres->iconSet = $r->iid;
+		$parametres->iconSet = 1;
+		$parametres->couleurI = oldIconesToColor($r->iid);
 		$c->parametres = serialize($parametres);
 		$c->insert();
 	}
@@ -314,6 +311,14 @@ foreach($tables as $t) {
 	$core->con->execute('ALTER TABLE ' . $t . ' ENABLE KEYS');
 }
 
+function oldIconesToColor($iid){
+	global $oldIconesColors;
+	if(!isset($oldIconesColors)){
+		$oldIconesColors=file('_doc/icones.txt');
+	}
+	return trim($oldIconesColors[$iid-1]);
+}
+
 function getWsUser($oldid)
 {
 	global $ws2ext;
diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 4e6577371..ebb118cf4 100644
--- 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);
 		$this->fields['usePageEdges'] = array('type' => 'boolean', 'default' => true, 'editable' => true,
 			'label' => __("Afficher la bordure des pages"), 'extra' => true, 'grade' => 4);
+		$this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true,
+			'label' => __("Intervertir le menu et le logo"), 'extra' => true, 'grade' => 4);
 		$this->fields['pageEdgeColor'] = array('type' => 'couleur', 'default' => 'dddddd', 'editable' => true,
 			'label' => __('Couleur de la bordure'), 'extra' => true, 'grade' => 4);
 		$this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,