From ccf4844f14d47887906024bd9cd6a6217b198465 Mon Sep 17 00:00:00 2001 From: Ralph Asendeteufrer Date: Thu, 4 Oct 2012 10:04:49 -0400 Subject: [PATCH] BUG 9849 - When you add a new skin - the skin menu does not show it selected PROBLEM The skin table does not show any row selected to determine which is the selected one. SOLVED Adding an small feature to display italic, bold text and set a checked image in the current skin row. --- workflow/engine/methods/setup/skin_Ajax.php | 17 ++++++++-------- workflow/engine/templates/setup/skinList.js | 22 +++++++++++++++------ 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php index 8bf9c2acc..0d4658561 100755 --- a/workflow/engine/methods/setup/skin_Ajax.php +++ b/workflow/engine/methods/setup/skin_Ajax.php @@ -49,16 +49,17 @@ function skinList() foreach ($skinList['skins'] as $key => $value) { if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs') { - if($skinList['currentSkin']==$value['SKIN_FOLDER_ID']){ - $value['SKIN_STATUS'] = "@ACTIVE"; - $value['SKIN_NAME'] = '@'.$value['SKIN_NAME']; - $value['SKIN_DESCRIPTION'] = '@'.$value['SKIN_DESCRIPTION']; - $value['SKIN_AUTHOR'] = '@'.$value['SKIN_AUTHOR']; - $value['SKIN_CREATEDATE'] = '@'.$value['SKIN_CREATEDATE']; - $value['SKIN_MODIFIEDDATE'] = '@'.$value['SKIN_MODIFIEDDATE']; + if($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']){ + $wildcard = '@'; + $value['SKIN_STATUS'] = $wildcard . G::LoadTranslation('ID_ACTIVE'); + $value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME']; + $value['SKIN_DESCRIPTION'] = $wildcard . $value['SKIN_DESCRIPTION']; + $value['SKIN_AUTHOR'] = $wildcard . $value['SKIN_AUTHOR']; + $value['SKIN_CREATEDATE'] = $wildcard . $value['SKIN_CREATEDATE']; + $value['SKIN_MODIFIEDDATE'] = $wildcard . $value['SKIN_MODIFIEDDATE']; } else{ - $value['SKIN_STATUS'] = "inactive"; + $value['SKIN_STATUS'] = G::LoadTranslation('ID_INACTIVE'); } $skinListArray['skins'][] = $value; } diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js index 5f7553e79..326632c50 100755 --- a/workflow/engine/templates/setup/skinList.js +++ b/workflow/engine/templates/setup/skinList.js @@ -368,20 +368,30 @@ Ext.onReady(function(){ }); }); +gotWildCard = function (value){ + var currentSkinWildcard = '@'; + if(value.length <= 0){ + return false; + } + return (value[0] == currentSkinWildcard); +} + +setBoldItalic = function(value) +{ + return '' + value + ''; +} //Function format dates showdate = function (value){ - if(value[0]=='@'){ - str = _DF(value.substring(1)); - return '' + str + ''; + if(gotWildCard(value)){ + return setBoldItalic(_DF(value.substring(1))); } return _DF(value); }; selectedSkin = function (value){ - if(value[0]=='@'){ - str = value.substring(1); - return '' + str + ''; + if(gotWildCard(value)){ + return setBoldItalic(value.substring(1)); } return value; };