From 4da634bd605957a35f47eae7ca7e174a6da58d11 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 19 Oct 2011 18:44:38 +0000 Subject: [PATCH] --- inc/ws/Controlleur/class.ws.ajax.php | 2 +- inc/ws/Metier/class.ws.theme.parametres.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php index 19d5da350..5771be61d 100644 --- a/inc/ws/Controlleur/class.ws.ajax.php +++ b/inc/ws/Controlleur/class.ws.ajax.php @@ -728,7 +728,7 @@ class wsAjax extends cubeAjax { $dao->setLinksAndRulers($book_id, json_encode($links), json_encode($rulers), 'Restore links from ' . date('Y-m-d H:i:s', $time), $core->user->utilisateur_id); } - private static function getLinksFromExcel($xls, &$links, &$rulers) { + public static function getLinksFromExcel($xls, &$links, &$rulers) { $s = $xls->setActiveSheetIndexByName('Links'); $i = 0; $links = array(); diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php index ebfb198da..d0810fdc0 100644 --- a/inc/ws/Metier/class.ws.theme.parametres.php +++ b/inc/ws/Metier/class.ws.theme.parametres.php @@ -86,6 +86,8 @@ class wsThemeParametres extends wsParametres { 'label' => __('Couleur des numéros de page')); $this->fields['linksColor'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true, 'label' => __('Couleur des liens')); + $this->fields['videoBackgroundColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true, + 'label' => __('Couleur de fond des videos')); $this->fields['pageEdgeColor'] = array('type' => 'couleur', 'default' => 'dddddd', 'editable' => true, 'label' => __('Couleur de la bordure')); @@ -94,7 +96,7 @@ class wsThemeParametres extends wsParametres { '|', 'usePageEdges', 'pageEdgeColor', '|', 'bookShadeColor', '|', 'displayPageNumber', 'colorPageNumber', - '|', 'linksColor',)); + '|', 'linksColor','videoBackgroundColor')); /* Credits */ $this->fields['creditsColor'] = array('type' => 'couleurAlpha', 'default' => '80ffffff', 'editable' => true, 'label' => __("Couleur du texte")); -- 2.39.5