cpee 1.4.31 → 1.4.32

data/cockpit/themes/{lego → packed}/theme.js

@@ -2,21 +2,38 @@ function WFAdaptorManifestation(adaptor) {
   var self = this;
 
   this.adaptor = adaptor;
+  this.resources = {};
   this.elements = {};
   this.events = {};
-  this.compact = false;
+  this.compact = true;
+  this.striped = false;
+  this.endpoints = {};
 
-  this.noarrow = ['alternative', 'otherwise'];
-  this.source = function(rng) {
-    $('#relaxngworker').empty();
-    var rngw = new RelaxNGui(rng,$('#relaxngworker'),self.adaptor.description.context_eval);
-    var nnew = $(rngw.save().documentElement);
-        nnew.attr('trans-xmlns','http://cpee.org/ns/description/1.0');
-    var ntxt = nnew.serializeXML();
-    ntxt = ntxt.replace(/trans-xmlns/,'xmlns');
+  //{{{ transform the details data to description parts based on rng
+  this.source = function(base,opts) {
+    if (base[0].namespaceURI == "http://relaxng.org/ns/structure/1.0") {
+      $('#relaxngworker').empty();
+      var rngw = new RelaxNGui(base,$('#relaxngworker'),self.adaptor.description.context_eval);
+      var nnew = $(rngw.save().documentElement);
+          nnew.attr('trans-xmlns','http://cpee.org/ns/description/1.0');
+      var ntxt = nnew.serializeXML();
+      ntxt = ntxt.replace(/trans-xmlns/,'xmlns');
 
-    return($X(ntxt));
-  };
+      return($X(ntxt));
+    } else {
+      if (opts && opts == 'clone') {
+        base = base.clone();
+        if (base.attr('id')) {
+          base.attr('id',self.adaptor.description.get_free_id());
+        }
+        base.find('*[id]').each(function(k,v){
+          $(v).attr('id',self.adaptor.description.get_free_id(base));
+        });
+      }
+      return base;
+    }
+  }; //}}}
+  //{{{ Return the svgid for the selected task
   this.selected = function(){
     var svgid = 'unknown';
     _.each(self.adaptor.illustrator.get_elements(),function(value,key) {
@@ -25,62 +42,170 @@ function WFAdaptorManifestation(adaptor) {
       }
     });
     return svgid;
-  };
+  }; //}}}
+  //{{{ Return the svgids for all marked tasks
+  this.marked = function(){
+    var svgid = [];
+    _.each(self.adaptor.illustrator.get_elements(),function(value,key) {
+      if ($(value).hasClass('marked')) {
+        svgid.push($(value).attr('element-id'));
+      }
+    });
+    return svgid;
+  }; //}}}
+  //{{{ Render the details from rng (right hand side of graph tab)
+  this.update_details = function(svgid){
+    var tab  = $('#dat_details');
+    var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
+        tab.empty();
+    if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
+      save['details_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
+      var rng = self.adaptor.description.elements[$(node).attr('svg-subtype')].clone();
+      if (save['endpoints_cache'][$(node).attr('endpoint')] && save['endpoints_cache'][$(node).attr('endpoint')].schema) {
+        var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
+        $(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
+      }
+      if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
+        $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
+      }
+      save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
+      save['details'].content(node);
+      format_visual_forms();
+    }
+  }; //}}}
+
+  function copyOrMove(menu,group,xml_node,mode) { //{{{
+    var markymark = self.marked();
+    var check1 = [];
+    var check2 = [];
+    $(markymark).each(function(key,svgid){
+      var node = self.adaptor.description.get_node_by_svg_id(svgid);
+      check1.push($(node).attr('svg-type'));
+    });
+    $(group).each(function(key,value){
+      check2.push(value.type);
+    });
+
+    if (markymark.length > 0 && _.uniq(check1).length == _.intersection(check1,check2).length) {
+      var nodes = [];
+      $(markymark).each(function(key,svgid){
+        var node = self.adaptor.description.get_node_by_svg_id(svgid);
+        nodes.unshift(node);
+      });
+
+      var iconm =  self.resources['arrow'].clone();
+      var iconc =  self.resources['arrow'].clone();
+      iconm.children('.rfill').addClass('menu');
+      menu.push(
+        {
+          'label': '<em>Move Marked Elements</em>',
+          'function_call': mode,
+          'menu_icon': iconm,
+          'type': undefined,
+          'params': [nodes, xml_node]
+        },
+        {
+          'label': '<em>Copy Marked Elements</em>',
+          'function_call': mode,
+          'menu_icon': iconc,
+          'type': undefined,
+          'params': [nodes, xml_node, 'clone']
+        }
+      );
+    }
+  } //}}}
 
   // Events
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
     } else if(e.button == 2) { // right-click
+      if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
+
       var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
       var group = null;
       var menu = {};
 
       if (child) {
         group = self.elements[xml_node.get(0).tagName].permissible_children(xml_node,'into');
-        if(group.length > 0) menu['Insert into'] = group;
+        if(group.length > 0) {
+          menu['Insert into'] = group;
+          copyOrMove(menu['Insert into'],group,xml_node,self.adaptor.description.insert_first_into);
+        }
       }
       if (sibling) {
         group = self.elements[xml_node.parent().get(0).tagName].permissible_children(xml_node,'after');
-        if(group.length > 0) menu['Insert after'] = group;
+        if(group.length > 0) {
+          menu['Insert after'] = group;
+          copyOrMove(menu['Insert after'],group,xml_node,self.adaptor.description.insert_after);
+        }
       }
 
       if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
         var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
-        icon.children('.rfill').css({'fill':'#ff7f7f','fill-opacity':'1'});
+        icon.children('.rfill').addClass('menu');
         menu['Delete'] = [{
           'label': 'Remove Element',
           'function_call': self.adaptor.description.remove,
           'menu_icon': icon,
+          'type': undefined,
           'params': [null, xml_node]
         }];
       }
       if($('> finalize, > update', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
         var icon =  self.elements.callmanipulate.illustrator.svg.clone();
-        icon.children('.rfill:last').css({'fill':'#ff7f7f','fill-opacity':'1'});
+        icon.children('.rfill:last').addClass('menu');
         menu['Delete'].push({
           'label': 'Remove Scripts',
           'function_call': self.adaptor.description.remove,
           'menu_icon': icon,
+          'type': undefined,
           'params': ['> finalize, > update', xml_node]
         });
       }
+      if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
+        var icon =  self.elements.call.illustrator.svg.clone();
+        icon.children('g.replace').addClass('active');
+        var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+        if (vtarget.length > 0) {
+          if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+            menu['Position'] = [{
+              'label': 'No Execution from here',
+              'function_call': del_ui_pos,
+              'menu_icon': icon,
+              'type': undefined,
+              'params': xml_node
+            }];
+          } else {
+            menu['Position'] = [{
+              'label': 'Execute from here',
+              'function_call': add_ui_pos,
+              'menu_icon': icon,
+              'type': undefined,
+              'params': xml_node
+            }];
+          }
+        }
+      }
       new CustomMenu(e).contextmenu(menu);
     }
     return false;
   } // }}}
+  this.events.suppress = function(svgid, e, child, sibling) { // {{{
+    return false;
+  } // }}}
   this.events.click = function(svgid, e) { // {{{
     if (self.adaptor.description.get_node_by_svg_id(svgid).length == 0) {
       return;
     }
 
-    var visid = 'details';
-    var tab   = $('#dat_' + visid);
-        tab.empty();
-
     self.adaptor.illustrator.get_elements().removeClass('selected');
+    self.adaptor.illustrator.get_labels().removeClass('selected');
 
     if (e && e.ctrlKey) {
+      if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
+      var tab = $('#dat_details');
+          tab.empty();
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
         vtarget.parents('g.element[element-id]').toggleClass('marked');
@@ -92,52 +217,46 @@ function WFAdaptorManifestation(adaptor) {
       if (vtarget.length > 0) {
         vtarget.parents('g.element[element-id]').addClass('selected');
       }
+      self.adaptor.illustrator.get_label_by_svg_id(svgid).addClass('selected');
 
-      var node  = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
-
-      if (self.adaptor.description.elements[$(node).attr('svg-type')]) {
-        save[visid + '_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
-        save[visid] = new RelaxNGui(self.adaptor.description.elements[$(node).attr('svg-type')],tab,self.adaptor.description.context_eval);
-        save[visid].content(node);
-      }
+      self.update_details(svgid);
     }
   } // }}}
   this.events.dblclick = function(svgid, e) { // {{{
   } // }}}
   this.events.mouseover = function(svgid, e) { // {{{
-    $('.tile[element-id = "' + svgid + '"]').css('display','block');
+    self.adaptor.illustrator.svg.container.find('.tile[element-id = "' + svgid + '"]').css('display','block');
+    self.adaptor.illustrator.svg.container.find('[element-id = "' + svgid + '"]').addClass('hover');
+    self.adaptor.illustrator.svg.label_container.find('[element-id = "' + svgid + '"]').addClass('hover');
     return false;
   } // }}}
   this.events.mouseout = function(svgid, e) { // {{{
-    $('.tile[element-id = "' + svgid + '"]').css('display','none');
+    self.adaptor.illustrator.svg.container.find('.tile[element-id = "' + svgid + '"]').css('display','none');
+    self.adaptor.illustrator.svg.container.find('[element-id = "' + svgid + '"]').removeClass('hover');
+    self.adaptor.illustrator.svg.label_container.find('[element-id = "' + svgid + '"]').removeClass('hover');
     return false;
   } // }}}
   this.events.dragstart = function (svgid, e) { //{{{
   } //}}}
 
+  // other resources
+  this.resources.arrow =  self.adaptor.theme_dir + 'symbols/arrow.svg';
+
   // Primitive Elements
   this.elements.call = { /*{{{*/
     'type': 'primitive',
     'illustrator': {//{{{
       'endnodes': 'this',
-      'label': function(node){return $('label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'')},
+      'label': function(node){
+        var ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') } ];
+        return ret;
+      },
+      'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($(node).attr('endpoint').match(/^instantiation/)) {
-          return 'callinstantiation';
-        } else if($(node).attr('endpoint').match(/^correlation_send/)) {
-          return 'callcorrelationsend';
-        } else if($(node).attr('endpoint').match(/^correlation_receive/)) {
-          return 'callcorrelationreceive';
-        } else if($(node).attr('endpoint').match(/^worklist/) && $('finalize,update', node).length > 0) {
-          return 'callmanipulateworklist';
-        } else if($(node).attr('endpoint').match(/^worklist/)) {
-          return 'callworklist';
-        } else if($('parameters > service', node).length > 0) {
-          return 'callinjection';
-        } else if($('finalize,update', node).length > 0) {
+        if($('finalize,update', node).length > 0) {
           return 'callmanipulate';
         } else {
-          return'call';
+          return 'call';
         }
       },
       'svg': self.adaptor.theme_dir + 'symbols/call.svg'
@@ -149,31 +268,43 @@ function WFAdaptorManifestation(adaptor) {
          {'label': 'Scripts',
           'function_call': self.adaptor.description.insert_last_into,
           'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+          'type': undefined,
           'params': [self.adaptor.description.elements.scripts, node]}
         ];
       return [];
     }, //}}}
-  'adaptor': {//{{{
-    'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
-    'click': self.events.click,
-    'dragstart': self.events.dragstart,
-   }//}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'click': self.events.click,
+      'dragstart': self.events.dragstart,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
+    }//}}}
   }; /*}}}*/
   this.elements.manipulate = { /*{{{*/
     'type': 'primitive',
     'illustrator': {//{{{
       'endnodes': 'this',
-      'label': function(node){return $(node).attr('label').replace(/^['"]/,'').replace(/['"]$/,'')},
+      'label': function(node){
+        var lab = $(node).attr('label');
+        if (lab) {
+          return [ { column: 'Label', value: lab.replace(/^['"]/,'').replace(/['"]$/,'') } ];
+        }  else {
+          return [];
+        }
+      },
       'svg': self.adaptor.theme_dir + 'symbols/manipulate.svg'
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/manipulate.rng',
     'permissible_children': function(node,mode) { //{{{
       return [];
     }, //}}}
-  'adaptor': {//{{{
-    'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
-    'click': self.events.click,
-   }//}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'click': self.events.click,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
+    }//}}}
   }; /*}}}*/
   this.elements.escape = { /*{{{*/
     'type': 'primitive',
@@ -188,6 +319,116 @@ function WFAdaptorManifestation(adaptor) {
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
       'click': self.events.click,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
+    }//}}}
+  }; /*}}}*/
+  this.elements.stop = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/stop.svg'
+    },//}}}
+    'description': self.adaptor.theme_dir + 'rngs/stop.rng',
+    'permissible_children': function(node,mode) { //{{{
+      return [];
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'click': self.events.click,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
+    }//}}}
+  }; /*}}}*/
+  this.elements.terminate = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'final': true,
+      'svg': self.adaptor.theme_dir + 'symbols/terminate.svg'
+    },//}}}
+    'description': self.adaptor.theme_dir + 'rngs/terminate.rng',
+    'permissible_children': function(node,mode) { //{{{
+      return [];
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) { self.events.mousedown(node,e,false,false); },
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
+    }//}}}
+  }; /*}}}*/
+  this.elements.end = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/end.svg'
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) {
+        self.events.suppress();
+      }
+    }//}}}
+  }; /*}}}*/
+  this.elements.event_end = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/event_end.svg'
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) {
+        self.events.suppress();
+      },
+      'click': self.events.click,
+      'dblclick': self.events.dblclick,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
+    }//}}}
+  }; /*}}}*/
+  this.elements.choose_finish = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/choose_inclusive.svg',
+      'resolve_symbol': function(node) {
+        if($(node).attr('mode') == 'exclusive') {
+          return 'choose_exclusive_finish';
+        } else {
+          return 'choose_inclusive_finish';
+        }
+      },
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) {
+        self.events.mousedown(node,e,true,true);
+      },
+      'click': self.events.click,
+      'dblclick': self.events.dblclick,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_finish = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
+      'resolve_symbol': function(node) {
+        if($(node).attr('wait') == '-1') {
+          return 'parallel_simple';
+        } else {
+          return 'parallel_complex';
+        }
+      },
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) {
+        self.events.mousedown(node,e,true,true);
+      },
+      'click': self.events.click,
+      'dblclick': self.events.dblclick,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
     }//}}}
   }; /*}}}*/
 
@@ -195,7 +436,7 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.choose = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'label': function(node){return $(node).attr('mode') == 'exclusive' ? 'exclusive' : 'inclusive' },
+      'label': function(node){ return [ { column: 'Label', value: $(node).attr('mode') == 'exclusive' ? 'exclusive' : 'inclusive' } ]; },
       'endnodes': 'aggregate',
       'closeblock': false,
       'expansion': function(node) {
@@ -222,21 +463,25 @@ function WFAdaptorManifestation(adaptor) {
         return [{'label': 'Parallel Branch',
          'function_call': func,
          'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+         'type': 'parallel_branch',
          'params': [self.adaptor.description.elements.parallel_branch, node]}];
       }
       var childs = [{'label': 'Alternative',
        'function_call': func,
        'menu_icon': self.elements.alternative.illustrator.svg.clone(),
+       'type': 'alternative',
        'params': [self.adaptor.description.elements.alternative, node]}];
       if((node.children('otherwise').length == 0) && node.parents('parallel').length == node.parents('parallel_branch').length)
         childs.push({'label': 'Otherwise',
          'function_call': self.adaptor.description.insert_last_into,
          'menu_icon': self.elements.otherwise.illustrator.svg.clone(),
+         'type': 'otherwise',
          'params': [self.adaptor.description.elements.otherwise, node]});
       if(node.parents('parallel').length > node.parents('parallel_branch').length)
         childs.push({'label': 'Parallel Branch',
          'function_call': func,
          'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+         'type': 'parallel_branch',
          'params': [self.adaptor.description.elements.parallel_branch, node]});
       return childs;
     }, //}}}
@@ -247,7 +492,7 @@ function WFAdaptorManifestation(adaptor) {
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
-      'mouseout': self.events.mouseout,
+      'mouseout': self.events.mouseout
     }//}}}
   };  /*}}}*/
   this.elements.otherwise = { /*{{{*/
@@ -255,6 +500,7 @@ function WFAdaptorManifestation(adaptor) {
     'illustrator': {//{{{
       'endnodes': 'passthrough',
       'closeblock': false,
+      'noarrow': true,
       'expansion': function(node) {
         return 'vertical';
       },
@@ -274,30 +520,47 @@ function WFAdaptorManifestation(adaptor) {
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
          'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
          'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
          'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
+         'type': 'critical',
          'params': [self.adaptor.description.elements.critical, node]}
       ];
     }, //}}}
@@ -314,8 +577,12 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.alternative = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'label': function(node){return $(node).attr('condition')},
+      'label': function(node){
+        var ret = [ { column: 'Label', value: $(node).attr('condition') } ];
+        return ret;
+      },
       'endnodes': 'passthrough',
+      'noarrow': true,
       'closeblock':false,
       'expansion': function(node) {
         return 'vertical';
@@ -333,36 +600,54 @@ function WFAdaptorManifestation(adaptor) {
         return [{'label': 'Parallel Branch',
          'function_call': func,
          'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+         'type': 'parallel_branch',
          'params': [self.adaptor.description.elements.parallel_branch, node]}];
       }
       return [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
          'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
          'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
          'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
+         'type': 'critical',
          'params': [self.adaptor.description.elements.critical, node]}
       ];
     }, //}}}
@@ -379,7 +664,10 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.loop = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'label': function(node){return  $(node).attr('condition') + ($(node).attr('mode') == 'pre_test' ? ' (⭱)' : ' (⭳)') },
+      'label': function(node){
+        var ret = [ { column: 'Label', value: $(node).attr('condition') + ($(node).attr('mode') == 'pre_test' ? ' (⭱)' : ' (⭳)') } ];
+        return ret;
+      },
       'endnodes': 'this',
       'closeblock': true,
       'expansion': function(node) {
@@ -399,38 +687,56 @@ function WFAdaptorManifestation(adaptor) {
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
          'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Manipulate',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Decision',
          'function_call': func,
          'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
+         'type': 'critical',
          'params': [self.adaptor.description.elements.critical, node]}
       ];
       if(node.parent('parallel').length > node.parent('parallel_branch').length) {
         childs.push({'label': 'Parallel Branch',
                      'function_call': func,
                      'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+                     'type': 'parallel_branch',
                      'params': [self.adaptor.description.elements.parallel_branch, node]}
                     );
       } else {
         childs.push({'label': 'Parallel',
                      'function_call': func,
                      'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+                     'type': 'parallel',
                      'params': [self.adaptor.description.elements.parallel, node]}
                     );
       }
@@ -449,9 +755,9 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'endnodes': 'this',
+      'endnodes': 'aggregate',
       'closeblock': false,
-      'border': true,
+      'closing_symbol': 'parallel_finish',
       'expansion': function(node) {
         // check if any sibling other than 'parallel_branch' is present
         if($(node).children(':not(parallel_branch)').length > 0) return 'vertical';
@@ -464,40 +770,46 @@ function WFAdaptorManifestation(adaptor) {
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
     'permissible_children': function(node,mode) { //{{{
+      var func = null;
+      if (mode == 'into') { func = self.adaptor.description.insert_first_into }
+      else { func = self.adaptor.description.insert_after }
       var childs =  [
         {'label': 'Service Call with Scripts',
-         'function_call': self.adaptor.description.insert_last_into,
+         'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
-         'function_call': self.adaptor.description.insert_last_into,
+         'function_call': func,
          'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Manipulate',
-         'function_call': self.adaptor.description.insert_last_into,
+         'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Decision',
-         'function_call': self.adaptor.description.insert_last_into,
+         'function_call': func,
          'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
-         'function_call': self.adaptor.description.insert_last_into,
+         'function_call': func,
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
-        {'label': 'Critical',
-         'function_call': self.adaptor.description.insert_last_into,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'params': [self.adaptor.description.elements.critical, node]},
         {'label': 'Parallel Branch',
-         'function_call': self.adaptor.description.insert_last_into,
+         'function_call': func,
          'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+         'type': 'parallel_branch',
          'params': [self.adaptor.description.elements.parallel_branch, node]}
       ];
       if(node.get(0).tagName != 'parallel')
         childs.push({'label': 'Parallel',
            'function_call': self.adaptor.description.insert_last_into,
            'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+           'type': 'parallel',
            'params': [self.adaptor.description.elements.parallel, node]});
       return childs;
     }, //}}}
@@ -514,11 +826,19 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_branch = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'endnodes': 'this',
+      'endnodes': 'passthrough',
       'closeblock': false,
+      'noarrow': true,
       'expansion': function(node) {
         return 'vertical';
       },
+      'resolve_symbol': function(node,shift) {
+        if(shift == true) {
+          return 'parallel_branch_compact';
+        } else {
+          return 'parallel_branch_normal';
+        }
+      },
       'col_shift': function(node) {
         if(node.parentNode.tagName == 'choose') return false;
         if($(node).parents('parallel').first().children(':not(parallel_branch)').length > 0) return true;
@@ -536,43 +856,66 @@ function WFAdaptorManifestation(adaptor) {
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
          'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
          'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
          'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
+         'type': 'critical',
          'params': [self.adaptor.description.elements.critical, node]},
       ];
       if(node.parents('choose').length > node.parents('alternative, otherwise').length && node.get(0).tagName == 'parallel_branch') {
         return [{'label': 'Alternative',
          'function_call': func,
          'menu_icon': self.elements.alternative.illustrator.svg.clone(),
+         'type': 'alternative',
          'params': [self.adaptor.description.elements.alternative, node]}];
       }
       return childs;
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,false);
+        var xml_node = self.adaptor.description.get_node_by_svg_id(node);
+        if(xml_node.get(0).parentNode.tagName == 'parallel') {
+          self.events.mousedown(node,e,true,false);
+        } else {
+          self.events.mousedown(node,e,true,true);
+        }
       },
       'click': self.events.click,
       'dblclick': self.events.dblclick,
@@ -603,30 +946,47 @@ function WFAdaptorManifestation(adaptor) {
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
          'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
          'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
          'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
+         'type': 'critical',
          'params': [self.adaptor.description.elements.critical, node]},
       ];
     }, //}}}
@@ -677,9 +1037,11 @@ function WFAdaptorManifestation(adaptor) {
     'illustrator': {//{{{
       'endnodes': 'passthrough',
       'closeblock': false,
+      'balance': true,
       'expansion': function(node) {
         return 'vertical';
       },
+      'closing_symbol': 'end',
       'col_shift': function(node) {
         return true;
       },
@@ -694,30 +1056,47 @@ function WFAdaptorManifestation(adaptor) {
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
          'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script Task',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
          'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
          'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
+         'type': 'critical',
          'params': [self.adaptor.description.elements.critical, node]}
       ];
     }, //}}}
@@ -736,66 +1115,74 @@ function WFAdaptorManifestation(adaptor) {
   // * they may only have an illustrator (or other parts)
   // * they HAVE TO have a parent
   this.elements.callmanipulate = { /*{{{*/
-    'type': 'abstract',
     'parent': 'call',
     'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
     'illustrator': {//{{{
-      'label': function(node){return $('label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'')},
+      'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
     },//}}}
   }; /*}}}*/
   this.elements.choose_inclusive = { /*{{{*/
-    'type': 'abstract',
     'parent': 'choose',
     'illustrator': {//{{{
       'svg': self.adaptor.theme_dir + 'symbols/choose_inclusive.svg'
-    },//}}}
+    }//}}}
   };  /*}}}*/
   this.elements.choose_exclusive = { /*{{{*/
-    'type': 'abstract',
     'parent': 'choose',
     'illustrator': {//{{{
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
-  this.elements.scripts = { /*{{{*/
-    'type': 'abstract',
-    'description': [self.adaptor.theme_dir + 'rngs/update.rng',self.adaptor.theme_dir + 'rngs/finalize.rng']
-  }; /*}}}*/
-  this.elements.callinstantiation = { /*{{{*/
-    'type': 'abstract',
-    'parent': 'call',
+  this.elements.choose_inclusive_finish = { /*{{{*/
+    'parent': 'choose_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/callinstantiation.svg'
-    },//}}}
+      'svg': self.adaptor.theme_dir + 'symbols/choose_inclusive.svg'
+    }//}}}
   };  /*}}}*/
-  this.elements.callcorrelationsend = { /*{{{*/
-    'type': 'abstract',
-    'parent': 'call',
+  this.elements.choose_exclusive_finish = { /*{{{*/
+    'parent': 'choose_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/callcorrelationsend.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
-  this.elements.callcorrelationreceive = { /*{{{*/
-    'type': 'abstract',
-    'parent': 'call',
+  this.elements.parallel_simple = { /*{{{*/
+    'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/callcorrelationreceive.svg'
-    },//}}}
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+    }//}}}
   };  /*}}}*/
-  this.elements.callworklist = { /*{{{*/
-    'type': 'abstract',
-    'parent': 'call',
+  this.elements.parallel_complex = { /*{{{*/
+    'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/callworklist.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
     },//}}}
   };  /*}}}*/
-  this.elements.callmanipulateworklist = { /*{{{*/
-    'type': 'abstract',
-    'parent': 'call',
-    'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
+  this.elements.parallel_branch_normal = { /*{{{*/
+    'parent': 'parallel_branch',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/callmanipulateworklist.svg'
-    },//}}}
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_branch_normal.svg'
+    }//}}}
   };  /*}}}*/
+  this.elements.parallel_branch_event = { /*{{{*/
+    'parent': 'parallel_branch',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'noarrow': false,
+      'border': true,
+      'wide': true,
+      'closing_symbol': 'event_end',
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_branch_event.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.parallel_branch_compact = { /*{{{*/
+    'parent': 'parallel_branch',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_branch_compact.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.scripts = { /*{{{*/
+    'description': [self.adaptor.theme_dir + 'rngs/update.rng',self.adaptor.theme_dir + 'rngs/finalize.rng']
+  }; /*}}}*/
 }