cpee 2.1.92 → 2.1.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6068f986f407667e9973cecebe9e44f299a4af0d30173394af1767dbb02f9515
-  data.tar.gz: e7450a6cf90f7e4e8552938f75da829f7e9e85bc87b5d9bb5f653432f7b59a31
+  metadata.gz: cf5b0ca7b67e6dbadba9928fa0eda969239240a09d0ea58294f7a066e8588899
+  data.tar.gz: e062395a4e937c3911a65631cdef394adebfc69595af72b6fdb2a2e99965479d
 SHA512:
-  metadata.gz: 3c06d2c59aeea2a90bf3f88ec0aca9d2a1ebae640009d80faf9ad8eeb5e5664109c8a8a49f527c44e222f195e4d357f62917660d2e36671388eb2c79b92412fb
-  data.tar.gz: 9401865c365904c987d743d2e9eaa35953800152d400ce86c78838a76ec6efa73dde341f6ed4ae4cd496b6c7ae3623f706964b097a0200ac38def0e85a0e0241
+  metadata.gz: fb94ceeb111ba2e7bef92d1916699280192502b15f270d0a80b72b15ffb2d55d650b6ee62e34780ae2caf02193e662eaaa4550bd9f6fefb0663e87c24fc3c9c6
+  data.tar.gz: d107315d6c39cb2f61dbbe7e85efdfc5d1d8b2f9319932376a3fb85d1cf7a6ce569bbd95c887a4201d904ca344da9434b33489c832ead6e44b8beeb34e95ce20

data/cockpit/css/ui.css

@@ -33,7 +33,7 @@ body {
 
 #instance ui-content { height: 6em; }
 
-#areanew td:nth-child(2)       { padding-top: 0.4em; padding-bottom: 0.4em; }
+#areanew td:nth-child(2)       { padding-top: 0.2em; padding-bottom: 0.2em; }
 #areanew td:nth-child(1)       { width: 7em; padding-right: 1em; }
 #areanew td:nth-child(3)       { width: 16em; padding-left: 1em; }
 #areanew input                 {
@@ -46,8 +46,8 @@ body {
   -webkit-box-sizing: border-box;
 }
 
-#areanew button[name=base]     { width: 100%; padding: 0.5em 1em; margin-bottom: 0.1em; }
-#areanew button[name=instance] { width: 100%; padding: 0.5em 1em; }
+#areanew button[name=base]     { width: 100%; padding: 0.3em 1em; margin-bottom: 0.1em; }
+#areanew button[name=instance] { width: 100%; padding: 0.3em 1em; }
 
 ui-tabbed ui-tabbar ui-behind button {
   margin-left: 0.5em;
@@ -124,7 +124,7 @@ ui-tabbed ui-tabbar ui-behind button {
 #areaexecution table.x-ui-compact tbody.exe tr:first-child td { padding-top: 0.5em; }
 #areaexecution table.x-ui-compact tbody.exe { border-top: 1px solid var(--x-ui-border-color); }
 
-#areaexecution table.x-ui-compact tbody.exe td { height: 2.2em; }
+#areaexecution table.x-ui-compact tbody.exe td { height: 2em; }
 
 #arealog > div {  padding-left: 1em; padding-top: 1em; }
 

data/cockpit/css/wfadaptor.css

@@ -23,14 +23,23 @@
   --wfadaptor-highlight: #0081c7;
   --wfadaptor-base: #000000;
   --wfadaptor-base-light: #A9A9A9;
-  --wfadaptor-label: #d4d4d4;
+  --wfadaptor-label: #e4e4e4;
   --wfadaptor-mark: #d4d4d4;
-  --wfadaptor-selected: #f57900;
-  --wfadaptor-hover: #f57900;
+
+/*--wfadaptor-selected: #f57900;*/
+/*--wfadaptor-hover: #f57900;*/
+
+/*--wfadaptor-selected: #4ee7d1;*/
+/*--wfadaptor-hover: #4ee7d1;*/
+
+  --wfadaptor-selected: #000000;
+  --wfadaptor-selected-text: #f57900;
+  --wfadaptor-hover: #000000;
+
   --wfadaptor-stripe: #e9e9e9;
   --wfadaptor-background: #ffffff;
-  --wfadaptor-menu: #ef2929;
   --wfadaptor-border: #a1a1a1;
+  --wfadaptor-important: #ef2929;
 }
 
 svg {
@@ -39,6 +48,10 @@ svg {
   padding:0;
 }
 
+svg .duration {
+  stroke: var(--wfadaptor-label);
+}
+
 svg rect.group {
   fill: var(--wfadaptor-highlight);
   fill-opacity: 0.2;
@@ -88,11 +101,6 @@ svg g.vote .execstylethin {
   stroke-linejoin:round;
 }
 
-svg .menu {
-  fill: var(--wfadaptor-menu) !important;
-  fill-opacity:1 !important;
-}
-
 svg line.edge, svg path.edge {
   stroke-opacity:1;
   stroke: var(--wfadaptor-base);
@@ -166,9 +174,6 @@ svg .greyfat {
   stroke-opacity:1;
   stroke-dasharray:none;
 }
-svg .standfat.menu {
-  stroke: var(--wfadaptor-menu);
-}
 svg .normal {
   fill: var(--wfadaptor-base);
   fill-opacity:1;
@@ -232,10 +237,10 @@ svg.labelsrow text.label {
   cursor: pointer;
 }
 svg.labelsrow text.label:hover, svg.labelsrow text.label.hover {
-  fill: var(--wfadaptor-selected);
+  fill: var(--wfadaptor-selected-text);
 }
 svg text.label.selected {
-  fill: var(--wfadaptor-selected);
+  fill: var(--wfadaptor-selected-text);
 }
 svg .selected .markstyle {
   stroke: var(--wfadaptor-selected);
@@ -243,7 +248,8 @@ svg .selected .markstyle {
   stroke-linejoin:round;
   stroke-miterlimit:4;
   stroke-opacity:1;
-  stroke-dasharray:none;
+  stroke-dasharray: 1,2;
+  stroke-width: 1.6;
 }
 
 svg .unknown {
@@ -277,38 +283,6 @@ svg .standwithout {
 svg .standtrans {
   fill: var(--wfadaptor-background);
 }
-svg text.normal {
-  font-size:20px;
-  font-style:normal;
-  font-variant:normal;
-  font-weight:bold;
-  font-stretch:normal;
-  text-align:center;
-  line-height:125%;
-  writing-mode:horizontal-tb;
-  text-anchor:middle;
-  color: var(--wfadaptor-base);
-  fill: var(--wfadaptor-base);
-  fill-opacity:1;
-  stroke:none;
-  font-family: adawaita-sans;
-}
-svg text.inverted {
-  font-size:20px;
-  font-style:normal;
-  font-variant:normal;
-  font-weight:bold;
-  font-stretch:normal;
-  text-align:center;
-  line-height:125%;
-  writing-mode:horizontal-tb;
-  text-anchor:middle;
-  color: var(--wfadaptor-background);
-  fill: var(--wfadaptor-background);
-  fill-opacity:1;
-  stroke:none;
-  font-family: adawaita-sans;
-}
 
 svg text.super {
   font-size:11px;
@@ -366,40 +340,6 @@ svg tspan.necessary {
   display: inline;
 }
 
-svg text.normallarge {
-  font-size:25px;
-  font-style:normal;
-  font-variant:normal;
-  font-weight:bold;
-  font-stretch:normal;
-  text-align:center;
-  line-height:125%;
-  writing-mode:horizontal-tb;
-  text-anchor:middle;
-  color: var(--wfadaptor-base);
-  fill: var(--wfadaptor-base);
-  fill-opacity:1;
-  stroke:none;
-  font-family: adawaita-sans;
-}
-
-svg text.small {
-  font-size:14px;
-  font-style:normal;
-  font-variant:normal;
-  font-weight:bold;
-  font-stretch:normal;
-  text-align:center;
-  line-height:125%;
-  writing-mode:horizontal-tb;
-  text-anchor:middle;
-  color: var(--wfadaptor-base);
-  fill: var(--wfadaptor-base);
-  fill-opacity:1;
-  stroke:none;
-  font-family: adawaita-sans;
-}
-
 svg text.label {
   font-size:14px;
   font-style:normal;
@@ -429,23 +369,6 @@ svg text.label.rotate {
   transform: translateY(10px) rotate(-30deg);
 }
 
-svg text.smaller {
-  font-size:12px;
-  font-style:normal;
-  font-variant:normal;
-  font-weight:bold;
-  font-stretch:normal;
-  text-align:center;
-  line-height:125%;
-  writing-mode:horizontal-tb;
-  text-anchor:middle;
-  color: var(--wfadaptor-base);
-  fill: var(--wfadaptor-base);
-  fill-opacity:1;
-  stroke:none;
-  font-family: adawaita-sans;
-}
-
 #arrow {
   stroke: var(--wfadaptor-base);
   stroke-width: 2;
@@ -458,11 +381,13 @@ svg g.element[element-id].hover {
 
 svg g.element[element-id].hover .hoverstyle {
   stroke: var(--wfadaptor-hover);
-  stroke-width: 3;
+  stroke-dasharray: 1,2;
+  stroke-width: 1.6;
 }
 svg g.element[element-id].hover .hoverstylethin {
   stroke: var(--wfadaptor-hover);
-  stroke-width: 2;
+  stroke-dasharray: 1,2;
+  stroke-width: 1.6;
 }
 svg g.element[element-id].hover > text.label {
   color: var(--wfadaptor-selected);

data/cockpit/js/details.js

@@ -72,6 +72,13 @@ function do_main_work(svgid) { //{{{
     nnew[0].removeAttribute('xmlns');
   }
 
+  // copy all elements from different namespaces
+  [...node[0].attributes].forEach(attr =>{
+    if (attr && attr.namespaceURI && attr.namespaceURI != 'http://cpee.org/ns/description/1.0') {
+      nnew[0].setAttributeNS(attr.namespaceURI,attr.nodeName,attr.nodeValue);
+    }
+  });
+
   node.replaceWith(nnew);
 
   var ttarget = manifestation.adaptor.illustrator.get_node_by_svg_id(svgid);

data/cockpit/js/instance.js

@@ -586,14 +586,21 @@ function adaptor_init(url,theme,dslx) { //{{{
     suspended_redrawing = true;
     save['graph_theme'] = theme;
     save['graph_adaptor'] = new WfAdaptor($('body').data('theme-base') + '/' + theme + '/theme.js',function(graphrealization){
-      graphrealization.illustrator.get_symbol = (target) => {
+      graphrealization.illustrator.get_symbol = (target) => { //{{{
         if (save['endpoints_cache'][target]) {
           return save['endpoints_cache'][target].symbol;
         } else {
           return undefined;
         }
-      }
-      graphrealization.draw_labels = (max,labels,dimensions,striped) => {
+      } //}}}
+      graphrealization.illustrator.get_properties = (target) => { //{{{
+        if (save['endpoints_cache'][target]) {
+          return save['endpoints_cache'][target].properties;
+        } else {
+          return undefined;
+        }
+      } //}}}
+      graphrealization.draw_labels = (max,labels,dimensions,striped) => { //{{{
         // highlight
         if (graph_highlight) {
           graph_highlight_tasks.forEach((ele) => {
@@ -761,10 +768,10 @@ function adaptor_init(url,theme,dslx) { //{{{
         // Add the last stripe
         var j = tcolumns.length;
         for (var i = 0; i < max.row; i++) {
-          var ele = $('<div element-row="' + i + '" class="graphlast ' + (i % 2 == 0 ? 'odd' : 'even') + '" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '; padding-bottom: ' + dimensions.height_shift + 'px">&#032;</div>');
+          var ele = $('<div element-row="' + i + '" class="graphlast ' + (i % 2 == 0 ? 'odd' : 'even') + '" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '; height: ' + dimensions.stripe_height + 'px">&#032;</div>');
           $('#graphgrid').append(ele);
         }
-      };
+      }; //}}}
       graphrealization.set_svg_container($('#graphcanvas'));
       graphrealization.set_label_container($('#graphgrid'));
       graphrealization.set_description($(dslx), true);
@@ -944,7 +951,6 @@ function monitor_instance_pos_change(content) {// {{{
   if (content['at']) {
     $.each(content['at'],function(a,b){
       format_visual_add(b.position,"passive",false);
-      console.log('rrrrrr add', b.position);
     });
   }
   if (content['after']) {
@@ -955,7 +961,6 @@ function monitor_instance_pos_change(content) {// {{{
   if (content['unmark']) {
     $.each(content['unmark'],function(a,b){
       format_visual_remove(b.position,"passive",false)
-      console.log('rrrrrr remove', b.position);
     });
   }
   if (!content['at'] && !content['unmark'] && !content['after'] && !content['wait']) {
@@ -1192,6 +1197,7 @@ function save_svgfile() {// {{{
     }
   });
   gc.attr('width',start+1);
+  gc.find('.duration').remove();
   $.ajax({
     type: "GET",
     url: url + "/properties/attributes/info/",