From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 8 Mar 2010 15:13:47 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=05d45478aa67dd14be5d26aaf5d9326337578449;p=cubeextranet.git

---

diff --git a/inc/config.inc.php b/inc/config.inc.php
index f7e8e55ed..c3e31c4df 100644
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -48,7 +48,7 @@ if (in_array($_SERVER['HTTP_HOST'], $ws)) {
 	define('GA', 'UA-4339912-4');
 	define('TITLE', 'Extranet Cubedesigners');
 }
-
+define('MINIMIZE_JS', false);
 define('WORKER_PREFIX', 'worker.');
 
 define('CACHE', ROOT . '/cache');
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 18383e8b0..bb6e967a1 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -92,12 +92,13 @@ class wsUrl {
 		$shortcuts = array();
 
 		$steps = array();
-		$steps[1] = __('Composition');
-		$steps[2] = __('Personnalisation');
-		$steps[3] = __('Paramètres');
-		$steps[4] = __('Edition des liens');
-		$steps[5] = __('Aperçu');
+		$steps['composition'] = __('Composition');
+		$steps['theme'] = __('Personnalisation');
+		$steps['settings'] = __('Paramètres');
+		$steps['links'] = __('Edition des liens');
+		$steps['preview'] = __('Aperçu');
 
+		$i = 1;
 		foreach($steps as $s => $n) {
 			$template = 'Step';
 			if ($s == $step) {
@@ -105,31 +106,24 @@ class wsUrl {
 				$ae = $as = '';
 			} else {
 				$class = 'step';
-				$as = '<a href="' . SITE_PATH . 'editbook/' . $book_id . '/' . $s . '">';
+				$as = '<a href="' . SITE_PATH . 'editbook/' . $book_id . '/#/' . $s . '">';
 				$ae = '</a>';
 			}
 
-			if ($s == count($steps)) {
+			if ($i == count($steps)) {
 				$template = 'Last' . $template;
 			}
-			$shortcuts[] = $as . $core->typo->$template($s . '. ' . $n, $class, -1) . $ae;
+			$shortcuts[] = $as . $core->typo->$template($i . '. ' . $n, $class, -1) . $ae;
+			$i++;
 		}
 
 		$res = extranetPage::barre(null , null, null, $shortcuts);
 		$res .= extranetPage::tMain(null, true);
 		$res .= extranetPage::bh();
 		$res .= '<div id="listeBooks">';
-		if ($step == 1) {
-			$res .= self::editComposition($args);
-		} elseif ($step == 2) {
-			$res .= self::editTheme($args);
-		} elseif ($step == 3) {
-			$res .= self::editParametres($args);
-		} elseif ($step == 4) {
-			$res .= self::editLinks($args);
-		} else {
-			$res .= self::editApercu($args);
-		}
+
+		$res .= self::editComposition($args);
+
 		$res .= '</div>';
 		$res .= extranetPage::bf();
 		$res .= extranetPage::bMain();
@@ -138,8 +132,7 @@ class wsUrl {
 
 	public static function editComposition($args)
 	{
-		global $js;
-		$js[] = JS_CUBE . '/swfaddress.js';
+		cubePage::swfaddress();
 		$fv = array(session_name() => session_id(),
 			'book_id' => $args[1],
 			'finishedText' => __('Transfert terminé'),
@@ -151,30 +144,6 @@ class wsUrl {
 		$res = cubeMedia::flash(WEBROOT . '/swf/composer.swf?junk=' . TIME, '960', '100%', $fv, 'composerSwf', 'swfPanel', 9, '#ffffff', '', 'false', 'noscale', 'normal', array(), false, true);
 		return $res;
 	}
-
-	public static function editTheme($args)
-	{
-		$fv = array(session_name() => session_id(),
-			'book_id' => $args[1]);
-		$res = cubeMedia::flash(WEBROOT . '/swf/theme.swf', '960', '100%', $fv, 'composerSwf', 'swfPanel', 9, '#ffffff', '', 'false', 'noscale', 'transparent');
-		return $res;
-	}
-
-	public static function editParametres($args)
-	{
-	}
-
-	public static function editLinks($args)
-	{
-		$fv = array(session_name() => session_id(),
-			'book_id' => $args[1]);
-		$res = cubeMedia::flash(WEBROOT . '/swf/links.swf', '960', '100%', $fv, 'composerSwf', 'swfPanel', 9, '#ffffff', '', 'false', 'noscale', 'transparent');
-		return $res;
-	}
-
-	public static function editApercu($args)
-	{
-	}
 }
 
 ?>
\ No newline at end of file