Merge branch 'pm_wysiwyg'

2012-12-07 15:39:37 -04:00
parent 7892e2c452 9a82155717
commit 85e028d03f
25 changed files with 648 additions and 437 deletions
--- a/workflow/engine/xmlform/processes/processes_FilesOptions.xml
+++ b/workflow/engine/xmlform/processes/processes_FilesOptions.xml
@@ -85,8 +85,7 @@ function editFile(pro_uid, fileName){
 		position   : {x:50,y:50,center:true},
 		title	   : '',
 		control    : {close:true,resize:false},
-		fx         : {modal:true},
-		fx	       : {shadow:true,modal:true}
+		fx	   : {shadow:true,modal:true}
 	};
 	oPanel.make();