#8099 Added jquery mobile 1.4.5
This commit is contained in:
Daniel Maya
parent
56ca01112d
commit
05bc15f74c
|
|
@ -111,4 +111,6 @@ enterprise/operation/agentes/pandora_networkmap.view.php
|
|||
enterprise/include/ajax/map_enterprise.ajax.php
|
||||
enterprise/include/javascript/SimpleMapController.js
|
||||
enterprise/include/javascript/tooltipster.bundle.min.js
|
||||
enterprise/include/styles/tooltipster.bundle.min.css
|
||||
enterprise/include/styles/tooltipster.bundle.min.css
|
||||
mobile/include/javascript/jquery.mobile-1.3.1.js
|
||||
mobile/include/style/jquery.mobile-1.3.1.css
|
||||
|
|
@ -33,7 +33,7 @@ function include_javascript_dependencies_flot_graph($return=false, $mobile=false
|
|||
if ($mobile === true) {
|
||||
$output .= '
|
||||
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/mobile/include/javascript/jquery.js').'"></script>
|
||||
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/mobile/include/javascript/jquery.mobile-1.3.1.js').'"></script>';
|
||||
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/mobile/include/javascript/jquery.mobile-1.4.5.js').'"></script>';
|
||||
}
|
||||
|
||||
// NOTE: jquery.flot.threshold is not te original file. Is patched to allow multiple thresholds and filled area
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -147,7 +147,7 @@ legend {
|
|||
|
||||
tr.group_view_crit,
|
||||
.group_view_crit {
|
||||
background-color: #fa3030;
|
||||
background-color: #fa3030 !important;
|
||||
color: #000000 !important;
|
||||
}
|
||||
.group_view_crit * {
|
||||
|
|
@ -155,7 +155,7 @@ tr.group_view_crit,
|
|||
}
|
||||
.ui-btn-up-group_view_crit,
|
||||
.ui-btn-hover-group_view_crit {
|
||||
background-color: #f85858;
|
||||
background-color: #f85858 !important;
|
||||
color: #fff;
|
||||
border: 1px solid #111111;
|
||||
font-weight: bold;
|
||||
|
|
@ -166,7 +166,7 @@ tr.group_view_crit,
|
|||
.group_view_normal *,
|
||||
.group_view_norm,
|
||||
.group_view_norm * {
|
||||
background-color: #ffffff;
|
||||
background-color: #ffffff !important;
|
||||
color: #000000 !important;
|
||||
}
|
||||
.group_view_norm * {
|
||||
|
|
@ -175,7 +175,7 @@ tr.group_view_crit,
|
|||
|
||||
.group_view_not_init,
|
||||
.group_view_not_init * {
|
||||
background-color: #5ab7e5;
|
||||
background-color: #5ab7e5 !important;
|
||||
color: #fff !important;
|
||||
}
|
||||
|
||||
|
|
@ -183,7 +183,7 @@ tr.group_view_crit,
|
|||
.ui-btn-hover-group_view_normal,
|
||||
.ui-btn-up-group_view_norm,
|
||||
.ui-btn-hover-group_view_norm {
|
||||
background-color: #6eb432;
|
||||
background-color: #6eb432 !important;
|
||||
color: #fff;
|
||||
border: 1px solid #111111;
|
||||
font-weight: bold;
|
||||
|
|
@ -192,7 +192,7 @@ tr.group_view_crit,
|
|||
|
||||
.group_view_ok,
|
||||
.group_view_ok * {
|
||||
background-color: #00c000;
|
||||
background-color: #00c000 !important;
|
||||
color: #000000 !important;
|
||||
}
|
||||
.group_view_ok * {
|
||||
|
|
@ -200,7 +200,7 @@ tr.group_view_crit,
|
|||
}
|
||||
.ui-btn-up-group_view_ok,
|
||||
.ui-btn-hover-group_view_ok {
|
||||
background-color: #6eb432;
|
||||
background-color: #6eb432 !important;
|
||||
color: #fff;
|
||||
border: 1px solid #111111;
|
||||
font-weight: bold;
|
||||
|
|
@ -212,14 +212,14 @@ tr.group_view_warn,
|
|||
tr.group_view_warn.a,
|
||||
a.group_view_warn,
|
||||
tr.a.group_view_warn {
|
||||
background-color: #f5e535;
|
||||
background-color: #f5e535 !important;
|
||||
}
|
||||
a.group_view_warn {
|
||||
color: #000000 !important;
|
||||
}
|
||||
.ui-btn-up-group_view_warn,
|
||||
.ui-btn-hover-group_view_warn {
|
||||
background-color: #ffea59;
|
||||
background-color: #ffea59 !important;
|
||||
color: #111;
|
||||
border: 1px solid #111111;
|
||||
font-weight: bold;
|
||||
|
|
@ -228,14 +228,14 @@ a.group_view_warn {
|
|||
|
||||
tr.group_view_alrm,
|
||||
.group_view_alrm {
|
||||
background-color: #ed8701;
|
||||
background-color: #ed8701 !important;
|
||||
}
|
||||
.group_view_alrm * {
|
||||
color: #000000 !important;
|
||||
}
|
||||
.ui-btn-up-group_view_alrm,
|
||||
.ui-btn-hover-group_view_alrm {
|
||||
background-color: #f7931e;
|
||||
background-color: #f7931e !important;
|
||||
color: #fff;
|
||||
border: 1px solid #111111;
|
||||
font-weight: bold;
|
||||
|
|
@ -244,14 +244,14 @@ tr.group_view_alrm,
|
|||
|
||||
tr.group_view_unk,
|
||||
.group_view_unk {
|
||||
background-color: #c4c4c4;
|
||||
background-color: #c4c4c4 !important;
|
||||
}
|
||||
.group_view_unk * {
|
||||
color: #000000 !important;
|
||||
}
|
||||
.ui-btn-up-group_view_unk,
|
||||
.ui-btn-hover-group_view_unk {
|
||||
background-color: #999999;
|
||||
background-color: #999999 !important;
|
||||
color: #fff;
|
||||
border: 1px solid #111111;
|
||||
font-weight: bold;
|
||||
|
|
@ -302,10 +302,15 @@ tr.group_view_data,
|
|||
|
||||
.list_groups .number_count {
|
||||
right: 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.list_groups .name_count {
|
||||
left: 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.list_groups .name_count img {
|
||||
|
|
@ -316,13 +321,13 @@ tr.group_view_data,
|
|||
/* For mobiles */
|
||||
@media screen and (max-width: 750px) {
|
||||
.list_groups .name_count img {
|
||||
margin-top: -7px;
|
||||
margin-top: 0px;
|
||||
}
|
||||
}
|
||||
/* For tablets */
|
||||
@media screen and (min-width: 750px) {
|
||||
.list_groups .name_count img {
|
||||
margin-top: -3px;
|
||||
margin-top: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -450,134 +455,13 @@ table.event_details td.cell_event_name {
|
|||
|
||||
#validate_button {
|
||||
margin: 10px auto;
|
||||
display: block;
|
||||
padding: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
height: 40px;
|
||||
}
|
||||
|
||||
/*
|
||||
@media screen and (max-width: 25em)
|
||||
{
|
||||
.pandora_responsive th {
|
||||
padding-right: 10px;
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
.pandora_responsive .event_id td,
|
||||
.pandora_responsive .event_id th,
|
||||
.pandora_responsive .event_name td,
|
||||
.pandora_responsive .event_name th,
|
||||
.pandora_responsive .event_owner th,
|
||||
.pandora_responsive .event_timestamp th,
|
||||
.pandora_responsive .event_timestamp td,
|
||||
.pandora_responsive .event_type td,
|
||||
.pandora_responsive .event_type th {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.pandora_responsive .event_id {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.pandora_responsive .event_name {
|
||||
|
||||
}
|
||||
|
||||
.cell_event_name {
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
.event_timestamp td,
|
||||
.event_timestamp th {
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.cell_event_name {
|
||||
width: 300px;
|
||||
}
|
||||
|
||||
.cell_event_owner {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.event_type th {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.cell_event_type {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.event_owner {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.event_type {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.event_repeated {
|
||||
clear: left;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.event_repeated > th {
|
||||
float: left;
|
||||
}
|
||||
|
||||
|
||||
.cell_event_repeated {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.event_severity {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.event_severity > th {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.cell_event_severity {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.event_status > th {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.cell_event_status {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.event_acknowledged_by > th {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.cell_event_acknowledged_by {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.event_group > th {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.cell_event_group {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.event_tags > th {
|
||||
float: left;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.cell_event_tags {
|
||||
float: left;
|
||||
padding-left: 10px;
|
||||
width: 300px;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
@media screen and (max-width: 35em) {
|
||||
/* Hide the title of event name */
|
||||
#list_events tbody tr.events td.cell_0 b.ui-table-cell-label {
|
||||
|
|
@ -1149,6 +1033,8 @@ li.ui-btn {
|
|||
|
||||
.groups_sublist li {
|
||||
border-radius: 0px;
|
||||
margin-top: 5px !important;
|
||||
margin-bottom: 5px !important;
|
||||
}
|
||||
|
||||
.center {
|
||||
|
|
@ -1188,7 +1074,6 @@ li.ui-btn {
|
|||
/* For tablets */
|
||||
@media screen and (min-width: 750px) {
|
||||
.ui-content > .ui-btn {
|
||||
width: 31%;
|
||||
display: inline-block;
|
||||
margin: 8px 5px;
|
||||
height: 40px;
|
||||
|
|
@ -1278,42 +1163,61 @@ table.tactical_bars {
|
|||
font-weight: bold;
|
||||
}
|
||||
|
||||
/*INIT-----------Icons styles---------------------------------------*/
|
||||
/*INIT-----------Icons styles--------------------------------------- 1.3.1*/
|
||||
|
||||
.ui-icon-tactical_view {
|
||||
.ui-icon-tactical_view:after {
|
||||
background-image: url(../../../images/op_monitoring.menu.png) !important;
|
||||
background-position: unset !important;
|
||||
background-color: #333 !important;
|
||||
background-size: 21px 21px !important;
|
||||
}
|
||||
|
||||
.ui-icon-events {
|
||||
.ui-icon-events:after {
|
||||
background-image: url(../../../images/op_events.menu.png) !important;
|
||||
background-position: unset !important;
|
||||
background-color: #333 !important;
|
||||
}
|
||||
|
||||
.ui-icon-groups {
|
||||
.ui-icon-groups:after {
|
||||
background-image: url(../../../images/group.menu.png) !important;
|
||||
background-color: #333 !important;
|
||||
background-size: 20px 20px !important;
|
||||
}
|
||||
|
||||
.ui-icon-alerts {
|
||||
.ui-icon-alerts:after {
|
||||
background-image: url(../../../images/op_alerts.menu.png) !important;
|
||||
background-position: unset !important;
|
||||
background-color: #333 !important;
|
||||
}
|
||||
|
||||
.ui-icon-agents {
|
||||
.ui-icon-agents:after {
|
||||
background-image: url(../../../images/agent_mc.menu.png) !important;
|
||||
background-position: unset !important;
|
||||
background-color: #333 !important;
|
||||
}
|
||||
|
||||
.ui-icon-modules {
|
||||
.ui-icon-modules:after {
|
||||
background-image: url(../../../images/brick.menu.png) !important;
|
||||
background-color: #333 !important;
|
||||
background-size: 20px 20px !important;
|
||||
}
|
||||
|
||||
.ui-icon-network_maps {
|
||||
.ui-icon-network_maps:after {
|
||||
background-image: url(../../../images/op_network.menu.png) !important;
|
||||
background-position: unset !important;
|
||||
background-color: #333 !important;
|
||||
}
|
||||
|
||||
.ui-icon-visual_console {
|
||||
.ui-icon-visual_console:after {
|
||||
background-image: url(../../../images/visual_console.menu.png) !important;
|
||||
background-color: #333 !important;
|
||||
background-size: 20px 20px !important;
|
||||
}
|
||||
|
||||
.ui-icon-dashboard {
|
||||
.ui-icon-dashboard:after {
|
||||
background-image: url(../../../images/dashboard.menu.png) !important;
|
||||
background-position: unset !important;
|
||||
background-color: #333 !important;
|
||||
}
|
||||
|
||||
.ui-icon-tactical_view,
|
||||
|
|
@ -1325,10 +1229,13 @@ table.tactical_bars {
|
|||
.ui-icon-network_maps,
|
||||
.ui-icon-visual_console,
|
||||
.ui-icon-dashboard {
|
||||
background-color: #333 !important;
|
||||
background-position: center;
|
||||
border-radius: 15px !important;
|
||||
-webkit-border-radius: 15px !important;
|
||||
display: flex !important;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 5px !important;
|
||||
}
|
||||
|
||||
.ui-header.ui-bar-a .ui-btn-icon-notext .ui-btn-inner .ui-icon {
|
||||
|
|
@ -1353,10 +1260,8 @@ table.tactical_bars {
|
|||
.ui-icon-network_maps,
|
||||
.ui-icon-visual_console,
|
||||
.ui-icon-dashboard {
|
||||
width: 22px !important;
|
||||
height: 22px !important;
|
||||
margin-top: -13px !important;
|
||||
background-size: 16px 16px;
|
||||
height: 28px !important;
|
||||
margin-top: 0px !important;
|
||||
}
|
||||
}
|
||||
/* For tablets */
|
||||
|
|
@ -1370,18 +1275,20 @@ table.tactical_bars {
|
|||
.ui-icon-network_maps,
|
||||
.ui-icon-visual_console,
|
||||
.ui-icon-dashboard {
|
||||
width: 32px !important;
|
||||
height: 32px !important;
|
||||
margin-top: -17px !important;
|
||||
}
|
||||
}
|
||||
|
||||
/*END-----------Network maps styles---------------------------------------*/
|
||||
|
||||
#logout_dialog-button_close {
|
||||
display: block;
|
||||
display: flex;
|
||||
margin: 0 auto;
|
||||
margin-top: 20px;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding-top: 5px;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
|
||||
.ui-btn-active * {
|
||||
|
|
@ -1506,3 +1413,13 @@ div.nodata_container {
|
|||
.ui-popup-hidden {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.ui-collapsible-inset.ui-collapsible-themed-content .ui-collapsible-content {
|
||||
border-width: 0 !important;
|
||||
}
|
||||
|
||||
.ui-listview > .ui-li-static,
|
||||
.ui-listview > .ui-li-divider,
|
||||
.ui-listview > li > a.ui-btn {
|
||||
border-width: 0 !important;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -731,7 +731,7 @@ class Ui
|
|||
$html_title_close_button = "data-close-btn='yes'";
|
||||
}
|
||||
|
||||
$dialogHtml = "<div id='".$dialog_id."' class='".$dialog_class."' data-role='dialog' ".$html_title_close_button.">\n";
|
||||
$dialogHtml = "<div data-close-btn='right' id='".$dialog_id."' class='".$dialog_class."' data-role='dialog' ".$html_title_close_button.">\n";
|
||||
$dialogHtml .= "<div data-role='header'>\n";
|
||||
$dialogHtml .= "<h1 class='dialog_title'>".$title_text."</h1>\n";
|
||||
$dialogHtml .= "</div>\n";
|
||||
|
|
@ -785,10 +785,9 @@ class Ui
|
|||
echo " <meta charset='UTF-8' />\n";
|
||||
echo " <meta name='viewport' content='width=device-width, initial-scale=1'>\n";
|
||||
echo " <link rel='stylesheet' href='include/style/main.css' />\n";
|
||||
|
||||
echo " <link rel='stylesheet' href='include/style/jquery.mobile-1.3.1.css' />\n";
|
||||
echo " <link rel='stylesheet' href='include/style/jquery.mobile-1.4.5.css' />\n";
|
||||
echo " <script src='include/javascript/jquery.js'></script>\n";
|
||||
echo " <script src='include/javascript/jquery.mobile-1.3.1.js'></script>\n";
|
||||
echo " <script src='include/javascript/jquery.mobile-1.4.5.js'></script>\n";
|
||||
echo " <script src='../include/javascript/pandora.js'></script>\n";
|
||||
echo " <script src='../include/javascript/pandora_ui.js'></script>\n";
|
||||
|
||||
|
|
|
|||
|
|
@ -410,7 +410,7 @@ class Agent
|
|||
});
|
||||
|
||||
function agent_filter_modules() {
|
||||
$.mobile.showPageLoadingMsg();
|
||||
$.mobile.loading('show');
|
||||
$.ajax ({
|
||||
type: 'POST',
|
||||
url: 'index.php',
|
||||
|
|
@ -423,7 +423,7 @@ class Agent
|
|||
'filter': $('#filter-modules').val()
|
||||
},
|
||||
success: function(r) {
|
||||
$.mobile.hidePageLoadingMsg();
|
||||
$.mobile.loading('hide');
|
||||
var className = $('#list_agent_Modules').attr('class');
|
||||
if (document.getElementById('list_agent_Modules') == null) {
|
||||
$($('p.empty_advice')[0]).parent().html(r);
|
||||
|
|
@ -434,7 +434,7 @@ class Agent
|
|||
$('#list_agent_Modules').addClass(className);
|
||||
},
|
||||
error: function(r, t, e) {
|
||||
$.mobile.hidePageLoadingMsg();
|
||||
$.mobile.loading('hide');
|
||||
console.error(e);
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -893,7 +893,7 @@ class Events
|
|||
'
|
||||
<script type="text/javascript">
|
||||
function openDetails(id_event) {
|
||||
$.mobile.showPageLoadingMsg();
|
||||
$.mobile.loading("show");
|
||||
|
||||
postvars = {};
|
||||
postvars["action"] = "ajax";
|
||||
|
|
@ -952,24 +952,24 @@ class Events
|
|||
}
|
||||
else {
|
||||
//The event is validated.
|
||||
$("#validate_button").hide();
|
||||
$("#validate_button").hide();
|
||||
}
|
||||
$("#validate_button_loading").hide();
|
||||
$("#validate_button_fail").hide();
|
||||
$("#validate_button_correct").hide();
|
||||
|
||||
$.mobile.hidePageLoadingMsg();
|
||||
$.mobile.loading( "hide" );
|
||||
|
||||
$("#detail_event_dialog_hook").click();
|
||||
}
|
||||
else {
|
||||
$.mobile.hidePageLoadingMsg();
|
||||
$.mobile.loading( "hide" );
|
||||
$("#detail_event_dialog_error_hook").click();
|
||||
}
|
||||
},
|
||||
error:
|
||||
function (jqXHR, textStatus, errorThrown) {
|
||||
$.mobile.hidePageLoadingMsg();
|
||||
$.mobile.loading( "hide" );
|
||||
$("#detail_event_dialog_error_hook").click();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -93,37 +93,46 @@ class Groups
|
|||
$url_modules = 'index.php?page=modules&group=%s&status=%s';
|
||||
|
||||
foreach ($this->groups as $group) {
|
||||
// Calculate entire row color
|
||||
// Calculate entire row color.
|
||||
if ($group['_monitors_alerts_fired_'] > 0) {
|
||||
$color_class = 'group_view_alrm';
|
||||
$color = ' #f7931e';
|
||||
$status_image = ui_print_status_image('agent_alertsfired_ball.png', '', true);
|
||||
} else if ($group['_monitors_critical_'] > 0) {
|
||||
$color_class = 'group_view_crit';
|
||||
$color = ' #f85858';
|
||||
$status_image = ui_print_status_image('agent_critical_ball.png', '', true);
|
||||
} else if ($group['_monitors_warning_'] > 0) {
|
||||
$color_class = 'group_view_warn';
|
||||
$color = '#ffea59';
|
||||
$status_image = ui_print_status_image('agent_warning_ball.png', '', true);
|
||||
} else if ($group['_monitors_ok_'] > 0) {
|
||||
$color_class = 'group_view_ok';
|
||||
$color = '#6eb432';
|
||||
$status_image = ui_print_status_image('agent_ok_ball.png', '', true);
|
||||
} else if (($group['_monitors_unknown_'] > 0) || ($group['_agents_unknown_'] > 0)) {
|
||||
$color_class = 'group_view_unk';
|
||||
$color = '#999999';
|
||||
$status_image = ui_print_status_image('agent_no_monitors_ball.png', '', true);
|
||||
} else {
|
||||
$color_class = '';
|
||||
$color = '';
|
||||
$status_image = ui_print_status_image('agent_no_data_ball.png', '', true);
|
||||
}
|
||||
|
||||
$group['icon'] = ($group['icon'] == '') ? 'world' : $group['icon'];
|
||||
$group['_iconImg_'] = ($group['_iconImg_'] == '') ? 'world.png' : $group['_iconImg_'];
|
||||
$ui->contentAddHtml(
|
||||
'
|
||||
<style type="text/css">
|
||||
.ui-icon-group_'.$count.' {
|
||||
background: url("../images/groups_small/'.$group['icon'].'.png") no-repeat scroll 0 0 #F3F3F3 !important;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
margin-top: -12px !important;
|
||||
}
|
||||
background-color: '.$color.' !important;
|
||||
}
|
||||
|
||||
.ui-icon-group_'.$count.':after {
|
||||
background-color = #333 !important;
|
||||
background: url("../images/groups_small/'.$group['_iconImg_'].'") no-repeat scroll 0 0 #F3F3F3 !important;
|
||||
background-size: 22px 22px !important;
|
||||
}
|
||||
</style>
|
||||
'
|
||||
);
|
||||
|
|
|
|||
Loading…
Reference in New Issue