diff --git a/.gitignore b/.gitignore index d8b71b813..91f519306 100755 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ composer.lock vendor/ workflow/engine/config/schema-transformed.xml workflow/engine/config/_databases_.php +workflow/public_html/lib/ diff --git a/build-vendor.php b/build-vendor.php index a91f7675e..5600e3839 100644 --- a/build-vendor.php +++ b/build-vendor.php @@ -59,6 +59,9 @@ if (! is_dir($destinationDir)) { if (! is_dir($destinationDir.'/js')) { mkdir($destinationDir.'/js', 0777); } +if (! is_dir($destinationDir.'/css')) { + mkdir($destinationDir.'/css', 0777); +} if (! is_dir($destinationDir.'/mafe')) { mkdir($destinationDir.'/mafe', 0777); } @@ -71,17 +74,25 @@ $filesCollection = array( "jquery/jquery/jquery-1.10.2.min.js" => "js/jquery-1.10.2.min.js", "underscore/underscore/underscore-min.js" => "js/underscore-min.js", //libs - "colosa/michelangelo-fe-libs/jQueryLayout/jquery.layout.min.js" => "js/jquery.layout.min.js", + /*"colosa/michelangelo-fe-libs/jQueryLayout/jquery.layout.min.js" => "js/jquery.layout.min.js", "colosa/michelangelo-fe-libs/jQueryUI/jquery-ui-1.10.3.custom.min.js" => "js/jquery-ui-1.10.3.custom.min.js", "colosa/michelangelo-fe-libs/jQueryUI/jquery-ui-1.10.3.custom.min.css" => "js/jquery-ui-1.10.3.custom.min.css", - "colosa/michelangelo-fe-libs/wz_jsgraphics/wz_jsgraphics.js" => "js/wz_jsgraphics.js", + "colosa/michelangelo-fe-libs/wz_jsgraphics/wz_jsgraphics.js" => "js/wz_jsgraphics.js",*/ + "colosa/restclient/restclient-min.js" => "js/restclient-min.js", - "colosa/michelangelofe/app.js" => "js/app.js", + // michelangelofe + "colosa/michelangelofe/lib/wz_jsgraphics/wz_jsgraphics.js" => "js/wz_jsgraphics.js", + "colosa/michelangelofe/build/js/designer.js" => "mafe/designer.js", "colosa/michelangelofe/build/js/mafe.min.js" => "mafe/mafe.min.js", "colosa/michelangelofe/build/css/mafe.css" => "mafe/mafe.css", "colosa/michelangelofe/build/img/*" => "img/", // pmui + "colosa/pmui/libraries/jquery.layout/jquery.layout.min.js" => "js/jquery.layout.min.js", + "colosa/pmui/libraries/jquery.layout/LayoutPanel.css" => "css/jquery.layout.css", + "colosa/pmui/libraries/jquery-ui/js/jquery-ui-1.10.3.custom.min.js" => "js/jquery-ui-1.10.3.custom.min.js", + "colosa/pmui/libraries/jquery-ui/css/css-customized/jquery-ui-1.10.3.custom.css" => "css/jquery-ui-1.10.3.custom.min.css", + "colosa/pmui/build/js/min/pmui-1.0.0.min.js" => "pmUI/pmui-1.0.0.js", "colosa/pmui/build/css/pmui-1.0.0.css" => "pmUI/pmui-1.0.0.css", "colosa/pmui/build/img/*" => "img/", diff --git a/composer.json b/composer.json index b144f5209..5e2b7b466 100644 --- a/composer.json +++ b/composer.json @@ -52,18 +52,6 @@ } } }, - { - "type": "package", - "package": { - "name": "colosa/michelangelo-fe-libs", - "version": "dev-master", - "source": { - "url": "git@bitbucket.org:colosa/michelangelo-fe-libs.git", - "type": "git", - "reference": "origin/master" - } - } - }, { "type": "package", "package": { @@ -84,7 +72,6 @@ "jquery/jquery": "1.10.2", "colosa/pmui": "dev-master", "colosa/michelangelofe": "dev-master", - "colosa/michelangelo-fe-libs": "dev-master", "colosa/restclient": "dev-master", "underscore/underscore": "1.5.2" } diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html index c299a1b59..3f3c2e00f 100644 --- a/workflow/engine/templates/designer/index.html +++ b/workflow/engine/templates/designer/index.html @@ -1,10 +1,8 @@ - - - - + + @@ -12,9 +10,8 @@ - - +

Process Id: {$pro_uid}

\ No newline at end of file