diff --git a/gulliver/bin/tasks/templates/green.html.tpl b/gulliver/bin/tasks/templates/green.html.tpl index 50f0cbb56..0728dae58 100755 --- a/gulliver/bin/tasks/templates/green.html.tpl +++ b/gulliver/bin/tasks/templates/green.html.tpl @@ -6,35 +6,7 @@ {$header} @@ -109,7 +81,7 @@
{php}if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {{/php} {php}if ( defined('SYS_SYS') ) {{/php} - | System Information |
+ {php}}{/php}
Copyright © 2003-2008 Colosa, Inc. All rights reserved. {php}}{/php} diff --git a/gulliver/bin/tasks/templates/login.php.tpl b/gulliver/bin/tasks/templates/login.php.tpl index 9beb75d8f..e9f39f8a0 100755 --- a/gulliver/bin/tasks/templates/login.php.tpl +++ b/gulliver/bin/tasks/templates/login.php.tpl @@ -32,35 +32,4 @@ $G_PUBLISH = new Publisher; $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', '', SYS_URI.'login/authentication.php'); G::RenderPage( "publish" ); -?> - + diff --git a/workflow/engine/menus/setup.php b/workflow/engine/menus/setup.php index fe01eef05..011dbf0eb 100755 --- a/workflow/engine/menus/setup.php +++ b/workflow/engine/menus/setup.php @@ -79,6 +79,7 @@ if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1) { $G_TMP_MENU->AddIdRawOption('AUTHSOURCES', '../authSources/authSources_List', G::LoadTranslation('ID_AUTH_SOURCES'), '', '', 'users'); $G_TMP_MENU->AddIdRawOption('UX', '../admin/uxList', G::LoadTranslation('ID_USER_EXPERIENCE'), '', '', 'users'); $G_TMP_MENU->AddIdRawOption('SYSTEM', '../admin/system', G::LoadTranslation('ID_SYSTEM'), '', '', 'settings'); + $G_TMP_MENU->AddIdRawOption('INFORMATION', '../setup/systemInfo?option=processInfo', G::LoadTranslation('ID_SYSTEM_INFO'), '', '', 'settings'); } if ($RBAC->userCanAccess('PM_SETUP') == 1) { diff --git a/workflow/engine/methods/login/sysLogin.php b/workflow/engine/methods/login/sysLogin.php index 60be2716d..7024df2c0 100755 --- a/workflow/engine/methods/login/sysLogin.php +++ b/workflow/engine/methods/login/sysLogin.php @@ -140,52 +140,6 @@ G::RenderPage ("publish"); ?> addContent("setup/phpInfo"); //Adding a html file .html $oHeadPublisher->addExtJsScript("setup/phpInfo", false); //Adding a javascript file .js + G::RenderPage("publish", "extJs"); + break; + case "processInfo": + $oHeadPublisher = &headPublisher::getSingleton(); + $oHeadPublisher->addContent("setup/dbInfo"); //Adding a html file .html + $oHeadPublisher->addExtJsScript("setup/dbInfo", false); //Adding a javascript file .js + G::RenderPage("publish", "extJs"); break; default: diff --git a/workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css b/workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css index ee318afb8..6e05a6a6e 100755 --- a/workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css +++ b/workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css @@ -811,6 +811,12 @@ antes funcionaba. height: 16px !important; } +.ICON_INFORMATION{ + /*ss_information*/ + background-image: url(/images/icons_silk/sprites.png) !important; + background-position:0 -8749px !important +} + /* Language Support module styles*/ .upload-icon { background: url('/images/cases-documents.png') no-repeat 0 0 !important; diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php index 1772457aa..cf49a6740 100755 --- a/workflow/engine/skinEngine/skinEngine.php +++ b/workflow/engine/skinEngine/skinEngine.php @@ -332,9 +332,6 @@ class SkinEngine global $G_ID_MENU_SELECTED; global $G_ID_SUB_MENU_SELECTED; - if (! defined('DB_SYSTEM_INFORMATION')) - define('DB_SYSTEM_INFORMATION', 1); - G::verifyPath(PATH_SMARTY_C, true); G::verifyPath(PATH_SMARTY_CACHE, true); @@ -361,10 +358,6 @@ class SkinEngine $footer = ''; if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) { - if (DB_SYSTEM_INFORMATION == 1) { - $footer = "| " . G::LoadTranslation('ID_SYSTEM_INFO') . " |
"; - } - $freeOfChargeText = ""; if (! defined('SKIP_FREE_OF_CHARGE_TEXT')) { $freeOfChargeText = "Supplied free of charge with no support, certification, warranty,
maintenance nor indemnity by Colosa and its Certified Partners."; @@ -458,9 +451,6 @@ class SkinEngine $footer = ''; if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) { - if ( defined('SYS_SYS') ) { - $footer = "| " . G::LoadTranslation('ID_SYSTEM_INFO') . " |
"; - } $footer .= "
Copyright © 2003-" . date('Y') . " Colosa, Inc. All rights reserved."; } @@ -574,10 +564,6 @@ class SkinEngine global $G_ID_MENU_SELECTED; global $G_ID_SUB_MENU_SELECTED; - if (! defined('DB_SYSTEM_INFORMATION')) { - define('DB_SYSTEM_INFORMATION', 1); - } - G::verifyPath(PATH_SMARTY_C, true); G::verifyPath(PATH_SMARTY_CACHE, true); @@ -622,9 +608,6 @@ class SkinEngine $footer = ''; if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) { - if (DB_SYSTEM_INFORMATION == 1) { - $footer = "| " . G::LoadTranslation('ID_SYSTEM_INFO') . " |
"; - } $freeOfChargeText = ""; if (! defined('SKIP_FREE_OF_CHARGE_TEXT')) diff --git a/workflow/engine/skinEngine/uxmodern/css/pmos-xtheme-gray.css b/workflow/engine/skinEngine/uxmodern/css/pmos-xtheme-gray.css index 929bbfa7f..a6ac017b0 100644 --- a/workflow/engine/skinEngine/uxmodern/css/pmos-xtheme-gray.css +++ b/workflow/engine/skinEngine/uxmodern/css/pmos-xtheme-gray.css @@ -836,6 +836,12 @@ antes funcionaba. height: 16px !important; } +.ICON_INFORMATION{ + /*ss_information*/ + background-image: url(/images/icons_silk/sprites.png) !important; + background-position:0 -8749px !important +} + /* Language Support module styles*/ .upload-icon { background: url('/images/cases-documents.png') no-repeat 0 0 !important; diff --git a/workflow/engine/templates/setup/dbInfo.html b/workflow/engine/templates/setup/dbInfo.html new file mode 100644 index 000000000..281c6866c --- /dev/null +++ b/workflow/engine/templates/setup/dbInfo.html @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/workflow/engine/templates/setup/dbInfo.js b/workflow/engine/templates/setup/dbInfo.js new file mode 100644 index 000000000..f00cd390d --- /dev/null +++ b/workflow/engine/templates/setup/dbInfo.js @@ -0,0 +1,30 @@ +Ext.namespace("dbInfo"); + +dbInfo.application = { + init: function () + { + + var sumaryInfPanel = PMExt.createInfoPanel('../main/getSystemInfo'); + + var panelInfo = new Ext.Panel({ + id:'panelInfo', + title: _("ID_SYSTEM_INFO"), + frame:true, + autoWidth:true, + autoHeight:true, + collapsible:false, + items:[ + sumaryInfPanel + ] + }); + + //Load all panels + var viewport = new Ext.Viewport({ + layout: "fit", + items: [panelInfo] + }); + } +} + +Ext.onReady(dbInfo.application.init, dbInfo.application); + diff --git a/workflow/engine/xmlform/login/login.xml b/workflow/engine/xmlform/login/login.xml index 41373f02f..61c0b20f6 100755 --- a/workflow/engine/xmlform/login/login.xml +++ b/workflow/engine/xmlform/login/login.xml @@ -84,35 +84,6 @@ var dynaformOnload = function() { } }; -var openInfoPanel = function() { - var oInfoPanel = new leimnud.module.panel(); - oInfoPanel.options = { - size: {w:500,h:424}, - position: {x:0,y:0,center:true}, - title: '@G::LoadTranslation(ID_SYSTEM_INFO)', - theme: 'processmaker', - control: { - close: true, - drag: false - }, - fx:{ - modal: true - } - }; - oInfoPanel.setStyle = {modal: { - backgroundColor: 'white' - }}; - oInfoPanel.make(); - var oRPC = new leimnud.module.rpc.xmlhttp({ - url: '../login/dbInfo', - async: false, - method: 'POST', - args: '' - }); - oRPC.make(); - oInfoPanel.addContent(oRPC.xmlhttp.responseText); -}; - leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() { setNestedProperty(this, Array('disabled'), 'true'); setNestedProperty(this, Array('value'), @@LOGIN_VERIFY_MSG);