(no commit message)

diff --git a/inc/config.inc.php b/inc/config.inc.php
index f7e8e55ed7a7d5b41a3b2b8facd35e8154492d56..c3e31c4df5ed1dcd76db8944197948fcaf740de0 100644 (file)
--- 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');\r
        define('TITLE', 'Extranet Cubedesigners');\r
 }\r
-\r
+define('MINIMIZE_JS', false);\r
 define('WORKER_PREFIX', 'worker.');\r
 \r
 define('CACHE', ROOT . '/cache');\r

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