tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-7331-Bug-en-background-de-widgets-dashboards' into 'develop' 

Fixed errors widgets background black-theme and required group

See merge request artica/pandorafms!4044
This commit is contained in:
vgilc 2021-04-21 09:29:10 +00:00
parent ac8f669b8e eb5704a660
commit c99e810b54
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/javascript/pandora_dashboards.js
View File

@ -44,12 +44,12 @@ function update_dashboard(data) {
// eslint-disable-next-line no-unused-vars
function showGroup() {
$("#li-group").removeClass("hidden");
var private = $("#private").prop("checked");
if (private) {
$("#id_group").removeAttr("required");
$("#li-group").hide();
} else {
$("#id_group").attr("required", true);
$("#li-group").show();
}
}

1
pandora_console/include/styles/pandora_black.css
View File

@ -649,7 +649,6 @@ form ul.form_flex {
justify-content: center;
height: 100%;
width: 100%;
background-color: #222;
}
.container-layout {

20
pandora_console/views/dashboard/cell.php
View File

@ -73,12 +73,22 @@ if ($manageDashboards !== 0) {
$output .= '</div>';
$output .= '</div>';
if ($config['style'] === 'pandora') {
$options['background'] = '#fff';
}
if (empty($options['background']) === true) {
if ($config['style'] === 'pandora') {
$options['background'] = '#ffffff';
}
if ($config['style'] === 'pandora_black') {
$options['background'] = '#222';
if ($config['style'] === 'pandora_black') {
$options['background'] = '#222222';
}
} else if ($options['background'] === '#ffffff'
&& $config['style'] === 'pandora_black'
) {
$options['background'] = '#222222';
} else if ($options['background'] === '#222222'
&& $config['style'] === 'pandora'
) {
$options['background'] = '#ffffff';
}
if ((int) $cellData['id_widget'] !== 0) {