mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-27 15:54:29 +02:00
Merge branch 'ent-11174-graficas-descolocadas-en-diagnostic-info' into 'develop'
Ent 11174 graficas descolocadas en diagnostic info See merge request artica/pandorafms!6147
This commit is contained in:
commit
f7df38a0c4
@ -893,6 +893,17 @@
|
|||||||
var utcMillis = typeof dt === "number" ? dt : new Date(dt).getTime();
|
var utcMillis = typeof dt === "number" ? dt : new Date(dt).getTime();
|
||||||
var t = tz;
|
var t = tz;
|
||||||
var zoneList = _this.zones[t];
|
var zoneList = _this.zones[t];
|
||||||
|
|
||||||
|
if (typeof zoneList === "undefined") {
|
||||||
|
zoneList = [
|
||||||
|
[-53.46666666666666, "-", "LMT", -2422051200000],
|
||||||
|
[-60, "C-Eur", "CE%sT", -776556000000],
|
||||||
|
[-60, "SovietZone", "CE%sT", -725932800000],
|
||||||
|
[-60, "Germany", "CE%sT", 347068800000],
|
||||||
|
[-60, "EU", "CE%sT", null]
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
// Follow links to get to an actual zone
|
// Follow links to get to an actual zone
|
||||||
while (typeof zoneList === "string") {
|
while (typeof zoneList === "string") {
|
||||||
t = zoneList;
|
t = zoneList;
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 1.5em;
|
font-size: 1.5em;
|
||||||
font-weight: bolder;
|
font-weight: bolder;
|
||||||
color: #000;
|
color: var(--text-color);
|
||||||
background: var(--secondary-color);
|
background: var(--secondary-color);
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
}
|
}
|
||||||
@ -47,16 +47,36 @@
|
|||||||
font-size: 1.2em;
|
font-size: 1.2em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.title-self-monitoring {
|
||||||
|
border-top: 1px solid var(--border-color);
|
||||||
|
border-right: 1px solid var(--border-color);
|
||||||
|
border-left: 1px solid var(--border-color);
|
||||||
|
border-top-left-radius: 8px;
|
||||||
|
border-top-right-radius: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
.container-self-monitoring {
|
.container-self-monitoring {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
|
background-color: var(--secondary-color);
|
||||||
|
border-right: 1px solid var(--border-color);
|
||||||
|
border-bottom: 1px solid var(--border-color);
|
||||||
|
border-left: 1px solid var(--border-color);
|
||||||
|
border-bottom-left-radius: 8px;
|
||||||
|
border-bottom-right-radius: 8px;
|
||||||
|
padding-bottom: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.element-self-monitoring {
|
.element-self-monitoring {
|
||||||
flex: 2 1 600px;
|
flex: 2 1 600px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.element-self-monitoring > img[data-title="No data"] {
|
||||||
|
margin-top: 5%;
|
||||||
|
margin-left: 20%;
|
||||||
|
}
|
||||||
|
|
||||||
.footer-self-monitoring {
|
.footer-self-monitoring {
|
||||||
margin: 30px;
|
margin: 30px;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
|
@ -31,6 +31,8 @@
|
|||||||
--primary-color: #14524f;
|
--primary-color: #14524f;
|
||||||
--secondary-color: #ffffff;
|
--secondary-color: #ffffff;
|
||||||
--input-border: #c0ccdc;
|
--input-border: #c0ccdc;
|
||||||
|
--border-color: #eee;
|
||||||
|
--text-color: #333;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -20,6 +20,13 @@ Description: The default Pandora FMS theme layout
|
|||||||
// along with this program; if not, write to the Free Software
|
// along with this program; if not, write to the Free Software
|
||||||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
:root {
|
||||||
|
/* --primary-color: #14524f; */
|
||||||
|
--secondary-color: #222;
|
||||||
|
--text-color: #fff;
|
||||||
|
/* --input-border: #c0ccdc; */
|
||||||
|
--border-color: #484848;
|
||||||
|
}
|
||||||
|
|
||||||
/* General styles */
|
/* General styles */
|
||||||
body,
|
body,
|
||||||
|
@ -263,8 +263,7 @@ if ($new_networkmap || $save_networkmap) {
|
|||||||
'id_group_map' => $id_group_map,
|
'id_group_map' => $id_group_map,
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
hd('Entraaaa', true);
|
|
||||||
hd($exist, true);
|
|
||||||
if ($exist !== false) {
|
if ($exist !== false) {
|
||||||
$result_txt = ui_print_error_message(__('Another network map already exists with this name and group.'));
|
$result_txt = ui_print_error_message(__('Another network map already exists with this name and group.'));
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user