tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add new images to mobile version and fixed problems. Ticket internal: 79

Browse Source 
(cherry picked from commit 06b981e984f232566ce86fe759dc15801d23a466)
This commit is contained in:
m-lopez-f 2016-09-30 10:32:48 +02:00
parent 0ea6467045
commit f53de09659
8 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pandora_console/images/agent_mc.menu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 323 B

BIN
pandora_console/images/brick.menu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 392 B

BIN
pandora_console/images/group.menu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 348 B

BIN
pandora_console/mobile/images/metaconsole_mobile.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
pandora_console/mobile/images/pandora_mobile_console.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

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

@ -989,8 +989,9 @@ li.ui-btn {
} }
.login_logo img { .login_logo img {
width: 185px; width: 220px;
margin-bottom: 10px; margin-bottom: 10px;
padding-top: 5%;
} }
.untiny { .untiny {
@ -1033,6 +1034,7 @@ li.ui-btn {
.login_logo img { .login_logo img {
width: 300px; width: 300px;
margin-bottom: 20px; margin-bottom: 20px;
padding-top: 5%;
} }
.tiny { .tiny {
@ -1044,6 +1046,7 @@ li.ui-btn {
width: 60%; width: 60%;
margin: 0 auto; margin: 0 auto;
max-width: 300px; max-width: 300px;
padding-top: 5%;
} }
.event_name { .event_name {
@ -1089,35 +1092,35 @@ table.tactical_bars {
/*INIT-----------Icons styles---------------------------------------*/ /*INIT-----------Icons styles---------------------------------------*/
.ui-icon-tactical_view { .ui-icon-tactical_view {
background-image: url(../../../images/op_monitoring.png) !important; background-image: url(../../../images/op_monitoring.menu.png) !important;
} }
.ui-icon-events { .ui-icon-events {
background-image: url(../../../images/op_events.png) !important; background-image: url(../../../images/op_events.menu.png) !important;
} }
.ui-icon-groups { .ui-icon-groups {
background-image: url(../../../images/group.png) !important; background-image: url(../../../images/group.menu.png) !important;
} }
.ui-icon-alerts { .ui-icon-alerts {
background-image: url(../../../images/op_alerts.png) !important; background-image: url(../../../images/op_alerts.menu.png) !important;
} }
.ui-icon-agents { .ui-icon-agents {
background-image: url(../../../images/agent_mc.png) !important; background-image: url(../../../images/agent_mc.menu.png) !important;
} }
.ui-icon-modules { .ui-icon-modules {
background-image: url(../../../images/brick.png) !important; background-image: url(../../../images/brick.menu.png) !important;
} }
.ui-icon-network_maps { .ui-icon-network_maps {
background-image: url(../../../images/op_network.png) !important; background-image: url(../../../images/op_network.menu.png) !important;
} }
.ui-icon-visual_console { .ui-icon-visual_console {
background-image: url(../../../images/visual_console.png) !important; background-image: url(../../../images/visual_console.menu.png) !important;
} }
.ui-icon-tactical_view, .ui-icon-events, .ui-icon-tactical_view, .ui-icon-events,

13
pandora_console/mobile/include/user.class.php
View File

@ -202,6 +202,7 @@ class User {
global $pandora_version; global $pandora_version;
$ui = Ui::getInstance(); $ui = Ui::getInstance();
$system = System::getInstance();
$ui->createPage(); $ui->createPage();
if ($this->errorLogin) { if ($this->errorLogin) {
@ -224,10 +225,16 @@ class User {
$ui->createHeader(); $ui->createHeader();
$ui->showFooter(false); $ui->showFooter(false);
$ui->beginContent(); $ui->beginContent();
if (!$system->getConfig('metaconsole'))
$logo_image = html_print_image ("mobile/images/pandora_mobile_console.png",
true, array ("alt" => "logo", "border" => 0));
else
$logo_image = html_print_image ("mobile/images/metaconsole_mobile.png",
true, array ("alt" => "logo", "border" => 0),false, false, false, true);
$ui->contentAddHtml('<div style="text-align: center;" class="login_logo">' . $ui->contentAddHtml('<div style="text-align: center;" class="login_logo">' .
html_print_image ("mobile/images/pandora_mobile_console.png", $logo_image . '</div>');
true, array ("alt" => "logo", "border" => 0)) .
'</div>');
$ui->contentAddHtml('<div id="login_container">'); $ui->contentAddHtml('<div id="login_container">');
$ui->beginForm(); $ui->beginForm();
$ui->formAddHtml(html_print_input_hidden('action', 'login', true)); $ui->formAddHtml(html_print_input_hidden('action', 'login', true));

2
pandora_console/mobile/index.php
View File

@ -18,7 +18,7 @@ if (function_exists ('mb_internal_encoding')) {
mb_internal_encoding ("UTF-8"); mb_internal_encoding ("UTF-8");
} }
$develop_bypass = 1; $develop_bypass = 0;
require_once("include/ui.class.php"); require_once("include/ui.class.php");
require_once("include/system.class.php"); require_once("include/system.class.php");