Merge 644ac59 into 78c3083

.gitmodules

@@ -5,3 +5,15 @@
 	path = external/qooxdoo
 	url = https://github.com/CometVisu/qooxdoo.git
 	branch = cometvisu
+[submodule "external/qx-osparc-theme"]
+	path = external/qx-osparc-theme
+	url = https://github.com/peuter/qx-osparc-theme.git
+[submodule "external/qx-iconfont-material"]
+	path = external/qx-iconfont-material
+	url = https://github.com/peuter/qx-iconfont-material.git
+[submodule "external/qx-contrib-dialog"]
+	path = external/qx-contrib-dialog
+	url = https://github.com/cboulanger/qx-contrib-Dialog.git
+[submodule "external/qx-upload-manager"]
+	path = external/qx-upload-manager
+	url = https://github.com/johnspackman/UploadMgr.git

.jshintignore

@@ -0,0 +1 @@
+source/rest

.jshintrc

@@ -16,6 +16,7 @@
   "smarttabs": true,
   "multistr": true,
   "jasmine": true,
+  "worker": true,
   "globals": {
     "browser": false,
     "describe": false,
@@ -47,6 +48,12 @@
     "EVENT_RECORDER": true,
     "DOMWindow": false,
     "Favico": false,
-    "Sentry": true
+    "Sentry": true,
+    "osparc": true,
+    "monaco": true,
+    "CRC32": true,
+    "xmllint": true,
+    "dialog": true,
+    "com": true
   }
 }

DEVELOPMENT.md

@@ -9,7 +9,8 @@ Preparation
 
 The new build system requires python2 and grunt. Also you have to run `npm install` once,
 because at least the build-task (explained later) includes a grunt task which minifies included
-external dependencies.
+external dependencies. If you want to use the REST API backend included in the CometVisu you
+have to run `grunt composer:rest:install` to load the external dependencies for the PHP code.
 
 After cloning the sources or updating from 0.10.x you have to do the following steps once:
 

Gruntfile.js

@@ -516,6 +516,14 @@ module.exports = function(grunt) {
           dest: 'build/resource/libs'
         }]
       }
+    },
+    composer : {
+      rest: {
+        options : {
+          flags: ['prefer-dist', 'no-dev'],
+          cwd: 'source/rest/cv'
+        }
+      }
     }
   };
   grunt.initConfig(config);
@@ -642,12 +650,13 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-shell');
   grunt.loadNpmTasks('grunt-scaffold');
   grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-composer');
 
   // Default task runs all code checks, updates the banner and builds the release
   grunt.registerTask('buildicons', ['clean:iconcache', 'svgmin', 'svgstore', 'handle-kuf-svg']);
   grunt.registerTask('release-build', [ 'release-cv', 'release-client' ]);
   grunt.registerTask('release-cv', [
-    'updateicons', 'shell:lint', 'clean', 'file-creator', 'buildicons', 'shell:build',
+    'updateicons', 'shell:lint', 'clean', 'file-creator', 'buildicons', 'composer:rest:install', 'shell:build',
     'update-demo-config', 'chmod', 'shell:buildToRelease', 'compress:tar', 'compress:zip' ]);
 
   grunt.registerTask('release-client', ['shell:buildClient', 'rename-client-build']);

config.json

@@ -36,7 +36,8 @@
     "validate-config",
     "validate-manifest",
     "watch",
-    "profile"
+    "profile",
+    "make-font-map"
   ],
 
   "default-job" : "source-hybrid",
@@ -100,7 +101,8 @@
           "svg4everybody",
           "EVENT_RECORDER",
           "Favico",
-          "Sentry"
+          "Sentry",
+          "Promise"
         ]
       },
 
@@ -163,7 +165,8 @@
           "version",
           "library_version.inc.php",
           "manifest.json",
-          "../node_modules/monaco-editor"
+          "../node_modules/monaco-editor",
+          "rest/cv"
         ]
       }
     },
@@ -172,7 +175,23 @@
     {
       "library" :
       [
-        { "manifest" : "client/Manifest.json" }
+        { "manifest" : "client/Manifest.json" },
+        {
+          "manifest" : "external/qx-iconfont-material/Manifest.json",
+          "uri"      : "../external/qx-iconfont-material"
+        },
+        {
+          "manifest" :  "external/qx-osparc-theme/Manifest.json",
+          "uri"      : "../external/qx-osparc-theme"
+        },
+        {
+          "manifest" :  "external/qx-contrib-dialog/Manifest.json",
+          "uri"      : "../external/qx-contrib-dialog"
+        },
+        {
+          "manifest" :  "external/qx-upload-manager/Manifest.json",
+          "uri"      : "../external/qx-upload-manager"
+        }
       ]
     },
 
@@ -198,6 +217,7 @@
       {
 //        "verifier-bombs-on-error" : false,
 //        "separate-loader" : true,
+        "i18n-as-parts": true,
         "parts"  :
         {
           "boot"     :
@@ -213,6 +233,10 @@
             "include": [ "${APPLICATION}.ui.structure.pure.*" ]
           },
 
+          "manager": {
+            "include": [ "${APPLICATION}.ui.manager.Main" ]
+          },
+
           "plugin-diagram" :
           {
             "include" : [ "${APPLICATION}.plugins.diagram.*" ]
@@ -283,7 +307,7 @@
           },
           "plugin-openhab" :
           {
-            "include" : [ "${APPLICATION}.plugins.openhab.*", "${QXTHEME}" ]
+            "include" : [ "${APPLICATION}.plugins.openhab.*" ]
           }
         }
       }
@@ -521,6 +545,30 @@
       {
         "qx.aspects" : true
       }
+    },
+
+    "make-font-map" :
+    {
+      "desc" : "Build a font mapping from glyphname to unicode id",
+
+      "let" :
+      {
+        "RESPATH" : "./external/qx-iconfont-material/source/resource",
+        "QXRESPATH" : "${QOOXDOO_PATH}/framework/source/resource"
+      },
+
+      "font-map" :
+      {
+        "fonts" :
+        {
+          "${RESPATH}/iconfont/material/MaterialIcons-Regular.ttf" :
+          {
+            "prefix": [ "${RESPATH}" ],
+            "alias" : "MaterialIcons",
+            "size" : 32
+          }
+        }
+      }
     }
   }
 }