From 3199da9b19ae6fd4eace79a90422bf3142318389 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 27 Dec 2010 17:55:34 +0000 Subject: [PATCH] --- .htaccess | 6 +++--- inc/ws/Controlleur/class.ws.url.php | 20 +++++++++++++------- inc/ws/Metier/class.ws.theme.parametres.php | 8 +++++--- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.htaccess b/.htaccess index 02679a1d1..690dc17c8 100644 --- a/.htaccess +++ b/.htaccess @@ -18,8 +18,8 @@ RewriteRule ^favicon.ico$ images/ws/favicon.ico [L] # Skip RewriteRule ^phpMyAdmin - [L] -RewriteRule ^books - [L] -RewriteRule ^docs - [L] +#RewriteRule ^books - [L] +#RewriteRule ^docs - [L] RewriteRule ^ajax/supprimeFichier/([0-9]+)/(.*)$ index.php/ajax/supprimeFichier/$1/$2 [L] @@ -28,5 +28,5 @@ RewriteRule ^([-_a-zA-Z0-9/]+)$ index.php/$1 [L] RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ viewer/$1_$2_$3/index [L] RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.swf$ fluidbook/compile/index.swf [L] -RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/data/player.swf$ fluidbook/compile/player.swf [L] +RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/player.swf$ fluidbook/compile/player.swf [L] RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/final/$1/$4 [L] diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 048420c08..0b61d3bf6 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -141,17 +141,21 @@ html{height:100%}' . "\n"; } $dao = new wsDAOBook($core->con); - $book = $dao->selectById($e[0]); + $book_id=$e[0]; + $book = $dao->selectById($book_id); if ($book->hash != $e[1]) { http::head(401); exit; } - if (!$dao->isUpToDate($e[0])) { - $dao->compile($e[0]); - $dao->touchCompile($e[0]); + if (!$dao->isUpToDate($book_id)) { + $dao->compile($book_id); + $dao->touchCompile($book_id); } + $daoTheme = new wsDAOTheme($core->con); + $theme = $daoTheme->getThemeOfBook($book_id, false); + $webcompile = WEBROOT . '/fluidbook/compile/'; $standard = 'XHTML 1.0 Transitional'; @@ -167,6 +171,7 @@ html{height:100%}' . "\n"; $res = ''; $res .= ''; $res .= '' . $book->parametres->title . ''; + // Entêtes Facebook if ($book->parametres->facebook) { $meta['og:title'] = ($book->parametres->facebook_title == '')?$book->parametres->title:$book->parametres->facebook_title; @@ -177,15 +182,16 @@ html{height:100%}' . "\n"; } $res .= ''; - $res .= ''; - $res .= cubeMedia::flash2('index.swf', '100%', '100%', $fv, 'fluidbook', '', 10, '#ffffff', '', 'true', 'noscale', 'gpu', array('allowScriptAccess' => 'always')); + $res .= ''; + fb($theme); + $res .= cubeMedia::flash2('index.swf', '100%', '100%', $fv, 'fluidbook', '', 10, '#'.$theme->parametres->loadingBackColor, '', 'true', 'noscale', 'gpu', array('allowScriptAccess' => 'always')); $gacodes = array(GA); if ($book->parametres->googleAnalytics != '') { $gacodes[] = $book->parametres->googleAnalytics; } - $res .= cubePage::googleAnalytics($gacodes, false); + //$res .= cubePage::googleAnalytics($gacodes, false); $res .= ''; $res .= ''; diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php index 19991a388..45b29d7bb 100644 --- a/inc/ws/Metier/class.ws.theme.parametres.php +++ b/inc/ws/Metier/class.ws.theme.parametres.php @@ -122,9 +122,11 @@ class wsThemeParametres extends wsParametres { 'path' => $themeRoot, 'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id); $this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true, - 'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3); + 'label' => __("Couleur principale de la barre de chargement"), 'extra' => false, 'grade' => 3); $this->fields['loadingSecColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, - 'label' => __("Couleur secondaire"), 'extra' => false, 'grade' => 3); + 'label' => __("Couleur secondaire de la barre de chargement"), 'extra' => false, 'grade' => 3); + $this->fields['loadingBackColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, + 'label' => __("Couleur du fond affichée avant l'affichage de l'image de fond"), 'extra' => false, 'grade' => 3); /* Pages bar */ $this->fields['pagesBar'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Afficher la barre d'accès rapide aux pages"), 'extra' => true, 'grade' => 4); @@ -154,7 +156,7 @@ class wsThemeParametres extends wsParametres { $this->forms['menu'] = array('label' => __('Personnalisation des menus'), 'fieldsnames' => array('couleurB', 'subTextColor', 'subSelectColor', 'subTextSelectColor')); $this->forms['loader'] = array('label' => __('Personnalisation du loader'), - 'fieldsnames' => array('couleurL', 'loadingSecColor', 'logoLoader')); + 'fieldsnames' => array('loadingBackColor','|', 'couleurL', 'loadingSecColor', 'logoLoader')); $this->forms['logo'] = array('label' => __('Personnalisation du logo'), 'fieldsnames' => array('logo')); $this->forms['credits'] = array('label' => __('Personnalisation des crédits'), -- 2.39.5