fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #1753 from ralpheav/master

Browse Source 
BUG 11979: Cambios en el skin , la fecha en el mensaje de bienvenida en la esquina superior derecha, de la pantalla
This commit is contained in:
julceslauhub
2013-05-24 09:47:17 -07:00
parent 1723ba968e d29f0fa402
commit 57ec0643bd
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/skinEngine/skinEngine.php
View File

@@ -421,7 +421,7 @@ class SkinEngine
G::LoadClass( "configuration" ); G::LoadClass( "configuration" );
$conf = new Configurations(); $conf = new Configurations();
if (defined('SYS_SYS') && $conf->exists("ENVIRONMENT_SETTINGS")) { if (defined('SYS_SYS') && $conf->exists("ENVIRONMENT_SETTINGS")) {
$smarty->assign('udate', $conf->getSystemDate(date('Y-m-d'))); $smarty->assign('udate', $conf->getSystemDate(date('Y-m-d H:i:s')));
} else { } else {
$smarty->assign('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG)); $smarty->assign('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG));
} }
@@ -725,7 +725,7 @@ class SkinEngine
G::LoadClass( "configuration" ); G::LoadClass( "configuration" );
$conf = new Configurations(); $conf = new Configurations();
if ( defined('SYS_SYS') && $conf->exists("ENVIRONMENT_SETTINGS")) { if ( defined('SYS_SYS') && $conf->exists("ENVIRONMENT_SETTINGS")) {
$smarty->assign('udate', $conf->getSystemDate(date('Y-m-d'))); $smarty->assign('udate', $conf->getSystemDate(date('Y-m-d H:i:s')));
} else { } else {
$smarty->assign('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG)); $smarty->assign('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG));
} }

6
workflow/engine/templates/setup/environmentSettings.js
View File

@@ -279,6 +279,12 @@ Ext.onReady(function() {
success : function(res, req) { success : function(res, req) {
PMExt.notify(_('ID_PM_ENV_SETTINGS_TITLE'), req.result.msg); PMExt.notify(_('ID_PM_ENV_SETTINGS_TITLE'), req.result.msg);
saveButton.disable(); saveButton.disable();
currentLocation = parent.parent.location.href;
//frame = parent.location.href;
//settingsPage = location.href;
//location = settingsPage;
//parent.location = frame;
parent.parent.location = currentLocation;
} }
}); });
} }