(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 19d5da350b4873acb36be18a8f5560c14eedbf32..5771be61ded50aef9882d1d62f57d80e9e3dc6a9 100644 (file)
--- 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);\r
        }\r
 \r
-       private static function getLinksFromExcel($xls, &$links, &$rulers) {\r
+       public static function getLinksFromExcel($xls, &$links, &$rulers) {\r
                $s = $xls->setActiveSheetIndexByName('Links');\r
                $i = 0;\r
                $links = array();\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index ebfb198daae12db757e1b72b64ed76b7323e6c67..d0810fdc04f7ea834ea0544f0f5545f5311f2823 100644 (file)
--- 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'));\r
                $this->fields['linksColor'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true,\r
                        'label' => __('Couleur des liens'));\r
+               $this->fields['videoBackgroundColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
+                       'label' => __('Couleur de fond des videos'));\r
                $this->fields['pageEdgeColor'] = array('type' => 'couleur', 'default' => 'dddddd', 'editable' => true,\r
                        'label' => __('Couleur de la bordure'));\r
 \r
@@ -94,7 +96,7 @@ class wsThemeParametres extends wsParametres {
                                '|', 'usePageEdges', 'pageEdgeColor',\r
                                '|', 'bookShadeColor',\r
                                '|', 'displayPageNumber', 'colorPageNumber',\r
-                               '|', 'linksColor',));\r
+                               '|', 'linksColor','videoBackgroundColor'));\r
                /* Credits */\r
                $this->fields['creditsColor'] = array('type' => 'couleurAlpha', 'default' => '80ffffff', 'editable' => true,\r
                        'label' => __("Couleur du texte"));\r