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

2013-07-04 Miguel de Dios <miguel.dedios@artica.es> 

* mobile/include/style/images/*,
	mobile/include/style/jquery.mobile-1.3.1.css,
	mobile/include/javascript/jquery.js, 
	mobile/include/javascript/jquery.mobile-1.3.1.js: added the
	jquery mobile, and made some changes in the css.
	
	* mobile/include/style/main.css, mobile/operation/agents.php,
	mobile/include/ui.class.php: some fixes.
	
	MERGED FROM THE BRANCH 4.0.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8474 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-07-04 16:55:39 +00:00
parent fb217cc7a0
commit f7e0327b78
12 changed files with 24221 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/ChangeLog
View File

@ -1,3 +1,16 @@
2013-07-04 Miguel de Dios <miguel.dedios@artica.es>
* mobile/include/style/images/*,
mobile/include/style/jquery.mobile-1.3.1.css,
mobile/include/javascript/jquery.js,
mobile/include/javascript/jquery.mobile-1.3.1.js: added the
jquery mobile, and made some changes in the css.
* mobile/include/style/main.css, mobile/operation/agents.php,
mobile/include/ui.class.php: some fixes.
MERGED FROM THE BRANCH 4.0.
2013-07-04 Miguel de Dios <miguel.dedios@artica.es> 2013-07-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: fixed include javascript in the * include/functions_graph.php: fixed include javascript in the

9597
pandora_console/mobile/include/javascript/jquery.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

11191
pandora_console/mobile/include/javascript/jquery.mobile-1.3.1.js Executable file
View File

File diff suppressed because it is too large Load Diff

BIN
pandora_console/mobile/include/style/images/ajax-loader.gif Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
pandora_console/mobile/include/style/images/icons-18-black.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
pandora_console/mobile/include/style/images/icons-18-white.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
pandora_console/mobile/include/style/images/icons-36-black.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
pandora_console/mobile/include/style/images/icons-36-white.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

3366
pandora_console/mobile/include/style/jquery.mobile-1.3.1.css Executable file
View File

File diff suppressed because it is too large Load Diff

23
pandora_console/mobile/include/style/main.css
View File

@ -447,7 +447,7 @@ table#list_events th {
color: #000000 !important; color: #000000 !important;
} }
@media screen and (max-width: 35em) { @media screen and (max-width: 25em) {
#list_agents .cell_2 .ui-table-cell-label, #list_agents .cell_2 .ui-table-cell-label,
#list_agents .cell_3 .ui-table-cell-label, #list_agents .cell_3 .ui-table-cell-label,
#list_agents .cell_6 .ui-table-cell-label, #list_agents .cell_6 .ui-table-cell-label,
@ -489,13 +489,28 @@ table#list_events th {
#list_agents .show_collapside { #list_agents .show_collapside {
display: inline !important; display: inline !important;
} }
#list_agents .cell_1,
#list_agents .cell_2,
#list_agents .cell_3,
#list_agents .cell_4 {
display: none !important;
}
#list_agents .cell_0 .ui-link {
font-size: 15px;
}
#list_agents .cell_6 .show_collapside {
display: inline !important;
}
} }
/*END-----------Agents styles-----------------------------------------*/ /*END-----------Agents styles-----------------------------------------*/
/*INIT-----------Modules styles---------------------------------------*/ /*INIT-----------Modules styles---------------------------------------*/
@media screen and (max-width: 35em) { @media screen and (max-width: 25em) {
#list_Modules .cell_1 .ui-table-cell-label, #list_Modules .cell_1 .ui-table-cell-label,
#list_Modules .cell_5 .ui-table-cell-label, #list_Modules .cell_5 .ui-table-cell-label,
#list_Modules .cell_6 .ui-table-cell-label { #list_Modules .cell_6 .ui-table-cell-label {
@ -538,7 +553,7 @@ table#list_events th {
color: #000000 !important; color: #000000 !important;
} }
@media screen and (max-width: 35em) { @media screen and (max-width: 25em) {
#list_Modules_Embedded .cell_1 .ui-table-cell-label, #list_Modules_Embedded .cell_1 .ui-table-cell-label,
#list_Modules_Embedded .cell_4 .ui-table-cell-label { #list_Modules_Embedded .cell_4 .ui-table-cell-label {
min-width: auto !important; min-width: auto !important;
@ -662,7 +677,7 @@ ul.ui-listview li.ui-btn div.ui-btn-inner div.ui-btn-text {
border-bottom: 1px solid grey !important; border-bottom: 1px solid grey !important;
} }
@media screen and (max-width: 35em) { @media screen and (max-width: 25em) {
.ui-table th, .ui-table td { .ui-table th, .ui-table td {
padding: 0px !important; padding: 0px !important;
} }

8
pandora_console/mobile/include/ui.class.php
View File

@ -647,9 +647,11 @@ class Ui {
echo " <meta name='viewport' content='width=device-width, initial-scale=1'>\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/main.css' />\n";
echo " <link rel='stylesheet' href='http://code.jquery.com/mobile/1.3.0/jquery.mobile-1.3.0.css' />\n"; echo " <link rel='stylesheet' href='include/style/jquery.mobile-1.3.1.css' />\n";
echo " <script src='http://code.jquery.com/jquery-1.9.1.js'></script>\n"; //echo " <link rel='stylesheet' href='http://code.jquery.com/mobile/1.3.0/jquery.mobile-1.3.0.css' />\n";
echo " <script src='http://code.jquery.com/mobile/1.3.0/jquery.mobile-1.3.0.js'></script>\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='http://code.jquery.com/mobile/1.3.0/jquery.mobile-1.3.0.js'></script>\n";
echo " </head>\n"; echo " </head>\n";
echo " <body>\n"; echo " <body>\n";

51
pandora_console/mobile/operation/agents.php
View File

@ -66,14 +66,14 @@ class Agents {
foreach ($listAgents['agents'] as $key => $agent) { foreach ($listAgents['agents'] as $key => $agent) {
$agent[0] = '<b class="ui-table-cell-label">' . $agent[0] = '<b class="ui-table-cell-label">' .
__('Agent') . '</b>' . $agent[0]; __('Agent') . '</b>' . $agent[0];
$agent[1] = '<b class="ui-table-cell-label">' . //~ $agent[1] = '<b class="ui-table-cell-label">' .
__('Description') . '</b>' . $agent[1]; //~ __('Description') . '</b>' . $agent[1];
$agent[2] = '<b class="ui-table-cell-label">' . $agent[2] = '<b class="ui-table-cell-label">' .
__('OS') . '</b>' . $agent[2]; __('OS') . '</b>' . $agent[2];
$agent[3] = '<b class="ui-table-cell-label">' . $agent[3] = '<b class="ui-table-cell-label">' .
__('Group') . '</b>' . $agent[3]; __('Group') . '</b>' . $agent[3];
$agent[4] = '<b class="ui-table-cell-label">' . //~ $agent[4] = '<b class="ui-table-cell-label">' .
__('Interval') . '</b>' . $agent[4]; //~ __('Interval') . '</b>' . $agent[4];
$agent[5] = '<b class="ui-table-cell-label">' . $agent[5] = '<b class="ui-table-cell-label">' .
__('Modules') . '</b>' . $agent[5]; __('Modules') . '</b>' . $agent[5];
$agent[6] = '<b class="ui-table-cell-label">' . $agent[6] = '<b class="ui-table-cell-label">' .
@ -251,21 +251,30 @@ class Agents {
foreach ($agents_db as $agent) { foreach ($agents_db as $agent) {
$row = array(); $row = array();
$row[0] = $row[__('Agent')] = '<a class="ui-link" data-ajax="false" href="index.php?page=agent&id=' . $agent['id_agente'] . '">' . io_safe_output($agent['nombre']) . '</a>';
$row[1] = $row[__('Description')] = '<span class="small">' . $img_status = agents_tree_view_status_img ($agent["critical_count"],
ui_print_truncate_text($agent["description"], 'description', false, true) . $agent["warning_count"], $agent["unknown_count"])
'</span>';
$row[0] = $row[__('Agent')] =
'<a class="ui-link" data-ajax="false" href="index.php?page=agent&id=' . $agent['id_agente'] . '">' . io_safe_output($agent['nombre']) . '</a>';
//~ $row[1] = $row[__('Description')] = '<span class="small">' .
//~ ui_print_truncate_text($agent["description"], 'description', false, true) .
//~ '</span>';
$row[2] = $row[__('OS')] = ui_print_os_icon ($agent["id_os"], false, true); $row[2] = $row[__('OS')] = ui_print_os_icon ($agent["id_os"], false, true);
$row[3] = $row[__('Group')] = ui_print_group_icon ($agent["id_grupo"], true); $row[3] = $row[__('Group')] = ui_print_group_icon ($agent["id_grupo"], true);
$row[4] = $row[__('Interval')] = '<span class="show_collapside" style="vertical-align: 0%; display: none; font-weight: bolder;">&nbsp;&nbsp;' . __('I.') . ' </span>' . //~ $row[4] = $row[__('Interval')] = '<span class="show_collapside" style="vertical-align: 0%; display: none; font-weight: bolder;">&nbsp;&nbsp;' . __('I.') . ' </span>' .
'<span style="vertical-align: 0%;">' . human_time_description_raw($agent["intervalo"]) . '</span>'; //~ '<span style="vertical-align: 0%;">' . human_time_description_raw($agent["intervalo"]) . '</span>';
$row[5] = $row[__('Status')] = '<span class="show_collapside" style="vertical-align: 10%; display: none; font-weight: bolder;">' . __('S.') . ' </span>' . agents_tree_view_status_img ($agent["critical_count"],
$agent["warning_count"], $agent["unknown_count"]); $row[5] = $row[__('Status')] = '<span class="show_collapside" style="vertical-align: 10%; display: none; font-weight: bolder;">' . __('S.') . ' </span>' .
$img_status;
$row[6] = $row[__('Alerts')] = '<span class="show_collapside" style="vertical-align: 10%; display: none; font-weight: bolder;">&nbsp;&nbsp;' . __('A.') . ' </span>' . agents_tree_view_alert_img ($agent["fired_count"]); $row[6] = $row[__('Alerts')] = '<span class="show_collapside" style="vertical-align: 10%; display: none; font-weight: bolder;">&nbsp;&nbsp;' . __('A.') . ' </span>' . agents_tree_view_alert_img ($agent["fired_count"]);
$row[7] = $row[__('Modules')] = '<span class="show_collapside" style="vertical-align: 0%; display: none; font-weight: bolder;">&nbsp;&nbsp;' . __('M.') . ' </span>' . $row[7] = $row[__('Modules')] =
'<span class="show_collapside" style="display: none; vertical-align: top;">' . $img_status . '</span>' .
'<span class="show_collapside" style="vertical-align: 0%; display: none; font-weight: bolder;">&nbsp;&nbsp;' . __('M.') . ' </span>' .
reporting_tiny_stats($agent, true); reporting_tiny_stats($agent, true);
$last_time = strtotime ($agent["ultimo_contacto"]); $last_time = strtotime ($agent["ultimo_contacto"]);
@ -363,14 +372,14 @@ class Agents {
.append(\"<tr class=''>\" + .append(\"<tr class=''>\" +
\"<th class='head_vertical'></th>\" + \"<th class='head_vertical'></th>\" +
\"<td class='cell_0'>\" + agent[0] + \"</td>\" + \"<td class='cell_0'>\" + agent[0] + \"</td>\" +
\"<td class='cell_1'>\" + agent[1] + \"</td>\" + // \"<td class='cell_1'>\" + agent[1] + \"</td>\" +
\"<td class='cell_2'>\" + agent[2] + \"</td>\" + \"<td class='cell_1'>\" + agent[2] + \"</td>\" +
\"<td class='cell_3'>\" + agent[3] + \"</td>\" + \"<td class='cell_2'>\" + agent[3] + \"</td>\" +
\"<td class='cell_4'>\" + agent[4] + \"</td>\" + // \"<td class='cell_4'>\" + agent[4] + \"</td>\" +
\"<td class='cell_5'>\" + agent[5] + \"</td>\" + \"<td class='cell_3'>\" + agent[5] + \"</td>\" +
\"<td class='cell_6'>\" + agent[6] + \"</td>\" + \"<td class='cell_4'>\" + agent[6] + \"</td>\" +
\"<td class='cell_7'>\" + agent[7] + \"</td>\" + \"<td class='cell_5'>\" + agent[7] + \"</td>\" +
\"<td class='cell_8'>\" + agent[8] + \"</td>\" + \"<td class='cell_6'>\" + agent[8] + \"</td>\" +
\"</tr>\"); \"</tr>\");
}); });