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

styles fixed

This commit is contained in:
Daniel Barbero 2020-01-09 12:07:19 +01:00
parent b40f5b17c1
commit a933a091ea
13 changed files with 105 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/include/class/HTML.class.php
View File

@ -352,7 +352,16 @@ class HTML
return '';
}
$input = html_print_input(($data + ['return' => true]), 'div', true);
$input_only = true;
if (isset($data['input_only']) === true) {
$input_only = $data['input_only'];
}
$input = html_print_input(
($data + ['return' => true]),
'div',
$input_only
);
if ($input === false) {
return '';
}

9
pandora_console/include/functions_html.php
View File

@ -3359,6 +3359,11 @@ function html_print_input($data, $wrapper='div', $input_only=false)
}
}
if (isset($data['wrapper']) === true) {
$output = '<'.$data['wrapper'].' id="wr_'.$data['name'].'" ';
$output .= ' class="'.$data['input_class'].'">';
}
switch ($data['type']) {
case 'text':
$output .= html_print_input_text(
@ -3785,6 +3790,10 @@ function html_print_input($data, $wrapper='div', $input_only=false)
break;
}
if (isset($data['wrapper']) === true) {
$output .= '</'.$data['wrapper'].'>';
}
if ($data['label'] && $input_only === false) {
$output .= '</'.$wrapper.'>';
if (!$data['return']) {

2
pandora_console/include/rest-api/models/VisualConsole/Item.php
View File

@ -2077,7 +2077,7 @@ class Item extends CachedModel
break;
default:
$text = __('Item');
// Line not parent.
break;
}

9
pandora_console/include/rest-api/models/VisualConsole/Items/BarsGraph.php
View File

@ -399,10 +399,11 @@ final class BarsGraph extends Item
$inputs[] = [
'label' => __('Grid color'),
'arguments' => [
'name' => 'gridColor',
'type' => 'color',
'value' => $values['gridColor'],
'return' => true,
'wrapper' => 'div',
'name' => 'gridColor',
'type' => 'color',
'value' => $values['gridColor'],
'return' => true,
],
];

18
pandora_console/include/rest-api/models/VisualConsole/Items/Box.php
View File

@ -107,10 +107,11 @@ final class Box extends Item
$inputs[] = [
'label' => __('Border color'),
'arguments' => [
'name' => 'borderColor',
'type' => 'color',
'value' => $values['borderColor'],
'return' => true,
'wrapper' => 'div',
'name' => 'borderColor',
'type' => 'color',
'value' => $values['borderColor'],
'return' => true,
],
];
@ -129,10 +130,11 @@ final class Box extends Item
$inputs[] = [
'label' => __('Fill color'),
'arguments' => [
'name' => 'fillColor',
'type' => 'color',
'value' => $values['fillColor'],
'return' => true,
'wrapper' => 'div',
'name' => 'fillColor',
'type' => 'color',
'value' => $values['fillColor'],
'return' => true,
],
];
}

9
pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php
View File

@ -249,10 +249,11 @@ final class Clock extends Item
$inputs[] = [
'label' => __('Fill color'),
'arguments' => [
'name' => 'color',
'type' => 'color',
'value' => $values['color'],
'return' => true,
'wrapper' => 'div',
'name' => 'color',
'type' => 'color',
'value' => $values['color'],
'return' => true,
],
];
}

9
pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php
View File

@ -247,10 +247,11 @@ final class DonutGraph extends Item
$inputs[] = [
'label' => __('Resume data color'),
'arguments' => [
'name' => 'legendBackgroundColor',
'type' => 'color',
'value' => $values['legendBackgroundColor'],
'return' => true,
'wrapper' => 'div',
'name' => 'legendBackgroundColor',
'type' => 'color',
'value' => $values['legendBackgroundColor'],
'return' => true,
],
];

9
pandora_console/include/rest-api/models/VisualConsole/Items/Line.php
View File

@ -466,10 +466,11 @@ final class Line extends Model
$inputs[] = [
'label' => __('Color'),
'arguments' => [
'name' => 'borderColor',
'type' => 'color',
'value' => $values['borderColor'],
'return' => true,
'wrapper' => 'div',
'name' => 'borderColor',
'type' => 'color',
'value' => $values['borderColor'],
'return' => true,
],
];

4
pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php
View File

@ -372,8 +372,8 @@ final class ModuleGraph extends Item
'direct' => 1,
'block_content' => [
[
'label' => __('Module Graph'),
'arguments' => [
'label' => __('Module Graph'),
'type' => 'radio_button',
'attributes' => 'class="btn"',
'name' => 'choosetype',
@ -384,8 +384,8 @@ final class ModuleGraph extends Item
],
],
[
'label' => __('Custom Graph'),
'arguments' => [
'label' => __('Custom Graph'),
'type' => 'radio_button',
'attributes' => 'class="btn"',
'name' => 'choosetype',

18
pandora_console/include/rest-api/models/VisualConsole/Items/Percentile.php
View File

@ -526,10 +526,11 @@ final class Percentile extends Item
$inputs[] = [
'label' => __('Element color'),
'arguments' => [
'name' => 'color',
'type' => 'color',
'value' => $values['color'],
'return' => true,
'wrapper' => 'div',
'name' => 'color',
'type' => 'color',
'value' => $values['color'],
'return' => true,
],
];
@ -537,10 +538,11 @@ final class Percentile extends Item
$inputs[] = [
'label' => __('Value color'),
'arguments' => [
'name' => 'labelColor',
'type' => 'color',
'value' => $values['labelColor'],
'return' => true,
'wrapper' => 'div',
'name' => 'labelColor',
'type' => 'color',
'value' => $values['labelColor'],
'return' => true,
],
];

21
pandora_console/include/visual-console-client/vc.main.css
View File

@ -527,6 +527,27 @@ li#li-image-item label img {
flex: initial;
}
.discovery.modal * {
font-weight: normal;
color: #343434;
font-family: "lato", "Open Sans", sans-serif;
}
.discovery.modal select {
width: 100px;
}
.discovery.modal div#cacheExpiration_manual select,
.discovery.modal div#cacheExpiration_manual input,
.discovery.modal div#cacheExpiration_default select {
font-size: inherit !important;
}
.discovery.modal div#cacheExpiration_default select#cacheExpiration_select {
max-width: 230px;
width: inherit;
}
/* Styles for the solid icons */
.fa {

2
pandora_console/include/visual-console-client/vc.main.css.map
View File

File diff suppressed because one or more lines are too long

21
visual_console_client/src/main.css
View File

@ -405,3 +405,24 @@ li#li-image-item label {
li#li-image-item label img {
flex: initial;
}
.discovery.modal * {
font-weight: normal;
color: #343434;
font-family: "lato", "Open Sans", sans-serif;
}
.discovery.modal select {
width: 100px;
}
.discovery.modal div#cacheExpiration_manual select,
.discovery.modal div#cacheExpiration_manual input,
.discovery.modal div#cacheExpiration_default select {
font-size: inherit !important;
}
.discovery.modal div#cacheExpiration_default select#cacheExpiration_select {
max-width: 230px;
width: inherit;
}