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

Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF 

Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: 792472b0cc9b3f1ae56894c53407419c7fbd573e
This commit is contained in:
daniel 2019-02-07 10:30:23 +01:00
parent 19c5a1c844 1f3fe51f69
commit 4d4b8bbc0d
74 changed files with 2065 additions and 2293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.731-190204
Version: 7.0NG.731-190207
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.731-190204"
pandora_version="7.0NG.731-190207"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -42,7 +42,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.731';
use constant AGENT_BUILD => '190204';
use constant AGENT_BUILD => '190207';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.731
%define release 190204
%define release 190207
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.731
%define release 190204
%define release 190207
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.731"
PI_BUILD="190204"
PI_BUILD="190207"
OS_NAME=`uname -s`
FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{190204}
{190207}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.731(Build 190204)")
#define PANDORA_VERSION ("7.0NG.731(Build 190207)")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.731(Build 190204))"
VALUE "ProductVersion", "(7.0NG.731(Build 190207))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.731-190204
Version: 7.0NG.731-190207
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.731-190204"
pandora_version="7.0NG.731-190207"
package_pear=0
package_pandora=1

1
pandora_console/extensions/agents_modules.php
View File

@ -235,7 +235,6 @@ function mainAgentsModules()
echo '</div>';
// Floating menu - End
ui_require_jquery_file('countdown');
ui_require_css_file('countdown');
}
if ($config['pure'] != 1) {

2
pandora_console/extensions/module_groups.php
View File

@ -309,7 +309,7 @@ function mainModuleGroups()
ui_print_info_message(['no_close' => true, 'message' => __('There are no defined groups or module groups') ]);
}
ui_require_css_file('cluetip');
ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip');
?>
<script>

4
pandora_console/general/login_page.php
View File

@ -17,6 +17,8 @@ if (isset($config['homedir'])) {
$homedir = '';
}
ui_require_css_file('login');
require_once $homedir.'include/functions_ui.php';
require_once $homedir.'include/functions.php';
require_once __DIR__.'/../include/functions_html.php';
@ -537,7 +539,7 @@ if ($login_screen == 'error_authconfig' || $login_screen == 'error_emptyconfig'
}
ui_require_css_file('dialog');
ui_require_css_file('jquery-ui.min');
ui_require_css_file('jquery-ui.min', 'include/styles/js/');
ui_require_jquery_file('jquery-ui.min');
?>

2
pandora_console/godmode/alerts/alert_list.builder.php
View File

@ -192,7 +192,7 @@ if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
echo '</div></form>';
}
ui_require_css_file('cluetip');
ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip');
ui_require_jquery_file('pandora.controls');
ui_require_jquery_file('bgiframe');

2
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -836,7 +836,7 @@ if ($display_create && (check_acl($config['id_user'], 0, 'LW') || check_acl($con
echo '</div>';
}
ui_require_css_file('cluetip');
ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip');
ui_require_jquery_file('pandora.controls');
ui_require_jquery_file('bgiframe');

2
pandora_console/godmode/gis_maps/configure_gis_map.php
View File

@ -629,7 +629,7 @@ echo '</form>';
<?php
// -------------------------END CHUNKS---------------------------------------
ui_require_css_file('cluetip');
ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip');
ui_require_jquery_file('pandora.controls');
ui_require_jquery_file('json');

3
pandora_console/godmode/groups/group_list.php
View File

@ -11,6 +11,9 @@
// 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.
ui_require_css_file('tree');
ui_require_css_file('fixed-bottom-box');
// Load global vars
global $config;

2
pandora_console/godmode/reporting/visual_console_builder.data.php
View File

@ -233,7 +233,7 @@ html_print_submit_button(
echo '</div>';
echo '</form>';
ui_require_css_file('color-picker');
ui_require_css_file('color-picker', 'include/styles/js/');
ui_require_jquery_file('colorpicker');
?>

4
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -168,8 +168,8 @@ echo "<div id='saving_in_progress_dialog' style='display: none; text-align: cent
echo "<div id='delete_in_progress_dialog' style='display: none; text-align: center;' title='".__('Action in progress')."'>".__('Deletion in progress').'<br />'.html_print_image('images/spinner.gif', true).'</div>';
// CSS
ui_require_css_file('color-picker');
ui_require_css_file('jquery-ui.min');
ui_require_css_file('color-picker', 'include/styles/js/');
ui_require_css_file('jquery-ui.min', 'include/styles/js/');
// Javascript
ui_require_jquery_file('colorpicker');

2
pandora_console/godmode/reporting/visual_console_builder.elements.php
View File

@ -697,7 +697,7 @@ echo '<span id="ip_text" style="display: none;">'.__('IP').'</span>';
<textarea id="tinyMCE_editor" name="tinyMCE_editor"></textarea>
</div>
<?php
ui_require_css_file('color-picker');
ui_require_css_file('color-picker', 'include/styles/js/');
ui_require_jquery_file('colorpicker');
ui_require_jquery_file('pandora.controls');

2
pandora_console/godmode/setup/setup_visuals.php
View File

@ -1234,7 +1234,7 @@ html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"'
echo '</div>';
echo '</form>';
ui_require_css_file('color-picker');
ui_require_css_file('color-picker', 'include/styles/js/');
ui_require_jquery_file('colorpicker');

2
pandora_console/include/chart_generator.php
View File

@ -61,7 +61,7 @@ if (file_exists('languages/'.$user_language.'.mo')) {
<title>Pandora FMS Graph (<?php echo agents_get_alias($agent_id).' - '.$interface_name; ?>)</title>
<link rel="stylesheet" href="styles/pandora.css" type="text/css" />
<link rel="stylesheet" href="styles/pandora_minimal.css" type="text/css" />
<link rel="stylesheet" href="styles/jquery-ui.min.css" type="text/css" />
<link rel="stylesheet" href="styles/js/jquery-ui.min.css" type="text/css" />
<script language="javascript" type='text/javascript' src='javascript/pandora.js'></script>
<script language="javascript" type='text/javascript' src='javascript/jquery-3.3.1.min.js'></script>
<script language="javascript" type='text/javascript' src='javascript/jquery.pandora.js'></script>

2
pandora_console/include/config_process.php
View File

@ -20,7 +20,7 @@
/**
* Pandora build version and version
*/
$build_version = 'PC190204';
$build_version = 'PC190207';
$pandora_version = 'v7.0NG.731';
// Do not overwrite default timezone set if defined.

2
pandora_console/include/functions_networkmap.php
View File

@ -25,7 +25,7 @@
require_once 'functions_agents.php';
require_once $config['homedir'].'/include/functions_modules.php';
require_once $config['homedir'].'/include/functions_groups.php';
ui_require_css_file('cluetip');
ui_require_css_file('cluetip', 'include/styles/js/');
// Check if a node descends from a given node

2
pandora_console/include/functions_pandora_networkmap.php
View File

@ -1641,7 +1641,7 @@ function show_networkmap($id=0, $user_readonly=false, $nodes_and_relations=[], $
$networkmap['filter']['l2_network_interfaces'] = 1;
echo '<script type="text/javascript" src="'.$config['homeurl'].'include/javascript/d3.3.5.14.js" charset="utf-8"></script>';
ui_require_css_file('jquery.contextMenu', 'include/javascript/');
ui_require_css_file('jquery.contextMenu', 'include/styles/js/');
echo '<script type="text/javascript" src="'.$config['homeurl'].'include/javascript/jquery.contextMenu.js"></script>';
echo '<script type="text/javascript" src="'.$config['homeurl'].'include/javascript/functions_pandora_networkmap.js"></script>';
echo '<div id="networkconsole_'.$networkmap['id'].'" style="position: relative; overflow: hidden; background: #FAFAFA">';

2
pandora_console/include/functions_reporting_html.php
View File

@ -3914,7 +3914,7 @@ function reporting_get_event_histogram($events, $text_header_event=false)
$graph_data,
$max_value,
100,
35,
25,
$full_legend,
$colors,
$config['fontpath'],

4
pandora_console/include/functions_ui.php
View File

@ -1612,11 +1612,11 @@ function ui_process_page_head($string, $bitfield)
}
// Add the jquery UI styles CSS
$config['css']['jquery-UI'] = 'include/styles/jquery-ui.min.css';
$config['css']['jquery-UI'] = 'include/styles/js/jquery-ui.min.css';
// Add the dialog styles CSS
$config['css']['dialog'] = 'include/styles/dialog.css';
// Add the dialog styles CSS
$config['css']['dialog'] = 'include/javascript/introjs.css';
$config['css']['dialog'] = 'include/styles/js/introjs.css';
// If skin's css files exists then add them
if ($exists_css) {

2
pandora_console/include/functions_visual_map_editor.php
View File

@ -1150,7 +1150,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background)
echo '<div id="div_step_2" class="forced_title_layer"
style="display: none; position: absolute; z-index: 99;">'.__('Click end point<br />of the line').'</div>';
ui_require_css_file('color-picker');
ui_require_css_file('color-picker', 'include/styles/js/');
ui_require_jquery_file('colorpicker');
?>

167
pandora_console/include/javascript/jquery.contextMenu.css
View File

@ -1,167 +0,0 @@
/*!
* jQuery contextMenu - Plugin for simple contextMenu handling
*
* Version: 1.6.5
*
* Authors: Rodney Rehm, Addy Osmani (patches for FF)
* Web: http://medialize.github.com/jQuery-contextMenu/
*
* Licensed under
* MIT License http://www.opensource.org/licenses/mit-license
* GPL v3 http://opensource.org/licenses/GPL-3.0
*
*/
.context-menu-list {
margin:0;
padding:0;
min-width: 120px;
max-width: 250px;
display: inline-block;
position: absolute;
list-style-type: none;
border: 1px solid #DDD;
border-radius: 4px;
background: #EEE;
-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
text-align: left;
}
.context-menu-item {
padding: 0px 2px 0px 24px;
background-color: #EEE;
position: relative;
border-radius: 4px;
-webkit-user-select: none;
-moz-user-select: -moz-none;
-ms-user-select: none;
user-select: none;
padding-top: 8px;
padding-bottom: 8px;
}
.context-menu-item span {
padding-top: 10px;
padding-bottom: 10px;
padding-right: 10px;
padding-left: 10px;
}
.context-menu-separator {
padding-bottom:0;
border-bottom: 1px solid #DDD;
}
.context-menu-item > label > input,
.context-menu-item > label > textarea {
-webkit-user-select: text;
-moz-user-select: text;
-ms-user-select: text;
user-select: text;
}
.context-menu-item.hover {
cursor: pointer;
background-color: #82b92e;
border-radius: 4px;
color: #fff;
}
.context-menu-item.disabled {
color: #666 !important;
}
.context-menu-input.hover,
.context-menu-item.disabled.hover {
cursor: default;
background-color: #EEE;
}
.context-menu-submenu:after {
content: ">";
color: #666;
position: absolute;
top: 0;
right: 3px;
z-index: 1;
}
/* icons
#protip:
In case you want to use sprites for icons (which I would suggest you do) have a look at
http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement
.context-menu-item.icon:before {}
*/
.context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 2px; }
.context-menu-item.icon-edit { background-image: url(../../images/page_white_edit.png); }
.context-menu-item.icon-cut { background-image: url(../../images/cut.png); }
.context-menu-item.icon-copy { background-image: url(../../images/page_white_copy.png); }
.context-menu-item.icon-paste { background-image: url(../../images/page_white_paste.png); }
.context-menu-item.icon-delete { background-image: url(../../images/delete.png); }
.context-menu-item.icon-add { background-image: url(../../images/page_white_add.png); }
.context-menu-item.icon-quit { background-image: url(../../images/door.png); }
.context-menu-item.icon-refresh { background-image: url(../../images/refresh.png); }
.context-menu-item.icon-center { background-image: url(../../images/set_center.png); }
.context-menu-item.icon-details { background-image: url(../../images/show_details.png); }
.context-menu-item.icon-children { background-image: url(../../images/children.png); }
.context-menu-item.icon-cancel_set_parent { background-image: url(../../images/link_delete.png); }
.context-menu-item.icon-set_parent { background-image: url(../../images/father.png); }
.context-menu-item.icon-add_node { background-image: url(../../images/add.png); }
.context-menu-item.icon-refresh_holding_area { background-image: url(../../images/refresh_holding_area.png); }
.context-menu-item.icon-restart_map { background-image: url(../../images/reset.png); }
.context-menu-item.icon-interface_link_children { background-image: url(../../images/icono_link_hijo.png); }
.context-menu-item.icon-interface_link_parent { background-image: url(../../images/icono_link_padre.png); }
.context-menu-item.icon-interface_link_cancel { background-image: url(../../images/link_abortar.png); }
/* vertically align inside labels */
.context-menu-input > label > * { vertical-align: top; }
/* position checkboxes and radios as icons */
.context-menu-input > label > input[type="checkbox"],
.context-menu-input > label > input[type="radio"] {
margin-left: -17px;
}
.context-menu-input > label > span {
margin-left: 5px;
}
.context-menu-input > label,
.context-menu-input > label > input[type="text"],
.context-menu-input > label > textarea,
.context-menu-input > label > select {
display: block;
width: 100%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
-o-box-sizing: border-box;
box-sizing: border-box;
}
.context-menu-input > label > textarea {
height: 100px;
}
.context-menu-item > .context-menu-list {
display: none;
/* re-positioned by js */
right: -5px;
top: 5px;
}
.context-menu-item.hover > .context-menu-list {
display: block;
}
.context-menu-accesskey {
text-decoration: underline;
}

144
pandora_console/include/styles/cluster_view.css Normal file
View File

@ -0,0 +1,144 @@
/*
* ---------------------------------------------------------------------
* - CLUSTER VIEW -
* ---------------------------------------------------------------------
*/
#main_cluster {
max-width: 1770px;
margin: 0 auto;
}
.sub_cluster_1 {
width: 400px;
float: left;
margin-left: 30px;
margin-bottom: 25px;
vertical-align: top;
border: 1px solid #e7e9ea;
height: 150px;
}
.sub_cluster_2 {
width: 833px;
float: left;
margin-left: 30px;
margin-bottom: 25px;
vertical-align: top;
border: 1px solid #e7e9ea;
height: 150px;
}
.sub_cluster_header {
width: 100%;
height: 30px;
background-color: #373737;
color: white;
text-align: center;
font-size: 9pt;
display: flex;
justify-content: center;
align-content: center;
flex-direction: column;
}
.sub_cluster_body {
width: 100%;
height: 120px;
background-color: #f9faf9;
display: flex;
justify-content: center;
align-content: center;
flex-direction: column;
}
.sub_cluster_body_3 {
width: 100%;
height: 120px;
background-color: #f9faf9;
overflow-y: scroll;
}
#cluster_map {
border: 1px solid lightgray;
width: 900px;
height: 500px;
float: left;
margin-bottom: 30px;
}
#cluster_status_content {
width: 90%;
height: 30px;
margin: 0px auto;
}
#cluster_status_bar {
width: 85%;
height: 100%;
float: left;
}
.status_animation {
width: 1%;
height: 100%;
left: 0%;
background-color: red;
position: relative;
}
#cluster_status_button {
float: left;
width: 10%;
margin-left: 5%;
}
#last_contact_content {
width: 90%;
height: 60px;
margin: 0px auto;
}
#last_contact_clock {
width: 15%;
height: 100%;
float: left;
}
#last_contact_date {
float: left;
height: 60px;
width: 80%;
margin-left: 5%;
text-align: center;
display: flex;
justify-content: center;
align-content: center;
flex-direction: column;
}
#last_contact_date_text {
font-size: 14pt;
}
.balanced_module_item {
float: left;
margin-top: 11.5px;
margin-left: 5%;
height: 25px;
width: 90%;
}
.module_icon {
float: left;
width: 10%;
}
.modal_module_list {
float: left;
width: 90%;
height: 100%;
display: flex;
justify-content: center;
align-content: center;
flex-direction: column;
}

78
pandora_console/include/styles/common.css
View File

@ -1,35 +1,3 @@
/* Common useful styles */
.invisible {
display: none;
}
.left {
clear: left;
float: left;
}
.right {
clear: right;
float: right;
}
.clear {
clear: both;
}
.top {
vertical-align: top;
margin-top: 0;
padding-top: 0;
}
img.left {
margin-right: 1em;
margin-bottom: 1.8em;
}
img.right {
margin-left: 1em;
margin-bottom: 1.8em;
}
.text-right {
text-align: right;
}
/* Debug styles */
pre.debug,
div.backtrace {
@ -65,3 +33,49 @@ div.database_debug_title {
padding: 5px;
width: 95%;
}
/* Common useful styles */
.invisible {
display: none;
}
.left {
clear: left;
float: left;
}
.right {
clear: right;
float: right;
}
.clear {
clear: both;
}
.top {
vertical-align: top;
margin-top: 0;
padding-top: 0;
}
img.left {
margin-right: 1em;
margin-bottom: 1.8em;
}
img.right {
margin-left: 1em;
margin-bottom: 1.8em;
}
.text-right {
text-align: right;
}
.noshadow {
-moz-box-shadow: 0px !important;
-webkit-box-shadow: 0px !important;
box-shadow: 0px !important;
}
.center_align {
text-align: center;
}
.left_align {
text-align: left;
}
.right_align {
text-align: right;
}

76
pandora_console/include/styles/dialog.css
View File

@ -173,82 +173,6 @@
height: 22px;
}
/* Dialog handle styles */
/*Disabled*/
/*
.ui-dialog .ui-resizable-n {
cursor: n-resize;
height: 6px;
width: 100%;
top: 0px;
left: 0px;
background: transparent url(images/dialog-n.gif) repeat scroll center top;
}
.ui-dialog .ui-resizable-s {
cursor: s-resize;
height: 8px;
width: 100%;
bottom: 0px;
left: 0px;
background: transparent url(images/dialog-s.gif) repeat scroll center top;
}
.ui-dialog .ui-resizable-e {
cursor: e-resize;
width: 7px;
right: 0px;
top: 0px;
height: 100%;
background: transparent url(images/dialog-e.gif) repeat scroll right center;
}
.ui-dialog .ui-resizable-w {
cursor: w-resize;
width: 7px;
left: 0px;
top: 0px;
height: 100%;
background: transparent url(images/dialog-w.gif) repeat scroll right center;
}
.ui-dialog .ui-resizable-se {
cursor: se-resize;
width: 9px;
height: 9px;
right: 0px;
bottom: 0px;
background: transparent url(images/dialog-se.gif);
}
.ui-dialog .ui-resizable-sw {
cursor: sw-resize;
width: 9px;
height: 9px;
left: 0px;
bottom: 0px;
background: transparent url(images/dialog-sw.gif);
}
.ui-dialog .ui-resizable-nw {
cursor: nw-resize;
width: 9px;
height: 29px;
left: 0px;
top: 0px;
background: transparent url(images/dialog-nw.gif);
}
.ui-dialog .ui-resizable-ne {
cursor: ne-resize;
width: 9px;
height: 29px;
right: 0px;
top: 0px;
background: transparent url(images/dialog-ne.gif);
}
*/
.ui-dialog .ui-button-dialog {
cursor: pointer;
margin: 0.5em 0.4em 0.5em 0;

30
pandora_console/include/styles/help.css
View File

@ -1,19 +1,19 @@
/*
// Pandora FMS - the Flexible Monitoring System
// =============================================
// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L
// 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.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Pandora FMS - the Flexible Monitoring System
// =============================================
// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L
// 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.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
* {

67
pandora_console/include/styles/js/calendar.css Normal file
View File

@ -0,0 +1,67 @@
/*
* ---------------------------------------------------------------------
* - CALENDAR TOOLTIP -
* ---------------------------------------------------------------------
*/
/* Calendar background */
table.scw {
background-color: #82b92e;
border: 0 !important;
border-radius: 4px;
}
/* Week number heading */
td.scwWeekNumberHead {
color: #111;
}
td.scwWeek {
color: #111 !important;
}
/* Today selector */
td.scwFootDisabled {
background-color: #000;
color: #ffffff;
}
tfoot.scwFoot {
color: #111;
}
.scwFoot :hover {
color: #3f3f3f !important;
}
table.scwCells {
background-color: #fff !important;
color: #3c3c3c !important;
}
table.scwCells:hover {
background-color: #fff !important;
}
td.scwCellsExMonth {
background-color: #eee !important;
color: #3c3c3c !important;
}
td.scwCellsWeekend {
background-color: #3c3c3c !important;
color: #fff !important;
border: 0 !important;
}
td.scwInputDate {
background-color: #777 !important;
color: #ffffff !important;
border: 0 !important;
}
td.scwFoot {
background-color: #fff !important;
color: #3c3c3c !important;
border: 0 !important;
}

0
pandora_console/include/styles/cluetip.css → pandora_console/include/styles/js/cluetip.css
View File

0
pandora_console/include/styles/color-picker.css → pandora_console/include/styles/js/color-picker.css
View File

0
pandora_console/include/styles/datatables.min.css → pandora_console/include/styles/js/datatables.min.css vendored
View File

0
pandora_console/include/javascript/introjs.css → pandora_console/include/styles/js/introjs.css
View File

2
pandora_console/include/styles/jquery-ui.min.css → pandora_console/include/styles/js/jquery-ui.min.css vendored
View File

File diff suppressed because one or more lines are too long

263
pandora_console/include/styles/js/jquery-ui_custom.css Normal file
View File

@ -0,0 +1,263 @@
@import url(calendar.css);
/* --- JQUERY-UI --- */
.ui-dialog .ui-dialog-titlebar {
background-color: #82b92e !important;
}
/*center ui dialog center*/
.ui-dialog-titlebar .ui-icon-closethick {
margin-top: -5px !important;
}
.ui-button-text-only .ui-button-text {
font-family: nunito;
font-size: 9pt;
color: #82b92e;
}
.ui-datepicker .ui-datepicker-title *,
.ui-datepicker th * {
color: white;
}
.ui-datepicker .ui-datepicker-title select,
.ui-datepicker .ui-datepicker-title option {
color: #111 !important;
}
.ui-dialog .ui-dialog-titlebar {
display: inherit;
text-align: center;
padding: 0.4em 1em;
height: 30px;
position: relative;
}
.ui-dialog .ui-dialog-title {
font-family: Nunito, sans-serif;
margin: 0.1em 0 !important;
white-space: nowrap !important;
width: 100% !important;
overflow: hidden !important;
text-overflow: ellipsis !important;
font-size: 11pt;
position: relative;
top: 5px;
float: none !important;
}
.ui-dialog .ui-dialog-titlebar-close {
position: absolute !important;
right: 1em !important;
width: 21px !important;
margin: 0px 0 0 0 !important;
padding: 1px !important;
height: 20px !important;
bottom: 30% !important;
top: 20% !important;
}
.ui-dialog .ui-dialog-content {
position: relative !important;
border: 0;
padding: 0.5em 1em !important;
background: none !important;
overflow: auto !important;
margin-bottom: 1em;
}
.ui-dialog .ui-dialog-buttonpane {
text-align: left;
border-width: 1px 0 0 0;
background-image: none;
margin-top: 0.5em;
padding: 0.3em 1em 0.5em 0.4em;
}
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
float: right;
}
.ui-dialog .ui-dialog-buttonpane button {
margin: 0.5em 1em 0.5em 0 !important;
cursor: pointer !important;
background: white !important;
background-color: white !important;
border: 1px solid #82b92e !important;
height: 30px !important;
width: 90px !important;
}
.ui-widget-header .ui-icon {
background-image: url(../images/ui-icons_444444_256x240.png) !important;
}
.ui-icon,
.ui-widget-content .ui-icon {
background-image: url(../images/ui-icons_444444_256x240.png) !important;
}
.ui-widget-content {
background: #ffffff url(../images/ui-bg_flat_75_ffffff_40x100.png) 50% 50%
repeat-x;
}
.ui-state-default,
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default {
margin-top: 3px;
border: 1px solid #d3d3d3 !important;
border-bottom: 0 !important;
background: #e6e6e6 url(../images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50%
repeat-x !important;
font-weight: normal !important;
color: #555555 !important;
}
.ui-corner-all,
.ui-corner-top,
.ui-corner-left,
.ui-corner-tl {
border-top-left-radius: 0 !important;
}
.ui-corner-all,
.ui-corner-top,
.ui-corner-right,
.ui-corner-tr {
border-top-right-radius: 0 !important;
}
.ui-corner-all,
.ui-corner-bottom,
.ui-corner-left,
.ui-corner-bl {
border-bottom-left-radius: 0 !important;
}
.ui-corner-all,
.ui-corner-bottom,
.ui-corner-right,
.ui-corner-br {
border-bottom-right-radius: 0 !important;
}
#ui-datepicker-div {
border-color: #b1b1b1;
background: #ffffff;
}
.ui-widget-header {
background: #b1b1b1 !important;
color: #ffffff !important;
}
.ui-datepicker-calendar th {
background-color: #3f3f3f;
}
.ui-dialog .ui-widget-header {
background-color: #82b92e;
}
.ui_tpicker_hour,
.ui_tpicker_minute,
.ui_tpicker_second,
.ui-slider-handle {
border: 1px solid #aaaaaa !important;
}
.ui-timepicker-div dd {
margin: 0px 15px 0px 15px;
}
.ui-timepicker-div .ui-datepicker-title {
color: white;
}
.ui-datepicker-buttonpane button {
border-color: #b1b1b1 !important;
}
.ui-datepicker-buttonpane .ui-datepicker-current {
margin-left: 0.2em !important;
}
.ui-dialog .ui-widget-content {
border: 0px !important;
}
.ui-dialog {
box-shadow: 5px 5px 19px #4e4e4e;
border: 0px !important;
padding: 0 !important;
}
.ui-dialog-titlebar {
border: 0px !important;
}
.ui-dialog-titlebar .ui-icon-closethick,
.ui-dialog-titlebar .ui-state-default,
.ui-dialog-titlebar .ui-state-hover,
.ui-dialog-titlebar button {
background: transparent;
border: 0px;
}
.ui-dialog-titlebar .ui-icon-closethick {
background-image: url("../../../images/icono_cerrar.png") !important;
}
.ui-dialog-title {
color: #ffffff;
font-size: 9pt;
}
.ui-widget input,
.ui-widget select,
.ui-widget textarea,
.ui-widget button {
font-family: Verdana, Arial, sans-serif !important;
}
a.ui-button:active,
.ui-button:active,
.ui-button.ui-state-active:hover,
.ui-state-focus .ui-widget-content,
.ui-state-focus .ui-widget-header,
.ui-state-focus .ui-button:hover,
.ui-button:focus {
background: transparent !important;
border: none !important;
}
.ui-state-hover,
.ui-widget-content .ui-state-hover,
.ui-widget-header .ui-state-hover {
border: 1px solid #999999 !important;
border-bottom: 0 !important;
background: #dadada url(../images/ui-bg_glass_75_dadada_1x400.png) 50% 50%
repeat-x !important;
}
.ui-state-active,
.ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active {
border: 1px solid #aaaaaa !important;
border-bottom: 0 !important;
background: #ffffff url(../images/ui-bg_glass_65_ffffff_1x400.png) 50% 50%
repeat-x !important;
font-weight: normal !important;
color: #212121 !important;
}
.ui-state-active a,
.ui-state-active a:link,
.ui-state-active a:visited {
color: #212121 !important;
}
ul.ui-front {
z-index: 1000000 !important;
padding-right: 0px !important;
}
ul.ui-front li {
padding: 3px !important;
}
ul.ui-front li:hover {
background-color: #e1e3e1 !important;
}
ul.ui-front li a.ui-menu-item-wrapper {
background: transparent !important;
border: none !important;
}
ul.ui-front li a.ui-menu-item-wrapper span {
padding-left: 5px !important;
}
ul.ui-front li a.ui-menu-item-wrapper:hover {
text-decoration: none !important;
}
input[type="submit"].ui-button-dialog {
margin: 0.5em 1em 0.5em 0 !important;
cursor: pointer !important;
background: white !important;
background-color: white !important;
color: #82b92e !important;
text-align: center !important;
border: 1px solid #82b92e !important;
height: 30px !important;
width: 90px !important;
}

211
pandora_console/include/styles/js/jquery.contextMenu.css Normal file
View File

@ -0,0 +1,211 @@
/*!
* jQuery contextMenu - Plugin for simple contextMenu handling
*
* Version: 1.6.5
*
* Authors: Rodney Rehm, Addy Osmani (patches for FF)
* Web: http://medialize.github.com/jQuery-contextMenu/
*
* Licensed under
* MIT License http://www.opensource.org/licenses/mit-license
* GPL v3 http://opensource.org/licenses/GPL-3.0
*
*/
.context-menu-list {
margin: 0;
padding: 0;
min-width: 120px;
max-width: 250px;
display: inline-block;
position: absolute;
list-style-type: none;
border: 1px solid #ddd;
border-radius: 4px;
background: #eee;
-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
text-align: left;
}
.context-menu-item {
padding: 0px 2px 0px 24px;
background-color: #eee;
position: relative;
border-radius: 4px;
-webkit-user-select: none;
-moz-user-select: -moz-none;
-ms-user-select: none;
user-select: none;
padding-top: 8px;
padding-bottom: 8px;
}
.context-menu-item span {
padding-top: 10px;
padding-bottom: 10px;
padding-right: 10px;
padding-left: 10px;
}
.context-menu-separator {
padding-bottom: 0;
border-bottom: 1px solid #ddd;
}
.context-menu-item > label > input,
.context-menu-item > label > textarea {
-webkit-user-select: text;
-moz-user-select: text;
-ms-user-select: text;
user-select: text;
}
.context-menu-item.hover {
cursor: pointer;
background-color: #82b92e;
border-radius: 4px;
color: #fff;
}
.context-menu-item.disabled {
color: #666 !important;
}
.context-menu-input.hover,
.context-menu-item.disabled.hover {
cursor: default;
background-color: #eee;
}
.context-menu-submenu:after {
content: ">";
color: #666;
position: absolute;
top: 0;
right: 3px;
z-index: 1;
}
/* icons
#protip:
In case you want to use sprites for icons (which I would suggest you do) have a look at
http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement
.context-menu-item.icon:before {}
*/
.context-menu-item.icon {
min-height: 18px;
background-repeat: no-repeat;
background-position: 4px 2px;
}
.context-menu-item.icon-edit {
background-image: url(../../images/page_white_edit.png);
}
.context-menu-item.icon-cut {
background-image: url(../../images/cut.png);
}
.context-menu-item.icon-copy {
background-image: url(../../images/page_white_copy.png);
}
.context-menu-item.icon-paste {
background-image: url(../../images/page_white_paste.png);
}
.context-menu-item.icon-delete {
background-image: url(../../images/delete.png);
}
.context-menu-item.icon-add {
background-image: url(../../images/page_white_add.png);
}
.context-menu-item.icon-quit {
background-image: url(../../images/door.png);
}
.context-menu-item.icon-refresh {
background-image: url(../../images/refresh.png);
}
.context-menu-item.icon-center {
background-image: url(../../images/set_center.png);
}
.context-menu-item.icon-details {
background-image: url(../../images/show_details.png);
}
.context-menu-item.icon-children {
background-image: url(../../images/children.png);
}
.context-menu-item.icon-cancel_set_parent {
background-image: url(../../images/link_delete.png);
}
.context-menu-item.icon-set_parent {
background-image: url(../../images/father.png);
}
.context-menu-item.icon-add_node {
background-image: url(../../images/add.png);
}
.context-menu-item.icon-refresh_holding_area {
background-image: url(../../images/refresh_holding_area.png);
}
.context-menu-item.icon-restart_map {
background-image: url(../../images/reset.png);
}
.context-menu-item.icon-interface_link_children {
background-image: url(../../images/icono_link_hijo.png);
}
.context-menu-item.icon-interface_link_parent {
background-image: url(../../images/icono_link_padre.png);
}
.context-menu-item.icon-interface_link_cancel {
background-image: url(../../images/link_abortar.png);
}
/* vertically align inside labels */
.context-menu-input > label > * {
vertical-align: top;
}
/* position checkboxes and radios as icons */
.context-menu-input > label > input[type="checkbox"],
.context-menu-input > label > input[type="radio"] {
margin-left: -17px;
}
.context-menu-input > label > span {
margin-left: 5px;
}
.context-menu-input > label,
.context-menu-input > label > input[type="text"],
.context-menu-input > label > textarea,
.context-menu-input > label > select {
display: block;
width: 100%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
-o-box-sizing: border-box;
box-sizing: border-box;
}
.context-menu-input > label > textarea {
height: 100px;
}
.context-menu-item > .context-menu-list {
display: none;
/* re-positioned by js */
right: -5px;
top: 5px;
}
.context-menu-item.hover > .context-menu-list {
display: block;
}
.context-menu-accesskey {
text-decoration: underline;
}

411
pandora_console/include/styles/login.css Normal file
View File

@ -0,0 +1,411 @@
/*
* ---------------------------------------------------------------------
* - LOGIN STYLES -
* ---------------------------------------------------------------------
*/
h1#log_title {
font-size: 18px;
margin-bottom: 0px;
color: #fff !important;
width: 300px;
}
div#log_msg {
display: none;
}
div#error_buttons {
margin-top: 20px;
}
div#error_buttons a {
margin: 14px;
}
#login_body {
/* Set rules to fill background */
min-height: 100%;
min-width: 1200px;
width: 100%;
z-index: -9999;
position: absolute;
background-image: url("../../images/backgrounds/background_pandora_console_keys.jpg");
background-repeat: repeat;
}
/*@media screen and (max-width: 1024px) { /* Specific to this particular image */
/* #login_body {
left: 50%;
margin-left: -512px; /* 50% */
/* }
}
@media screen and (max-width: 1100px) { /* Specific to this particular image */
/* #login_body {
background-image: url("../../images/backgrounds/background_pandora_console_keys.jpg");
background-repeat: repeat;
}
}
@media screen and (max-width: 1400px) { /* Specific to this particular image */
/* #login_body {
background-image: url("../../images/backgrounds/background_pandora_console_keys.jpg");
background-repeat: repeat;
}
}
@media screen and (max-width: 2000px) { /* Specific to this particular image */
/* #login_body {
background-image: url("../../images/backgrounds/background_pandora_console_keys.jpg");
background-repeat: repeat;
}
}
@media screen and (min-width: 2000px) { /* Specific to this particular image */
/* #login_body {
background-image: url("../../images/backgrounds/background_pandora_console_keys.jpg");
background-repeat: repeat;
}
}*/
p.log_in {
color: #fff !important;
padding: 0px 10px;
width: 300px;
}
h1#log_f {
color: #c00;
border-bottom: 1px solid #c00;
padding-bottom: 3px;
}
div#error_login {
text-align: center;
margin-top: 5px;
margin-left: 5px;
width: 75%;
float: right;
text-align: left;
top: 100px;
}
div#error_login_icon {
margin-top: 10px;
margin-right: 7px;
text-align: center;
width: 20%;
float: right;
}
div#login_f {
margin-top: 10px;
margin-bottom: 25px;
}
#ver_num {
margin: 0px auto;
width: 100%;
position: absolute;
bottom: 10px;
color: #fff;
text-align: center;
}
/*
* ---------------------------------------------------------------------
* - LOGIN PAGE -
* ---------------------------------------------------------------------
*/
/* --- Login page - header --- */
div#header_login {
width: 100%;
height: 65px;
background-color: rgba(255, 255, 255, 0.06);
}
div#icon_custom_pandora {
float: left;
margin-top: 5px;
margin-left: 4%;
}
div#list_icon_docs_support {
float: right;
margin-top: 8px;
margin-right: 4%;
}
div#list_icon_docs_support ul {
margin-top: 5px;
}
div#list_icon_docs_support ul li {
display: inline-block;
color: white;
vertical-align: middle;
margin-right: 5px;
font-size: 10pt;
}
li#li_margin_left {
margin-left: 30px;
}
/* --- Login page - form --- */
div.container_login {
margin-top: 10%;
margin-left: 5%;
margin-right: 5%;
}
div.login_page {
width: 35%;
min-height: 600px;
float: left;
}
div.login_page form {
border-right: 1px solid #868686;
padding-top: 30px;
padding-bottom: 50px;
min-width: 400px;
max-height: 600px;
}
div.login_logo_icon {
margin-bottom: 40px;
text-align: center;
}
div.login_logo_icon img {
margin: 0 auto;
width: 150px;
}
div.login_double_auth_code,
div.login_nick,
div.login_pass {
margin: 0 auto;
width: 70%;
height: 40px;
background-color: rgba(255, 255, 255, 0.2) !important;
margin-bottom: 25px;
min-width: 260px;
}
div.login_nick img,
div.login_pass img {
vertical-align: middle;
margin: 3px;
}
div.login_nick input,
div.login_pass input {
background-color: rgba(255, 255, 255, 0) !important;
border: 0px !important;
color: white !important;
border-radius: 0px;
width: 89%;
height: 40px;
font-size: 9pt;
padding: 0px !important;
}
div.login_nick input:focus,
div.login_pass input:focus {
outline: none;
}
div.login_nick input:-webkit-autofill,
div.login_nick input:-webkit-autofill:hover,
div.login_nick input:-webkit-autofill:focus,
div.login_nick input:-webkit-autofill:active,
div.login_pass input:-webkit-autofill,
div.login_pass input:-webkit-autofill:hover,
div.login_pass input:-webkit-autofill:focus,
div.login_pass input:-webkit-autofill:active {
transition: background-color 10000s ease-in-out 0s;
-webkit-box-shadow: 0 0 0px 0px transparent inset !important;
-webkit-text-fill-color: white !important;
border: 0px;
width: 89%;
}
div.login_nick input::-webkit-input-placeholder,
div.login_pass input::-webkit-input-placeholder {
color: white;
}
div.login_pass img,
div.login_nick img {
width: 30px;
}
div.login_pass div,
div.login_nick div {
float: left;
width: 11%;
}
div.login_button {
margin: 0 auto;
width: 70%;
height: 40px;
background-color: rgb(25, 25, 25);
border: 1px solid white;
min-width: 260px;
}
div.login_button input {
width: 100%;
background-color: rgb(25, 25, 25) !important;
text-align: center;
border: 0px;
border-radius: 0px;
height: 40px;
padding: 0px;
font-size: 9pt;
color: white;
}
div.login_data {
width: 65%;
min-height: 600px;
float: left;
}
div.text_banner_login {
width: 100%;
margin-bottom: 60px;
color: white;
text-align: center;
}
div.text_banner_login span {
width: 100%;
}
span.span1 {
font-size: 3vw;
font-family: "lato-thin";
color: white;
}
span.span2 {
font-size: 3vw;
font-family: "lato-bolder";
color: white;
}
div.img_banner_login {
width: 100%;
text-align: center;
}
div.img_banner_login img {
max-width: 70%;
min-width: 70%;
max-height: 50%;
min-height: 50%;
}
@media all and (max-width: 1200px) {
span.span1 {
font-size: 30pt;
}
span.span2 {
font-size: 30pt;
}
}
/* --- Login page - modal windows --- */
div.content_alert {
width: 98%;
margin-top: 20px;
}
div.icon_message_alert {
float: left;
width: 25%;
text-align: center;
}
div.icon_message_alert img {
width: 85px;
}
div.content_message_alert {
width: 75%;
float: right;
}
div.text_message_alert {
width: 100%;
margin-top: 10px;
}
div.text_message_alert h1 {
margin: 0px;
}
div.text_message_alert p {
margin: 0px;
font-size: 10.3pt;
line-height: 14pt;
}
div.button_message_alert {
width: 100%;
}
div.button_message_alert input {
float: right;
width: 87px;
height: 33px;
color: #82b92e;
border: 1px solid #82b92e;
font-weight: bold;
margin-right: 20px;
margin-top: 20px;
font-size: 10pt;
}
div.form_message_alert {
width: 90%;
clear: both;
padding-top: 20px;
padding-left: 40px;
}
div.form_message_alert ul li {
display: inline-block;
padding: 10px;
}
div.form_message_alert ul li input {
border: none;
background-color: #dadada !important;
border-radius: 0px;
height: 17px;
width: 145px;
padding-left: 5px;
}
div.form_message_alert ul li label {
font-size: 10pt;
padding-right: 20px;
}
div.form_message_alert h4 {
margin: 0px;
margin-bottom: 10px;
}
div.button_message_alert_form input {
float: right;
width: 87px;
height: 33px;
color: #82b92e;
border: 1px solid #82b92e;
font-weight: bold;
font-size: 10pt;
margin-right: 25px;
}

137
pandora_console/include/styles/menu.css
View File

@ -34,10 +34,7 @@
}
.menu li a {
/*background-color: inherit;*/
color: #ffffff;
/*font-weight: bold;*/
/* This makes it so that the whole li is clickable */
text-decoration: none;
}
@ -49,6 +46,7 @@ li:hover ul {
padding: 10.5px;
margin-left: 0px;
width: 100%;
color: #fff;
}
.menu li.subselected a {
@ -259,3 +257,136 @@ ul li a:hover {
color: #e2144a;
} /* Hover Styles */
/*li ul li a { padding: 2px 5px; } Sub Menu Styles */
/*
* ---------------------------------------------------------------------
* - MAIN LEFT MENU and SUBMENU -
* ---------------------------------------------------------------------
*/
.menu li.selected {
font-weight: bold;
}
.menu_icon {
transition-property: background-color;
transition-duration: 0.5s;
transition-timing-function: ease-out;
-webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color;
-moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out;
-o-transition-property: background-color;
-o-transition-duration: 0.5s;
-o-transition-timing-function: ease-out;
}
.menu_icon:hover {
transition-property: background-color;
transition-duration: 0.5s;
transition-timing-function: ease-out;
-webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color;
-moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out;
-o-transition-property: background-color;
-o-transition-duration: 0.5s;
-o-transition-timing-function: ease-out;
background-color: #585858 !important;
}
.submenu_not_selected:hover {
transition-property: background-color;
transition-duration: 0.5s;
transition-timing-function: ease-out;
-webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color;
-moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out;
-o-transition-property: background-color;
-o-transition-duration: 0.5s;
-o-transition-timing-function: ease-out;
background-color: #585858 !important;
}
.submenu_selected:hover {
background-color: #585858 !important;
}
.sub_subMenu {
transition-property: background-color;
transition-duration: 0.5s;
transition-timing-function: ease-out;
-webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color;
-moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out;
-o-transition-property: background-color;
-o-transition-duration: 0.5s;
}
.sub_subMenu:hover {
transition-property: background-color;
transition-duration: 0.5s;
transition-timing-function: ease-out;
-webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color;
-moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out;
-o-transition-property: background-color;
-o-transition-duration: 0.5s;
background-color: #585858 !important;
}
.menu li.selected {
box-shadow: inset 4px 0 #80ba27;
}
/* creo que no se usan
.is_submenu2 li {
background-color: #ff0000;
}
.is_submenu2 {
background-color: #222222 !important;
}
*/
.operation {
background-color: #333 !important;
border-top-right-radius: 5px;
border-right-style: solid;
border-right-width: 0px;
}
.operation .selected {
background-color: #585858 !important;
}
.menu li,
.menu .li.not_selected {
border-radius: 0px 0px 0px 0px;
display: block;
min-height: 35px;
border-bottom: 0px none #424242;
vertical-align: middle;
}
.godmode,
.menu_icon ul li {
background-color: #222;
}
.operation .menu_icon ul li {
background-color: #333;
}
.godmode {
border-top: 4px solid #777 !important;
padding-bottom: 4px !important;
border-bottom-right-radius: 5px;
border-right-style: solid;
border-right-width: 0px;
}

2305
pandora_console/include/styles/pandora.css
View File

File diff suppressed because it is too large Load Diff

25
pandora_console/include/styles/pandoraPDF.css
View File

@ -25,39 +25,20 @@
* GNU General Public License for more details.
* ============================================================================
*/
table {
border-collapse: collapse;
}
table th {
background-color: #434343;
color: #fff;
}
table.databox {
margin-bottom: 15px;
}
table.databox td {
width: 100%;
}
table.content_table {
page-break-inside: avoid;
}
table.header_table {
width: 100%;
}
table.header_table tbody tr th,
table.header_table thead tr th,
table.header_table tbody tr td {
padding: 10px;
}
thead.header_tr tbody tr {
thead.header_tr tr {
background: #e6e6e6;
}
thead.header_tr tbody tr th {
thead.header_tr tr th {
font-weight: normal;
text-align: right;
}

12
pandora_console/include/styles/tooltipster-light.css
View File

@ -1,12 +0,0 @@
.tooltipster-light {
border-radius: 5px;
border: 1px solid #cccccc;
background: #ededed;
color: #666666;
}
.tooltipster-light .tooltipster-content {
font-family: Arial, sans-serif;
font-size: 14px;
line-height: 16px;
padding: 8px 10px;
}

12
pandora_console/include/styles/tooltipster-noir.css
View File

@ -1,12 +0,0 @@
.tooltipster-noir {
border-radius: 0px;
border: 3px solid #82B92E;
background: #fff;
color: #2c2c2c;
}
.tooltipster-noir .tooltipster-content {
font-family: 'Georgia', serif;
font-size: 14px;
line-height: 16px;
padding: 8px 10px;
}

12
pandora_console/include/styles/tooltipster-punk.css
View File

@ -1,12 +0,0 @@
.tooltipster-punk {
border-radius: 5px;
border-bottom: 3px solid #82B92E;
background: #ccc;
color: #fff;
}
.tooltipster-punk .tooltipster-content {
font-family: 'Courier', monospace;
font-size: 14px;
line-height: 16px;
padding: 8px 10px;
}

12
pandora_console/include/styles/tooltipster-shadow.css
View File

@ -1,12 +0,0 @@
.tooltipster-shadow {
border-radius: 5px;
background: #fff;
box-shadow: 0px 0px 14px rgba(0,0,0,0.3);
color: #2c2c2c;
}
.tooltipster-shadow .tooltipster-content {
font-family: 'Arial', sans-serif;
font-size: 14px;
line-height: 16px;
padding: 8px 10px;
}

274
pandora_console/include/styles/tooltipster.css
View File

@ -1,274 +0,0 @@
/* This is the default Tooltipster theme (feel free to modify or duplicate and create multiple themes!): */
.tooltipster-default {
border-radius: 5px;
border: 2px solid #000;
background: #4c4c4c;
color: #fff;
}
/* Use this next selector to style things like font-size and line-height: */
.tooltipster-default .tooltipster-content {
font-family: Arial, sans-serif;
font-size: 14px;
line-height: 16px;
padding: 8px 10px;
overflow: hidden;
}
/* This next selector defines the color of the border on the outside of the arrow. This will automatically match the color and size of the border set on the main tooltip styles. Set display: none; if you would like a border around the tooltip but no border around the arrow */
.tooltipster-default .tooltipster-arrow .tooltipster-arrow-border {
/* border-color: ... !important; */
}
/* If you're using the icon option, use this next selector to style them */
.tooltipster-icon {
cursor: help;
margin-left: 4px;
}
/* This is the base styling required to make all Tooltipsters work */
.tooltipster-base {
padding: 0;
font-size: 0;
line-height: 0;
position: absolute;
left: 0;
top: 0;
z-index: 9999999;
pointer-events: none;
width: auto;
overflow: visible;
}
.tooltipster-base .tooltipster-content {
overflow: hidden;
}
/* These next classes handle the styles for the little arrow attached to the tooltip. By default, the arrow will inherit the same colors and border as what is set on the main tooltip itself. */
.tooltipster-arrow {
display: block;
text-align: center;
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
z-index: -1;
}
.tooltipster-arrow span, .tooltipster-arrow-border {
display: block;
width: 0;
height: 0;
position: absolute;
}
.tooltipster-arrow-top span, .tooltipster-arrow-top-right span, .tooltipster-arrow-top-left span {
border-left: 8px solid transparent !important;
border-right: 8px solid transparent !important;
border-top: 8px solid;
bottom: -7px;
}
.tooltipster-arrow-top .tooltipster-arrow-border, .tooltipster-arrow-top-right .tooltipster-arrow-border, .tooltipster-arrow-top-left .tooltipster-arrow-border {
border-left: 9px solid transparent !important;
border-right: 9px solid transparent !important;
border-top: 9px solid;
bottom: -7px;
}
.tooltipster-arrow-bottom span, .tooltipster-arrow-bottom-right span, .tooltipster-arrow-bottom-left span {
border-left: 8px solid transparent !important;
border-right: 8px solid transparent !important;
border-bottom: 8px solid;
top: -7px;
}
.tooltipster-arrow-bottom .tooltipster-arrow-border, .tooltipster-arrow-bottom-right .tooltipster-arrow-border, .tooltipster-arrow-bottom-left .tooltipster-arrow-border {
border-left: 9px solid transparent !important;
border-right: 9px solid transparent !important;
border-bottom: 9px solid;
top: -7px;
}
.tooltipster-arrow-top span, .tooltipster-arrow-top .tooltipster-arrow-border, .tooltipster-arrow-bottom span, .tooltipster-arrow-bottom .tooltipster-arrow-border {
left: 0;
right: 0;
margin: 0 auto;
}
.tooltipster-arrow-top-left span, .tooltipster-arrow-bottom-left span {
left: 6px;
}
.tooltipster-arrow-top-left .tooltipster-arrow-border, .tooltipster-arrow-bottom-left .tooltipster-arrow-border {
left: 5px;
}
.tooltipster-arrow-top-right span, .tooltipster-arrow-bottom-right span {
right: 6px;
}
.tooltipster-arrow-top-right .tooltipster-arrow-border, .tooltipster-arrow-bottom-right .tooltipster-arrow-border {
right: 5px;
}
.tooltipster-arrow-left span, .tooltipster-arrow-left .tooltipster-arrow-border {
border-top: 8px solid transparent !important;
border-bottom: 8px solid transparent !important;
border-left: 8px solid;
top: 50%;
margin-top: -7px;
right: -7px;
}
.tooltipster-arrow-left .tooltipster-arrow-border {
border-top: 9px solid transparent !important;
border-bottom: 9px solid transparent !important;
border-left: 9px solid;
margin-top: -8px;
}
.tooltipster-arrow-right span, .tooltipster-arrow-right .tooltipster-arrow-border {
border-top: 8px solid transparent !important;
border-bottom: 8px solid transparent !important;
border-right: 8px solid;
top: 50%;
margin-top: -7px;
left: -7px;
}
.tooltipster-arrow-right .tooltipster-arrow-border {
border-top: 9px solid transparent !important;
border-bottom: 9px solid transparent !important;
border-right: 9px solid;
margin-top: -8px;
}
/* Some CSS magic for the awesome animations - feel free to make your own custom animations and reference it in your Tooltipster settings! */
.tooltipster-fade {
opacity: 0;
-webkit-transition-property: opacity;
-moz-transition-property: opacity;
-o-transition-property: opacity;
-ms-transition-property: opacity;
transition-property: opacity;
}
.tooltipster-fade-show {
opacity: 1;
}
.tooltipster-grow {
-webkit-transform: scale(0,0);
-moz-transform: scale(0,0);
-o-transform: scale(0,0);
-ms-transform: scale(0,0);
transform: scale(0,0);
-webkit-transition-property: -webkit-transform;
-moz-transition-property: -moz-transform;
-o-transition-property: -o-transform;
-ms-transition-property: -ms-transform;
transition-property: transform;
-webkit-backface-visibility: hidden;
}
.tooltipster-grow-show {
-webkit-transform: scale(1,1);
-moz-transform: scale(1,1);
-o-transform: scale(1,1);
-ms-transform: scale(1,1);
transform: scale(1,1);
-webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
-webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
-moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
-ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
-o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
}
.tooltipster-swing {
opacity: 0;
-webkit-transform: rotateZ(4deg);
-moz-transform: rotateZ(4deg);
-o-transform: rotateZ(4deg);
-ms-transform: rotateZ(4deg);
transform: rotateZ(4deg);
-webkit-transition-property: -webkit-transform, opacity;
-moz-transition-property: -moz-transform;
-o-transition-property: -o-transform;
-ms-transition-property: -ms-transform;
transition-property: transform;
}
.tooltipster-swing-show {
opacity: 1;
-webkit-transform: rotateZ(0deg);
-moz-transform: rotateZ(0deg);
-o-transform: rotateZ(0deg);
-ms-transform: rotateZ(0deg);
transform: rotateZ(0deg);
-webkit-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 1);
-webkit-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
-moz-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
-ms-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
-o-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
}
.tooltipster-fall {
top: 0;
-webkit-transition-property: top;
-moz-transition-property: top;
-o-transition-property: top;
-ms-transition-property: top;
transition-property: top;
-webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
-webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
-moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
-ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
-o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
}
.tooltipster-fall-show {
}
.tooltipster-fall.tooltipster-dying {
-webkit-transition-property: all;
-moz-transition-property: all;
-o-transition-property: all;
-ms-transition-property: all;
transition-property: all;
top: 0px !important;
opacity: 0;
}
.tooltipster-slide {
left: -40px;
-webkit-transition-property: left;
-moz-transition-property: left;
-o-transition-property: left;
-ms-transition-property: left;
transition-property: left;
-webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
-webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
-moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
-ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
-o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
}
.tooltipster-slide.tooltipster-slide-show {
}
.tooltipster-slide.tooltipster-dying {
-webkit-transition-property: all;
-moz-transition-property: all;
-o-transition-property: all;
-ms-transition-property: all;
transition-property: all;
left: 0px !important;
opacity: 0;
}
/* CSS transition for when contenting is changing in a tooltip that is still open. The only properties that will NOT transition are: width, height, top, and left */
.tooltipster-content-changing {
opacity: 0.5;
-webkit-transform: scale(1.1, 1.1);
-moz-transform: scale(1.1, 1.1);
-o-transform: scale(1.1, 1.1);
-ms-transform: scale(1.1, 1.1);
transform: scale(1.1, 1.1);
}

2
pandora_console/install.php
View File

@ -113,7 +113,7 @@
<div style='height: 10px'>
<?php
$version = '7.0NG.731';
$build = '190204';
$build = '190207';
$banner = "v$version Build $build";
error_reporting(0);

2
pandora_console/operation/agentes/alerts_status.php
View File

@ -634,7 +634,7 @@ echo '</div>';
enterprise_hook('close_meta_frame');
ui_require_css_file('cluetip');
ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip');
?>

2
pandora_console/operation/agentes/estado_monitores.php
View File

@ -323,7 +323,7 @@ ui_toggle(
}
</script>
<?php
ui_require_css_file('cluetip');
ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip');
echo "<div id='module_details_dialog' style='display: none;'></div>";

2
pandora_console/operation/agentes/interface_traffic_graph_win.php
View File

@ -76,7 +76,7 @@ if ($refresh > 0) {
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo __('%s Interface Graph', get_product_name()).' ('.agents_get_alias($agent_id).' - '.$interface_name; ?>)</title>
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/jquery-ui.min.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css" type="text/css" />
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery-3.3.1.min.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>

2
pandora_console/operation/agentes/realtime_win.php
View File

@ -63,7 +63,7 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo __('%s Realtime Module Graph', get_product_name()); ?></title>
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/jquery-ui.min.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css" type="text/css" />
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery-3.3.1.min.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>

2
pandora_console/operation/agentes/stat_win.php
View File

@ -71,7 +71,7 @@ $alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent);
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo __('%s Graph', get_product_name()).' ('.$alias.' - '.$label; ?>)</title>
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/jquery-ui.min.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css" type="text/css" />
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery-3.3.1.min.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>

1
pandora_console/operation/events/events.php
View File

@ -523,7 +523,6 @@ if ($config['pure'] == 0 || $meta) {
echo '</div>';
// Floating menu - End
ui_require_jquery_file('countdown');
ui_require_css_file('countdown');
}
// Error div for ajax messages

2
pandora_console/operation/snmpconsole/snmp_view.php
View File

@ -681,7 +681,7 @@ if (empty($traps)) {
ui_require_css_file('pandora_enterprise', ENTERPRISE_DIR.'/include/styles/');
ui_require_css_file('pandora_dashboard', ENTERPRISE_DIR.'/include/styles/');
ui_require_css_file('cluetip');
ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('countdown');
ui_require_javascript_file('pandora_dashboard', ENTERPRISE_DIR.'/include/javascript/');

3
pandora_console/operation/tree.php
View File

@ -11,6 +11,9 @@
// 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.
ui_require_css_file('tree');
ui_require_css_file('fixed-bottom-box');
global $config;
$pure = get_parameter('pure', 0);

1
pandora_console/operation/visual_console/render_view.php
View File

@ -227,7 +227,6 @@ if ($config['pure']) {
echo '</div>';
// Floating menu - End
ui_require_jquery_file('countdown');
ui_require_css_file('countdown');
?>
<style type="text/css">

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.731
%define release 190204
%define release 190207
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.731
%define release 190204
%define release 190207
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.731-190204
Version: 7.0NG.731-190207
Architecture: all
Priority: optional
Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.731-190204"
pandora_version="7.0NG.731-190207"
package_cpan=0
package_pandora=1

5
pandora_server/conf/pandora_server.conf.new
View File

@ -292,6 +292,11 @@ braa /usr/bin/braa
braa_retries 3
# Location of the pandorafsnmp binary needed by the Enterprise SNMP Server.
# /usr/bin/pandorafsnmp by default (PANDORA FMS ENTERPRISE ONLY).
fsnmp /usr/bin/pandorafsnmp
# Default group id for new agents created with Pandora FMS Data Server
# If this token is enabled and Agent is setup with a fixed group, server settings will override agent settings
# If this token is disabled and group is not provided in the agent, or provided group doesn't exist, agent data

7
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -45,7 +45,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.731";
my $pandora_build = "190204";
my $pandora_build = "190207";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
@ -490,6 +490,8 @@ sub pandora_load_config {
$pa_config->{'snmp_extlog'} = ""; # 7.0 726
$pa_config->{"fsnmp"} = "/usr/bin/pandorafsnmp"; # 7.0 732
# Check for UID0
if ($pa_config->{"quiet"} != 0){
if ($> == 0){
@ -1123,6 +1125,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^snmp_extlog\s(.*)/i) {
$pa_config->{'snmp_extlog'} = clean_blank($1);
}
elsif ($parametro =~ m/^fsnmp\s(.*)/i) {
$pa_config->{'fsnmp'}= clean_blank($1);
}
} # end of loop for parameter #
# Set to RDBMS' standard port

5
pandora_server/lib/PandoraFMS/DataServer.pm
View File

@ -30,6 +30,10 @@ use XML::Simple;
use POSIX qw(setsid strftime);
use IO::Uncompress::Unzip;
# Required for file names with accents
use Encode qw(decode);
use Encode::Locale ();
# For Reverse Geocoding
use LWP::Simple;
@ -111,6 +115,7 @@ sub data_producer ($) {
# Do not read more than max_queue_files files
my $file_count = 0;
while (my $file = readdir (DIR)) {
$file = Encode::decode( locale_fs => $file );
# Data files must have the extension .data
next if ($file !~ /^.*[\._]\d+\.data$/);

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.731";
my $pandora_build = "190204";
my $pandora_build = "190207";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.731
%define release 190204
%define release 190207
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.731
%define release 190204
%define release 190207
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.731"
PI_BUILD="190204"
PI_BUILD="190207"
MODE=$1
if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -34,7 +34,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.731 PS190204";
my $version = "7.0NG.731 PS190207";
# Pandora server configuration
my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "7.0NG.731 PS190204";
my $version = "7.0NG.731 PS190207";
# save program name for logging
my $progname = basename($0);