cpee 1.3.223 → 1.3.224

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

@@ -26,4 +26,30 @@
       </zeroOrMore>
     </element>
   </element>
+  <element name="_timing" rngui:header="Timing">
+    <element name="_timing_min" rngui:label='Min in m'>
+      <data type='float' rngui:label='Minutes'/>
+    </element>
+    <element name="_timing_max" rngui:label='Max in m'>
+      <data type='float' rngui:label='Minutes'/>
+    </element>
+    <element name="_timing_avg" rngui:label='Avg in m'>
+      <data type='float' rngui:label='Minutes'/>
+    </element>
+  </element>
+  <element name="_notes" rngui:header="Notes">
+    <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>

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

@@ -38,4 +38,33 @@
     </attribute>
     <text rngui:label='Script that is executed, when a service sends intermediate data'/>
   </element>
+  <element name="_timing" rngui:header="Timing">
+    <element name="_timing_min" rngui:label='Min in m'>
+      <data type='float' rngui:label='Minutes'/>
+    </element>
+    <element name="_timing_max" rngui:label='Max in m'>
+      <data type='float' rngui:label='Minutes'/>
+    </element>
+    <element name="_timing_avg" rngui:label='Avg in m'>
+      <data type='float' rngui:label='Minutes'/>
+    </element>
+  </element>
+  <element name="_notes" rngui:header="Notes">
+    <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>

data/cockpit/themes/default/rngs/manipulate.rng

@@ -2,5 +2,8 @@
   <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="label" rngui:label="Label">
+    <data type="string" rngui:label="Short description of the task"/>
+  </attribute>
   <text rngui:label='Script that is executed'/>
 </element>

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

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <circle cx="15" cy="15" r="14" class="standwithout"/>
-  <text transform="translate(15,20)" class="cfill normal">{..}</text>
+  <text transform="translate(15,20)" class="htext cfill normal">{..}</text>
 </svg>

data/cockpit/themes/default/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/default/symbols/call.svg

@@ -1,4 +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 cline stand"/>
+  <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"/>
 </svg>

data/cockpit/themes/default/symbols/callcorrelationreceive.svg

@@ -1,6 +1,6 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <circle cx="15" cy="15" r="14" class="cline stand"/>
-  <circle cx="15" cy="15" r="11" class="cline rfill stand"/>
+  <circle cx="15" cy="15" r="11" class="cline hfill rfill stand"/>
   <rect x="9" y="11" width="12" height="8" class="black" style="fill: none"/>
   <path d="m 9,11 6,4 6,-4" class="black" style="fill: none"/>
 </svg>

data/cockpit/themes/default/symbols/callcorrelationsend.svg

@@ -1,6 +1,6 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <circle cx="15" cy="15" r="14" class="cline stand"/>
-  <circle cx="15" cy="15" r="11" class="cline rfill stand"/>
+  <circle cx="15" cy="15" r="11" class="cline hfill rfill stand"/>
   <rect x="9" y="11" width="12" height="8" class="black"/>
-  <path d="m 9,11 6,3 6,-3" class="white" style="fill: none;"/>
+  <path d="m 9,11 6,3 6,-3" class="white hline" style="fill: none;"/>
 </svg>

data/cockpit/themes/default/symbols/callinstantiation.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="cline rfill stand" style="stroke-dasharray: 1, 3;"/>
+  <rect x="1" y="1" width="28" height="28" rx="4" class="cline hfill rfill stand" style="stroke-dasharray: 1, 3;"/>
 </svg>

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

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="cline rfill stand"/>
+  <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"/>
   <circle cx="28" cy="27" r="9" class="cline rfill stand"/>
   <text transform="translate(28,31)" class="small">s</text>

data/cockpit/themes/default/symbols/callmanipulateworklist.svg

@@ -1,6 +1,6 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="cline rfill stand"/>
+  <rect x="1" y="1" width="28" height="28" rx="4" class="cline hfill rfill stand"/>
   <path transform="translate(-2,-2)" class="normal" style="fill:#000000;" d="m 15,6.5 a 3.9999995,4 0 0 0 -4,4 3.9999995,4 0 0 0 4,4 3.9999995,4 0 0 0 4,-4 3.9999995,4 0 0 0 -4,-4 z m 0,8 -3.5,0 c -1.108,0 -2,0.892 -2,2 l 0,5 c 0,1.108 0.892,2 2,2 l 7,0 c 1.108,0 2,-0.892 2,-2 l 0,-5 c 0,-1.108 -0.892,-2 -2,-2 l -3.5,0 z"/>
-  <circle cx="28" cy="27" r="9" class="cline rfill stand"/>
+  <circle cx="28" cy="27" r="9" class="cline hfill rfill stand"/>
   <text transform="translate(28,31)" class="small">s</text>
 </svg>

data/cockpit/themes/default/symbols/callworklist.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="cline rfill stand"/>
+  <rect x="1" y="1" width="28" height="28" rx="4" class="cline hfill rfill stand"/>
   <path class="normal" style="fill:#000000;" d="m 15,6.5 a 3.9999995,4 0 0 0 -4,4 3.9999995,4 0 0 0 4,4 3.9999995,4 0 0 0 4,-4 3.9999995,4 0 0 0 -4,-4 z m 0,8 -3.5,0 c -1.108,0 -2,0.892 -2,2 l 0,5 c 0,1.108 0.892,2 2,2 l 7,0 c 1.108,0 2,-0.892 2,-2 l 0,-5 c 0,-1.108 -0.892,-2 -2,-2 l -3.5,0 z"/>
 </svg>

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

@@ -1,5 +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 stand"/>
+  <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/default/symbols/choose_exclusive.svg

@@ -1,5 +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 stand"/>
+  <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/default/symbols/choose_inclusive.svg

@@ -1,4 +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 stand"/>
+  <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/default/symbols/critical.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="cline stand"/>
-  <text transform="translate(15,21)" class="normal">⚠</text>
+  <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/default/symbols/escape.svg

@@ -1,5 +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"/>
+  <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/default/symbols/loop.svg

@@ -1,5 +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 stand"/>
+  <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/default/symbols/manipulate.svg

@@ -1,4 +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 cline stand"/>
+  <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/default/symbols/otherwise.svg

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

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

@@ -1,5 +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 stand"/>
+  <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/default/symbols/parallel_branch.svg

@@ -1,4 +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 stand"/>
+  <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/default/symbols/scripts.svg

@@ -1,4 +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 cline stand"/>
+  <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/default/theme.js

@@ -2,20 +2,34 @@ function WFAdaptorManifestation(adaptor) {
   var self = this;
 
   this.adaptor = adaptor;
+  this.resources = {};
   this.elements = {};
   this.events = {};
-  this.compact = true;
+  this.compact = false;
 
   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');
+  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') {
+        if (base.attr('id')) {
+          base = base.clone();
+          // not very generic, because it is assumed that id is attribute of top level
+          // a better solution would be to parse rng for get_free_id()
+          // but: there is lots of lock-in to element-id, so fuck it
+          base.attr('id',self.adaptor.description.get_free_id());
+        }
+      }
+      return base;
+    }
   };
   this.clicked = function(){
     var svgid = 'unknown';
@@ -26,6 +40,56 @@ function WFAdaptorManifestation(adaptor) {
     });
     return svgid;
   };
+  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;
+  };
+
+  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) { // {{{
@@ -37,31 +101,39 @@ function WFAdaptorManifestation(adaptor) {
       var menu = {};
 
       if (child) {
-        group = self.elements[xml_node.get(0).tagName].permissible_children(xml_node);
-        if(group.length > 0) menu['Insert into'] = group;
+        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,self.adaptor.description.insert_first_into);
+        }
       }
       if (sibling) {
-        group = self.elements[xml_node.parent().get(0).tagName].permissible_children(xml_node);
-        if(group.length > 0) menu['Insert after'] = group;
+        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(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]
         });
       }
@@ -69,37 +141,37 @@ function WFAdaptorManifestation(adaptor) {
     }
     return false;
   } // }}}
-  this.events.click = function(svgid) { // {{{
+  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();
 
-    if (self.adaptor.description.get_node_by_svg_id(svgid).length == 0) {
-      return;
-    }
     self.adaptor.illustrator.get_elements().removeClass('clicked');
 
-    var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
-    if (vtarget.length > 0) {
-      vtarget.parents('g.element[element-id]').addClass('clicked');
-    }
+    if (e && e.ctrlKey) {
+      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+      if (vtarget.length > 0) {
+        vtarget.parents('g.element[element-id]').toggleClass('marked');
+      }
+    } else {
+      self.adaptor.illustrator.get_elements().removeClass('marked');
 
-    if ($('#state').text() != 'finished')
-      $('#main ui-behind button').show();
-    if ($('#main ui-behind button').hasClass('highlight')) {
-      var check = confirm("Discard changes?");
-      if (check)
-        $('#main ui-behind button').removeClass('highlight');
-      else
-        return;
-    }
+      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+      if (vtarget.length > 0) {
+        vtarget.parents('g.element[element-id]').addClass('clicked');
+      }
 
-    var node  = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
+      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);
+      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);
+      }
     }
   } // }}}
   this.events.dblclick = function(svgid, e) { // {{{
@@ -115,6 +187,9 @@ function WFAdaptorManifestation(adaptor) {
   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',
@@ -143,12 +218,13 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/call.svg'
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/call.rng',
-    'permissible_children': function(node) { //{{{
+    'permissible_children': function(node,mode) { //{{{
       if(node.children('finalize,update').length < 1)
         return [
          {'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 [];
@@ -163,10 +239,18 @@ function WFAdaptorManifestation(adaptor) {
     'type': 'primitive',
     'illustrator': {//{{{
       'endnodes': 'this',
+      'label': function(node){
+        var lab = $(node).attr('label');
+        if (lab) {
+          return 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) { //{{{
+    'permissible_children': function(node,mode) { //{{{
       return [];
     }, //}}}
   'adaptor': {//{{{
@@ -181,7 +265,7 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/escape.svg'
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/escape.rng',
-    'permissible_children': function(node) { //{{{
+    'permissible_children': function(node,mode) { //{{{
       return [];
     }, //}}}
     'adaptor': {//{{{
@@ -213,29 +297,33 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose.svg'
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/choose.rng',
-    'permissible_children': function(node) { //{{{
+    'permissible_children': function(node,mode) { //{{{
       var func = null;
-      if(node.get(0).tagName == 'choose') { func = self.adaptor.description.insert_first_into }
+      if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
       if(node.children('parallel_branch').length > 0) {
         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;
     }, //}}}
@@ -264,39 +352,46 @@ function WFAdaptorManifestation(adaptor) {
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/otherwise.rng',
     'neverdelete': true,
-    'permissible_children': function(node) { //{{{
+    'permissible_children': function(node,mode) { //{{{
       var func = null;
       var childs = null;
-      if(node.get(0).tagName == 'otherwise') { func = self.adaptor.description.insert_first_into }
+      if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
       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': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
+         'type': 'critical',
          'params': [self.adaptor.description.elements.critical, node]}
       ];
     }, //}}}
@@ -325,43 +420,51 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/alternative.svg'
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/alternative.rng',
-    'permissible_children': function(node) { //{{{
-      if(node.get(0).tagName == 'alternative') { func = self.adaptor.description.insert_first_into }
+    'permissible_children': function(node,mode) { //{{{
+      if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
       if(node.parents('parallel').length > node.parents('parallel_branch').length && node.get(0).tagName == 'alternative') {
         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': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
+         'type': 'critical',
          'params': [self.adaptor.description.elements.critical, node]}
       ];
     }, //}}}
@@ -390,46 +493,54 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/loop.svg'
     },// }}}
     'description': self.adaptor.theme_dir + 'rngs/loop.rng',
-    'permissible_children': function(node) { //{{{
+    'permissible_children': function(node,mode) { //{{{
       var func = null;
-      if(node.get(0).tagName == 'loop') { func = self.adaptor.description.insert_first_into }
+      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': 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': '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]}
                     );
       }
@@ -462,41 +573,49 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
-    'permissible_children': function(node) { //{{{
+    'permissible_children': function(node,mode) { //{{{
       var childs =  [
         {'label': 'Service Call with Scripts',
          'function_call': self.adaptor.description.insert_last_into,
          '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,
          '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,
          '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,
          '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,
          '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(),
+         'type': 'critical',
          'params': [self.adaptor.description.elements.critical, node]},
         {'label': 'Parallel Branch',
          'function_call': self.adaptor.description.insert_last_into,
          '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;
     }, //}}}
@@ -526,45 +645,53 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/parallel_branch.svg'
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/parallel_branch.rng',
-    'permissible_children': function(node) { //{{{
+    'permissible_children': function(node,mode) { //{{{
       var func = null;
       var childs = null;
-      if(node.get(0).tagName == 'parallel_branch') { func = self.adaptor.description.insert_first_into }
+      if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
       childs =  [
         {'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': '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;
@@ -594,38 +721,45 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/critical.svg'
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/critical.rng',
-    'permissible_children': function(node) { //{{{
+    'permissible_children': function(node,mode) { //{{{
       var func = null;
-      if(node.get(0).tagName == 'critical') { func = self.adaptor.description.insert_first_into }
+      if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
       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': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
+         'type': 'critical',
          'params': [self.adaptor.description.elements.critical, node]},
       ];
     }, //}}}
@@ -654,9 +788,9 @@ function WFAdaptorManifestation(adaptor) {
       'svg': null
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/group.rng',
-    'permissible_children': function(node) { //{{{
+    'permissible_children': function(node,mode) { //{{{
       var func = null;
-      if(node.get(0).tagName == 'group') { func = self.adaptor.description.insert_first_into }
+      if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
       return [
       ];
@@ -685,38 +819,45 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/start.svg'
     },//}}}
     'description': null,
-    'permissible_children': function(node) { //{{{
+    'permissible_children': function(node,mode) { //{{{
       var func = null;
-      if(node.get(0).tagName == 'description') { func = self.adaptor.description.insert_first_into }
+      if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
       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 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': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
+         'type': 'critical',
          'params': [self.adaptor.description.elements.critical, node]}
       ];
     }, //}}}