From: vincent@cubedesigners.com Date: Tue, 27 Apr 2010 13:00:46 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=08d4fac0b45deb6c25924ff6f13988042d87c278;p=cubeextranet.git --- diff --git a/inc/prepend.php b/inc/prepend.php index 5454c289f..0ae51760e 100644 --- a/inc/prepend.php +++ b/inc/prepend.php @@ -19,6 +19,7 @@ $core->url->registerDefault(array('extranetUrl', 'home')); $core->url->register('ajax', 'ajax', '^ajax(.*)$', array('cubeAjax', 'ajax')); $core->url->register('cleanDownload', 'cleanDownload', '^cleanDownload$', array('extranetUrl', 'cleanDownload')); $core->url->register('flash', 'flash', '^flash(.*)$', array('wsFlash', 'in')); +$core->url->register('editbook', 'editbook', '^editbook/(.*)$', array('wsUrl', 'editbook')); if (isset($_POST['q'])) { $_SESSION['q'] = $_POST['q']?$_POST['q']:null; diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index b30cc70fe..bcc006334 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -58,7 +58,7 @@ class wsUrl { $res .= '' . $f . ''; $res .= '' . $core->books_status[$book->status] . ''; $res .= '' . cubeMedia::cssRollover($core->typo->Voir('voir', '', false)) . ''; - $res .= '' . cubeMedia::cssRollover($core->typo->Editer('éditer', '', false)) . ''; + $res .= '' . cubeMedia::cssRollover($core->typo->Editer('éditer', '', false)) . ''; $res .= '' . cubeMedia::cssRollover($core->typo->Stats('stats', '', false)) . ''; $res .= '' . cubeMedia::cssRollover($core->typo->Telecharger('télécharger', '', false)) . ''; $res .= '' . cubeMedia::cssRollover($core->typo->Supprimer('suppr.', '', false)) . ''; @@ -79,7 +79,8 @@ class wsUrl { public static function editbook($args) { global $core; - $book_id = $args[1]; + $args = cubePage::getArgs($args); + $book_id = $args[0]; if ($book_id == 'new') { $dao = new wsDAOBook($core->con); @@ -117,30 +118,37 @@ class wsUrl { $i++; }*/ - $res = extranetPage::barre(null , null, null, null); + /*$res = extranetPage::barre(null , null, null, null); $res .= extranetPage::tMain(null, true); - $res .= extranetPage::bh(); - $res .= '
'; - + $res .= extranetPage::bh();*/ + $res = ''; + $res .= '' . __('Edition de la publication') . ' #' . $args[0].''; + $res .= ''; + $res .= ''; $res .= self::editComposition($args); - - $res .= '
'; + $res .= ''; + $res .= ''; + /* $res .= extranetPage::bf(); - $res .= extranetPage::bMain(); - return $res; + $res .= extranetPage::bMain();*/ + echo $res; } public static function editComposition($args) { $fv = array(session_name() => session_id(), - 'book_id' => $args[1], + 'book_id' => $args[0], 'finishedText' => __('Transfert terminé'), 'loadingFileText' => __('Chargement du fichier'), 'totalText' => __('Total'), 'browseText' => __('Parcourir') . ' ...', 'titreUpload' => __('Sélectionnez un ou plusieurs document PDF sur votre ordinateur'), 'titreComposition' => __('Organisez le(s) document(s) pour composer votre fluidbook')); - $res = cubeMedia::flash(WEBROOT . '/swf/composer.swf?junk=' . TIME, '960', '100%', $fv, 'composerSwf', 'swfPanel', 9, '#ffffff', '', 'false', 'noscale', 'normal', array(), false, true,true); + $res = cubeMedia::flash(WEBROOT . '/swf/composer.swf?junk=' . TIME, '100%', '100%', $fv, 'composerSwf', 'swfPanel', 9, '#d2d3c7', '', 'false', 'noscale', 'normal', array(), false, true, true); return $res; } } diff --git a/js/extranet.js b/js/extranet.js index 7fb6e6349..23070c859 100644 --- a/js/extranet.js +++ b/js/extranet.js @@ -175,8 +175,6 @@ function resize(){ var mh=h-$("#header").height()-$("#footer").height()-$("#bar").height()-30-13; mh=Math.max(mh,450); $("#main").css('height',mh); - - $(".swfPanel").css('height',mh-30); } diff --git a/style/ws/style.css b/style/ws/style.css index eae975695..172ef2931 100644 --- a/style/ws/style.css +++ b/style/ws/style.css @@ -432,4 +432,6 @@ display:none; #uploaderContainer{width:970px;height:50px;} -.gris{background-color:#ecedf0;} \ No newline at end of file +.gris{background-color:#ecedf0;} + +#listeBooks{width:100%;height:100%;} \ No newline at end of file diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla index f880a180c..26707572a 100644 Binary files a/swf/_src/wsComposer.fla and b/swf/_src/wsComposer.fla differ