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' into new-vc-line-element

This commit is contained in:
Daniel Barbero 2019-12-13 08:15:23 +01:00
parent 63dd3c48f8 37c5acf4d1
commit 319b3e604f
35 changed files with 996 additions and 335 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.741-191212
Version: 7.0NG.741-191213
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.741-191212"
pandora_version="7.0NG.741-191213"
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

@ -55,7 +55,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.741';
use constant AGENT_BUILD => '191212';
use constant AGENT_BUILD => '191213';
# 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.741
%define release 191212
%define release 191213
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.741
%define release 191212
%define release 191213
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.741"
PI_BUILD="191212"
PI_BUILD="191213"
OS_NAME=`uname -s`
FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{191212}
{191213}
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.741(Build 191212)")
#define PANDORA_VERSION ("7.0NG.741(Build 191213)")
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.741(Build 191212))"
VALUE "ProductVersion", "(7.0NG.741(Build 191213))"
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.741-191212
Version: 7.0NG.741-191213
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.741-191212"
pandora_version="7.0NG.741-191213"
package_pear=0
package_pandora=1

8
pandora_console/godmode/agentes/module_manager_editor_network.php
View File

@ -466,11 +466,11 @@ $data[1] = html_print_select(
$array_os = [
'inherited' => __('Inherited'),
'linux' => __('Linux'),
'windows' => __('Windows'),
'linux' => __('SSH'),
'windows' => __('Windows remote'),
];
$data[2] = __('Target OS');
$data[2] = __('Connection method');
$data[3] = html_print_select(
$array_os,
'command_os',
@ -541,14 +541,12 @@ $(document).ready (function () {
$("#simple-field_snmpv3_row2").attr("style", "");
$("#simple-field_snmpv3_row3").attr("style", "");
$("input[name=active_snmp_v3]").val(1);
$("input[name=snmp_community]").attr("disabled", true);
}
else {
$("#simple-field_snmpv3_row1").css("display", "none");
$("#simple-field_snmpv3_row2").css("display", "none");
$("#simple-field_snmpv3_row3").css("display", "none");
$("input[name=active_snmp_v3]").val(0);
$("input[name=snmp_community]").removeAttr('disabled');
}
});

2
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -2204,7 +2204,7 @@ $class = 'databox filters';
<tr id="row_show_address_agent" style="" class="datos">
<td style="font-weight:bold;">
<?php
echo __('Show address instead module name.').ui_print_help_tip(
echo __('Show address instead module name').ui_print_help_tip(
__('Show the main address of agent.'),
true
);

2
pandora_console/include/config_process.php
View File

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

229
pandora_console/include/functions_reporting.php
View File

@ -887,6 +887,10 @@ function reporting_SLA(
$edge_interval = 10;
if (empty($content['subitems'])) {
if (is_metaconsole()) {
metaconsole_restore_db();
}
$slas = db_get_all_rows_field_filter(
'treport_content_sla_combined',
'id_report_content',
@ -1393,6 +1397,10 @@ function reporting_event_top_n(
$return['top_n'] = $content['top_n_value'];
if (empty($content['subitems'])) {
if (is_metaconsole()) {
metaconsole_restore_db();
}
// Get all the related data.
$sql = sprintf(
'SELECT id_agent_module, server_name
@ -2428,6 +2436,9 @@ function reporting_exception(
WHERE id_report_content = %d',
$content['id_rc']
);
if (is_metaconsole()) {
metaconsole_restore_db();
}
$exceptions = db_process_sql($sql);
} else {
@ -3490,6 +3501,7 @@ function reporting_network_interfaces_report($report, $content, $type='dinamic',
$return['data'] = [];
if (is_metaconsole()) {
metaconsole_restore_db();
$server_names = metaconsole_get_connection_names();
if (isset($server_names) && is_array($server_names)) {
foreach ($server_names as $key => $value) {
@ -3560,16 +3572,17 @@ function agents_get_network_interfaces_array(
$width = null;
$params = [
'period' => $content['period'],
'width' => $width,
'unit_name' => array_fill(0, count($interface['traffic']), __('bytes/s')),
'date' => $report['datetime'],
'only_image' => $pdf,
'homeurl' => $config['homeurl'],
'fullscale' => $fullscale,
'server_id' => $id_meta,
'height' => $config['graph_image_height'],
'landscape' => $content['landscape'],
'period' => $content['period'],
'width' => $width,
'unit_name' => array_fill(0, count($interface['traffic']), __('bytes/s')),
'date' => $report['datetime'],
'only_image' => $pdf,
'homeurl' => $config['homeurl'],
'fullscale' => $fullscale,
'server_id' => $id_meta,
'height' => $config['graph_image_height'],
'landscape' => $content['landscape'],
'return_img_base_64' => true,
];
$params_combined = [
@ -3581,11 +3594,21 @@ function agents_get_network_interfaces_array(
case 'dinamic':
case 'static':
if (!empty($interface['traffic'])) {
$row_interface['chart'] = graphic_combined_module(
array_values($interface['traffic']),
$params,
$params_combined
);
if ($pdf === false) {
$row_interface['chart'] = graphic_combined_module(
array_values($interface['traffic']),
$params,
$params_combined
);
} else {
$row_interface['chart'] = '<img src="data:image/jpg;base64,';
$row_interface['chart'] .= graphic_combined_module(
array_values($interface['traffic']),
$params,
$params_combined
);
$row_interface['chart'] .= '" />';
}
}
break;
@ -4562,28 +4585,38 @@ function reporting_projection_graph(
case 'dinamic':
case 'static':
$params = [
'period' => $content['period'],
'width' => $width,
'date' => $report['datetime'],
'unit' => '',
'only_image' => $pdf,
'homeurl' => ui_get_full_url(false, false, false, false).'/',
'ttl' => $ttl,
'server_id' => $id_meta,
'height' => $config['graph_image_height'],
'landscape' => $content['landscape'],
'period' => $content['period'],
'width' => $width,
'date' => $report['datetime'],
'unit' => '',
'only_image' => $pdf,
'homeurl' => ui_get_full_url(false, false, false, false).'/',
'ttl' => $ttl,
'server_id' => $id_meta,
'height' => $config['graph_image_height'],
'landscape' => $content['landscape'],
'return_img_base_64' => true,
];
$params_combined = [
'projection' => $content['top_n_value'],
];
$return['chart'] = graphic_combined_module(
[$content['id_agent_module']],
$params,
$params_combined
);
if ($pdf === true) {
$return['chart'] = '<img src="data:image/jpg;base64,';
$return['chart'] .= graphic_combined_module(
[$content['id_agent_module']],
$params,
$params_combined
);
$return['chart'] .= '" />';
} else {
$return['chart'] = graphic_combined_module(
[$content['id_agent_module']],
$params,
$params_combined
);
}
break;
case 'data':
@ -4816,20 +4849,21 @@ function reporting_value($report, $content, $type, $pdf=false)
}
$params = [
'agent_module_id' => $content['id_agent_module'],
'period' => $content['period'],
'width' => '600px',
'pure' => false,
'date' => $report['datetime'],
'only_image' => $only_image,
'homeurl' => ui_get_full_url(false, false, false, false),
'ttl' => 1,
'type_graph' => $config['type_module_charts'],
'time_interval' => $content['lapse'],
'server_id' => $id_meta,
'height' => $config['graph_image_height'],
'fullscale' => true,
'landscape' => $content['landscape'],
'agent_module_id' => $content['id_agent_module'],
'period' => $content['period'],
'width' => '600px',
'pure' => false,
'date' => $report['datetime'],
'only_image' => $only_image,
'homeurl' => ui_get_full_url(false, false, false, false),
'ttl' => 1,
'type_graph' => $config['type_module_charts'],
'time_interval' => $content['lapse'],
'server_id' => $id_meta,
'height' => $config['graph_image_height'],
'fullscale' => true,
'landscape' => $content['landscape'],
'return_img_base_64' => true,
];
switch ($type) {
@ -4895,7 +4929,12 @@ function reporting_value($report, $content, $type, $pdf=false)
];
if ($content['visual_format'] != 1) {
$graph = grafico_modulo_sparse($params);
if ($only_image === false) {
$graph = grafico_modulo_sparse($params);
} else {
$graph = '<img src="data:image/jpg;base64,'.grafico_modulo_sparse($params).'" />';
}
$return['data'][] = ['value' => $graph];
}
@ -5113,6 +5152,10 @@ function reporting_sql($report, $content)
$historical_db = $content['historical_db'];
}
if (is_metaconsole()) {
metaconsole_restore_db();
}
$result = db_get_all_rows_sql($sql, $historical_db);
if ($result !== false) {
foreach ($result as $row) {
@ -6204,6 +6247,10 @@ function reporting_availability($report, $content, $date=false, $time=false)
}
if (empty($content['subitems'])) {
if (is_metaconsole()) {
metaconsole_restore_db();
}
$sql = sprintf(
'
SELECT id_agent_module,
@ -6475,6 +6522,10 @@ function reporting_availability_graph($report, $content, $pdf=false)
$edge_interval = 10;
if (empty($content['subitems'])) {
if (is_metaconsole()) {
metaconsole_restore_db();
}
$slas = io_safe_output(
db_get_all_rows_field_filter(
'treport_content_sla_combined',
@ -7079,6 +7130,7 @@ function reporting_increment($report, $content)
AND utimestamp <= '.(time() - $period).' ORDER BY utimestamp DESC';
$sql2 = 'SELECT datos FROM tagente_datos WHERE id_agente_modulo = '.$id_agent_module.' ORDER BY utimestamp DESC';
metaconsole_restore_db();
$servers = db_get_all_rows_sql(
'SELECT *
FROM tmetaconsole_setup
@ -7184,6 +7236,10 @@ function reporting_general($report, $content)
$return['show_in_same_row'] = $content['style']['show_in_same_row'];
if (empty($content['subitems'])) {
if (is_metaconsole()) {
metaconsole_restore_db();
}
$generals = db_get_all_rows_filter(
'treport_content_item',
['id_report_content' => $content['id_rc']]
@ -7597,17 +7653,18 @@ function reporting_custom_graph(
case 'dinamic':
case 'static':
$params = [
'period' => $content['period'],
'width' => $width,
'date' => $report['datetime'],
'only_image' => $pdf,
'homeurl' => ui_get_full_url(false, false, false, false),
'ttl' => $ttl,
'percentil' => $graphs[0]['percentil'],
'fullscale' => $graphs[0]['fullscale'],
'server_id' => $id_meta,
'height' => $config['graph_image_height'],
'landscape' => $content['landscape'],
'period' => $content['period'],
'width' => $width,
'date' => $report['datetime'],
'only_image' => $pdf,
'homeurl' => ui_get_full_url(false, false, false, false),
'ttl' => $ttl,
'percentil' => $graphs[0]['percentil'],
'fullscale' => $graphs[0]['fullscale'],
'server_id' => $id_meta,
'height' => $config['graph_image_height'],
'landscape' => $content['landscape'],
'return_img_base_64' => true,
];
$params_combined = [
@ -7620,12 +7677,21 @@ function reporting_custom_graph(
'labels' => $content['style']['label'],
];
$return['chart'] = graphic_combined_module(
$modules,
$params,
$params_combined
);
if ($pdf === true) {
$return['chart'] = '<img src="data:image/jpg;base64,';
$return['chart'] .= graphic_combined_module(
$modules,
$params,
$params_combined
);
$return['chart'] .= '" />';
} else {
$return['chart'] = graphic_combined_module(
$modules,
$params,
$params_combined
);
}
break;
case 'data':
@ -7769,29 +7835,34 @@ function reporting_simple_graph(
}
$params = [
'agent_module_id' => $content['id_agent_module'],
'period' => $content['period'],
'title' => $label,
'pure' => false,
'date' => $report['datetime'],
'only_image' => $only_image,
'homeurl' => ui_get_full_url(
'agent_module_id' => $content['id_agent_module'],
'period' => $content['period'],
'title' => $label,
'pure' => false,
'date' => $report['datetime'],
'only_image' => $only_image,
'homeurl' => ui_get_full_url(
false,
false,
false,
false
),
'ttl' => $ttl,
'compare' => $time_compare_overlapped,
'show_unknown' => true,
'percentil' => ($content['style']['percentil'] == 1) ? $config['percentil'] : null,
'fullscale' => $fullscale,
'server_id' => $id_meta,
'height' => $config['graph_image_height'],
'landscape' => $content['landscape'],
'ttl' => $ttl,
'compare' => $time_compare_overlapped,
'show_unknown' => true,
'percentil' => ($content['style']['percentil'] == 1) ? $config['percentil'] : null,
'fullscale' => $fullscale,
'server_id' => $id_meta,
'height' => $config['graph_image_height'],
'landscape' => $content['landscape'],
'return_img_base_64' => true,
];
$return['chart'] = grafico_modulo_sparse($params);
if ($only_image === false) {
$return['chart'] = grafico_modulo_sparse($params);
} else {
$return['chart'] = '<img src="data:image/jpg;base64,'.grafico_modulo_sparse($params).'" />';
}
break;
case 'data':

4
pandora_console/include/functions_reporting_html.php
View File

@ -160,11 +160,11 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
$table->width = '100%';
$table->class = 'databox filters';
$table->rowclass = [];
$table->rowclass[0] = 'datos3';
$table->rowclass[0] = 'datos5';
$table->data = [];
$table->head = [];
$table->colspan = [];
$table->rowstyle = [];
$table->rowstyle = ['background-color: #686868'];
if (isset($item['label']) && $item['label'] != '') {
$id_agent = $item['id_agent'];

28
pandora_console/include/functions_reports.php
View File

@ -810,30 +810,30 @@ function reports_get_report_types($template=false, $not_editor=false)
$types['alert_report_module'] = [
'optgroup' => __('Alerts'),
'name' => __('Alert report module'),
'name' => __('Module alert report'),
];
$types['alert_report_agent'] = [
'optgroup' => __('Alerts'),
'name' => __('Alert report agent'),
'name' => __('Agent alert report '),
];
if (!$template) {
$types['alert_report_group'] = [
'optgroup' => __('Alerts'),
'name' => __('Alert report group'),
'name' => __('Group alert report'),
];
}
$types['event_report_agent'] = [
'optgroup' => __('Events'),
'name' => __('Event report agent'),
];
$types['event_report_module'] = [
'optgroup' => __('Events'),
'name' => __('Event report module'),
'name' => __('Module event report'),
];
$types['event_report_agent'] = [
'optgroup' => __('Events'),
'name' => __('Agent event report'),
];
$types['event_report_group'] = [
'optgroup' => __('Events'),
'name' => __('Event report group'),
'name' => __('Group event report'),
];
if ($config['enterprise_installed']) {
@ -879,10 +879,12 @@ function reports_get_report_types($template=false, $not_editor=false)
];
}
$types['nt_top_n'] = [
'optgroup' => __('Network traffic'),
'name' => __('Network Traffic Top N'),
];
if (!is_metaconsole()) {
$types['nt_top_n'] = [
'optgroup' => __('Network traffic'),
'name' => __('Network Traffic Top N'),
];
}
return $types;
}

43
pandora_console/include/graphs/functions_flot.php
View File

@ -760,27 +760,32 @@ function flot_slicesbar_graph(
if ($ttl == 2) {
$params = [
'graph_data' => $graph_data,
'period' => $period,
'width' => $width,
'height' => $height,
'legend' => $legend,
'colors' => $colors,
'fontpath' => $fontpath,
'round_corner' => $round_corner,
'homeurl' => $homeurl,
'watermark' => $watermark,
'adapt_key' => $adapt_key,
'stat_win' => $stat_win,
'id_agent' => $id_agent,
'full_legend_date' => $full_legend_date,
'not_interactive' => $not_interactive,
'ttl' => 1,
'widgets' => $widgets,
'show' => $show,
'graph_data' => $graph_data,
'period' => $period,
'width' => $width,
'height' => $height,
'legend' => $legend,
'colors' => $colors,
'fontpath' => $fontpath,
'round_corner' => $round_corner,
'homeurl' => $homeurl,
'watermark' => $watermark,
'adapt_key' => $adapt_key,
'stat_win' => $stat_win,
'id_agent' => $id_agent,
'full_legend_date' => $full_legend_date,
'not_interactive' => $not_interactive,
'ttl' => 1,
'widgets' => $widgets,
'show' => $show,
'return_img_base_64' => true,
];
return generator_chart_to_pdf('slicebar', $params);
$graph = '<img src="data:image/jpg;base64,';
$graph .= generator_chart_to_pdf('slicebar', $params);
$graph .= '" />';
return $graph;
}
// Get a unique identifier to graph

5
pandora_console/include/javascript/pandora_modules.js
View File

@ -7,6 +7,7 @@
var id_modules_icmp = Array(6, 7);
var id_modules_tcp = Array(8, 9, 10, 11);
var id_modules_snmp = Array(15, 16, 17, 18);
var id_modules_exec = Array(34, 35, 36, 37);
function configure_modules_form() {
$("#id_module_type").change(function() {
@ -23,6 +24,10 @@ function configure_modules_form() {
$("tr#simple-snmp_1, tr#simple-snmp_2").hide();
$("tr#simple-tcp_send, tr#simple-tcp_receive").show();
$("#text-tcp_port").removeAttr("disabled");
} else if (id_modules_exec.in_array(this.value)) {
$("tr#simple-tcp_send, tr#simple-tcp_receive").hide();
$("tr#simple-snmp_1, tr#simple-snmp_2").hide();
$("#text-tcp_port").attr("disabled", false);
}
});

955
pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/ui.css vendored
View File

@ -1,219 +1,794 @@
/* Reset */
.defaultSkin table, .defaultSkin tbody, .defaultSkin a, .defaultSkin img, .defaultSkin tr, .defaultSkin div, .defaultSkin td, .defaultSkin iframe, .defaultSkin span, .defaultSkin *, .defaultSkin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}
.defaultSkin a:hover, .defaultSkin a:link, .defaultSkin a:visited, .defaultSkin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
.defaultSkin table td {vertical-align:middle}
.defaultSkin table,
.defaultSkin tbody,
.defaultSkin a,
.defaultSkin img,
.defaultSkin tr,
.defaultSkin div,
.defaultSkin td,
.defaultSkin iframe,
.defaultSkin span,
.defaultSkin *,
.defaultSkin .mceText {
border: 0;
margin: 0;
padding: 0;
background: transparent;
white-space: nowrap;
text-decoration: none;
font-weight: normal;
cursor: default;
color: #000;
vertical-align: baseline;
width: auto;
border-collapse: separate;
text-align: left;
}
.defaultSkin a:hover,
.defaultSkin a:link,
.defaultSkin a:visited,
.defaultSkin a:active {
text-decoration: none;
font-weight: normal;
cursor: default;
color: #000;
}
.defaultSkin table td {
vertical-align: middle;
}
/* Containers */
.defaultSkin table {direction:ltr;background:transparent}
.defaultSkin iframe {display:block;}
.defaultSkin .mceToolbar {height:26px}
.defaultSkin .mceLeft {text-align:left}
.defaultSkin .mceRight {text-align:right}
.defaultSkin table {
direction: ltr;
background: transparent;
}
.defaultSkin iframe {
display: block;
}
.defaultSkin .mceToolbar {
height: 26px;
}
.defaultSkin .mceLeft {
text-align: left;
}
.defaultSkin .mceRight {
text-align: right;
}
/* External */
.defaultSkin .mceExternalToolbar {position:absolute; border:1px solid #CCC; border-bottom:0; display:none;}
.defaultSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
.defaultSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}
.defaultSkin .mceExternalToolbar {
position: absolute;
border: 1px solid #ccc;
border-bottom: 0;
display: none;
}
.defaultSkin .mceExternalToolbar td.mceToolbar {
padding-right: 13px;
}
.defaultSkin .mceExternalClose {
position: absolute;
top: 3px;
right: 3px;
width: 7px;
height: 7px;
background: url(../../img/icons.gif) -820px 0;
}
/* Layout */
.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC; margin-bottom:10px;}
.defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}
.defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}
.defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}
.defaultSkin td.mceToolbar {background:#F0F0EE; padding-top:1px; vertical-align:top}
.defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}
.defaultSkin .mceStatusbar {background:#F0F0EE; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:10px;}
.defaultSkin .mceStatusbar div {float:left; margin:2px}
.defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}
.defaultSkin .mceStatusbar a:hover {text-decoration:underline}
.defaultSkin table.mceToolbar {margin-left:3px}
.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {display:block; width:20px; height:20px}
.defaultSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
.defaultSkin td.mceCenter {text-align:center;}
.defaultSkin td.mceCenter table {margin:0 auto; text-align:left;}
.defaultSkin td.mceRight table {margin:0 0 0 auto;}
.defaultSkin table.mceLayout {
border: 0;
border-left: 1px solid #ccc;
border-right: 1px solid #ccc;
margin-bottom: 10px;
}
.defaultSkin table.mceLayout tr.mceFirst td {
border-top: 1px solid #ccc;
}
.defaultSkin table.mceLayout tr.mceLast td {
border-bottom: 1px solid #ccc;
display: none;
}
.defaultSkin table.mceToolbar,
.defaultSkin tr.mceFirst .mceToolbar tr td,
.defaultSkin tr.mceLast .mceToolbar tr td {
border: 0;
margin: 0;
padding: 0;
}
.defaultSkin td.mceToolbar {
background: #f0f0ee;
padding-top: 1px;
vertical-align: top;
}
.defaultSkin .mceIframeContainer {
border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
.defaultSkin .mceStatusbar {
background: #f0f0ee;
font-family: "MS Sans Serif", sans-serif, Verdana, Arial;
font-size: 9pt;
line-height: 16px;
overflow: visible;
color: #000;
display: block;
height: 10px;
}
.defaultSkin .mceStatusbar div {
float: left;
margin: 2px;
}
.defaultSkin .mceStatusbar a.mceResize {
display: block;
float: right;
background: url(../../img/icons.gif) -800px 0;
width: 20px;
height: 20px;
cursor: se-resize;
outline: 0;
}
.defaultSkin .mceStatusbar a:hover {
text-decoration: underline;
}
.defaultSkin table.mceToolbar {
margin-left: 3px;
}
.defaultSkin span.mceIcon,
.defaultSkin img.mceIcon {
display: block;
width: 20px;
height: 20px;
}
.defaultSkin .mceIcon {
background: url(../../img/icons.gif) no-repeat 20px 20px;
}
.defaultSkin td.mceCenter {
text-align: center;
}
.defaultSkin td.mceCenter table {
margin: 0 auto;
text-align: left;
}
.defaultSkin td.mceRight table {
margin: 0 0 0 auto;
}
/* Button */
.defaultSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px; margin-right:1px}
.defaultSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}
.defaultSkin a.mceButtonActive, .defaultSkin a.mceButtonSelected {border:1px solid #0A246A; background-color:#C2CBE0}
.defaultSkin .mceButtonDisabled .mceIcon {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
.defaultSkin .mceButtonLabeled {width:auto}
.defaultSkin .mceButtonLabeled span.mceIcon {float:left}
.defaultSkin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}
.defaultSkin .mceButtonDisabled .mceButtonLabel {color:#888}
.defaultSkin .mceButton {
display: block;
border: 1px solid #f0f0ee;
width: 20px;
height: 20px;
margin-right: 1px;
}
.defaultSkin a.mceButtonEnabled:hover {
border: 1px solid #0a246a;
background-color: #b2bbd0;
}
.defaultSkin a.mceButtonActive,
.defaultSkin a.mceButtonSelected {
border: 1px solid #0a246a;
background-color: #c2cbe0;
}
.defaultSkin .mceButtonDisabled .mceIcon {
opacity: 0.3;
-ms-filter: "alpha(opacity=30)";
filter: alpha(opacity=30);
}
.defaultSkin .mceButtonLabeled {
width: auto;
}
.defaultSkin .mceButtonLabeled span.mceIcon {
float: left;
}
.defaultSkin span.mceButtonLabel {
display: block;
font-size: 10px;
padding: 4px 6px 0 22px;
font-family: Tahoma, Verdana, Arial, Helvetica;
}
.defaultSkin .mceButtonDisabled .mceButtonLabel {
color: #888;
}
/* Separator */
.defaultSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:2px 2px 0 4px}
.defaultSkin .mceSeparator {
display: block;
background: url(../../img/icons.gif) -180px 0;
width: 2px;
height: 20px;
margin: 2px 2px 0 4px;
}
/* ListBox */
.defaultSkin .mceListBox, .defaultSkin .mceListBox a {display:block}
.defaultSkin .mceListBox .mceText {padding-left:4px; width:70px; text-align:left; border:1px solid #CCC; border-right:0; background:#FFF; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
.defaultSkin .mceListBox .mceOpen {width:9px; height:20px; background:url(../../img/icons.gif) -741px 0; margin-right:2px; border:1px solid #CCC;}
.defaultSkin table.mceListBoxEnabled:hover .mceText, .defaultSkin .mceListBoxHover .mceText, .defaultSkin .mceListBoxSelected .mceText {border:1px solid #A2ABC0; border-right:0; background:#FFF}
.defaultSkin table.mceListBoxEnabled:hover .mceOpen, .defaultSkin .mceListBoxHover .mceOpen, .defaultSkin .mceListBoxSelected .mceOpen {background-color:#FFF; border:1px solid #A2ABC0}
.defaultSkin .mceListBoxDisabled a.mceText {color:gray; background-color:transparent;}
.defaultSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
.defaultSkin .mceOldBoxModel .mceListBox .mceText {height:22px}
.defaultSkin .mceOldBoxModel .mceListBox .mceOpen {width:11px; height:22px;}
.defaultSkin select.mceNativeListBox {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:7pt; background:#F0F0EE; border:1px solid gray; margin-right:2px;}
.defaultSkin .mceListBox,
.defaultSkin .mceListBox a {
display: block;
}
.defaultSkin .mceListBox .mceText {
padding-left: 4px;
width: 70px;
text-align: left;
border: 1px solid #ccc;
border-right: 0;
background: #fff;
font-family: Tahoma, Verdana, Arial, Helvetica;
font-size: 11px;
height: 20px;
line-height: 20px;
overflow: hidden;
}
.defaultSkin .mceListBox .mceOpen {
width: 9px;
height: 20px;
background: url(../../img/icons.gif) -741px 0;
margin-right: 2px;
border: 1px solid #ccc;
}
.defaultSkin table.mceListBoxEnabled:hover .mceText,
.defaultSkin .mceListBoxHover .mceText,
.defaultSkin .mceListBoxSelected .mceText {
border: 1px solid #a2abc0;
border-right: 0;
background: #fff;
}
.defaultSkin table.mceListBoxEnabled:hover .mceOpen,
.defaultSkin .mceListBoxHover .mceOpen,
.defaultSkin .mceListBoxSelected .mceOpen {
background-color: #fff;
border: 1px solid #a2abc0;
}
.defaultSkin .mceListBoxDisabled a.mceText {
color: gray;
background-color: transparent;
}
.defaultSkin .mceListBoxMenu {
overflow: auto;
overflow-x: hidden;
}
.defaultSkin .mceOldBoxModel .mceListBox .mceText {
height: 22px;
}
.defaultSkin .mceOldBoxModel .mceListBox .mceOpen {
width: 11px;
height: 22px;
}
.defaultSkin select.mceNativeListBox {
font-family: "MS Sans Serif", sans-serif, Verdana, Arial;
font-size: 7pt;
background: #f0f0ee;
border: 1px solid gray;
margin-right: 2px;
}
/* SplitButton */
.defaultSkin .mceSplitButton {width:32px; height:20px; direction:ltr}
.defaultSkin .mceSplitButton a, .defaultSkin .mceSplitButton span {height:20px; display:block}
.defaultSkin .mceSplitButton a.mceAction {width:20px; border:1px solid #F0F0EE; border-right:0;}
.defaultSkin .mceSplitButton span.mceAction {width:20px; background-image:url(../../img/icons.gif);}
.defaultSkin .mceSplitButton a.mceOpen {width:9px; background:url(../../img/icons.gif) -741px 0; border:1px solid #F0F0EE;}
.defaultSkin .mceSplitButton span.mceOpen {display:none}
.defaultSkin table.mceSplitButtonEnabled:hover a.mceAction, .defaultSkin .mceSplitButtonHover a.mceAction, .defaultSkin .mceSplitButtonSelected a.mceAction {border:1px solid #0A246A; border-right:0; background-color:#B2BBD0}
.defaultSkin table.mceSplitButtonEnabled:hover a.mceOpen, .defaultSkin .mceSplitButtonHover a.mceOpen, .defaultSkin .mceSplitButtonSelected a.mceOpen {background-color:#B2BBD0; border:1px solid #0A246A;}
.defaultSkin .mceSplitButtonDisabled .mceAction, .defaultSkin .mceSplitButtonDisabled a.mceOpen {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
.defaultSkin .mceSplitButtonActive a.mceAction {border:1px solid #0A246A; background-color:#C2CBE0}
.defaultSkin .mceSplitButtonActive a.mceOpen {border-left:0;}
.defaultSkin .mceSplitButton {
width: 32px;
height: 20px;
direction: ltr;
}
.defaultSkin .mceSplitButton a,
.defaultSkin .mceSplitButton span {
height: 20px;
display: block;
}
.defaultSkin .mceSplitButton a.mceAction {
width: 20px;
border: 1px solid #f0f0ee;
border-right: 0;
}
.defaultSkin .mceSplitButton span.mceAction {
width: 20px;
background-image: url(../../img/icons.gif);
}
.defaultSkin .mceSplitButton a.mceOpen {
width: 9px;
background: url(../../img/icons.gif) -741px 0;
border: 1px solid #f0f0ee;
}
.defaultSkin .mceSplitButton span.mceOpen {
display: none;
}
.defaultSkin table.mceSplitButtonEnabled:hover a.mceAction,
.defaultSkin .mceSplitButtonHover a.mceAction,
.defaultSkin .mceSplitButtonSelected a.mceAction {
border: 1px solid #0a246a;
border-right: 0;
background-color: #b2bbd0;
}
.defaultSkin table.mceSplitButtonEnabled:hover a.mceOpen,
.defaultSkin .mceSplitButtonHover a.mceOpen,
.defaultSkin .mceSplitButtonSelected a.mceOpen {
background-color: #b2bbd0;
border: 1px solid #0a246a;
}
.defaultSkin .mceSplitButtonDisabled .mceAction,
.defaultSkin .mceSplitButtonDisabled a.mceOpen {
opacity: 0.3;
-ms-filter: "alpha(opacity=30)";
filter: alpha(opacity=30);
}
.defaultSkin .mceSplitButtonActive a.mceAction {
border: 1px solid #0a246a;
background-color: #c2cbe0;
}
.defaultSkin .mceSplitButtonActive a.mceOpen {
border-left: 0;
}
/* ColorSplitButton */
.defaultSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}
.defaultSkin .mceColorSplitMenu td {padding:2px}
.defaultSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}
.defaultSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
.defaultSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
.defaultSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}
.defaultSkin a.mceMoreColors:hover {border:1px solid #0A246A}
.defaultSkin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a}
.defaultSkin .mce_forecolor span.mceAction, .defaultSkin .mce_backcolor span.mceAction {overflow:hidden; height:16px}
.defaultSkin div.mceColorSplitMenu table {
background: #fff;
border: 1px solid gray;
}
.defaultSkin .mceColorSplitMenu td {
padding: 2px;
}
.defaultSkin .mceColorSplitMenu a {
display: block;
width: 9px;
height: 9px;
overflow: hidden;
border: 1px solid #808080;
}
.defaultSkin .mceColorSplitMenu td.mceMoreColors {
padding: 1px 3px 1px 1px;
}
.defaultSkin .mceColorSplitMenu a.mceMoreColors {
width: 100%;
height: auto;
text-align: center;
font-family: Tahoma, Verdana, Arial, Helvetica;
font-size: 11px;
line-height: 20px;
border: 1px solid #fff;
}
.defaultSkin .mceColorSplitMenu a.mceMoreColors:hover {
border: 1px solid #0a246a;
background-color: #b6bdd2;
}
.defaultSkin a.mceMoreColors:hover {
border: 1px solid #0a246a;
}
.defaultSkin .mceColorPreview {
margin-left: 2px;
width: 16px;
height: 4px;
overflow: hidden;
background: #9a9b9a;
}
.defaultSkin .mce_forecolor span.mceAction,
.defaultSkin .mce_backcolor span.mceAction {
overflow: hidden;
height: 16px;
}
/* Menu */
.defaultSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #D4D0C8; direction:ltr}
.defaultSkin .mceNoIcons span.mceIcon {width:0;}
.defaultSkin .mceNoIcons a .mceText {padding-left:10px}
.defaultSkin .mceMenu table {background:#FFF}
.defaultSkin .mceMenu a, .defaultSkin .mceMenu span, .defaultSkin .mceMenu {display:block}
.defaultSkin .mceMenu td {height:20px}
.defaultSkin .mceMenu a {position:relative;padding:3px 0 4px 0}
.defaultSkin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}
.defaultSkin .mceMenu span.mceText, .defaultSkin .mceMenu .mcePreview {font-size:11px}
.defaultSkin .mceMenu pre.mceText {font-family:Monospace}
.defaultSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
.defaultSkin .mceMenu .mceMenuItemEnabled a:hover, .defaultSkin .mceMenu .mceMenuItemActive {background-color:#dbecf3}
.defaultSkin td.mceMenuItemSeparator {background:#DDD; height:1px}
.defaultSkin .mceMenuItemTitle a {border:0; background:#EEE; border-bottom:1px solid #DDD}
.defaultSkin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}
.defaultSkin .mceMenuItemDisabled .mceText {color:#888}
.defaultSkin .mceMenuItemSelected .mceIcon {background:url(img/menu_check.gif)}
.defaultSkin .mceNoIcons .mceMenuItemSelected a {background:url(img/menu_arrow.gif) no-repeat -6px center}
.defaultSkin .mceMenu span.mceMenuLine {display:none}
.defaultSkin .mceMenuItemSub a {background:url(img/menu_arrow.gif) no-repeat top right;}
.defaultSkin .mceMenuItem td, .defaultSkin .mceMenuItem th {line-height: normal}
.defaultSkin .mceMenu {
position: absolute;
left: 0;
top: 0;
z-index: 1000;
border: 1px solid #d4d0c8;
direction: ltr;
}
.defaultSkin .mceNoIcons span.mceIcon {
width: 0;
}
.defaultSkin .mceNoIcons a .mceText {
padding-left: 10px;
}
.defaultSkin .mceMenu table {
background: #fff;
}
.defaultSkin .mceMenu a,
.defaultSkin .mceMenu span,
.defaultSkin .mceMenu {
display: block;
}
.defaultSkin .mceMenu td {
height: 20px;
}
.defaultSkin .mceMenu a {
position: relative;
padding: 3px 0 4px 0;
}
.defaultSkin .mceMenu .mceText {
position: relative;
display: block;
font-family: Tahoma, Verdana, Arial, Helvetica;
color: #000;
cursor: default;
margin: 0;
padding: 0 25px 0 25px;
display: block;
}
.defaultSkin .mceMenu span.mceText,
.defaultSkin .mceMenu .mcePreview {
font-size: 11px;
}
.defaultSkin .mceMenu pre.mceText {
font-family: Monospace;
}
.defaultSkin .mceMenu .mceIcon {
position: absolute;
top: 0;
left: 0;
width: 22px;
}
.defaultSkin .mceMenu .mceMenuItemEnabled a:hover,
.defaultSkin .mceMenu .mceMenuItemActive {
background-color: #dbecf3;
}
.defaultSkin td.mceMenuItemSeparator {
background: #ddd;
height: 1px;
}
.defaultSkin .mceMenuItemTitle a {
border: 0;
background: #eee;
border-bottom: 1px solid #ddd;
}
.defaultSkin .mceMenuItemTitle span.mceText {
color: #000;
font-weight: bold;
padding-left: 4px;
}
.defaultSkin .mceMenuItemDisabled .mceText {
color: #888;
}
.defaultSkin .mceMenuItemSelected .mceIcon {
background: url(img/menu_check.gif);
}
.defaultSkin .mceNoIcons .mceMenuItemSelected a {
background: url(img/menu_arrow.gif) no-repeat -6px center;
}
.defaultSkin .mceMenu span.mceMenuLine {
display: none;
}
.defaultSkin .mceMenuItemSub a {
background: url(img/menu_arrow.gif) no-repeat top right;
}
.defaultSkin .mceMenuItem td,
.defaultSkin .mceMenuItem th {
line-height: normal;
}
/* Progress,Resize */
.defaultSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50); background:#FFF}
.defaultSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
.defaultSkin .mceBlocker {
position: absolute;
left: 0;
top: 0;
z-index: 1000;
opacity: 0.5;
-ms-filter: "alpha(opacity=50)";
filter: alpha(opacity=50);
background: #fff;
}
.defaultSkin .mceProgress {
position: absolute;
left: 0;
top: 0;
z-index: 1001;
background: url(img/progress.gif) no-repeat;
width: 32px;
height: 32px;
margin: -16px 0 0 -16px;
}
/* Rtl */
.mceRtl .mceListBox .mceText {text-align: right; padding: 0 4px 0 0}
.mceRtl .mceMenuItem .mceText {text-align: right}
.mceRtl .mceListBox .mceText {
text-align: right;
padding: 0 4px 0 0;
}
.mceRtl .mceMenuItem .mceText {
text-align: right;
}
/* Formats */
.defaultSkin .mce_formatPreview a {font-size:10px}
.defaultSkin .mce_p span.mceText {}
.defaultSkin .mce_address span.mceText {font-style:italic}
.defaultSkin .mce_pre span.mceText {font-family:monospace}
.defaultSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
.defaultSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
.defaultSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
.defaultSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
.defaultSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
.defaultSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
.defaultSkin .mce_formatPreview a {
font-size: 10px;
}
.defaultSkin .mce_p span.mceText {
}
.defaultSkin .mce_address span.mceText {
font-style: italic;
}
.defaultSkin .mce_pre span.mceText {
font-family: monospace;
}
.defaultSkin .mce_h1 span.mceText {
font-weight: bolder;
font-size: 2em;
}
.defaultSkin .mce_h2 span.mceText {
font-weight: bolder;
font-size: 1.5em;
}
.defaultSkin .mce_h3 span.mceText {
font-weight: bolder;
font-size: 1.17em;
}
.defaultSkin .mce_h4 span.mceText {
font-weight: bolder;
font-size: 1em;
}
.defaultSkin .mce_h5 span.mceText {
font-weight: bolder;
font-size: 0.83em;
}
.defaultSkin .mce_h6 span.mceText {
font-weight: bolder;
font-size: 0.75em;
}
/* Theme */
.defaultSkin span.mce_bold {background-position:0 0}
.defaultSkin span.mce_italic {background-position:-60px 0}
.defaultSkin span.mce_underline {background-position:-140px 0}
.defaultSkin span.mce_strikethrough {background-position:-120px 0}
.defaultSkin span.mce_undo {background-position:-160px 0}
.defaultSkin span.mce_redo {background-position:-100px 0}
.defaultSkin span.mce_cleanup {background-position:-40px 0}
.defaultSkin span.mce_bullist {background-position:-20px 0}
.defaultSkin span.mce_numlist {background-position:-80px 0}
.defaultSkin span.mce_justifyleft {background-position:-460px 0}
.defaultSkin span.mce_justifyright {background-position:-480px 0}
.defaultSkin span.mce_justifycenter {background-position:-420px 0}
.defaultSkin span.mce_justifyfull {background-position:-440px 0}
.defaultSkin span.mce_anchor {background-position:-200px 0}
.defaultSkin span.mce_indent {background-position:-400px 0}
.defaultSkin span.mce_outdent {background-position:-540px 0}
.defaultSkin span.mce_link {background-position:-500px 0}
.defaultSkin span.mce_unlink {background-position:-640px 0}
.defaultSkin span.mce_sub {background-position:-600px 0}
.defaultSkin span.mce_sup {background-position:-620px 0}
.defaultSkin span.mce_removeformat {background-position:-580px 0}
.defaultSkin span.mce_newdocument {background-position:-520px 0}
.defaultSkin span.mce_image {background-position:-380px 0}
.defaultSkin span.mce_help {background-position:-340px 0}
.defaultSkin span.mce_code {background-position:-260px 0}
.defaultSkin span.mce_hr {background-position:-360px 0}
.defaultSkin span.mce_visualaid {background-position:-660px 0}
.defaultSkin span.mce_charmap {background-position:-240px 0}
.defaultSkin span.mce_paste {background-position:-560px 0}
.defaultSkin span.mce_copy {background-position:-700px 0}
.defaultSkin span.mce_cut {background-position:-680px 0}
.defaultSkin span.mce_blockquote {background-position:-220px 0}
.defaultSkin .mce_forecolor span.mceAction {background-position:-720px 0}
.defaultSkin .mce_backcolor span.mceAction {background-position:-760px 0}
.defaultSkin span.mce_forecolorpicker {background-position:-720px 0}
.defaultSkin span.mce_backcolorpicker {background-position:-760px 0}
.defaultSkin span.mce_bold {
background-position: 0 0;
}
.defaultSkin span.mce_italic {
background-position: -60px 0;
}
.defaultSkin span.mce_underline {
background-position: -140px 0;
}
.defaultSkin span.mce_strikethrough {
background-position: -120px 0;
}
.defaultSkin span.mce_undo {
background-position: -160px 0;
}
.defaultSkin span.mce_redo {
background-position: -100px 0;
}
.defaultSkin span.mce_cleanup {
background-position: -40px 0;
}
.defaultSkin span.mce_bullist {
background-position: -20px 0;
}
.defaultSkin span.mce_numlist {
background-position: -80px 0;
}
.defaultSkin span.mce_justifyleft {
background-position: -460px 0;
}
.defaultSkin span.mce_justifyright {
background-position: -480px 0;
}
.defaultSkin span.mce_justifycenter {
background-position: -420px 0;
}
.defaultSkin span.mce_justifyfull {
background-position: -440px 0;
}
.defaultSkin span.mce_anchor {
background-position: -200px 0;
}
.defaultSkin span.mce_indent {
background-position: -400px 0;
}
.defaultSkin span.mce_outdent {
background-position: -540px 0;
}
.defaultSkin span.mce_link {
background-position: -500px 0;
}
.defaultSkin span.mce_unlink {
background-position: -640px 0;
}
.defaultSkin span.mce_sub {
background-position: -600px 0;
}
.defaultSkin span.mce_sup {
background-position: -620px 0;
}
.defaultSkin span.mce_removeformat {
background-position: -580px 0;
}
.defaultSkin span.mce_newdocument {
background-position: -520px 0;
}
.defaultSkin span.mce_image {
background-position: -380px 0;
}
.defaultSkin span.mce_help {
background-position: -340px 0;
}
.defaultSkin span.mce_code {
background-position: -260px 0;
}
.defaultSkin span.mce_hr {
background-position: -360px 0;
}
.defaultSkin span.mce_visualaid {
background-position: -660px 0;
}
.defaultSkin span.mce_charmap {
background-position: -240px 0;
}
.defaultSkin span.mce_paste {
background-position: -560px 0;
}
.defaultSkin span.mce_copy {
background-position: -700px 0;
}
.defaultSkin span.mce_cut {
background-position: -680px 0;
}
.defaultSkin span.mce_blockquote {
background-position: -220px 0;
}
.defaultSkin .mce_forecolor span.mceAction {
background-position: -720px 0;
}
.defaultSkin .mce_backcolor span.mceAction {
background-position: -760px 0;
}
.defaultSkin span.mce_forecolorpicker {
background-position: -720px 0;
}
.defaultSkin span.mce_backcolorpicker {
background-position: -760px 0;
}
/* Plugins */
.defaultSkin span.mce_advhr {background-position:-0px -20px}
.defaultSkin span.mce_ltr {background-position:-20px -20px}
.defaultSkin span.mce_rtl {background-position:-40px -20px}
.defaultSkin span.mce_emotions {background-position:-60px -20px}
.defaultSkin span.mce_fullpage {background-position:-80px -20px}
.defaultSkin span.mce_fullscreen {background-position:-100px -20px}
.defaultSkin span.mce_iespell {background-position:-120px -20px}
.defaultSkin span.mce_insertdate {background-position:-140px -20px}
.defaultSkin span.mce_inserttime {background-position:-160px -20px}
.defaultSkin span.mce_absolute {background-position:-180px -20px}
.defaultSkin span.mce_backward {background-position:-200px -20px}
.defaultSkin span.mce_forward {background-position:-220px -20px}
.defaultSkin span.mce_insert_layer {background-position:-240px -20px}
.defaultSkin span.mce_insertlayer {background-position:-260px -20px}
.defaultSkin span.mce_movebackward {background-position:-280px -20px}
.defaultSkin span.mce_moveforward {background-position:-300px -20px}
.defaultSkin span.mce_media {background-position:-320px -20px}
.defaultSkin span.mce_nonbreaking {background-position:-340px -20px}
.defaultSkin span.mce_pastetext {background-position:-360px -20px}
.defaultSkin span.mce_pasteword {background-position:-380px -20px}
.defaultSkin span.mce_selectall {background-position:-400px -20px}
.defaultSkin span.mce_preview {background-position:-420px -20px}
.defaultSkin span.mce_print {background-position:-440px -20px}
.defaultSkin span.mce_cancel {background-position:-460px -20px}
.defaultSkin span.mce_save {background-position:-480px -20px}
.defaultSkin span.mce_replace {background-position:-500px -20px}
.defaultSkin span.mce_search {background-position:-520px -20px}
.defaultSkin span.mce_styleprops {background-position:-560px -20px}
.defaultSkin span.mce_table {background-position:-580px -20px}
.defaultSkin span.mce_cell_props {background-position:-600px -20px}
.defaultSkin span.mce_delete_table {background-position:-620px -20px}
.defaultSkin span.mce_delete_col {background-position:-640px -20px}
.defaultSkin span.mce_delete_row {background-position:-660px -20px}
.defaultSkin span.mce_col_after {background-position:-680px -20px}
.defaultSkin span.mce_col_before {background-position:-700px -20px}
.defaultSkin span.mce_row_after {background-position:-720px -20px}
.defaultSkin span.mce_row_before {background-position:-740px -20px}
.defaultSkin span.mce_merge_cells {background-position:-760px -20px}
.defaultSkin span.mce_table_props {background-position:-980px -20px}
.defaultSkin span.mce_row_props {background-position:-780px -20px}
.defaultSkin span.mce_split_cells {background-position:-800px -20px}
.defaultSkin span.mce_template {background-position:-820px -20px}
.defaultSkin span.mce_visualchars {background-position:-840px -20px}
.defaultSkin span.mce_abbr {background-position:-860px -20px}
.defaultSkin span.mce_acronym {background-position:-880px -20px}
.defaultSkin span.mce_attribs {background-position:-900px -20px}
.defaultSkin span.mce_cite {background-position:-920px -20px}
.defaultSkin span.mce_del {background-position:-940px -20px}
.defaultSkin span.mce_ins {background-position:-960px -20px}
.defaultSkin span.mce_pagebreak {background-position:0 -40px}
.defaultSkin span.mce_restoredraft {background-position:-20px -40px}
.defaultSkin span.mce_spellchecker {background-position:-540px -20px}
.defaultSkin span.mce_visualblocks {background-position: -40px -40px}
.defaultSkin span.mce_advhr {
background-position: -0px -20px;
}
.defaultSkin span.mce_ltr {
background-position: -20px -20px;
}
.defaultSkin span.mce_rtl {
background-position: -40px -20px;
}
.defaultSkin span.mce_emotions {
background-position: -60px -20px;
}
.defaultSkin span.mce_fullpage {
background-position: -80px -20px;
}
.defaultSkin span.mce_fullscreen {
background-position: -100px -20px;
}
.defaultSkin span.mce_iespell {
background-position: -120px -20px;
}
.defaultSkin span.mce_insertdate {
background-position: -140px -20px;
}
.defaultSkin span.mce_inserttime {
background-position: -160px -20px;
}
.defaultSkin span.mce_absolute {
background-position: -180px -20px;
}
.defaultSkin span.mce_backward {
background-position: -200px -20px;
}
.defaultSkin span.mce_forward {
background-position: -220px -20px;
}
.defaultSkin span.mce_insert_layer {
background-position: -240px -20px;
}
.defaultSkin span.mce_insertlayer {
background-position: -260px -20px;
}
.defaultSkin span.mce_movebackward {
background-position: -280px -20px;
}
.defaultSkin span.mce_moveforward {
background-position: -300px -20px;
}
.defaultSkin span.mce_media {
background-position: -320px -20px;
}
.defaultSkin span.mce_nonbreaking {
background-position: -340px -20px;
}
.defaultSkin span.mce_pastetext {
background-position: -360px -20px;
}
.defaultSkin span.mce_pasteword {
background-position: -380px -20px;
}
.defaultSkin span.mce_selectall {
background-position: -400px -20px;
}
.defaultSkin span.mce_preview {
background-position: -420px -20px;
}
.defaultSkin span.mce_print {
background-position: -440px -20px;
}
.defaultSkin span.mce_cancel {
background-position: -460px -20px;
}
.defaultSkin span.mce_save {
background-position: -480px -20px;
}
.defaultSkin span.mce_replace {
background-position: -500px -20px;
}
.defaultSkin span.mce_search {
background-position: -520px -20px;
}
.defaultSkin span.mce_styleprops {
background-position: -560px -20px;
}
.defaultSkin span.mce_table {
background-position: -580px -20px;
}
.defaultSkin span.mce_cell_props {
background-position: -600px -20px;
}
.defaultSkin span.mce_delete_table {
background-position: -620px -20px;
}
.defaultSkin span.mce_delete_col {
background-position: -640px -20px;
}
.defaultSkin span.mce_delete_row {
background-position: -660px -20px;
}
.defaultSkin span.mce_col_after {
background-position: -680px -20px;
}
.defaultSkin span.mce_col_before {
background-position: -700px -20px;
}
.defaultSkin span.mce_row_after {
background-position: -720px -20px;
}
.defaultSkin span.mce_row_before {
background-position: -740px -20px;
}
.defaultSkin span.mce_merge_cells {
background-position: -760px -20px;
}
.defaultSkin span.mce_table_props {
background-position: -980px -20px;
}
.defaultSkin span.mce_row_props {
background-position: -780px -20px;
}
.defaultSkin span.mce_split_cells {
background-position: -800px -20px;
}
.defaultSkin span.mce_template {
background-position: -820px -20px;
}
.defaultSkin span.mce_visualchars {
background-position: -840px -20px;
}
.defaultSkin span.mce_abbr {
background-position: -860px -20px;
}
.defaultSkin span.mce_acronym {
background-position: -880px -20px;
}
.defaultSkin span.mce_attribs {
background-position: -900px -20px;
}
.defaultSkin span.mce_cite {
background-position: -920px -20px;
}
.defaultSkin span.mce_del {
background-position: -940px -20px;
}
.defaultSkin span.mce_ins {
background-position: -960px -20px;
}
.defaultSkin span.mce_pagebreak {
background-position: 0 -40px;
}
.defaultSkin span.mce_restoredraft {
background-position: -20px -40px;
}
.defaultSkin span.mce_spellchecker {
background-position: -540px -20px;
}
.defaultSkin span.mce_visualblocks {
background-position: -40px -40px;
}

4
pandora_console/include/styles/tables.css
View File

@ -239,6 +239,10 @@
padding: 1.3em 0;
}
.datos5 * {
color: #ffffff;
}
/*td.datos_id {
color: #1a313a;
}*/

3
pandora_console/include/web2image.js
View File

@ -94,7 +94,8 @@ page.onCallback = function() {
if (!base_64) {
page.render(output_filename, { format: "png" });
} else {
var base64 = page.renderBase64("png");
page.settings.loadImages = false;
var base64 = page.renderBase64("jpg");
// do not remove this console.output
console.log(base64);
}

2
pandora_console/install.php
View File

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

2
pandora_console/pandora_console.redhat.spec
View File

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

2
pandora_console/pandora_console.rhel7.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.741
%define release 191212
%define release 191213
# 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.741
%define release 191212
%define release 191213
%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.741-191212
Version: 7.0NG.741-191213
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.741-191212"
pandora_version="7.0NG.741-191213"
package_cpan=0
package_pandora=1

2
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.741";
my $pandora_build = "191212";
my $pandora_build = "191213";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

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.741";
my $pandora_build = "191212";
my $pandora_build = "191213";
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.741
%define release 191212
%define release 191213
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.741
%define release 191212
%define release 191213
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.741"
PI_BUILD="191212"
PI_BUILD="191213"
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.741 PS191212";
my $version = "7.0NG.741 PS191213";
# 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.741 PS191212";
my $version = "7.0NG.741 PS191213";
# save program name for logging
my $progname = basename($0);