diff --git a/core/core.js.php b/core/core.js.php index 61120619..e0f24618 100755 --- a/core/core.js.php +++ b/core/core.js.php @@ -479,14 +479,14 @@ $(document).ready(function(){ * */ - $(".helpDisplayButton").on({ + $(".buttonHelp").on({ click: function () { $(".helpDisplayContent").slideToggle(); - if( $(".helpDisplayButton").css('opacity') > '0.75'){ - $(".helpDisplayButton").css('opacity','0.5'); + if( $(".buttonHelp").css('opacity') > '0.75'){ + $(".buttonHelp").css('opacity','0.5'); } else{ - $(".helpDisplayButton").css('opacity','1'); + $(".buttonHelp").css('opacity','1'); } } }); diff --git a/core/core.php b/core/core.php index ba1036d4..53bafa12 100755 --- a/core/core.php +++ b/core/core.php @@ -1872,6 +1872,8 @@ class core extends common { $css .= '.button.buttonGrey {background-color: ' . $colors['normal'] . ';color: ' . $colors['text'] . ';}.button.buttonGrey:hover {background-color:' . $colors['darken'] . ';color:' . $colors['text'] . ';}.button.buttonGrey:active {background-color:' . $colors['veryDarken'] . ';color:' . $colors['text'] . ';}'; $colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonRed'])); $css .= '.button.buttonRed {background-color: ' . $colors['normal'] . ';color: ' . $colors['text'] . ';}.button.buttonRed:hover {background-color:' . $colors['darken'] . ';color:' . $colors['text'] . ';}.button.buttonRed:active {background-color:' . $colors['veryDarken'] . ';color:' . $colors['text'] . ';}'; + $colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonHelp'])); + $css .= '.button.buttonHelp {background-color: ' . $colors['normal'] . ';color: ' . $colors['text'] . ';}.button.buttonHelp:hover {background-color:' . $colors['darken'] . ';color:' . $colors['text'] . ';}.button.buttonHelp:active {background-color:' . $colors['veryDarken'] . ';color:' . $colors['text'] . ';}'; $colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonGreen'])); $css .= '.button.buttonGreen, button[type=submit] {background-color: ' . $colors['normal'] . ';color: ' . $colors['text'] . ';}.button.buttonGreen:hover, button[type=submit]:hover {background-color: ' . $colors['darken'] . ';color: ' . $colors['text'] .';}.button.buttonGreen:active, button[type=submit]:active {background-color: ' . $colors['darken'] . ';color: ' .$colors['text'] .';}'; $colors = helper::colorVariants($this->getData(['admin','backgroundBlockColor'])); diff --git a/core/layout/common.css b/core/layout/common.css index d3192e3e..7dff3e99 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -1708,11 +1708,5 @@ th.col12 { -webkit-box-shadow: 5px 5px 11px 0px #222222; box-shadow: 5px 5px 11px 0px #222222; border-radius: 5px; - background-color:#333; - color: white; z-index: 30; } - -.helpDisplayButton { - opacity: 1; -} diff --git a/core/module/addon/view/index/index.php b/core/module/addon/view/index/index.php index 0401c675..deadb2d6 100644 --- a/core/module/addon/view/index/index.php +++ b/core/module/addon/view/index/index.php @@ -10,7 +10,7 @@
'helpDisplayButton', + 'class' => 'buttonHelp', 'ico' => 'help', 'value' => 'Aide' ]); ?> diff --git a/core/module/config/view/index/index.help.html b/core/module/config/view/index/index.help.html new file mode 100644 index 00000000..acb4625c --- /dev/null +++ b/core/module/config/view/index/index.help.html @@ -0,0 +1,2 @@ +

PAGES SPECIALES

+En cours de rédaction. diff --git a/core/module/config/view/index/index.php b/core/module/config/view/index/index.php index f7c50a18..db735215 100755 --- a/core/module/config/view/index/index.php +++ b/core/module/config/view/index/index.php @@ -8,7 +8,14 @@ 'value' => 'Accueil' ]); ?>
-
+
+ 'buttonHelp', + 'ico' => 'help', + 'value' => 'Aide' + ]); ?> +
+
helper::baseUrl() . 'config/advanced', 'value' => 'Avancée', @@ -19,6 +26,10 @@
+ +
+ +
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 0bf8ac7b..7b6ba668 100755 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -210,6 +210,7 @@ class init extends common { 'backgroundColorButtonGrey' => 'rgba(170, 180, 188, 1)', 'backgroundColorButtonRed' => 'rgba(217, 95, 78, 1)', 'backgroundColorButtonGreen' => 'rgba(162, 223, 57, 1)', + 'backgroundColorButtonHelp' => 'rgba(255, 153, 0, 1)', 'backgroundBlockColor' => 'rgba(236, 239, 241, 1)', 'borderBlockColor' => 'rgba(190, 202, 209, 1)' ], @@ -838,4 +839,3 @@ class init extends common { ] ]; } - diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 3dae5e3b..25c90b94 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -255,6 +255,7 @@ class theme extends common { 'backgroundColorButtonGrey' => $this->getInput('adminColorGrey'), 'backgroundColorButtonRed' => $this->getInput('adminColorRed'), 'backgroundColorButtonGreen'=> $this->getInput('adminColorGreen'), + 'backgroundColorButtonHelp'=> $this->getInput('adminColorHelp'), 'fontText' => $this->getInput('adminFontText'), 'fontSize' => $this->getInput('adminFontTextSize'), 'fontTitle' => $this->getInput('adminFontTitle'), diff --git a/core/module/theme/view/admin/admin.php b/core/module/theme/view/admin/admin.php index 46c20ff3..1ab92938 100755 --- a/core/module/theme/view/admin/admin.php +++ b/core/module/theme/view/admin/admin.php @@ -59,7 +59,7 @@
-
+
'colorPicker', 'help' => 'Couleur visible en l\'absence d\'une image.
Le curseur horizontal règle le niveau de transparence. La couleur du texte est automatique.', @@ -67,7 +67,7 @@ 'value' => $this->getData(['admin', 'backgroundBlockColor']) ]); ?>
-
+
'colorPicker', 'help' => 'Couleur visible en l\'absence d\'une image.
Le curseur horizontal règle le niveau de transparence.', @@ -75,6 +75,14 @@ 'value' => $this->getData(['admin', 'borderBlockColor']) ]); ?>
+
+ 'colorPicker', + 'help' => 'Couleur visible en l\'absence d\'une image.
Le curseur horizontal règle le niveau de transparence.', + 'label' => 'Bouton Aide', + 'value' => $this->getData(['admin', 'backgroundColorButtonHelp']) + ]); ?> +
@@ -143,4 +151,4 @@
- \ No newline at end of file +