cpee 2.1.21 → 2.1.25

data/cockpit/themes/default/theme.js

@@ -8,6 +8,7 @@ function WFAdaptorManifestation(adaptor) {
   this.compact = false;
   this.striped = false;
   this.endpoints = {};
+  this.presstimer;
 
   //{{{ transform the details data to description parts based on rng
   this.source = function(base,opts) {
@@ -137,93 +138,104 @@ function WFAdaptorManifestation(adaptor) {
     }
   } //}}}
 
-  // 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; }
+  function contextMenuHandling(svgid,e,child,sibling) { //{{{
+    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 = {};
+    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 (child) {
+      group = self.elements[xml_node.get(0).tagName].permissible_children(xml_node,'into');
+      if(group.length > 0) {
+        menu['Insert into'] = group;
+        copyOrMove(menu['Insert into'],group,xml_node,self.adaptor.description.insert_first_into);
+      }
+      if (self.elements[xml_node.get(0).tagName].permissible_children_expert) {
+        group = self.elements[xml_node.get(0).tagName].permissible_children_expert(xml_node,'into');
         if(group.length > 0) {
-          menu['Insert into'] = group;
-          copyOrMove(menu['Insert into'],group,xml_node,self.adaptor.description.insert_first_into);
-        }
-        if (self.elements[xml_node.get(0).tagName].permissible_children_expert) {
-          group = self.elements[xml_node.get(0).tagName].permissible_children_expert(xml_node,'into');
-          if(group.length > 0) {
-            menu['Insert into (Experts Only!)'] = group;
-            copyOrMove(menu['Insert into (Experts Only!)'],group,xml_node,self.adaptor.description.insert_first_into);
-          }
+          menu['Insert into (Experts Only!)'] = group;
+          copyOrMove(menu['Insert into (Experts Only!)'],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 (sibling) {
+      group = self.elements[xml_node.parent().get(0).tagName].permissible_children(xml_node,'after');
+      if(group.length > 0) {
+        menu['Insert after'] = group;
+        copyOrMove(menu['Insert after'],group,xml_node,self.adaptor.description.insert_after);
+      }
+      if (self.elements[xml_node.parent().get(0).tagName].permissible_children_expert) {
+        group = self.elements[xml_node.parent().get(0).tagName].permissible_children_expert(xml_node,'after');
         if(group.length > 0) {
-          menu['Insert after'] = group;
-          copyOrMove(menu['Insert after'],group,xml_node,self.adaptor.description.insert_after);
-        }
-        if (self.elements[xml_node.parent().get(0).tagName].permissible_children_expert) {
-          group = self.elements[xml_node.parent().get(0).tagName].permissible_children_expert(xml_node,'after');
-          if(group.length > 0) {
-            menu['Insert after (Experts Only!)'] = group;
-            copyOrMove(menu['Insert after (Experts Only!)'],group,xml_node,self.adaptor.description.insert_after);
-          }
+          menu['Insert after (Experts Only!)'] = group;
+          copyOrMove(menu['Insert after (Experts Only!)'],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').addClass('menu');
-        menu['Delete'] = [{
-          'label': 'Remove Element',
-          'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
-          'menu_icon': icon,
-          'type': undefined,
-          'params': [null, xml_node, self.selected()]
-        }];
-      }
-      if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
-        var icon =  self.elements.callmanipulate.illustrator.svg.clone();
-        icon.children('.rfill:last').addClass('menu');
-        menu['Delete'].push({
-          'label': 'Remove Scripts',
-          'function_call': self.adaptor.description.remove,
-          'menu_icon': icon,
-          'type': undefined,
-          'params': ['> code', 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
-            }];
-          }
+    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').addClass('menu');
+      menu['Delete'] = [{
+        'label': 'Remove Element',
+        'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
+        'menu_icon': icon,
+        'type': undefined,
+        'params': [null, xml_node, self.selected()]
+      }];
+    }
+    if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
+      var icon =  self.elements.callmanipulate.illustrator.svg.clone();
+      icon.children('.rfill:last').addClass('menu');
+      menu['Delete'].push({
+        'label': 'Remove Scripts',
+        'function_call': self.adaptor.description.remove,
+        'menu_icon': icon,
+        'type': undefined,
+        'params': ['> code', 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);
+    }
+    new CustomMenu(e).contextmenu(menu);
+  } //}}}
+
+  // Events
+  this.events.touchend = function(svgid, e) { // {{{
+    clearTimeout(self.presstimer);
+  } // }}}
+  this.events.touchstart = function(svgid, e, child, sibling) { // {{{
+    self.presstimer = window.setTimeout(function() { contextMenuHandling(svgid,e,child,sibling); },1000);
+    return false;
+  } // }}}
+  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
+      contextMenuHandling(svgid,e,child,sibling);
     }
     return false;
   } // }}}
@@ -321,6 +333,8 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dragstart': self.events.dragstart,
       'mouseover': self.events.mouseover,
@@ -347,6 +361,8 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,false,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'mouseover': self.events.mouseover,
       'mouseout': self.events.mouseout
@@ -364,6 +380,8 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,false,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'mouseover': self.events.mouseover,
       'mouseout': self.events.mouseout
@@ -381,6 +399,8 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,false,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'mouseover': self.events.mouseover,
       'mouseout': self.events.mouseout
@@ -399,6 +419,8 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,false,false); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,false,false); },
+      'touchend': self.events.touchend,
       'mouseover': self.events.mouseover,
       'mouseout': self.events.mouseout
     }//}}}
@@ -410,9 +432,7 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/end.svg'
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.suppress();
-      }
+      'mousedown': function (node,e) { self.events.suppress(); }
     }//}}}
   }; /*}}}*/
   this.elements.event_end = { /*{{{*/
@@ -422,9 +442,7 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/event_end.svg'
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.suppress();
-      },
+      'mousedown': function (node,e) { self.events.suppress(); },
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -445,9 +463,9 @@ function WFAdaptorManifestation(adaptor) {
       },
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -466,9 +484,9 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg',
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -493,9 +511,9 @@ function WFAdaptorManifestation(adaptor) {
       },
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -558,9 +576,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -642,9 +660,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,false);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,false); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,false); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -734,9 +752,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -830,9 +848,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -923,9 +941,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -1017,9 +1035,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -1099,9 +1117,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -1131,9 +1149,9 @@ function WFAdaptorManifestation(adaptor) {
       ];
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -1209,9 +1227,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,false);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,false); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,false); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,

data/cockpit/themes/extended/rngs/call.rng

@@ -25,92 +25,6 @@
         </element>
       </zeroOrMore>
     </element>
-    <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
-
-      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Probe">
-          <element name="probe">
-            <element name="name" rngui:label="Label">
-              <data type="string" rngui:label="Label"/>
-            </element>
-            <element name="extractor_type" rngui:label="Extractor Type">
-              <choice>
-                <value id='code'>Code</value>
-                <value id='service'>Service</value>
-              </choice>
-            </element>
-            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
-              <text rngui:label="Code"/>
-            </element>
-            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="extractor_params" rngui:label="Extractor Service Arguments:">
-              <zeroOrMore rngui:label="Create Argument Pairs">
-                <element rngui:label="Name">
-                  <anyName/>
-                  <data type="string" rngui:label="Value / Json"/>
-                </element>
-              </zeroOrMore>
-            </element>
-            <element name="visualizer_url" rngui:label="Visualizer Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="visualizer_params" rngui:label="Visualizer Arguments">
-              <zeroOrMore rngui:label="Create Argument Pairs">
-                <element rngui:label="Name">
-                  <anyName/>
-                  <data type="string" rngui:label="Value / Json"/>
-                </element>
-              </zeroOrMore>
-            </element>
-          </element>
-        </zeroOrMore>
-      </element>
-
-      <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Impact Profile">
-          <element name="ip">
-            <element name="name" rngui:label="Label">
-              <data type="string" rngui:label="Label"/>
-            </element>
-            <element name="target" rngui:label="Target Value">
-              <data type="string" rngui:label="Value"/>
-            </element>
-            <element name="ifs" rngui:header="Impact Factors">
-              <zeroOrMore rngui:label="Add Impact Factor">
-                <element name="if">
-                  <element name="ivs" rngui:header="Impact Values">
-                    <zeroOrMore rngui:label="Add Impact Value ">
-                      <element name="iv">
-                        <element name="extractor_url" rngui:label="Extractor Url">
-                          <data type="string" rngui:label="Service Url + Parameters"/>
-                        </element>
-                        <element name="aggregator_url" rngui:label="Aggregator Url">
-                          <data type="string" rngui:label="Service Url + Parameters"/>
-                        </element>
-                      </element>
-                    </zeroOrMore>
-                  </element>
-                  <element name="aggregator_url" rngui:label="Impact Function Url">
-                    <data type="string" rngui:label="Service Url + Parameters"/>
-                  </element>
-                </element>
-              </zeroOrMore>
-            </element>
-            <element name="vfunc_url" rngui:label="Violation Function Url">
-              <data type="string" rngui:label="Service Url + Parameters"/>
-            </element>
-          </element>
-        </zeroOrMore>
-      </element>
-
-    </element>
-    <element name="report" rngui:header="Reporting" rngui:fold="closed">
-      <element name="url" rngui:label='HTML Snippet'>
-        <data type="string" rngui:label="url to report snippet"/>
-      </element>
-    </element>
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
@@ -120,6 +34,92 @@
       <element name="_timing_avg" rngui:label="Avg in min">
         <data type="float" rngui:label="Minutes"/>
       </element>
+      <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
+
+        <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
+          <zeroOrMore rngui:label="Add Probe">
+            <element name="probe">
+              <element name="name" rngui:label="Label">
+                <data type="string" rngui:label="Label"/>
+              </element>
+              <element name="extractor_type" rngui:label="Extractor Type">
+                <choice>
+                  <value id='code'>Code</value>
+                  <value id='service'>Service</value>
+                </choice>
+              </element>
+              <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
+                <text rngui:label="Code"/>
+              </element>
+              <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
+                <data type="string" rngui:label="Service Url"/>
+              </element>
+              <element name="extractor_params" rngui:label="Extractor Service Arguments:">
+                <zeroOrMore rngui:label="Create Argument Pairs">
+                  <element rngui:label="Name">
+                    <anyName/>
+                    <data type="string" rngui:label="Value / Json"/>
+                  </element>
+                </zeroOrMore>
+              </element>
+              <element name="visualizer_url" rngui:label="Visualizer Url">
+                <data type="string" rngui:label="Service Url"/>
+              </element>
+              <element name="visualizer_params" rngui:label="Visualizer Arguments">
+                <zeroOrMore rngui:label="Create Argument Pairs">
+                  <element rngui:label="Name">
+                    <anyName/>
+                    <data type="string" rngui:label="Value / Json"/>
+                  </element>
+                </zeroOrMore>
+              </element>
+            </element>
+          </zeroOrMore>
+        </element>
+
+        <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
+          <zeroOrMore rngui:label="Add Impact Profile">
+            <element name="ip">
+              <element name="name" rngui:label="Label">
+                <data type="string" rngui:label="Label"/>
+              </element>
+              <element name="target" rngui:label="Target Value">
+                <data type="string" rngui:label="Value"/>
+              </element>
+              <element name="ifs" rngui:header="Impact Factors">
+                <zeroOrMore rngui:label="Add Impact Factor">
+                  <element name="if">
+                    <element name="ivs" rngui:header="Impact Values">
+                      <zeroOrMore rngui:label="Add Impact Value ">
+                        <element name="iv">
+                          <element name="extractor_url" rngui:label="Extractor Url">
+                            <data type="string" rngui:label="Service Url + Parameters"/>
+                          </element>
+                          <element name="aggregator_url" rngui:label="Aggregator Url">
+                            <data type="string" rngui:label="Service Url + Parameters"/>
+                          </element>
+                        </element>
+                      </zeroOrMore>
+                    </element>
+                    <element name="aggregator_url" rngui:label="Impact Function Url">
+                      <data type="string" rngui:label="Service Url + Parameters"/>
+                    </element>
+                  </element>
+                </zeroOrMore>
+              </element>
+              <element name="vfunc_url" rngui:label="Violation Function Url">
+                <data type="string" rngui:label="Service Url + Parameters"/>
+              </element>
+            </element>
+          </zeroOrMore>
+        </element>
+
+      </element>
+      <element name="report" rngui:header="Reporting" rngui:fold="closed">
+        <element name="url" rngui:label='HTML Snippet'>
+          <data type="string" rngui:label="url to report snippet"/>
+        </element>
+      </element>
       <element name="explanations" rngui:header="Explanations">
         <zeroOrMore rngui:label="Add Explanation">
           <element name="explanation">
@@ -155,29 +155,31 @@
       </element>
     </element>
   </element>
-  <element name="input" rngui:header="Input Arguments Documentation" rngui:fold="closed">
-    <zeroOrMore rngui:label="Create Argument">
-      <element name="item" rngui:label="Description">
-        <attribute name="label" rngui:label="Name">
-          <data type="string"/>
-        </attribute>
-        <text rngui:wrap="true" rngui:label="What does it do?"/>
-      </element>
-    </zeroOrMore>
-  </element>
-  <element name="output" rngui:header="Output Elements Documentation" rngui:fold="closed">
-    <zeroOrMore rngui:label="Create Element">
-      <element name="item" rngui:label="Description">
-        <attribute name="label" rngui:label="Name">
-          <data type="string"/>
-        </attribute>
-        <text rngui:wrap="true" rngui:label="What does it do?"/>
+  <element name="documentation" rngui:header="Documentation">
+    <element name="input" rngui:header="Input Arguments" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Argument">
+        <element name="item" rngui:label="Description">
+          <attribute name="label" rngui:label="Name">
+            <data type="string"/>
+          </attribute>
+          <text rngui:wrap="true" rngui:label="What does it do?"/>
+        </element>
+      </zeroOrMore>
+    </element>
+    <element name="output" rngui:header="Output Elements" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Element">
+        <element name="item" rngui:label="Description">
+          <attribute name="label" rngui:label="Name">
+            <data type="string"/>
+          </attribute>
+          <text rngui:wrap="true" rngui:label="What does it do?"/>
+        </element>
+      </zeroOrMore>
+    </element>
+    <element name="implementation" rngui:header="Implementation" rngui:fold="closed">
+      <element name="description" rngui:label="Description">
+        <text rngui:wrap="true" rngui:label="What is supposed to happen?"/>
       </element>
-    </zeroOrMore>
-  </element>
-  <element name="implementation" rngui:header="Implementation Documentation" rngui:fold="closed">
-    <element name="description" rngui:label="Description">
-      <text rngui:wrap="true" rngui:label="What is supposed to happen?"/>
     </element>
   </element>
 </element>