2013-11-28 Sergio Martin <sergio.martin@artica.es>
* mobile/include/style/main.css mobile/operation/networkmap.php mobile/operation/home.php mobile/operation/modules.php mobile/operation/alerts.php mobile/operation/networkmaps.php mobile/operation/agent.php mobile/operation/groups.php mobile/operation/agents.php mobile/operation/events.php mobile/operation/tactical.php: General improvements in mobile console. Cut some large strings, style fixes, back button path fix to iPhone app... git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9139 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo
parent
c6374a8648
commit
379d2b1eaa
|
|
@ -1,3 +1,19 @@
|
|||
2013-11-28 Sergio Martin <sergio.martin@artica.es>
|
||||
|
||||
* mobile/include/style/main.css
|
||||
mobile/operation/networkmap.php
|
||||
mobile/operation/home.php
|
||||
mobile/operation/modules.php
|
||||
mobile/operation/alerts.php
|
||||
mobile/operation/networkmaps.php
|
||||
mobile/operation/agent.php
|
||||
mobile/operation/groups.php
|
||||
mobile/operation/agents.php
|
||||
mobile/operation/events.php
|
||||
mobile/operation/tactical.php: General improvements
|
||||
in mobile console. Cut some large strings, style fixes,
|
||||
back button path fix to iPhone app...
|
||||
|
||||
2013-11-27 Sergio Martin <sergio.martin@artica.es>
|
||||
|
||||
* images/hourglass_dark.png
|
||||
|
|
|
|||
|
|
@ -54,19 +54,10 @@ tr.group_view_crit, .group_view_crit {
|
|||
.group_view_crit * {
|
||||
color: #000000 !important;
|
||||
}
|
||||
.ui-btn-up-group_view_crit {
|
||||
background: linear-gradient(#D50505, #FA3030) repeat scroll 0 0 #FA3030;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#D50505), to(#FA3030));
|
||||
.ui-btn-up-group_view_crit, .ui-btn-hover-group_view_crit {
|
||||
background-color: #FF4040;
|
||||
color: #fff;
|
||||
border: 1px solid #111111;
|
||||
color: #000000;
|
||||
font-weight: bold;
|
||||
text-shadow: none;
|
||||
}
|
||||
.ui-btn-hover-group_view_crit {
|
||||
background: linear-gradient(#C41616, #E94141) repeat scroll 0 0 #E94141;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#C41616), to(#E94141));
|
||||
border: 1px solid #111111;
|
||||
color: #000000;
|
||||
font-weight: bold;
|
||||
text-shadow: none;
|
||||
}
|
||||
|
|
@ -81,25 +72,14 @@ tr.group_view_crit, .group_view_crit {
|
|||
.group_view_norm * {
|
||||
color: #000000 !important;
|
||||
}
|
||||
.ui-btn-up-group_view_normal,
|
||||
.ui-btn-up-group_view_norm {
|
||||
background: linear-gradient(#D7D7D7, #FFFFFF) repeat scroll 0 0 #FFFFFF;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#D7D7D7), to(#FFFFFF));
|
||||
.ui-btn-up-group_view_normal, .ui-btn-hover-group_view_normal,
|
||||
.ui-btn-up-group_view_norm, .ui-btn-hover-group_view_norm {
|
||||
background-color: #6EB432;
|
||||
color: #fff;
|
||||
border: 1px solid #111111;
|
||||
color: #000000;
|
||||
font-weight: bold;
|
||||
text-shadow: none;
|
||||
}
|
||||
.ui-btn-hover-group_view_normal,
|
||||
.ui-btn-hover-group_view_normal {
|
||||
background: linear-gradient(#D7D7D7, #FFFFFF) repeat scroll 0 0 #FFFFFF;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#D7D7D7), to(#FFFFFF));
|
||||
border: 1px solid #111111;
|
||||
color: #000000;
|
||||
font-weight: bold;
|
||||
text-shadow: none;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.group_view_ok, .group_view_ok * {
|
||||
|
|
@ -109,23 +89,13 @@ tr.group_view_crit, .group_view_crit {
|
|||
.group_view_ok * {
|
||||
color: #000000 !important;
|
||||
}
|
||||
.ui-btn-up-group_view_ok {
|
||||
background: linear-gradient(#007000, #00C000) repeat scroll 0 0 #00C000;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#007000), to(#00C000));
|
||||
.ui-btn-up-group_view_ok, .ui-btn-hover-group_view_ok {
|
||||
background-color: #6EB432;
|
||||
color: #fff;
|
||||
border: 1px solid #111111;
|
||||
color: #000000;
|
||||
font-weight: bold;
|
||||
text-shadow: none;
|
||||
}
|
||||
.ui-btn-hover-group_view_ok {
|
||||
background: linear-gradient(#096709, #0FB10F) repeat scroll 0 0 #0FB10F;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#096709), to(#0FB10F));
|
||||
border: 1px solid #111111;
|
||||
color: #000000;
|
||||
font-weight: bold;
|
||||
text-shadow: none;
|
||||
}
|
||||
|
||||
|
||||
|
||||
tr.group_view_warn, .group_view_warn, tr.group_view_warn.a, a.group_view_warn, tr.a.group_view_warn {
|
||||
|
|
@ -134,23 +104,13 @@ tr.group_view_warn, .group_view_warn, tr.group_view_warn.a, a.group_view_warn, t
|
|||
a.group_view_warn {
|
||||
color: #000000 !important;
|
||||
}
|
||||
.ui-btn-up-group_view_warn {
|
||||
background: linear-gradient(#D0BF0A, #F5E535) repeat scroll 0 0 #F5E535;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#D0BF0A), to(#F5E535));
|
||||
.ui-btn-up-group_view_warn, .ui-btn-hover-group_view_warn {
|
||||
background-color: #F2D400;
|
||||
color: #111;
|
||||
border: 1px solid #111111;
|
||||
color: #000000;
|
||||
font-weight: bold;
|
||||
text-shadow: none;
|
||||
}
|
||||
.ui-btn-hover-group_view_warn {
|
||||
background: linear-gradient(#BFB11B, #E4D746) repeat scroll 0 0 #E4D746;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#BFB11B), to(#E4D746));
|
||||
border: 1px solid #111111;
|
||||
color: #000000;
|
||||
font-weight: bold;
|
||||
text-shadow: none;
|
||||
}
|
||||
|
||||
|
||||
|
||||
tr.group_view_alrm, .group_view_alrm {
|
||||
|
|
@ -159,23 +119,13 @@ tr.group_view_alrm, .group_view_alrm {
|
|||
.group_view_alrm * {
|
||||
color: #000000 !important;
|
||||
}
|
||||
.ui-btn-up-group_view_alrm {
|
||||
background: linear-gradient(#9D5A01, #ED8701) repeat scroll 0 0 #ED8701;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#9D5A01), to(#ED8701));
|
||||
.ui-btn-up-group_view_alrm, .ui-btn-hover-group_view_alrm {
|
||||
background-color: #F7931E;
|
||||
color: #111;
|
||||
border: 1px solid #111111;
|
||||
color: #000000;
|
||||
font-weight: bold;
|
||||
text-shadow: none;
|
||||
}
|
||||
.ui-btn-hover-group_view_alrm {
|
||||
background: linear-gradient(#91580D, #DA8414) repeat scroll 0 0 #DA8414;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#91580D), to(#DA8414));
|
||||
border: 1px solid #111111;
|
||||
color: #000000;
|
||||
font-weight: bold;
|
||||
text-shadow: none;
|
||||
}
|
||||
|
||||
|
||||
|
||||
tr.group_view_unk, .group_view_unk {
|
||||
|
|
@ -184,19 +134,10 @@ tr.group_view_unk, .group_view_unk {
|
|||
.group_view_unk * {
|
||||
color: #000000 !important;
|
||||
}
|
||||
.ui-btn-up-group_view_unk {
|
||||
background: linear-gradient(#9C9C9C, #C4C4C4) repeat scroll 0 0 #C4C4C4;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#9C9C9C), to(#C4C4C4));
|
||||
.ui-btn-up-group_view_unk, .ui-btn-hover-group_view_unk {
|
||||
background-color: #999999;
|
||||
color: #fff;
|
||||
border: 1px solid #111111;
|
||||
color: #000000;
|
||||
font-weight: bold;
|
||||
text-shadow: none;
|
||||
}
|
||||
.ui-btn-hover-group_view_unk {
|
||||
background: linear-gradient(#888888, #B0B0B0) repeat scroll 0 0 #ECECEC;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#888888), to(#B0B0B0));
|
||||
border: 1px solid #111111;
|
||||
color: #000000;
|
||||
font-weight: bold;
|
||||
text-shadow: none;
|
||||
}
|
||||
|
|
@ -794,3 +735,7 @@ span.nobold * {
|
|||
.events_agent b.ui-table-cell-label {
|
||||
display: block !important;
|
||||
}
|
||||
|
||||
#list_Modules *, #list_agents *, #list_alerts *, #list_networkmaps * {
|
||||
color: #222;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ class Agent {
|
|||
$agent_name = (string) agents_get_name ($this->id);
|
||||
|
||||
$ui->createDefaultHeader(
|
||||
sprintf(__("PandoraFMS: %s"), $agent_name),
|
||||
sprintf('%s', $agent_name),
|
||||
$ui->createHeaderButton(
|
||||
array('icon' => 'back',
|
||||
'pos' => 'left',
|
||||
|
|
|
|||
|
|
@ -152,12 +152,12 @@ class Agents {
|
|||
$ui = Ui::getInstance();
|
||||
|
||||
$ui->createPage();
|
||||
$ui->createDefaultHeader(__("PandoraFMS: Agents"),
|
||||
$ui->createDefaultHeader(__("Agents"),
|
||||
$ui->createHeaderButton(
|
||||
array('icon' => 'back',
|
||||
'pos' => 'left',
|
||||
'text' => __('Back'),
|
||||
'href' => 'index.php')));
|
||||
'href' => 'index.php?page=home')));
|
||||
$ui->showFooter(false);
|
||||
$ui->beginContent();
|
||||
$filter_title = sprintf(__('Filter Agents by %s'),
|
||||
|
|
|
|||
|
|
@ -147,12 +147,12 @@ class Alerts {
|
|||
$ui = Ui::getInstance();
|
||||
|
||||
$ui->createPage();
|
||||
$ui->createDefaultHeader(__("PandoraFMS: Alerts"),
|
||||
$ui->createDefaultHeader(__("Alerts"),
|
||||
$ui->createHeaderButton(
|
||||
array('icon' => 'back',
|
||||
'pos' => 'left',
|
||||
'text' => __('Back'),
|
||||
'href' => 'index.php')));
|
||||
'href' => 'index.php?page=home')));
|
||||
$ui->showFooter(false);
|
||||
$ui->beginContent();
|
||||
$filter_title = sprintf(__('Filter Alerts by %s'),
|
||||
|
|
@ -286,6 +286,7 @@ class Alerts {
|
|||
}
|
||||
else {
|
||||
$tableHTML = new Table();
|
||||
$tableHTML->id = 'list_alerts';
|
||||
$tableHTML->importFromHash($table);
|
||||
if (!$return) {
|
||||
$ui->contentAddHtml($tableHTML->getHTML());
|
||||
|
|
@ -335,4 +336,4 @@ class Alerts {
|
|||
}
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -503,7 +503,7 @@ class Events {
|
|||
array('icon' => 'back',
|
||||
'pos' => 'left',
|
||||
'text' => __('Back'),
|
||||
'href' => 'index.php')));
|
||||
'href' => 'index.php?page=home')));
|
||||
$ui->showFooter(false);
|
||||
$ui->beginContent();
|
||||
$ui->contentAddHtml("<a id='detail_event_dialog_hook' href='#detail_event_dialog' style='display:none;'>detail_event_hook</a>");
|
||||
|
|
|
|||
|
|
@ -57,11 +57,11 @@ class Groups {
|
|||
$ui = Ui::getInstance();
|
||||
|
||||
$ui->createPage();
|
||||
$ui->createDefaultHeader(__("PandoraFMS: Groups"), $ui->createHeaderButton(
|
||||
$ui->createDefaultHeader(__("Groups"), $ui->createHeaderButton(
|
||||
array('icon' => 'back',
|
||||
'pos' => 'left',
|
||||
'text' => __('Back'),
|
||||
'href' => 'index.php')));
|
||||
'href' => 'index.php?page=home')));
|
||||
$ui->showFooter(false);
|
||||
$ui->beginContent();
|
||||
|
||||
|
|
@ -166,4 +166,4 @@ class Groups {
|
|||
|
||||
return $return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ class Home {
|
|||
'text' => __('Logout'),
|
||||
'href' => 'index.php?action=logout'));
|
||||
}
|
||||
$ui->createHeader(__("PandoraFMS: Home"), $left_button);
|
||||
$ui->createHeader(__("Home"), $left_button);
|
||||
$ui->showFooter(false);
|
||||
$ui->beginContent();
|
||||
$ui->beginForm("index.php?page=agents");
|
||||
|
|
@ -52,7 +52,7 @@ class Home {
|
|||
//List of buttons
|
||||
$options = array('icon' => 'gear',
|
||||
'pos' => 'right',
|
||||
'text' => __('Tactical'),
|
||||
'text' => __('Tactical view'),
|
||||
'href' => 'index.php?page=tactical');
|
||||
$ui->contentAddHtml($ui->createButton($options));
|
||||
$options = array('icon' => 'info',
|
||||
|
|
|
|||
|
|
@ -177,12 +177,12 @@ class Modules {
|
|||
$ui = Ui::getInstance();
|
||||
|
||||
$ui->createPage();
|
||||
$ui->createDefaultHeader(__("PandoraFMS: Modules"),
|
||||
$ui->createDefaultHeader(__("Modules"),
|
||||
$ui->createHeaderButton(
|
||||
array('icon' => 'back',
|
||||
'pos' => 'left',
|
||||
'text' => __('Back'),
|
||||
'href' => 'index.php')));
|
||||
'href' => 'index.php?page=home')));
|
||||
$ui->showFooter(false);
|
||||
$ui->beginContent();
|
||||
$filter_title = sprintf(__('Filter Modules by %s'),
|
||||
|
|
@ -397,16 +397,17 @@ class Modules {
|
|||
$modules = array();
|
||||
foreach ($modules_db as $module) {
|
||||
$row = array();
|
||||
|
||||
$row[0] = $row[__('Module name')] =
|
||||
'<span class="data"><span class="show_collapside" style="display: none; font-weight: bolder;">' . __('Module') . ' </span>' .
|
||||
$module['module_name'];
|
||||
|
||||
if ($this->columns['agent']) {
|
||||
$row[0] = $row[__('Agent name')] =
|
||||
$row[2] = $row[__('Agent name')] =
|
||||
'<span class="data"><span class="show_collapside" style="display: none; font-weight: bolder;">' . __('Agent') . ' </span>' .
|
||||
'<a class="ui-link" data-ajax="false" href="index.php?page=agent&id=' . $module["id_agent"] . '">' . $module['agent_name'] . '</a>' .
|
||||
'</span>';
|
||||
}
|
||||
|
||||
$row[2] = $row[__('Module name')] =
|
||||
'<span class="data"><span class="show_collapside" style="display: none; font-weight: bolder;">' . __('Module') . ' </span>' .
|
||||
$module['module_name'];
|
||||
if ($module['utimestamp'] == 0 && (($module['module_type'] < 21 ||
|
||||
$module['module_type'] > 23) && $module['module_type'] != 100)) {
|
||||
$row[5] = $row[__('Status')] = ui_print_status_image(STATUS_MODULE_NO_DATA,
|
||||
|
|
@ -616,8 +617,8 @@ class Modules {
|
|||
$.each(data.modules, function(key, module) {
|
||||
$(\"table#list_Modules tbody\").append(\"<tr>\" +
|
||||
\"<th class='head_vertical'></th>\" +
|
||||
\"<td class='cell_0'><b class='ui-table-cell-label'>" . __('Agent name') . "</b>\" + module[0] + \"</td>\" +
|
||||
\"<td class='cell_1'><b class='ui-table-cell-label'>" . __('Module name') . "</b>\" + module[2] + \"</td>\" +
|
||||
\"<td class='cell_1'><b class='ui-table-cell-label'>" . __('Module name') . "</b>\" + module[0] + \"</td>\" +
|
||||
\"<td class='cell_0'><b class='ui-table-cell-label'>" . __('Agent name') . "</b>\" + module[2] + \"</td>\" +
|
||||
\"<td class='cell_2'><b class='ui-table-cell-label'>" . __('Status') . "</b>\" + module[5] + \"</td>\" +
|
||||
\"<td class='cell_3'><b class='ui-table-cell-label'>" . __('Interval') . "</b>\" + module[4] + \"</td>\" +
|
||||
\"<td class='cell_4'><b class='ui-table-cell-label'>" . __('Timestamp') . "</b>\" + module[6] + \"</td>\" +
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ class Networkmap {
|
|||
|
||||
$ui->createPage();
|
||||
$ui->createDefaultHeader(
|
||||
sprintf(__("PandoraFMS: Networkmap %s"),
|
||||
sprintf("%s",
|
||||
$this->network_map['name']),
|
||||
$ui->createHeaderButton(
|
||||
array('icon' => 'back',
|
||||
|
|
@ -235,4 +235,4 @@ class Networkmap {
|
|||
$ui->showPage();
|
||||
}
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -105,12 +105,12 @@ class Networkmaps {
|
|||
$ui = Ui::getInstance();
|
||||
|
||||
$ui->createPage();
|
||||
$ui->createDefaultHeader(__("PandoraFMS: Networkmaps"),
|
||||
$ui->createDefaultHeader(__("Networkmaps"),
|
||||
$ui->createHeaderButton(
|
||||
array('icon' => 'back',
|
||||
'pos' => 'left',
|
||||
'text' => __('Back'),
|
||||
'href' => 'index.php')));
|
||||
'href' => 'index.php?page=home')));
|
||||
$ui->showFooter(false);
|
||||
$ui->beginContent();
|
||||
$filter_title = sprintf(__('Filter Networkmaps by %s'),
|
||||
|
|
@ -230,4 +230,4 @@ class Networkmaps {
|
|||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -49,12 +49,12 @@ class Tactical {
|
|||
$ui = Ui::getInstance();
|
||||
|
||||
$ui->createPage();
|
||||
$ui->createDefaultHeader(__("PandoraFMS: Tactical"),
|
||||
$ui->createDefaultHeader(__("Tactical view"),
|
||||
$ui->createHeaderButton(
|
||||
array('icon' => 'back',
|
||||
'pos' => 'left',
|
||||
'text' => __('Back'),
|
||||
'href' => 'index.php')));
|
||||
'href' => 'index.php?page=home')));
|
||||
$ui->showFooter(false);
|
||||
$ui->beginContent();
|
||||
$ui->contentBeginGrid('responsive');
|
||||
|
|
|
|||
Loading…
Reference in New Issue