diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php index a00e17f75..b903c48e6 100755 --- a/workflow/engine/methods/setup/skin_Ajax.php +++ b/workflow/engine/methods/setup/skin_Ajax.php @@ -24,6 +24,7 @@ if (in_array($_REQUEST ['action'],$restrictedFunctions)) { $functionName = $_REQUEST ['action']; +//echo $_REQUEST ['action']; $functionParams = isset($_REQUEST ['params']) ? $_REQUEST ['params'] : array(); $functionName(); @@ -48,7 +49,8 @@ function skinList() { } function newSkin($baseSkin='classic') { -//G::pr($_REQUEST); + //G::pr($_REQUEST); + $skinBase = $baseSkin != "" ? strtolower($baseSkin) : 'classic'; if ((isset($_REQUEST['skinBase'])) && ($_REQUEST['skinBase'] != "")) { $skinBase = strtolower($_REQUEST['skinBase']); @@ -81,15 +83,20 @@ function newSkin($baseSkin='classic') { //All validations OK then create skin switch ($skinBase) { - case 'classic': //Special Copy of this dir + xmlreplace - //$configurationFile = G::ExpandPath("skinEngine") . 'base' . PATH_SEP . 'config.xml'; - copy_skin_folder(G::ExpandPath("skinEngine") . 'base' . PATH_SEP, PATH_CUSTOM_SKINS . $skinFolder,array("config.xml","baseCss")); - $pathBase=G::ExpandPath("skinEngine") . 'base' . PATH_SEP; - break; - default: //Commmon copy/paste of a folder + xmlrepalce - copy_skin_folder(PATH_CUSTOM_SKINS . $skinBase, PATH_CUSTOM_SKINS . $skinFolder,array("config.xml")); - $pathBase=PATH_CUSTOM_SKINS.$skinBase; - break; + case 'uxmodern': + copy_skin_folder(G::ExpandPath("skinEngine") . 'uxmodern' . PATH_SEP, PATH_CUSTOM_SKINS . $skinFolder,array("config.xml")); + $pathBase=G::ExpandPath("skinEngine") . 'base' . PATH_SEP; + break; + case 'classic': + //Special Copy of this dir + xmlreplace + copy_skin_folder(G::ExpandPath("skinEngine") . 'base' . PATH_SEP, PATH_CUSTOM_SKINS . $skinFolder,array("config.xml","baseCss")); + $pathBase=G::ExpandPath("skinEngine") . 'base' . PATH_SEP; + break; + default: + //Commmon copy/paste of a folder + xmlrepalce + copy_skin_folder(PATH_CUSTOM_SKINS . $skinBase, PATH_CUSTOM_SKINS . $skinFolder,array("config.xml")); + $pathBase=PATH_CUSTOM_SKINS.$skinBase; + break; } //ReBuild config file //TODO: Improve this pre_replace lines @@ -330,4 +337,4 @@ function copy_skin_folder($path, $dest, $exclude=array()) { } else { return false; } -} \ No newline at end of file +} diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js index a11f93d12..7120997ef 100755 --- a/workflow/engine/templates/setup/skinList.js +++ b/workflow/engine/templates/setup/skinList.js @@ -490,7 +490,7 @@ newSkin = function(){ Ext.getCmp("newDialog").destroy(); if( !action.result ) { - Ext.MessageBox.alert("error", _('ID_ERROR')); + Ext.MessageBox.alert("error", action.response.responseText); return; } Ext.MessageBox.alert("error", action.result.error);