Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

js/apps/aardvark/frontend/js/graphViewer/graph/edgeShaper.js

@@ -29,12 +29,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 /*
-* flags example format:
+* config example format:
 * {
 *   shape: {
 *     type: EdgeShaper.shapes.ARROW
 *   }
-*   label: "key" \\ function(node)
+*   label: "key" \\ function(edge)
 *   actions: {
 *     click: function(edge)
 *   }
@@ -43,7 +43,7 @@
 *
 */
 
-function EdgeShaper(parent, flags, idfunc) {
+function EdgeShaper(parent, config, idfunc) {
   "use strict";
   
   var self = this,
@@ -332,8 +332,8 @@ function EdgeShaper(parent, flags, idfunc) {
     toplevelSVG = d3.select(toplevelSVG[0][0].ownerSVGElement);
   }
   
-  if (flags === undefined) {
+  if (config === undefined) {
-    flags = {
+    config = {
       color: {
         type: "single",
         stroke: "#686766"
@@ -341,14 +341,14 @@ function EdgeShaper(parent, flags, idfunc) {
     };
   }
   
-  if (flags.color === undefined) {
+  if (config.color === undefined) {
-    flags.color = {
+    config.color = {
       type: "single",
       stroke: "#686766"
     };
   }
 
-  parseConfig(flags);
+  parseConfig(config);
 
   if (_.isFunction(idfunc)) {
     idFunction = idfunc;

js/apps/aardvark/frontend/js/graphViewer/graph/eventDispatcher.js

@@ -268,4 +268,4 @@ function EventDispatcher(nodeShaper, edgeShaper, config) {
     throw "Not implemented";
   };
   */
-}
+}

js/apps/aardvark/frontend/js/graphViewer/graph/nodeShaper.js

@@ -526,4 +526,4 @@ NodeShaper.shapes = Object.freeze({
   "CIRCLE": 1,
   "RECT": 2,
   "IMAGE": 3
-});
+});

js/apps/aardvark/frontend/js/templates/graphView.ejs

@@ -112,6 +112,13 @@ gs = _.sortBy(gs, sortF);
                     <input id="nodeLabel" type="text" name="nodeLabel" placeholder="Attribute" maxlength="75" class="input-xlarge">
                   </div>
                 </div>
+ 
+                <div class="control-group">
+                  <label for="nodeColor" class="control-label">Vertex color attribute (e.g. "name")</label>
+                  <div class="controls">
+                    <input id="nodeColor" type="text" name="nodeColor" placeholder="Attribute" maxlength="75" class="input-xlarge">
+                  </div>
+                </div>
                 
                 
                 <fieldset id="group_by_list">

js/apps/aardvark/frontend/js/views/graphView.js

@@ -55,6 +55,7 @@ window.graphView = Backbone.View.extend({
       groupByList,
       groupByAttribute,
       label,
+      color,
       config,
       ui,
       width,
@@ -64,6 +65,7 @@ window.graphView = Backbone.View.extend({
     ncol = $("#nodeCollection").val();
     undirected = !!$("#undirected").attr("checked");
     label = $("#nodeLabel").val();
+    color = $("#nodeColor").val();
     randomStart = !!$("#randomStart").attr("checked");
 
     groupByAttribute = [];
@@ -92,6 +94,13 @@ window.graphView = Backbone.View.extend({
         }
       };
     }
+    if (color !== undefined && color !== "") {
+      config.nodeShaper = config.nodeShaper || {};
+      config.nodeShaper.color = {
+        type: "attribute",
+        key: color
+      };
+    }
     width = this.width || $("#content").width();
     $("#background").remove();
     if (randomStart) {