From b986161695d873b39b71215859ee5d07c06c25d6 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Fri, 12 Feb 2016 10:39:40 -0400 Subject: [PATCH] HOR-202 - La fecha ya no se muestra en los templates de los skins por defecto y se elimino el codigo PHP que obtenia la fecha, ya que ahora es innecesario obtenerla --- workflow/engine/controllers/main.php | 1 - workflow/engine/skinEngine/base/layout.html | 3 +-- workflow/engine/skinEngine/neoclassic/layout.html | 3 +-- workflow/engine/skinEngine/simplified/layout.html | 3 +-- workflow/engine/skinEngine/skinEngine.php | 10 ---------- workflow/engine/skinEngine/uxmodern/layout.html | 3 +-- workflow/engine/skinEngine/uxs/layout.html | 3 +-- 7 files changed, 5 insertions(+), 21 deletions(-) diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php index d181d35a8..15435cc52 100644 --- a/workflow/engine/controllers/main.php +++ b/workflow/engine/controllers/main.php @@ -40,7 +40,6 @@ class Main extends Controller $this->setVar( 'logout', G::LoadTranslation( 'ID_LOGOUT' ) ); $this->setVar( 'workspace', defined( 'SYS_SYS' ) ? ucfirst( SYS_SYS ) : '' ); $this->setVar( 'user_avatar', 'users/users_ViewPhotoGrid?pUID=' . $_SESSION['USER_LOGGED'] . '&h=' . rand() ); - $this->setVar( 'udate', G::getformatedDate( date( 'Y-m-d' ), 'M d, yyyy', SYS_LANG ) ); // license notification $expireInLabel = ''; diff --git a/workflow/engine/skinEngine/base/layout.html b/workflow/engine/skinEngine/base/layout.html index 13b89edfc..ea2b8ddaa 100755 --- a/workflow/engine/skinEngine/base/layout.html +++ b/workflow/engine/skinEngine/base/layout.html @@ -21,8 +21,7 @@ {/if} {$logout}  
-     +     {else} {if $tracker eq 1} {$logout}   diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html index be5bbd643..e5ad8fc07 100644 --- a/workflow/engine/skinEngine/neoclassic/layout.html +++ b/workflow/engine/skinEngine/neoclassic/layout.html @@ -31,8 +31,7 @@ {/if} {$logout}  
-     +     {else} {if $tracker eq 1} {$logout}   diff --git a/workflow/engine/skinEngine/simplified/layout.html b/workflow/engine/skinEngine/simplified/layout.html index a7479c297..88f413ea8 100644 --- a/workflow/engine/skinEngine/simplified/layout.html +++ b/workflow/engine/skinEngine/simplified/layout.html @@ -18,8 +18,7 @@ {php}if ((int)$_SESSION['USER_LOGGED'] != 0) {{/php} {$msgVer} {$logout}  
-     +     {php}}{/php} diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php index 91d402859..36ea2be41 100755 --- a/workflow/engine/skinEngine/skinEngine.php +++ b/workflow/engine/skinEngine/skinEngine.php @@ -434,11 +434,6 @@ class SkinEngine G::LoadClass( "configuration" ); $conf = new Configurations(); $conf->getFormats(); - if (defined('SYS_SYS')) { - $smarty->assign('udate', $conf->getSystemDate(date('Y-m-d H:i:s'))); - } else { - $smarty->assign('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG)); - } $name = $conf->userNameFormat(isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME']: '', isset($_SESSION['USR_FULLNAME']) ? htmlentities($_SESSION['USR_FULLNAME'] , ENT_QUOTES, 'UTF-8'): '', isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : ''); $smarty->assign('user',$name); } @@ -758,11 +753,6 @@ class SkinEngine G::LoadClass( "configuration" ); $conf = new Configurations(); $conf->getFormats(); - if ( defined('SYS_SYS')) { - $smarty->assign('udate', $conf->getSystemDate(\ProcessMaker\Util\DateTime::convertUtcToTimeZone(date('Y-m-d H:i:s')))); - } else { - $smarty->assign('udate', G::getformatedDate(\ProcessMaker\Util\DateTime::convertUtcToTimeZone(date('Y-m-d H:i:s')), 'M d, yyyy', SYS_LANG)); - } $name = $conf->userNameFormat(isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME']: '', isset($_SESSION['USR_FULLNAME']) ? htmlentities($_SESSION['USR_FULLNAME'] , ENT_QUOTES, 'UTF-8'): '', isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : ''); $smarty->assign('user',$name); } diff --git a/workflow/engine/skinEngine/uxmodern/layout.html b/workflow/engine/skinEngine/uxmodern/layout.html index 66fc025a1..25e7d032a 100644 --- a/workflow/engine/skinEngine/uxmodern/layout.html +++ b/workflow/engine/skinEngine/uxmodern/layout.html @@ -21,8 +21,7 @@ {/if} {$logout}  
-     +     {/if} diff --git a/workflow/engine/skinEngine/uxs/layout.html b/workflow/engine/skinEngine/uxs/layout.html index e19068311..57e40b3d8 100644 --- a/workflow/engine/skinEngine/uxs/layout.html +++ b/workflow/engine/skinEngine/uxs/layout.html @@ -21,8 +21,7 @@ {/if} {$logout}  
-     +     {/if}