Merge branch 'develop' into 'ent-8084-elementos-deshabilitados-irreconocibles-con-black-theme'

# Conflicts:
#   pandora_console/include/styles/pandora_black.css
This commit is contained in:
Marcos Alconada 2021-10-07 13:42:14 +00:00
commit 4378c3d6f5
3 changed files with 32 additions and 11 deletions

View File

@ -4315,18 +4315,28 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
}
}
$skip_meta_tag = false;
if ($url === '') {
if ($proxy) {
$url = '';
} else {
if ($proxy === false) {
$url = $_SERVER['REQUEST_URI'];
}
} else if ($url === false) {
if ($proxy) {
$url = '';
// Already inserted in request_uri.
$skip_meta_tag = true;
} else {
// Only add the home url.
// Redirect to main.
$url = '?'.$_SERVER['QUERY_STRING'];
}
} else if (empty($url) === true) {
if ($proxy === false) {
$url = $config['homeurl_static'].'/';
if ($metaconsole_root === true
&& is_metaconsole()
) {
$url = $config['homeurl_static'].'/'.ENTERPRISE_DIR.'/meta/';
}
$skip_meta_tag = true;
} else {
$url = '';
}
} else if (!strstr($url, '.php')) {
if ($proxy) {
@ -4354,8 +4364,11 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
$url = substr($url, 1);
}
if (is_metaconsole() && $metaconsole_root) {
$fullurl .= 'enterprise/meta/';
if ($skip_meta_tag === false
&& $metaconsole_root
&& is_metaconsole()
) {
$fullurl .= ENTERPRISE_DIR.'/meta/';
}
return $fullurl.$url;

View File

@ -965,9 +965,12 @@ var TreeController = {
$content.append($statusImage);
}
element.name = htmlDecode(element.name);
// Name max 42 chars.
$content.append(
'<span class="module-name">' +
'<span title="' +
element.name +
'" class="module-name">' +
element.name.substring(0, 42) +
(element.name.length > 42 ? "..." : "") +
"</span>"

View File

@ -1202,6 +1202,11 @@ a.pandora_pagination,
.bg_ccc {
background-color: #50505050 !important;
}
.filter_none {
filter: brightness(0) contrast(50%) !important;
}
input[type="image"] {
background-color: transparent !important;
}