Merge branch 'ent-9000-cambio-update-manager-a-warp-update' into 'develop'
Ent 9000 cambio update manager a warp update See merge request artica/pandorafms!4957
This commit is contained in:
commit
fa28b5b7e1
|
@ -1665,3 +1665,4 @@ godmode/um_client/vendor/sebastian/object-enumerator/tests
|
|||
godmode/um_client/vendor/sebastian/object-enumerator
|
||||
godmode/um_client/vendor/sebastian
|
||||
godmode/um_client/vendor
|
||||
/update_manager_client/resources/styles/pandora.css
|
|
@ -525,21 +525,21 @@ $menu_godmode['links']['sub'] = $sub;
|
|||
|
||||
// Update Manager
|
||||
if (check_acl($config['id_user'], 0, 'PM') && $config['enable_update_manager']) {
|
||||
$menu_godmode['messages']['text'] = __('Update manager');
|
||||
$menu_godmode['messages']['text'] = __('Warp Update');
|
||||
$menu_godmode['messages']['id'] = 'god-um_messages';
|
||||
$menu_godmode['messages']['sec2'] = '';
|
||||
|
||||
$sub = [];
|
||||
$sub['godmode/update_manager/update_manager&tab=offline']['text'] = __('Update Manager offline');
|
||||
$sub['godmode/update_manager/update_manager&tab=offline']['text'] = __('Update offline');
|
||||
$sub['godmode/update_manager/update_manager&tab=offline']['id'] = 'Offline';
|
||||
|
||||
$sub['godmode/update_manager/update_manager&tab=online']['text'] = __('Update Manager online');
|
||||
$sub['godmode/update_manager/update_manager&tab=online']['text'] = __('Update online');
|
||||
$sub['godmode/update_manager/update_manager&tab=online']['id'] = 'Online';
|
||||
|
||||
$sub['godmode/update_manager/update_manager&tab=setup']['text'] = __('Update Manager options');
|
||||
$sub['godmode/update_manager/update_manager&tab=setup']['text'] = __('Options');
|
||||
$sub['godmode/update_manager/update_manager&tab=setup']['id'] = 'Options';
|
||||
|
||||
$sub['godmode/update_manager/update_manager&tab=history']['text'] = __('Update Manager journal');
|
||||
$sub['godmode/update_manager/update_manager&tab=history']['text'] = __('Warp journal');
|
||||
$sub['godmode/update_manager/update_manager&tab=history']['id'] = 'Journal';
|
||||
|
||||
$menu_godmode['messages']['sub'] = $sub;
|
||||
|
|
|
@ -313,7 +313,7 @@ if (is_array($config) === true) {
|
|||
if ($mode === Manager::MODE_ONLINE
|
||||
&& ($puid === null || $puid === 'OFFLINE')
|
||||
) {
|
||||
ui_print_error_message(__('Update manager online requires registration.'));
|
||||
ui_print_error_message(__('Update online requires registration.'));
|
||||
}
|
||||
|
||||
if ($mode === Manager::MODE_OFFLINE) {
|
||||
|
|
|
@ -1,21 +1,36 @@
|
|||
<?php
|
||||
/**
|
||||
* Update manager.
|
||||
*
|
||||
* @category Update Manager
|
||||
* @package Pandora FMS
|
||||
* @subpackage Community
|
||||
* @version 1.0.0
|
||||
* @license See below
|
||||
*
|
||||
* ______ ___ _______ _______ ________
|
||||
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
|
||||
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
|
||||
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
|
||||
*
|
||||
* ============================================================================
|
||||
* Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
|
||||
* Please see http://pandorafms.org for full contribution list
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation for version 2.
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* ============================================================================
|
||||
*/
|
||||
|
||||
// Pandora FMS - http://pandorafms.com
|
||||
// ==================================================
|
||||
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
|
||||
// Please see http://pandorafms.org for full contribution list
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; version 2
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
// Begin.
|
||||
global $config;
|
||||
|
||||
check_login();
|
||||
// The ajax is in
|
||||
// include/ajax/update_manager.php
|
||||
// The ajax is in include/ajax/update_manager.php.
|
||||
if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user'])) {
|
||||
db_pandora_audit(
|
||||
AUDIT_LOG_ACL_VIOLATION,
|
||||
|
@ -36,59 +51,65 @@ if ($php_version_array[0] < 7) {
|
|||
$tab = get_parameter('tab', 'online');
|
||||
|
||||
$buttons['setup'] = [
|
||||
'active' => ($tab == 'setup') ? true : false,
|
||||
'active' => ($tab === 'setup') ? true : false,
|
||||
'text' => '<a href="'.ui_get_full_url(
|
||||
'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=setup'
|
||||
).'">'.html_print_image('images/gm_setup.png', true, ['title' => __('Options'), 'class' => 'invert_filter']).'</a>',
|
||||
).'">'.html_print_image('images/gm_setup.png', true, ['title' => __('Setup'), 'class' => 'invert_filter']).'</a>',
|
||||
];
|
||||
|
||||
$buttons['history'] = [
|
||||
'active' => ($tab == 'history') ? true : false,
|
||||
'active' => ($tab === 'history') ? true : false,
|
||||
'text' => '<a href="'.ui_get_full_url(
|
||||
'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=histo'
|
||||
).'ry">'.html_print_image('images/gm_db.png', true, ['title' => __('Journal'), 'class' => 'invert_filter']).'</a>',
|
||||
];
|
||||
|
||||
$buttons['offline'] = [
|
||||
'active' => ($tab == 'offline') ? true : false,
|
||||
'active' => ($tab === 'offline') ? true : false,
|
||||
'text' => '<a href="'.ui_get_full_url(
|
||||
'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=offli'
|
||||
).'ne">'.html_print_image('images/box.png', true, ['title' => __('Offline update manager'), 'class' => 'invert_filter']).'</a>',
|
||||
).'ne">'.html_print_image('images/box.png', true, ['title' => __('Offline update'), 'class' => 'invert_filter']).'</a>',
|
||||
];
|
||||
|
||||
$buttons['online'] = [
|
||||
'active' => ($tab == 'online') ? true : false,
|
||||
'active' => ($tab === 'online') ? true : false,
|
||||
'text' => '<a href="'.ui_get_full_url(
|
||||
'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=onlin'
|
||||
).'e">'.html_print_image('images/op_gis.png', true, ['title' => __('Online update manager'), 'class' => 'invert_filter']).'</a>',
|
||||
).'e">'.html_print_image('images/op_gis.png', true, ['title' => __('Online update'), 'class' => 'invert_filter']).'</a>',
|
||||
];
|
||||
|
||||
switch ($tab) {
|
||||
case 'history':
|
||||
$title = __('Update manager » Journal');
|
||||
$title = __('Journal');
|
||||
break;
|
||||
|
||||
case 'setup':
|
||||
$title = __('Update manager » Setup');
|
||||
$title = __('Setup');
|
||||
break;
|
||||
|
||||
case 'offline':
|
||||
$title = __('Update manager » Offline');
|
||||
$title = __('Offline');
|
||||
break;
|
||||
|
||||
case 'online':
|
||||
default:
|
||||
$title = __('Update manager » Online');
|
||||
$title = __('Online');
|
||||
break;
|
||||
}
|
||||
|
||||
ui_print_page_header(
|
||||
ui_print_standard_header(
|
||||
$title,
|
||||
'images/gm_setup.png',
|
||||
false,
|
||||
'',
|
||||
true,
|
||||
$buttons
|
||||
$buttons,
|
||||
[
|
||||
[
|
||||
'link' => '',
|
||||
'label' => 'Warp Update',
|
||||
],
|
||||
]
|
||||
);
|
||||
|
||||
switch ($tab) {
|
||||
|
|
|
@ -268,17 +268,18 @@ $table->style[$i] = 'font-weight: bolder;width:250px';
|
|||
|
||||
$url_update_manager = update_manager_get_url();
|
||||
|
||||
$table->data[$i][0] = __('URL update manager:');
|
||||
$table->data[$i][0] = __('Warp Update URL');
|
||||
$table->data[$i++][1] = html_print_input_text(
|
||||
'url_update_manager',
|
||||
$url_update_manager,
|
||||
__('URL update manager'),
|
||||
80,
|
||||
255,
|
||||
true,
|
||||
true
|
||||
);
|
||||
|
||||
$table->data[$i][0] = __('Use secured update manager:');
|
||||
$table->data[$i][0] = __('Use secured Warp Update');
|
||||
$table->data[$i++][1] = html_print_input(
|
||||
[
|
||||
'type' => 'switch',
|
||||
|
@ -287,7 +288,7 @@ $table->data[$i++][1] = html_print_input(
|
|||
]
|
||||
);
|
||||
|
||||
$table->data[$i][0] = __('Proxy server:');
|
||||
$table->data[$i][0] = __('Proxy server');
|
||||
$table->data[$i++][1] = html_print_input_text(
|
||||
'update_manager_proxy_server',
|
||||
$update_manager_proxy_server,
|
||||
|
@ -297,7 +298,7 @@ $table->data[$i++][1] = html_print_input_text(
|
|||
true
|
||||
);
|
||||
|
||||
$table->data[$i][0] = __('Proxy port:');
|
||||
$table->data[$i][0] = __('Proxy port');
|
||||
$table->data[$i++][1] = html_print_input_text(
|
||||
'update_manager_proxy_port',
|
||||
$update_manager_proxy_port,
|
||||
|
@ -307,7 +308,7 @@ $table->data[$i++][1] = html_print_input_text(
|
|||
true
|
||||
);
|
||||
|
||||
$table->data[$i][0] = __('Proxy user:');
|
||||
$table->data[$i][0] = __('Proxy user');
|
||||
$table->data[$i++][1] = html_print_input_text(
|
||||
'update_manager_proxy_user',
|
||||
$update_manager_proxy_user,
|
||||
|
@ -317,7 +318,7 @@ $table->data[$i++][1] = html_print_input_text(
|
|||
true
|
||||
);
|
||||
|
||||
$table->data[$i][0] = __('Proxy password:');
|
||||
$table->data[$i][0] = __('Proxy password');
|
||||
$table->data[$i++][1] = html_print_input_password(
|
||||
'update_manager_proxy_password',
|
||||
$update_manager_proxy_password,
|
||||
|
@ -327,7 +328,7 @@ $table->data[$i++][1] = html_print_input_password(
|
|||
true
|
||||
);
|
||||
|
||||
$table->data[$i][0] = __('Allow no-consecutive patches:');
|
||||
$table->data[$i][0] = __('Allow no-consecutive patches');
|
||||
$table->data[$i++][1] = html_print_switch(
|
||||
[
|
||||
'name' => 'allow_offline_patches',
|
||||
|
@ -336,7 +337,7 @@ $table->data[$i++][1] = html_print_switch(
|
|||
]
|
||||
);
|
||||
|
||||
$table->data[$i][0] = __('Limit to LTS updates:');
|
||||
$table->data[$i][0] = __('Limit to LTS updates');
|
||||
$table->data[$i++][1] = html_print_switch(
|
||||
[
|
||||
'name' => 'lts_updates',
|
||||
|
@ -346,11 +347,11 @@ $table->data[$i++][1] = html_print_switch(
|
|||
);
|
||||
|
||||
|
||||
$table->data[$i][0] = __('Registration ID:');
|
||||
$table->data[$i++][1] = '<i>'.$config['pandora_uid'].'</i>';
|
||||
$table->data[$i][0] = __('Registration ID');
|
||||
$table->data[$i++][1] = '<i>'.($config['pandora_uid'] ?? __('Not registred yet')).'</i>';
|
||||
|
||||
if (update_manager_verify_registration() === true && users_is_admin()) {
|
||||
$table->data[$i][0] = __('Cancel registration:');
|
||||
$table->data[$i][0] = __('Cancel registration');
|
||||
$table->data[$i][1] = '<a href="';
|
||||
if ((bool) is_metaconsole() === true) {
|
||||
$table->data[$i][1] .= ui_get_full_url(
|
||||
|
@ -367,7 +368,7 @@ if (update_manager_verify_registration() === true && users_is_admin()) {
|
|||
|
||||
if (license_free()) {
|
||||
$config['identification_reminder'] = isset($config['identification_reminder']) ? $config['identification_reminder'] : 1;
|
||||
$table->data[$i][0] = __('Pandora FMS community reminder').ui_print_help_tip(__('Every 8 days, a message is displayed to admin users to remember to register this Pandora instance'), true);
|
||||
$table->data[$i][0] = __('%s community reminder', get_product_name()).ui_print_help_tip(__('Every 8 days, a message is displayed to admin users to remember to register this %s instance', get_product_name()), true);
|
||||
$table->data[$i][1] = __('Yes').' '.html_print_radio_button('identification_reminder', 1, '', $config['identification_reminder'], true).' ';
|
||||
$table->data[$i++][1] .= __('No').' '.html_print_radio_button('identification_reminder', 0, '', $config['identification_reminder'], true);
|
||||
}
|
||||
|
|
|
@ -336,7 +336,7 @@ class OrderInterpreter extends Wizard
|
|||
),
|
||||
],
|
||||
[
|
||||
'name' => __('Update Manager'),
|
||||
'name' => __('Warp Update'),
|
||||
'icon' => ui_get_full_url(
|
||||
'images/menu/um_messages.menu_gray.png'
|
||||
),
|
||||
|
@ -404,10 +404,10 @@ class OrderInterpreter extends Wizard
|
|||
'.$value['name'].'</a><br>';
|
||||
}
|
||||
|
||||
$iterator ++;
|
||||
$iterator++;
|
||||
|
||||
if ($iterator > 10) {
|
||||
$more_results ++;
|
||||
$more_results++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -806,7 +806,7 @@ define('AUDIT_LOG_SNMP_MANAGEMENT', 'SNMP management');
|
|||
define('AUDIT_LOG_DASHBOARD_MANAGEMENT', 'Dashboard management');
|
||||
define('AUDIT_LOG_SERVICE_MANAGEMENT', 'Service management');
|
||||
define('AUDIT_LOG_INCIDENT_MANAGEMENT', 'Incident management');
|
||||
define('AUDIT_LOG_UMC', 'Update Manager');
|
||||
define('AUDIT_LOG_UMC', 'Warp Manager');
|
||||
|
||||
// MIMEs.
|
||||
define(
|
||||
|
|
|
@ -1189,13 +1189,9 @@ a.pandora_pagination,
|
|||
}
|
||||
#box_online {
|
||||
background-image: url("../../images/update_pandora_black.jpg") !important;
|
||||
background-position: left, left !important;
|
||||
background-repeat: no-repeat;
|
||||
background-color: #000 !important;
|
||||
padding: 40px 50px;
|
||||
border: 1px solid #111 !important;
|
||||
border-radius: 5px;
|
||||
min-height: 600px;
|
||||
background-size: contain;
|
||||
box-shadow: 1px 1px 4px rgba(160, 160, 160, 0.514);
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ input[type="button"].submit-next {
|
|||
background: #fff;
|
||||
padding: 5px;
|
||||
font-size: 1.3em;
|
||||
margin: 0.5em 1em 0.5em 0;
|
||||
margin: 0.5em 0em;
|
||||
cursor: pointer;
|
||||
text-align: center;
|
||||
height: 30px;
|
||||
|
@ -71,7 +71,7 @@ div.submit_buttons_container {
|
|||
position: relative;
|
||||
margin: 10px auto 0px;
|
||||
bottom: 0px;
|
||||
width: 90%;
|
||||
width: 95%;
|
||||
clear: both;
|
||||
height: 4em;
|
||||
}
|
||||
|
|
|
@ -460,7 +460,9 @@ function umShowUpdateDetails(update) {
|
|||
var um_update_details = document.getElementById("um-update-details");
|
||||
var header = document.getElementById("um-update-details-header");
|
||||
var content = document.getElementById("um-update-details-content");
|
||||
|
||||
var detailTitle = document
|
||||
.getElementsByClassName("um-package-details")
|
||||
.item(0).innerText;
|
||||
header.innerText = texts.updateText + " " + updates[update].version;
|
||||
content.innerText = updates[update].description;
|
||||
|
||||
|
@ -468,8 +470,8 @@ function umShowUpdateDetails(update) {
|
|||
um_update_details.style.display = "block";
|
||||
if (typeof $ == "function") {
|
||||
$("#um-update-details").dialog({
|
||||
title: update,
|
||||
width: 650,
|
||||
title: detailTitle,
|
||||
width: 800,
|
||||
height: 600
|
||||
});
|
||||
}
|
||||
|
|
|
@ -1,318 +0,0 @@
|
|||
.update_text p {
|
||||
font-size: 11pt;
|
||||
}
|
||||
|
||||
.update_text a {
|
||||
font-size: 11pt;
|
||||
color: #82b92e;
|
||||
}
|
||||
|
||||
.update_manager_warning p {
|
||||
font-size: 10pt;
|
||||
}
|
||||
|
||||
.ui-widget-content,
|
||||
.ui-widget-content p {
|
||||
font-size: 12pt;
|
||||
}
|
||||
.fileupload_form {
|
||||
background-color: #373a3d;
|
||||
background-image: -moz-linear-gradient(center, #373a3d, #313437);
|
||||
border-radius: 3px;
|
||||
margin: 0px;
|
||||
padding: 30px;
|
||||
}
|
||||
#drop_file {
|
||||
background-color: #e6e6e6;
|
||||
border: 20px solid rgba(0, 0, 0, 0);
|
||||
border-radius: 3px;
|
||||
color: #707070;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
margin-bottom: 30px;
|
||||
padding: 40px 50px;
|
||||
text-align: center;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
#drop_file table {
|
||||
vertical-align: middle;
|
||||
}
|
||||
#drop_file table td,
|
||||
#drop_file table label {
|
||||
color: #707070;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
margin-top: 0;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#drop_file table select {
|
||||
float: none;
|
||||
}
|
||||
#drop_file a {
|
||||
background-color: #82b92e;
|
||||
border-radius: 2px;
|
||||
color: #ffffff;
|
||||
cursor: pointer;
|
||||
display: inline-block;
|
||||
font-size: 14px;
|
||||
line-height: 1;
|
||||
padding: 12px 26px;
|
||||
}
|
||||
#drop_file a:hover {
|
||||
background-color: #a6ce67;
|
||||
text-decoration: none;
|
||||
}
|
||||
#drop_file input {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.fileupload_form ul {
|
||||
border-bottom: 1px solid #3d4043;
|
||||
border-top: 1px solid #2b2e31;
|
||||
list-style: none outside none;
|
||||
margin: 0 -30px;
|
||||
padding: 0;
|
||||
}
|
||||
.fileupload_form ul li {
|
||||
background-color: #333639;
|
||||
background-image: -moz-linear-gradient(center, #333639, #303335);
|
||||
border-bottom: 1px solid #2b2e31;
|
||||
border-top: 1px solid #3d4043;
|
||||
padding: 15px;
|
||||
position: relative;
|
||||
}
|
||||
.fileupload_form ul li #input-progress {
|
||||
left: 68px;
|
||||
position: absolute;
|
||||
}
|
||||
.fileupload_form ul li p {
|
||||
color: #eeeeee;
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
left: 95px;
|
||||
overflow: hidden;
|
||||
position: absolute;
|
||||
top: 12px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.fileupload_form ul li i {
|
||||
color: #7f7f7f;
|
||||
display: block;
|
||||
font-style: normal;
|
||||
font-weight: normal;
|
||||
}
|
||||
.fileupload_form ul li canvas {
|
||||
left: 13px;
|
||||
position: absolute;
|
||||
top: 15px;
|
||||
}
|
||||
.fileupload_form ul li span {
|
||||
background: url("../images/check-cross.png") no-repeat scroll 0 0
|
||||
rgba(0, 0, 0, 0);
|
||||
cursor: pointer;
|
||||
height: 12px;
|
||||
position: absolute;
|
||||
right: 13px;
|
||||
top: 34px;
|
||||
width: 15px;
|
||||
}
|
||||
.fileupload_form ul li div {
|
||||
display: block !important;
|
||||
}
|
||||
.fileupload_form ul li.working span {
|
||||
background-position: 0 -12px;
|
||||
height: 16px;
|
||||
}
|
||||
.fileupload_form ul li.loading span {
|
||||
background: url("../images/spinner.gif") no-repeat scroll 0 0 rgba(0, 0, 0, 0);
|
||||
height: 16px;
|
||||
}
|
||||
.fileupload_form ul li.suc span {
|
||||
background: url("../images/check-cross.png") no-repeat scroll 0 0
|
||||
rgba(0, 0, 0, 0);
|
||||
height: 12px;
|
||||
}
|
||||
.fileupload_form ul li.suc p {
|
||||
color: #5a8629;
|
||||
}
|
||||
.fileupload_form ul li.error span {
|
||||
background: url("../images/check-cross.png") no-repeat scroll 0 -12px rgba(0, 0, 0, 0);
|
||||
height: 16px;
|
||||
}
|
||||
.fileupload_form ul li.error p {
|
||||
color: #ff3333;
|
||||
}
|
||||
|
||||
#log_zone {
|
||||
background-color: #e6e6e6;
|
||||
border: 20px solid rgba(0, 0, 0, 0);
|
||||
border-radius: 3px;
|
||||
color: #707070;
|
||||
font-size: 12px;
|
||||
margin-bottom: 30px;
|
||||
padding: 10px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
#box_online {
|
||||
background-image: url("../images/update_manager_background.jpg");
|
||||
background-position: center center;
|
||||
background-repeat: no-repeat;
|
||||
background-color: #fff;
|
||||
padding: 40px 50px;
|
||||
border: 1px solid #f3f3f3;
|
||||
border-radius: 5px;
|
||||
min-height: 600px;
|
||||
background-size: contain;
|
||||
}
|
||||
|
||||
div#box_online * {
|
||||
font-size: 16pt;
|
||||
margin-bottom: 50px;
|
||||
}
|
||||
|
||||
#box_online .content {
|
||||
max-width: 50%;
|
||||
}
|
||||
|
||||
.update_popup {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
.update_icon {
|
||||
padding-left: 20px;
|
||||
}
|
||||
|
||||
.update_text h3 {
|
||||
font-weight: bold;
|
||||
font-size: 12pt;
|
||||
}
|
||||
|
||||
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
|
||||
float: left;
|
||||
padding-left: 19px;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
|
||||
a.update_manager_button {
|
||||
padding: 10px 12px;
|
||||
margin-top: 10px;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
font-size: 16px;
|
||||
border-radius: 4px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a.update_manager_button:after {
|
||||
content: url(../images/update_manager_button.png);
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
.progressbar {
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
.ui-draggable,
|
||||
.ui-draggable .ui-dialog-titlebar {
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
#box_online #pkg_version {
|
||||
color: #82b92e;
|
||||
font-size: 75pt;
|
||||
font-weight: bold;
|
||||
margin-bottom: 50px;
|
||||
}
|
||||
|
||||
/* METACONSOLE */
|
||||
.box_online_meta {
|
||||
background: none;
|
||||
min-height: 400px;
|
||||
text-align: center;
|
||||
border: none;
|
||||
}
|
||||
|
||||
div#box_online.box_online_meta * {
|
||||
font-size: 14pt;
|
||||
}
|
||||
|
||||
#box_online.box_online_meta .content {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
#box_online.box_online_meta #pkg_version {
|
||||
font-size: 60pt;
|
||||
}
|
||||
|
||||
/* COMMUNITY */
|
||||
.update_manager_open {
|
||||
max-width: 50%;
|
||||
font-size: 10pt;
|
||||
margin-top: 40px;
|
||||
padding: 20px;
|
||||
border: 1px solid #eaeaea;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.update_manager_warning {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.update_manager_warning img {
|
||||
padding-right: 20px;
|
||||
width: 90px;
|
||||
}
|
||||
|
||||
a.update_manager_button_open {
|
||||
padding: 5px 10px;
|
||||
font-size: 16px;
|
||||
text-decoration: none;
|
||||
border: 1px solid #82b92e;
|
||||
color: #82b92e;
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
||||
a.update_manager_button_open:hover {
|
||||
color: #fff;
|
||||
background-color: #82b92e;
|
||||
}
|
||||
|
||||
#um-update-details-header {
|
||||
background-image: url(../images/pandora_logo.png);
|
||||
}
|
||||
|
||||
.um-progress-bar {
|
||||
background-color: #8bb92e !important;
|
||||
}
|
||||
|
||||
.um-error {
|
||||
color: #e63c52;
|
||||
}
|
||||
|
||||
.um-success {
|
||||
color: #8bb92e;
|
||||
}
|
||||
|
||||
.dz-success-mark svg {
|
||||
background: #8bb92e;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.newsletter_div {
|
||||
font-size: 12pt;
|
||||
margin: 5px 20px;
|
||||
float: left;
|
||||
padding-top: 23px;
|
||||
}
|
||||
.register_update_manager {
|
||||
margin: 5px 0 10px;
|
||||
float: left;
|
||||
padding-left: 15px;
|
||||
}
|
|
@ -9,6 +9,58 @@
|
|||
margin: 5% auto;
|
||||
padding: 2em;
|
||||
}
|
||||
a.update_manager_button {
|
||||
padding: 10px 12px;
|
||||
margin-top: 10px;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
font-size: 16px;
|
||||
border-radius: 4px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a.update_manager_button:after {
|
||||
content: url(../images/update_manager_button.png);
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
.progressbar {
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
#log_zone {
|
||||
background-color: #e6e6e6;
|
||||
border: 20px solid rgba(0, 0, 0, 0);
|
||||
border-radius: 3px;
|
||||
color: #707070;
|
||||
font-size: 12px;
|
||||
margin-bottom: 30px;
|
||||
padding: 10px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
#box_online {
|
||||
background-image: url("../images/update_manager_background.jpg");
|
||||
background-position: top right;
|
||||
background-repeat: no-repeat;
|
||||
background-color: #fff;
|
||||
padding: 40px 50px;
|
||||
border: 1px solid #f3f3f3;
|
||||
border-radius: 5px;
|
||||
min-height: 400px;
|
||||
background-size: contain;
|
||||
}
|
||||
|
||||
#box_online #pkg_version {
|
||||
color: #82b92e;
|
||||
font-size: 6em;
|
||||
font-weight: bold;
|
||||
margin: 30px 0 !important;
|
||||
}
|
||||
|
||||
.update_manager_warning p {
|
||||
font-size: 10pt;
|
||||
}
|
||||
#update-list {
|
||||
max-height: 0;
|
||||
overflow: hidden;
|
||||
|
@ -16,6 +68,31 @@
|
|||
flex-direction: column;
|
||||
transition: max-height 0.15s ease-in-out;
|
||||
}
|
||||
.update_popup {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
.update_icon {
|
||||
padding-left: 20px;
|
||||
}
|
||||
|
||||
.update_text h3 {
|
||||
font-weight: bold;
|
||||
font-size: 12pt;
|
||||
}
|
||||
|
||||
.update_text p {
|
||||
font-size: 11pt;
|
||||
}
|
||||
|
||||
.update_text a {
|
||||
font-size: 11pt;
|
||||
color: #82b92e;
|
||||
}
|
||||
|
||||
.update {
|
||||
display: flex;
|
||||
|
@ -23,13 +100,161 @@
|
|||
justify-content: space-around;
|
||||
align-items: center;
|
||||
}
|
||||
#drop_file {
|
||||
background-color: #e6e6e6;
|
||||
border: 20px solid rgba(0, 0, 0, 0);
|
||||
border-radius: 3px;
|
||||
color: #707070;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
margin-bottom: 30px;
|
||||
padding: 40px 50px;
|
||||
text-align: center;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
#drop_file table {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#drop_file table td,
|
||||
#drop_file table label {
|
||||
color: #707070;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
margin-top: 0;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#drop_file table select {
|
||||
float: none;
|
||||
}
|
||||
|
||||
#drop_file a {
|
||||
background-color: #82b92e;
|
||||
border-radius: 2px;
|
||||
color: #ffffff;
|
||||
cursor: pointer;
|
||||
display: inline-block;
|
||||
font-size: 14px;
|
||||
line-height: 1;
|
||||
padding: 12px 26px;
|
||||
}
|
||||
|
||||
#drop_file a:hover {
|
||||
background-color: #a6ce67;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
#drop_file input {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* Offline form */
|
||||
.fileupload_form {
|
||||
background-color: #373a3d;
|
||||
background-image: -moz-linear-gradient(center, #373a3d, #313437);
|
||||
border-radius: 3px;
|
||||
margin: 0px;
|
||||
padding: 30px;
|
||||
}
|
||||
|
||||
.fileupload_form ul {
|
||||
border-bottom: 1px solid #3d4043;
|
||||
border-top: 1px solid #2b2e31;
|
||||
list-style: none outside none;
|
||||
margin: 0 -30px;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.fileupload_form ul li {
|
||||
background-color: #333639;
|
||||
background-image: -moz-linear-gradient(center, #333639, #303335);
|
||||
border-bottom: 1px solid #2b2e31;
|
||||
border-top: 1px solid #3d4043;
|
||||
padding: 15px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.fileupload_form ul li #input-progress {
|
||||
left: 68px;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
.fileupload_form ul li p {
|
||||
color: #eeeeee;
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
left: 95px;
|
||||
overflow: hidden;
|
||||
position: absolute;
|
||||
top: 12px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.fileupload_form ul li i {
|
||||
color: #7f7f7f;
|
||||
display: block;
|
||||
font-style: normal;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
.fileupload_form ul li canvas {
|
||||
left: 13px;
|
||||
position: absolute;
|
||||
top: 15px;
|
||||
}
|
||||
|
||||
.fileupload_form ul li span {
|
||||
background: url("../images/check-cross.png") no-repeat scroll 0 0
|
||||
rgba(0, 0, 0, 0);
|
||||
cursor: pointer;
|
||||
height: 12px;
|
||||
position: absolute;
|
||||
right: 13px;
|
||||
top: 34px;
|
||||
width: 15px;
|
||||
}
|
||||
|
||||
.fileupload_form ul li div {
|
||||
display: block !important;
|
||||
}
|
||||
|
||||
.fileupload_form ul li.working span {
|
||||
background-position: 0 -12px;
|
||||
height: 16px;
|
||||
}
|
||||
|
||||
.fileupload_form ul li.loading span {
|
||||
background: url("../images/spinner.gif") no-repeat scroll 0 0 rgba(0, 0, 0, 0);
|
||||
height: 16px;
|
||||
}
|
||||
|
||||
.fileupload_form ul li.suc span {
|
||||
background: url("../images/check-cross.png") no-repeat scroll 0 0
|
||||
rgba(0, 0, 0, 0);
|
||||
height: 12px;
|
||||
}
|
||||
|
||||
.fileupload_form ul li.suc p {
|
||||
color: #5a8629;
|
||||
}
|
||||
|
||||
.fileupload_form ul li.error span {
|
||||
background: url("../images/check-cross.png") no-repeat scroll 0 -12px rgba(0, 0, 0, 0);
|
||||
height: 16px;
|
||||
}
|
||||
|
||||
.fileupload_form ul li.error p {
|
||||
top: 18px;
|
||||
color: #ff3333;
|
||||
}
|
||||
#um-loading {
|
||||
background-image: url(../images/spinner.gif);
|
||||
height: 1.3em;
|
||||
height: 1em;
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
||||
text-indent: 6em;
|
||||
text-indent: 4.5em;
|
||||
}
|
||||
|
||||
#um-buttons {
|
||||
|
@ -64,7 +289,7 @@
|
|||
}
|
||||
|
||||
#um-update-details * {
|
||||
font-size: 16pt;
|
||||
font-size: 10pt;
|
||||
}
|
||||
|
||||
#um-update-details-header {
|
||||
|
@ -72,10 +297,10 @@
|
|||
background-color: #343434;
|
||||
background-repeat: no-repeat;
|
||||
background-position: 50% 20%;
|
||||
height: 3em;
|
||||
height: 1.8em;
|
||||
text-align: center;
|
||||
display: block;
|
||||
padding-top: 5.7em;
|
||||
padding-top: 5.3em;
|
||||
width: 100%;
|
||||
}
|
||||
#um-update-details-content {
|
||||
|
@ -115,11 +340,17 @@
|
|||
background-color: #1f282b;
|
||||
}
|
||||
|
||||
div#box_online * {
|
||||
font-size: 14pt;
|
||||
}
|
||||
|
||||
#box_online .content {
|
||||
max-width: 50%;
|
||||
}
|
||||
#box_offline form {
|
||||
background-color: #373a3d;
|
||||
background-image: -moz-linear-gradient(top, #373a3d, #313437);
|
||||
border-radius: 3px;
|
||||
font-family: "PT Sans Narrow", sans-serif;
|
||||
margin: 0px;
|
||||
padding: 30px;
|
||||
}
|
||||
|
@ -180,7 +411,9 @@ span.warning {
|
|||
justify-content: space-between;
|
||||
}
|
||||
.ui-dialog-content.ui-widget-content p {
|
||||
font-size: 10pt;
|
||||
word-break: keep-all;
|
||||
text-align: justify;
|
||||
}
|
||||
|
||||
.license_text {
|
||||
|
@ -204,3 +437,91 @@ input.error {
|
|||
textarea#signature {
|
||||
margin-top: 1em;
|
||||
}
|
||||
a.update_manager_button_open:hover {
|
||||
color: #fff;
|
||||
background-color: #82b92e;
|
||||
}
|
||||
|
||||
#um-update-details-header {
|
||||
background-image: url(../images/pandora_logo.png);
|
||||
font-size: 16pt;
|
||||
}
|
||||
|
||||
.um-progress-bar {
|
||||
background-color: #8bb92e !important;
|
||||
}
|
||||
|
||||
.um-error {
|
||||
color: #e63c52;
|
||||
}
|
||||
|
||||
.um-success {
|
||||
color: #8bb92e;
|
||||
}
|
||||
|
||||
.dz-success-mark svg {
|
||||
background: #8bb92e;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.newsletter_div {
|
||||
margin: 5px 20px;
|
||||
float: left;
|
||||
padding-top: 23px;
|
||||
}
|
||||
|
||||
.register_update_manager {
|
||||
margin: 5px 0 10px;
|
||||
float: left;
|
||||
padding-left: 15px;
|
||||
}
|
||||
|
||||
/* METACONSOLE */
|
||||
.box_online_meta {
|
||||
background: none;
|
||||
min-height: 400px;
|
||||
text-align: center;
|
||||
border: none;
|
||||
}
|
||||
|
||||
div#box_online.box_online_meta * {
|
||||
font-size: 14pt;
|
||||
}
|
||||
|
||||
#box_online.box_online_meta .content {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
#box_online.box_online_meta #pkg_version {
|
||||
font-size: 60pt;
|
||||
}
|
||||
|
||||
/* COMMUNITY */
|
||||
.update_manager_open {
|
||||
max-width: 50%;
|
||||
font-size: 10pt;
|
||||
margin-top: 40px;
|
||||
padding: 20px;
|
||||
border: 1px solid #eaeaea;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.update_manager_warning {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.update_manager_warning img {
|
||||
padding-right: 20px;
|
||||
width: 90px;
|
||||
}
|
||||
|
||||
a.update_manager_button_open {
|
||||
padding: 5px 10px;
|
||||
font-size: 16px;
|
||||
text-decoration: none;
|
||||
border: 1px solid #82b92e;
|
||||
color: #82b92e;
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
<script src="<?php $asset('resources/javascript/jquery.iframe-transport.js'); ?>" type="text/javascript"></script>
|
||||
<script src="<?php $asset('resources/javascript/jquery.knob.js'); ?>" type="text/javascript"></script>
|
||||
<link rel="stylesheet" href="<?php $asset('resources/styles/um.css'); ?>">
|
||||
<link rel="stylesheet" href="<?php $asset('resources/styles/pandora.css'); ?>">
|
||||
</head>
|
||||
|
||||
<div id="box_offline">
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
?>
|
||||
<head>
|
||||
<link rel="stylesheet" href="<?php $asset('resources/styles/um.css'); ?>">
|
||||
<link rel="stylesheet" href="<?php $asset('resources/styles/pandora.css'); ?>">
|
||||
<script src="<?php $asset('resources/javascript/umc.js'); ?>" type="text/javascript"></script>
|
||||
</head>
|
||||
|
||||
|
@ -40,10 +39,10 @@
|
|||
<span class="loading" style="font-size: 18pt; display: none;">
|
||||
<img src="images/wait.gif">
|
||||
</span>
|
||||
|
||||
<p style="font-weight: 600;">The latest version of package installed is:</p>
|
||||
|
||||
<p style="font-weight: 600;"><?php echo __('The latest version of package installed is').':'; ?></p>
|
||||
<div id="pkg_version"><?php echo $version; ?></div>
|
||||
|
||||
|
||||
<div class="content">
|
||||
<?php
|
||||
if (empty($error) !== true) {
|
||||
|
|
|
@ -41,28 +41,27 @@ $product_name = get_product_name(); ?>
|
|||
<script src="<?php $asset('resources/javascript/umc.js'); ?>" type="text/javascript"></script>
|
||||
<link rel="stylesheet" href="<?php $asset('resources/styles/jquery-ui.min.css'); ?>">
|
||||
<link rel="stylesheet" href="<?php $asset('resources/styles/um.css'); ?>">
|
||||
<link rel="stylesheet" href="<?php $asset('resources/styles/pandora.css'); ?>">
|
||||
</head>
|
||||
|
||||
<div id="registration_wizard" title="
|
||||
<?php echo __('Register to Update Manager'); ?>
|
||||
<?php echo __('Register to Warp Update'); ?>
|
||||
" class="invisible">
|
||||
<div class="register_update_manager">
|
||||
<?php echo html_print_image('images/pandora_circle_big.png', true); ?>
|
||||
</div>
|
||||
|
||||
<div class="newsletter_div">
|
||||
<?php echo __('Keep this %s console up to date with latest updates.', $product_name); ?>
|
||||
<div class="newsletter_div lato font_10pt">
|
||||
<?php echo __('Keep this %s console up to date with latest updates.', $product_name); ?>
|
||||
</div>
|
||||
|
||||
<div class="license_text both">
|
||||
<p>
|
||||
<p class="lato font_10pt">
|
||||
<?php
|
||||
echo __(
|
||||
'When you subscribe to the %s Update Manager service, you accept that we
|
||||
'When you subscribe to the Warp update service for %s, you accept that we
|
||||
register your %s instance as an identifier on a database owned by %s. This data will solely be used to
|
||||
provide you with information about %s and will not be conceded to third parties. You can unregister from
|
||||
said database at any time from the Update Manager options.',
|
||||
said database at any time from the Warp update options.',
|
||||
$product_name,
|
||||
$product_name,
|
||||
$product_name,
|
||||
|
@ -71,12 +70,12 @@ $product_name = get_product_name(); ?>
|
|||
?>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<?php echo __('Visit our privacy policy for more information'); ?>:
|
||||
<p class="lato font_10pt">
|
||||
<?php echo __('Visit our privacy policy for more information'); ?>:
|
||||
<a href="https://pandorafms.com/privacy-policy/" target="_blank">https://pandorafms.com/privacy-policy/</a>
|
||||
</p>
|
||||
|
||||
<input id="registration-email" type="email" placeholder="<?php echo __('Your email'); ?>" />
|
||||
<input id="registration-email" class="lato" type="email" placeholder="<?php echo __('Your email'); ?>" />
|
||||
</div>
|
||||
|
||||
<div class="submit_buttons_container">
|
||||
|
@ -86,7 +85,8 @@ $product_name = get_product_name(); ?>
|
|||
__('Cancel'),
|
||||
'cancel_registration',
|
||||
false,
|
||||
'class="ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel"',
|
||||
'class="lato ui-widget
|
||||
ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel"',
|
||||
true
|
||||
);
|
||||
?>
|
||||
|
@ -97,7 +97,7 @@ $product_name = get_product_name(); ?>
|
|||
__('OK!'),
|
||||
'register',
|
||||
false,
|
||||
'class="ui-widget
|
||||
'class="lato ui-widget
|
||||
ui-state-default ui-corner-all ui-button-text-only sub ok submit-next w100px"',
|
||||
true
|
||||
);
|
||||
|
@ -108,8 +108,8 @@ $product_name = get_product_name(); ?>
|
|||
|
||||
<!-- Verification modal.. -->
|
||||
<div id="reg_ensure_cancel" title="Confirmation Required" class="invisible">
|
||||
<div class="font_12_20">
|
||||
<?php echo __('Are you sure you don\'t want to use update manager?'); ?>
|
||||
<div class="lato font_10pt">
|
||||
<?php echo __('Are you sure you don\'t want to use Warp update?'); ?>
|
||||
<p>
|
||||
<?php
|
||||
echo __(
|
||||
|
@ -124,7 +124,7 @@ $product_name = get_product_name(); ?>
|
|||
|
||||
<!-- Results modal. -->
|
||||
<div id="reg_result" title="Registration process result" class="invisible">
|
||||
<div id="reg_result_content" class="font_12_20">
|
||||
<div id="reg_result_content" class="lato font_10pt">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Reference in New Issue