cpee 1.5.17 → 1.5.22

data/cockpit/themes/packed/symbols/scripts.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="1" y="1" width="28" height="28" rx="4" class="hfill rfill cline stand"/>
+  <text transform="translate(15,21)" class="normal">s</text>
+</svg>

data/cockpit/themes/packed/symbols/start.svg

@@ -0,0 +1,3 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="stand"/>
+</svg>

data/cockpit/themes/packed/symbols/stop.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="hfill rfill cline stand"/>
+  <line x1="12.5" y1="22.5" x2="12.5" y2="8.5" class="stand"/>
+  <line x1="17.5" y1="22.5" x2="17.5" y2="8.5" class="stand"/>
+</svg>

data/cockpit/themes/packed/symbols/terminate.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="standfat"/>
+  <circle cx="15" cy="15" r="9" class="black"/>
+</svg>

data/cockpit/themes/packed/theme.js

@@ -132,6 +132,13 @@ function WFAdaptorManifestation(adaptor) {
           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);
+          }
+        }
       }
       if (sibling) {
         group = self.elements[xml_node.parent().get(0).tagName].permissible_children(xml_node,'after');
@@ -139,6 +146,13 @@ function WFAdaptorManifestation(adaptor) {
           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);
+          }
+        }
       }
 
       if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
@@ -146,10 +160,10 @@ function WFAdaptorManifestation(adaptor) {
         icon.children('.rfill').addClass('menu');
         menu['Delete'] = [{
           'label': 'Remove Element',
-          'function_call': self.adaptor.description.remove,
+          '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]
+          'params': [null, xml_node, self.selected()]
         }];
       }
       if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
@@ -809,6 +823,19 @@ function WFAdaptorManifestation(adaptor) {
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
+      var childs =  [
+        {'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;
+    }, //}}}
+    'permissible_children_expert': function(node,mode) { //{{{
+      var func = null;
+      if (mode.match(/into/)) { func = self.adaptor.description.insert_first_into }
+      else { func = self.adaptor.description.insert_after }
       var childs =  [
         {'label': 'Service Call with Scripts',
          'function_call': func,
@@ -835,11 +862,6 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
-        {'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]},
         {'label': 'Stop',
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
@@ -950,12 +972,7 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
-        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);
-        }
+        self.events.mousedown(node,e,true,true);
       },
       'click': self.events.click,
       'dblclick': self.events.dblclick,
@@ -1128,11 +1145,6 @@ function WFAdaptorManifestation(adaptor) {
          '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(),

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

@@ -106,16 +106,6 @@
       <element name="_notes_general" rngui:label='General'>
         <text rngui:wrap='true' rngui:label='Notes'/>
       </element>
-      <element name="_attachments">
-        <zeroOrMore rngui:label="Create Attachment">
-          <element name='_attachment' rngui:label='Attachment'>
-            <attribute name="label" rngui:label="Note">
-              <data type="string"/>
-            </attribute>
-            <data type="string" rngui:label="Url"/>
-          </element>
-        </zeroOrMore>
-      </element>
     </element>
   </element>
 </element>

data/cockpit/themes/preset/rngs/callmanipulate.rng

@@ -129,19 +129,6 @@
       <element name="_notes_general" rngui:label='General'>
         <text rngui:wrap='true' rngui:label='Notes'/>
       </element>
-      <element name="_notes_output" rngui:label='Output'>
-        <text rngui:wrap='true' rngui:label='Notes'/>
-      </element>
-      <element name="_attachments">
-        <zeroOrMore rngui:label="Create Attachment">
-          <element name='_attachment' rngui:label='Attachment'>
-            <attribute name="label" rngui:label="Note">
-              <data type="string"/>
-            </attribute>
-            <data type="string" rngui:label="Url"/>
-          </element>
-        </zeroOrMore>
-      </element>
     </element>
   </element>
 </element>

data/cockpit/themes/preset/symbols/alternative.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="11" y="6" width="9" height="18" rx="0" class="hline white"/>
+  <path class="cline hfill stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
+  <line x1="15.6" y1="4" x2="15.6" y2="27" class="ourline"/>
+</svg>

data/cockpit/themes/preset/symbols/arrow.svg

@@ -0,0 +1,3 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <path class="rfill stand" d="m 5 10 l 10 0 l 0 -5 l 10 10 l -10 10 l 0 -5 l -10 0 z"/>
+</svg>

data/cockpit/themes/preset/symbols/call.svg

@@ -0,0 +1,6 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <g class="replace">
+    <rect x="1" y="1" width="28" height="28" rx="4" class="hfill rfill cline stand"/>
+    <path class="normal" style="fill:#000000;" d="m 21.561187,10.184155 c 0,-0.03232 0,-0.03232 0,-0.03232 C 21.076371,9.5054099 20.494591,8.9559512 19.815848,8.4388133 l 0,0.032323 C 19.266389,8.891311 18.71693,9.3438064 18.199794,9.7963017 17.973545,9.6670167 17.779619,9.5700535 17.585693,9.4730903 17.327124,9.3438064 17.068556,9.2145213 16.777665,9.1498799 16.680695,9.1175569 16.583739,9.0852339 16.486775,9.0852339 16.422135,8.3741695 16.357491,7.6631063 16.260528,6.952042 15.937318,6.887396 15.614106,6.887396 15.258574,6.855073 c -0.09697,0 -0.193926,0 -0.258569,0 -0.09697,0 -0.193925,0 -0.258568,0 -0.323211,0.032323 -0.614101,0.032323 -0.90499,0.096969 -0.09697,0.6787425 -0.161606,1.3898068 -0.193927,2.1008712 -0.129284,0 -0.226248,0.032323 -0.355532,0.064646 -0.03232,0 -0.06465,0 -0.09697,0.032323 -0.258568,0.064646 -0.517136,0.1939264 -0.775704,0.3232103 -0.226249,0.096969 -0.420175,0.1939264 -0.614102,0.3232114 -0.549458,-0.4524953 -1.066595,-0.87267 -1.616054,-1.3251654 0,0 0,0 -0.03232,-0.032323 C 10.022552,8.5357845 9.8932693,8.6327419 9.7963053,8.7297051 9.5700583,8.8913109 9.3761314,9.0852373 9.2145262,9.2791637 8.9236366,9.5377327 8.6973883,9.8609431 8.4388194,10.184155 c 0,0 0,0 0.032323,0 0.4201747,0.549459 0.87267,1.066596 1.325166,1.616054 -0.129285,0.193927 -0.258569,0.420175 -0.355533,0.614101 -0.129285,0.258569 -0.226248,0.549459 -0.2908894,0.808028 -0.064646,0.129284 -0.096969,0.258568 -0.096969,0.355531 -0.7110644,0.06465 -1.4221288,0.129285 -2.1008713,0.226248 -0.064646,0.323211 -0.096969,0.646422 -0.096969,1.001954 0,0.484816 0.032323,0.969632 0.1292839,1.422128 0.6787437,0.06465 1.3574862,0.129284 2.0685505,0.193926 0,0.129284 0.032323,0.258569 0.096969,0.355532 0.064646,0.29089 0.1616049,0.549459 0.2908899,0.840349 0.129284,0.226247 0.2262471,0.452495 0.387853,0.646421 -0.452496,0.549459 -0.9049912,1.066596 -1.3251647,1.616054 0.484816,0.678744 1.0665957,1.260523 1.7453387,1.74534 l 0,-0.03232 c 0.517137,-0.420175 1.066596,-0.87267 1.583733,-1.325166 l 0.03232,0 c 0.161605,0.09697 0.355532,0.193928 0.517136,0.290891 0.290891,0.129284 0.614101,0.258568 0.904991,0.32321 0.129284,0.03232 0.226248,0.06465 0.32321,0.09697 0.06465,0.678743 0.129285,1.389807 0.226249,2.100871 0.290889,0.03232 0.581779,0.06465 0.90499,0.06465 0.06465,0 0.258568,0 0.484817,0 0.355532,0 0.711064,-0.03232 1.066595,-0.09697 0.06465,-0.678742 0.129285,-1.389807 0.193926,-2.10087 0.09697,-0.03232 0.193927,-0.06465 0.29089,-0.09697 l 0,0 c 0.290891,-0.06464 0.549459,-0.161605 0.808028,-0.290889 0.226248,-0.09697 0.452495,-0.226248 0.678743,-0.387854 0,0.03232 0,0.03232 0.03232,0.03232 0.517137,0.452495 1.066596,0.904989 1.616054,1.325164 0.09697,-0.06465 0.193927,-0.129284 0.323212,-0.226247 0.193926,-0.161606 0.387852,-0.355532 0.549458,-0.549459 0.29089,-0.290889 0.58178,-0.614101 0.840348,-0.969633 -0.452495,-0.549459 -0.90499,-1.098917 -1.357486,-1.616054 0,-0.03232 0,-0.03232 0,-0.03232 0.09697,-0.161605 0.193927,-0.355531 0.29089,-0.549457 0.09696,-0.258569 0.226248,-0.517138 0.29089,-0.775707 0,-0.03232 0,-0.06465 0.03232,-0.06465 0,-0.129285 0.03232,-0.226248 0.06465,-0.290891 0.711065,-0.06465 1.422129,-0.129284 2.100872,-0.193926 0.06464,-0.323211 0.06464,-0.646422 0.09697,-0.969632 0,-0.09697 0,-0.193927 0,-0.29089 0,-0.06465 0,-0.161606 0,-0.258569 -0.03232,-0.323212 -0.03232,-0.646422 -0.09697,-0.969633 -0.678743,-0.06465 -1.389807,-0.129284 -2.100872,-0.193927 -0.03232,-0.09697 -0.06465,-0.193926 -0.06465,-0.290889 -0.09697,-0.29089 -0.193927,-0.58178 -0.323212,-0.872669 -0.09697,-0.193927 -0.226247,-0.420175 -0.32321,-0.614102 0.420173,-0.517136 0.872669,-1.066595 1.325164,-1.616054 z m -8.629731,2.682651 c 0.581779,-0.614101 1.292844,-0.904991 2.100871,-0.87267 0.840348,-0.03232 1.519091,0.258569 2.133192,0.87267 0.581779,0.581779 0.872669,1.292843 0.872669,2.10087 0,0.840348 -0.29089,1.519092 -0.872669,2.133192 -0.614101,0.58178 -1.292844,0.87267 -2.133192,0.87267 -0.808027,0 -1.519092,-0.29089 -2.100871,-0.87267 -0.581779,-0.6141 -0.872669,-1.292844 -0.872669,-2.133192 0,-0.808027 0.29089,-1.519091 0.872669,-2.10087 z"/>
+  </g>
+</svg>

data/cockpit/themes/preset/symbols/callmanipulate.svg

@@ -0,0 +1,8 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <g class="replace">
+    <rect x="1" y="1" width="28" height="28" rx="4" class="cline hfill rfill stand"/>
+    <path class="normal" transform="translate(-2,-2)" style="fill:#000000;" d="m 21.561187,10.184155 c 0,-0.03232 0,-0.03232 0,-0.03232 C 21.076371,9.5054099 20.494591,8.9559512 19.815848,8.4388133 l 0,0.032323 C 19.266389,8.891311 18.71693,9.3438064 18.199794,9.7963017 17.973545,9.6670167 17.779619,9.5700535 17.585693,9.4730903 17.327124,9.3438064 17.068556,9.2145213 16.777665,9.1498799 16.680695,9.1175569 16.583739,9.0852339 16.486775,9.0852339 16.422135,8.3741695 16.357491,7.6631063 16.260528,6.952042 15.937318,6.887396 15.614106,6.887396 15.258574,6.855073 c -0.09697,0 -0.193926,0 -0.258569,0 -0.09697,0 -0.193925,0 -0.258568,0 -0.323211,0.032323 -0.614101,0.032323 -0.90499,0.096969 -0.09697,0.6787425 -0.161606,1.3898068 -0.193927,2.1008712 -0.129284,0 -0.226248,0.032323 -0.355532,0.064646 -0.03232,0 -0.06465,0 -0.09697,0.032323 -0.258568,0.064646 -0.517136,0.1939264 -0.775704,0.3232103 -0.226249,0.096969 -0.420175,0.1939264 -0.614102,0.3232114 -0.549458,-0.4524953 -1.066595,-0.87267 -1.616054,-1.3251654 0,0 0,0 -0.03232,-0.032323 C 10.022552,8.5357845 9.8932693,8.6327419 9.7963053,8.7297051 9.5700583,8.8913109 9.3761314,9.0852373 9.2145262,9.2791637 8.9236366,9.5377327 8.6973883,9.8609431 8.4388194,10.184155 c 0,0 0,0 0.032323,0 0.4201747,0.549459 0.87267,1.066596 1.325166,1.616054 -0.129285,0.193927 -0.258569,0.420175 -0.355533,0.614101 -0.129285,0.258569 -0.226248,0.549459 -0.2908894,0.808028 -0.064646,0.129284 -0.096969,0.258568 -0.096969,0.355531 -0.7110644,0.06465 -1.4221288,0.129285 -2.1008713,0.226248 -0.064646,0.323211 -0.096969,0.646422 -0.096969,1.001954 0,0.484816 0.032323,0.969632 0.1292839,1.422128 0.6787437,0.06465 1.3574862,0.129284 2.0685505,0.193926 0,0.129284 0.032323,0.258569 0.096969,0.355532 0.064646,0.29089 0.1616049,0.549459 0.2908899,0.840349 0.129284,0.226247 0.2262471,0.452495 0.387853,0.646421 -0.452496,0.549459 -0.9049912,1.066596 -1.3251647,1.616054 0.484816,0.678744 1.0665957,1.260523 1.7453387,1.74534 l 0,-0.03232 c 0.517137,-0.420175 1.066596,-0.87267 1.583733,-1.325166 l 0.03232,0 c 0.161605,0.09697 0.355532,0.193928 0.517136,0.290891 0.290891,0.129284 0.614101,0.258568 0.904991,0.32321 0.129284,0.03232 0.226248,0.06465 0.32321,0.09697 0.06465,0.678743 0.129285,1.389807 0.226249,2.100871 0.290889,0.03232 0.581779,0.06465 0.90499,0.06465 0.06465,0 0.258568,0 0.484817,0 0.355532,0 0.711064,-0.03232 1.066595,-0.09697 0.06465,-0.678742 0.129285,-1.389807 0.193926,-2.10087 0.09697,-0.03232 0.193927,-0.06465 0.29089,-0.09697 l 0,0 c 0.290891,-0.06464 0.549459,-0.161605 0.808028,-0.290889 0.226248,-0.09697 0.452495,-0.226248 0.678743,-0.387854 0,0.03232 0,0.03232 0.03232,0.03232 0.517137,0.452495 1.066596,0.904989 1.616054,1.325164 0.09697,-0.06465 0.193927,-0.129284 0.323212,-0.226247 0.193926,-0.161606 0.387852,-0.355532 0.549458,-0.549459 0.29089,-0.290889 0.58178,-0.614101 0.840348,-0.969633 -0.452495,-0.549459 -0.90499,-1.098917 -1.357486,-1.616054 0,-0.03232 0,-0.03232 0,-0.03232 0.09697,-0.161605 0.193927,-0.355531 0.29089,-0.549457 0.09696,-0.258569 0.226248,-0.517138 0.29089,-0.775707 0,-0.03232 0,-0.06465 0.03232,-0.06465 0,-0.129285 0.03232,-0.226248 0.06465,-0.290891 0.711065,-0.06465 1.422129,-0.129284 2.100872,-0.193926 0.06464,-0.323211 0.06464,-0.646422 0.09697,-0.969632 0,-0.09697 0,-0.193927 0,-0.29089 0,-0.06465 0,-0.161606 0,-0.258569 -0.03232,-0.323212 -0.03232,-0.646422 -0.09697,-0.969633 -0.678743,-0.06465 -1.389807,-0.129284 -2.100872,-0.193927 -0.03232,-0.09697 -0.06465,-0.193926 -0.06465,-0.290889 -0.09697,-0.29089 -0.193927,-0.58178 -0.323212,-0.872669 -0.09697,-0.193927 -0.226247,-0.420175 -0.32321,-0.614102 0.420173,-0.517136 0.872669,-1.066595 1.325164,-1.616054 z m -8.629731,2.682651 c 0.581779,-0.614101 1.292844,-0.904991 2.100871,-0.87267 0.840348,-0.03232 1.519091,0.258569 2.133192,0.87267 0.581779,0.581779 0.872669,1.292843 0.872669,2.10087 0,0.840348 -0.29089,1.519092 -0.872669,2.133192 -0.614101,0.58178 -1.292844,0.87267 -2.133192,0.87267 -0.808027,0 -1.519092,-0.29089 -2.100871,-0.87267 -0.581779,-0.6141 -0.872669,-1.292844 -0.872669,-2.133192 0,-0.808027 0.29089,-1.519091 0.872669,-2.10087 z"/>
+  </g>
+  <circle cx="28" cy="27" r="9" class="cline rfill stand"/>
+  <text transform="translate(28,31)" class="small">s</text>
+</svg>

data/cockpit/themes/preset/symbols/choose.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
+  <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
+</svg>

data/cockpit/themes/preset/symbols/choose_exclusive.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
+  <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
+</svg>

data/cockpit/themes/preset/symbols/choose_inclusive.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <circle cx="15.5" cy="15.5" r="7" class="stand"/>
+</svg>

data/cockpit/themes/preset/symbols/complex.svg

@@ -0,0 +1,8 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
+  <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
+  <line x1="8.5" y1="15.5" x2="22.5" y2="15.5" class="stand"/>
+  <line x1="15.5" y1="8.5" x2="15.5" y2="22.5" class="stand"/>
+</svg>
+

data/cockpit/themes/preset/symbols/critical.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <path class="cline hfill rfill stand" d="m 3 27 l 12 -24 l 12 24 z"/>
+  <text transform="translate(15,23)" class="small">!</text>
+</svg>

data/cockpit/themes/preset/symbols/end.svg

@@ -0,0 +1,3 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="standfat"/>
+</svg>

data/cockpit/themes/preset/symbols/escape.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="stand cline"/>
+  <circle cx="15" cy="15" r="11" class="stand cline hfill"/>
+  <polygon points="10.5,20.5 15,8.5 20.5,20.5 15,15.5 10.5,20.5" class="black"/>
+</svg>

data/cockpit/themes/preset/symbols/event_end.svg

@@ -0,0 +1,3 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="rfill hfill cline standfat"/>
+</svg>

data/cockpit/themes/preset/symbols/loop.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
+  <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
+</svg>

data/cockpit/themes/preset/symbols/manipulate.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill hfill cline stand"/>
+  <text transform="translate(15,21)" class="normal">s</text>
+</svg>

data/cockpit/themes/preset/symbols/otherwise.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="11" class="hfill standtrans"/>
+  <line x1="9" y1="21" x2="21" y2="9" class="stand cline hline"/>
+  <line x1="15.6" y1="4" x2="15.6" y2="27" class="ourline"/>
+</svg>

data/cockpit/themes/preset/symbols/parallel.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <text transform="translate(15,25)" class="normallarge">+</text>
+</svg>
+

data/cockpit/themes/preset/symbols/parallel_branch.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="11" y="6" width="9" height="18" rx="0" class="hline white"/>
+  <path class="cline hfill stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
+  <line x1="15.6" y1="4" x2="15.6" y2="27" class="ourline"/>
+</svg>

data/cockpit/themes/preset/symbols/parallel_branch_compact.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <text transform="translate(15,20)" class="small">|||</text>
+</svg>

data/cockpit/themes/preset/symbols/parallel_branch_event.svg

@@ -0,0 +1,14 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
+
+  <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
+  <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
+  <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
+  <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
+  <line x1="28" y1="18" x2="24" y2="11" class="stand"/>
+
+  <circle cx="55.5" cy="15" r="14" class="cline hfill rfill stand"/>
+  <line x1="55.5" y1="11" x2="51.5" y2="18" class="stand"/>
+  <line x1="51.5" y1="18" x2="59.5" y2="18" class="stand"/>
+  <line x1="59.5" y1="18" x2="55.5" y2="11" class="stand"/>
+</svg>

data/cockpit/themes/preset/symbols/parallel_branch_normal.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="11" y="6" width="9" height="18" rx="0" class="hline white"/>
+  <path class="cline hfill stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
+  <line x1="15.6" y1="4" x2="15.6" y2="27" class="ourline"/>
+</svg>

data/cockpit/themes/preset/symbols/scripts.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="1" y="1" width="28" height="28" rx="4" class="hfill rfill cline stand"/>
+  <text transform="translate(15,21)" class="normal">s</text>
+</svg>

data/cockpit/themes/preset/symbols/start.svg

@@ -0,0 +1,3 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="stand"/>
+</svg>

data/cockpit/themes/preset/symbols/stop.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="hfill rfill cline stand"/>
+  <line x1="12.5" y1="22.5" x2="12.5" y2="8.5" class="stand"/>
+  <line x1="17.5" y1="22.5" x2="17.5" y2="8.5" class="stand"/>
+</svg>

data/cockpit/themes/preset/symbols/terminate.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="standfat"/>
+  <circle cx="15" cy="15" r="9" class="black"/>
+</svg>

data/cockpit/themes/preset/theme.js

@@ -132,6 +132,13 @@ function WFAdaptorManifestation(adaptor) {
           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);
+          }
+        }
       }
       if (sibling) {
         group = self.elements[xml_node.parent().get(0).tagName].permissible_children(xml_node,'after');
@@ -139,6 +146,13 @@ function WFAdaptorManifestation(adaptor) {
           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);
+          }
+        }
       }
 
       if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
@@ -146,10 +160,10 @@ function WFAdaptorManifestation(adaptor) {
         icon.children('.rfill').addClass('menu');
         menu['Delete'] = [{
           'label': 'Remove Element',
-          'function_call': self.adaptor.description.remove,
+          '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]
+          'params': [null, xml_node, self.selected()]
         }];
       }
       if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
@@ -810,6 +824,19 @@ function WFAdaptorManifestation(adaptor) {
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
+      var childs =  [
+        {'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;
+    }, //}}}
+    'permissible_children_expert': function(node,mode) { //{{{
+      var func = null;
+      if (mode.match(/into/)) { func = self.adaptor.description.insert_first_into }
+      else { func = self.adaptor.description.insert_after }
       var childs =  [
         {'label': 'Service Call with Scripts',
          'function_call': func,
@@ -836,11 +863,6 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
-        {'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]},
         {'label': 'Stop',
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
@@ -951,12 +973,7 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
-        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);
-        }
+        self.events.mousedown(node,e,true,true);
       },
       'click': self.events.click,
       'dblclick': self.events.dblclick,
@@ -1129,11 +1146,6 @@ function WFAdaptorManifestation(adaptor) {
          '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(),

data/cpee.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.5.17"
+  s.version          = "1.5.22"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"
 
   s.description      = "see http://cpee.org"
 
-  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,lib/**/*,cockpit/**/*,contrib/logo*,contrib/Screen*,log/**/*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*,log/logs/**/*}'] + %w(COPYING FEATURES INSTALL Rakefile cpee.gemspec README AUTHORS)
+  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,lib/**/*,cockpit/**/*,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*,log/**/*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*,log/logs/**/*}'] + %w(COPYING FEATURES INSTALL Rakefile cpee.gemspec README AUTHORS)
   s.require_path     = 'lib'
   s.extra_rdoc_files = ['README']
   s.bindir           = 'tools'
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'riddl', '~> 0.99'
   s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.80'
   s.add_runtime_dependency 'savon', '~> 2'
+  s.add_runtime_dependency 'xml-smart', '>=0.4.3', '~>0'
   s.add_runtime_dependency 'highline', '~> 1.6'
   s.add_runtime_dependency 'json', '~>2.1'
   s.add_runtime_dependency 'rubyzip', '~>1.2'