From 08d4fac0b45deb6c25924ff6f13988042d87c278 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 27 Apr 2010 13:00:46 +0000 Subject: [PATCH] --- inc/prepend.php | 1 + inc/ws/Controlleur/class.ws.url.php | 32 +++++++++++++++++----------- js/extranet.js | 2 -- style/ws/style.css | 4 +++- swf/_src/wsComposer.fla | Bin 664064 -> 664064 bytes 5 files changed, 24 insertions(+), 15 deletions(-) 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 f880a180ca9dc1382900403db92c4580d447e092..26707572ac8a93b7b39b840d91fae3a11a97c488 100644 GIT binary patch delta 8084 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 Z`+k6HgVR*dnm}s`%_1o{ty$Ep{{jzxo4^17 delta 1260 zcmY*X4NO~A6z+Y!ue7C5pyhAMpLDeh-3knY1jf%8D0YKUMu06&ezUnv<}3&m(sq== z2z0=MUT{N&jA~Gvql9PF@ITogWIEEaVeeg!G4U`{5*z;-0%I-T`jwOLJE12tT(s|1T}TP&7maS3x4tfc`K zstKBRMW|%nXPp%g0^U)qy@M-us%IwALM3#eps&PiCzt}_Ok7xkQH+tuh~SSFKLO)F z%!J#R+F@u679OnGjsW2l@O`m*b&7&*uYpONcu*JHYK_xu+*iC6`ZS2$0?moZ#&USy z>V2l(Vxe@WohUgWL>uMsp#bDzwqWlGnTodX_&V&3=a%H9}^0^f+Y8ywQvg>5km_ zphdvS$8&wK*8$q#gE*!EQdxsI0Z`-P!o62G?_!hoY&2R5o$)VN0j8JO9W@D%g8Xp7 z|5ouEh);+DFp_x|_12PI6I73Nxak-6ZKDBi2nrTJO?wKuv&iGnXN}McAZ-!Unu6H` zO3ft&w4ffgI?$bb@{0%rCZQO4OhHfNvkqP9I|}loqiGWorgV~H+JVvcW^w$3f&u~q(b;a&Q8R0L zd3vI^c3JT_GuB!8^_J6e_RvAohP(y&eA_TKSR1OC7_RkP|2?A*nDq5_*n)GQgt!cwY*ppE=*L#v~~GCTF+j5Znn#}ptND4B4yv9XoGr?v@2X0)xO!khxJ#*vvg0c^@a>Sp=-86QSqf=E! zYC~h!s&E9@zZWKammQ{X<^7s^h9*Uqmmjn9~~J*Iw@0 zK^A}0Hu|P}!~@r!sK%($k(NIaj#ttt3$o*Rkzu-pE_y!7 ml{C&>kq|jwo_738lAo6t8rM{+=_WBa7*-fuTGP$brT+t&E$&_b -- 2.39.5