From 5801e0af1527e8ed2f8c01abf23c98172af62093 Mon Sep 17 00:00:00 2001 From: Ralph Asendeteufrer Date: Wed, 3 Oct 2012 20:09:06 -0400 Subject: [PATCH 1/2] BUG 9849 When you add a new skin - the menu skin 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 | 11 +++++ workflow/engine/templates/setup/skinList.js | 40 +++++++++++++++++-- workflow/public_html/images/checkedsmall.gif | Bin 0 -> 897 bytes 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 workflow/public_html/images/checkedsmall.gif diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php index 211d93ce3..8bf9c2acc 100755 --- a/workflow/engine/methods/setup/skin_Ajax.php +++ b/workflow/engine/methods/setup/skin_Ajax.php @@ -49,6 +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']; + } + else{ + $value['SKIN_STATUS'] = "inactive"; + } $skinListArray['skins'][] = $value; } } diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js index 036465549..5f7553e79 100755 --- a/workflow/engine/templates/setup/skinList.js +++ b/workflow/engine/templates/setup/skinList.js @@ -223,21 +223,24 @@ Ext.onReady(function(){ header: _('ID_NAME'), dataIndex: 'SKIN_NAME', width: 80, - align:'left' + align:'left', + renderer: selectedSkinChecked }, { header: _('ID_DESCRIPTION'), dataIndex: 'SKIN_DESCRIPTION', width: 200, - align:'left' + align:'left', + renderer: selectedSkin }, { header: _('ID_AUTHOR'), dataIndex: 'SKIN_AUTHOR', width: 80, - align:'left' + align:'left', + renderer: selectedSkin }, { @@ -254,6 +257,14 @@ Ext.onReady(function(){ width: 50, align:'center', renderer: showdate + }, + + { + header: _('ID_STATUS'), + dataIndex: 'SKIN_STATUS', + width: 50, + align:'center', + renderer: selectedSkin } ] @@ -360,9 +371,30 @@ Ext.onReady(function(){ //Function format dates showdate = function (value){ - return _DF(value); + if(value[0]=='@'){ + str = _DF(value.substring(1)); + return '' + str + ''; + } + return _DF(value); }; +selectedSkin = function (value){ + if(value[0]=='@'){ + str = value.substring(1); + return '' + str + ''; + } + return value; +}; + +selectedSkinChecked = function (value){ + if(value[0]=='@'){ + str = value.substring(1); + return '' + str + ''; + } + return value; +}; + + //Funtion Handles Context Menu Opening onMessageContextMenu = function (grid, rowIndex, e) { e.stopEvent(); diff --git a/workflow/public_html/images/checkedsmall.gif b/workflow/public_html/images/checkedsmall.gif new file mode 100644 index 0000000000000000000000000000000000000000..7d919abb1eaf385dfd163fb1a3e7775c2fa45b5f GIT binary patch literal 897 zcmW-fJ%|`Y6oiNPk3ky|v{5WlWbLLou}YDPLPGFog~NcvV$jM1vEMEjZ4;QvA{@dZ zSO|fDiXb-OH4?VARa-&JaqqTR-tu7Iyl>{p+lL2l+&qu-I0jzFKBx7q(*gtp7$_iU zKqH#aj8_G8Z` zA;LuM9vj%mCN{GbTiC%)cCnki*uw!1a)`qm#Su<$l2e@KEY5I&i(KL|S8;^_Lq?35 zVz!RGHU$Y5YRgiC8r7s`wNi^Z)Tu6YtCxB-pg|33Sfeze2~BEB)0(9jEof0oTGlG9 zC{Ujn!1m)v8*mqdKdrx~o_9)Ibf^Pz~3p8mWnz ztf`u=Sv6A&wOC8FT&rrOf(k3DxKfpz24TCgk!)SNxuejK#x$ilt6M-g zWH3V+&ZvxJB9ocQbY^8H3t7xkma{7Bbl48sc6%e=d!G$IOa0mPv~cI-oqrCmy?pT4 zvlrj{;rh|9w;uj|iGLn{^V?T1KL5dY-+uPdPgg(v_oW;6zrT0+<0t+*dFHR*UwiA| zxko=9-M#SW=bMjzdG!9h!&fd{d+Lk3Hy&Jl_43zGUcdPHC-468%k2vv-hScW_+;IA Jc Date: Thu, 4 Oct 2012 10:04:49 -0400 Subject: [PATCH 2/2] 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; };