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

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

* mobile/operation/modules.php, mobile/include/style/main.css:
	yes another fixes.
	
	MERGED FROM BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8494 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-07-08 10:59:07 +00:00
parent 652e8006de
commit eebc24e2a5
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-07-08 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/modules.php, mobile/include/style/main.css:
yes another fixes.
MERGED FROM BRANCH 4.0
2013-07-08 Miguel de Dios <miguel.dedios@artica.es> 2013-07-08 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/alerts.php, mobile/operation/events.php, * mobile/operation/alerts.php, mobile/operation/events.php,

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

@ -598,7 +598,8 @@ table#list_events th {
*/ */
} }
#list_Modules_Embedded .cell_2 { #list_Modules_Embedded .cell_2,
#list_Modules_Embedded .cell_4 {
display: none !important; display: none !important;
} }
@ -610,7 +611,8 @@ table#list_events th {
} }
} }
#list_Modules_Embedded .cell_4 a { #list_Modules_Embedded .cell_4 a,
#list_Modules_Embedded .cell_1 a {
color: #000000 !important; color: #000000 !important;
} }
/* /*
@ -677,6 +679,10 @@ ul.ui-listview li.ui-btn div.ui-btn-inner div.ui-btn-text {
padding-left: 5px; padding-left: 5px;
} }
li.ui-btn {
margin-bottom: 4px !important;
margin-top: 4px !important;
}
/*INIT---------Fix the tons of air between the rows in small table----*/ /*INIT---------Fix the tons of air between the rows in small table----*/

14
pandora_console/mobile/operation/modules.php
View File

@ -541,14 +541,26 @@ class Modules {
} }
} }
else { else {
if (!$return) {
$table = new Table(); $table = new Table();
$table->id = 'list_Modules'; $table->id = 'list_Modules';
$table->importFromHash($listModules['modules']); $table->importFromHash($listModules['modules']);
if (!$return) {
$ui->contentAddHtml($table->getHTML()); $ui->contentAddHtml($table->getHTML());
} }
else { else {
foreach ($listModules['modules'] as $key => $module) {
$listModules['modules'][$key][__('Status')] .=
'<span style="display: none;" class="show_collapside">' .
$listModules['modules'][$key][__('Data')] .
'</span>';
}
$table = new Table();
$table->id = 'list_Modules_Embedded'; $table->id = 'list_Modules_Embedded';
$table->importFromHash($listModules['modules']);
$html = $table->getHTML(); $html = $table->getHTML();
return $html; return $html;