cpee 1.4.30 → 1.4.31

Sign up to get free protection for your applications and to get access to all the features.
Files changed (29) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/css/ui.css +23 -0
  3. data/cockpit/css/wfadaptor.css +80 -69
  4. data/cockpit/index.html +15 -8
  5. data/cockpit/js/details.js +2 -3
  6. data/cockpit/js/instance.js +37 -4
  7. data/cockpit/js/wfadaptor.js +196 -108
  8. data/cockpit/test.html +40 -0
  9. data/cockpit/themes/compact/theme.js +176 -36
  10. data/cockpit/themes/default/rngs/alternative.rng +20 -0
  11. data/cockpit/themes/default/rngs/call.rng +3 -3
  12. data/cockpit/themes/default/rngs/callmanipulate.rng +3 -3
  13. data/cockpit/themes/default/rngs/loop.rng +11 -0
  14. data/cockpit/themes/default/rngs/otherwise.rng +22 -1
  15. data/cockpit/themes/default/symbols/alternative.svg +3 -2
  16. data/cockpit/themes/default/symbols/complex.svg +8 -0
  17. data/cockpit/themes/default/symbols/end.svg +3 -0
  18. data/cockpit/themes/default/symbols/event_end.svg +3 -0
  19. data/cockpit/themes/default/symbols/parallel_branch.svg +3 -2
  20. data/cockpit/themes/default/symbols/parallel_branch_event.svg +14 -0
  21. data/cockpit/themes/default/symbols/parallel_branch_normal.svg +5 -0
  22. data/cockpit/themes/default/theme.js +200 -45
  23. data/cockpit/themes/lego/theme.js +4 -4
  24. data/cpee.gemspec +2 -2
  25. data/lib/cpee/value_helper.rb +16 -0
  26. data/log/elasticsearch_logging.rb +1 -0
  27. data/server/handlerwrappers/default.rb +2 -2
  28. metadata +9 -4
  29. data/cockpit/js_libs.zip +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3af489d577c4dea65d15939ddba88e8f1ed6782583aa641ca534a38fe83ef310
4
- data.tar.gz: 05ee4ea40caf21bd323f999dfb7b089312f7bf7502be0b4576b91cf838e16658
3
+ metadata.gz: 9e48011aec4db8af5bc2b79dd87481695b733dbdffb0b171e8fb6281af4de1c9
4
+ data.tar.gz: e686360f51c1b0f6c72446182b0e9bb9bb572a7cc57877bcb4dbb8c92201ce28
5
5
  SHA512:
6
- metadata.gz: a836d6cba5336a23f026fb7a46946f85fa7cace8c3832bdebece0459e683138f7bc6056737eb84cd1231f26d59323500dac1fa8e7aa60b55d17dc65984e1f2d4
7
- data.tar.gz: 998e48a4b3d21a7afbde101282ed0b3153fad3741a675a604b309dc1c7d53961348f6255e7bf179c719ec68d88bc0d5b54e422a1395539cfc28f7da906622652
6
+ metadata.gz: eb4e1ca4c4f3cc2ae1720d189aaca4a6daa3caa2021e89a3e46c6c59c14721e7b02a604e075b4c751708e1644789cc09ee1b2035014e7832f12cd8f0086c0ff7
7
+ data.tar.gz: 38310d626cd1f1adacc706938621e34aa1da45d846a4852da008c96b8e2d86d5aa1de12b47c9fe30fc1f2ecff03f22ac35632b75a52181d0ec5ed13af56239ad
data/cockpit/css/ui.css CHANGED
@@ -7,6 +7,29 @@ body {
7
7
  font-size: 1em;
8
8
  }
9
9
 
10
+ #graphgrid {
11
+ display: grid;
12
+ grid-gap: 0;
13
+ grid-template-columns: max-content repeat(100,min-content);
14
+ width: 100%;
15
+ }
16
+ #graphcanvas {
17
+ grid-column: 1;
18
+ }
19
+ .graphspacer {
20
+ grid-row: 1;
21
+ grid-column: 2;
22
+ }
23
+ .graphlabel {
24
+ padding-left: 0.5em;
25
+ display: flex;
26
+ flex-direction: row;
27
+ }
28
+ .graphlabel > span {
29
+ align-self: center;
30
+ white-space: nowrap;
31
+ }
32
+
10
33
  #instance ui-content { height: 7em; }
11
34
 
12
35
  #areanew td:nth-child(1) { width: 7em; padding-right: 1em; }
data/cockpit/css/wfadaptor.css CHANGED
@@ -14,71 +14,82 @@
14
14
  <http://www.gnu.org/licenses/>.
15
15
  */
16
16
 
17
- /* Browser Bug, set textarea explicitly */
17
+ :root {
18
+ --wfadaptor-exec-passive: #729fcf;
19
+ --wfadaptor-exec-active: #ef2929;
20
+ --wfadaptor-exec-active-text: #cc0000;
21
+ --wfadaptor-exec-vote: #8ae234;
22
+ --wfadaptor-exec-vote-text: #73d216;
23
+ --wfadaptor-highlight: Highlight;
24
+ --wfadaptor-base: #000000;
25
+ --wfadaptor-label: #d4d4d4;
26
+ --wfadaptor-mark: #d4d4d4;
27
+ --wfadaptor-selected: #f57900;
28
+ --wfadaptor-background: #ffffff;
29
+ --wfadaptor-background-menu: #ff7f7f;
30
+ }
31
+
18
32
  svg {
19
- fill: #DDDDDD;
20
- fill-opacity:1;
21
33
  display:inline;
22
34
  margin:0;
23
35
  padding:0;
24
- width: 100%;
25
36
  }
26
37
 
27
38
  svg rect.group {
28
- fill: Highlight;
39
+ fill: var(--wfadaptor-highlight);
29
40
  fill-opacity: 0.2;
30
41
  }
31
42
 
32
43
  svg g.passive .rfill {
33
- fill: #729fcf;
44
+ fill: var(--wfadaptor-exec-passive);
34
45
  fill-opacity:1;
35
46
  }
36
47
  svg g.active .rfill {
37
- fill: #ef2929;
48
+ fill: var(--wfadaptor-exec-active);
38
49
  fill-opacity:1;
39
50
  }
40
51
  svg g.vote .rfill {
41
- fill: #8ae234;
52
+ fill: var(--wfadaptor-exec-vote);
42
53
  fill-opacity:1;
43
54
  }
44
55
  svg g.passive .rline {
45
- stroke: #729fcf;
56
+ stroke: var(--wfadaptor-exec-passive);
46
57
  }
47
58
  svg g.active .rline {
48
- stroke: #ef2929;
59
+ stroke: var(--wfadaptor-exec-active);
49
60
  }
50
61
  svg g.vote .rline {
51
- stroke: #8ae234;
62
+ stroke: var(--wfadaptor-exec-vote);
52
63
  }
53
64
 
54
65
  svg .rfill.menu {
55
- fill: #ff7f7f;
66
+ fill: var(--wfadaptor-background-menu);
56
67
  fill-opacity:1;
57
68
  }
58
69
 
59
70
  svg line.ourline, svg path.ourline {
60
71
  stroke-opacity:1;
61
- stroke:#000000;
72
+ stroke: var(--wfadaptor-base);
62
73
  stroke-width: 2;
63
74
  fill: none;
64
75
  }
65
76
  svg rect.block {
66
77
  stroke-width: 1;
67
78
  stroke-dasharray: 3,5;
68
- stroke: #000000;
79
+ stroke: var(--wfadaptor-base);
69
80
  fill: none;
70
81
  }
71
82
  svg rect.tile {
72
83
  stroke-width: 1;
73
84
  stroke-dasharray: 3,5;
74
- fill: Highlight;
85
+ fill: var(--wfadaptor-highlight);
75
86
  fill-opacity: 0.3;
76
87
  display: none;
77
88
  }
78
89
  svg .stand {
79
- fill:#ffffff;
90
+ fill: var(--wfadaptor-background);
80
91
  fill-opacity:1;
81
- stroke:#000000;
92
+ stroke: var(--wfadaptor-base);
82
93
  stroke-width:1.6;
83
94
  stroke-linecap:round;
84
95
  stroke-linejoin:round;
@@ -87,9 +98,9 @@ svg .stand {
87
98
  stroke-dasharray:none;
88
99
  }
89
100
  svg .standfat {
90
- fill:#ffffff;
101
+ fill: var(--wfadaptor-background);
91
102
  fill-opacity:1;
92
- stroke:#000000;
103
+ stroke: var(--wfadaptor-base);
93
104
  stroke-width:3;
94
105
  stroke-linecap:round;
95
106
  stroke-linejoin:round;
@@ -98,9 +109,9 @@ svg .standfat {
98
109
  stroke-dasharray:none;
99
110
  }
100
111
  svg .normal {
101
- fill:#000000;
112
+ fill: var(--wfadaptor-base);
102
113
  fill-opacity:1;
103
- stroke:#000000;
114
+ stroke: var(--wfadaptor-base);
104
115
  stroke-width:0.2;
105
116
  stroke-linecap:round;
106
117
  stroke-linejoin:round;
@@ -109,9 +120,9 @@ svg .normal {
109
120
  stroke-dasharray:none;
110
121
  }
111
122
  svg .white {
112
- fill:#000000;
123
+ fill: var(--wfadaptor-background);
113
124
  fill-opacity:1;
114
- stroke:#ffffff;
125
+ stroke: var(--wfadaptor-background);
115
126
  stroke-width:1.6;
116
127
  stroke-linecap:round;
117
128
  stroke-linejoin:round;
@@ -120,9 +131,9 @@ svg .white {
120
131
  stroke-dasharray:none;
121
132
  }
122
133
  svg .black {
123
- fill:#000000;
134
+ fill: var(--wfadaptor-base);
124
135
  fill-opacity:1;
125
- stroke:#000000;
136
+ stroke: var(--wfadaptor-base);
126
137
  stroke-width: 1.6;
127
138
  stroke-linecap:round;
128
139
  stroke-linejoin:round;
@@ -132,13 +143,13 @@ svg .black {
132
143
  }
133
144
 
134
145
  svg .marked text.label {
135
- color: #d4d4d4;
136
- fill: #d4d4d4;
146
+ color: var(--wfadaptor-label);
147
+ fill: var(--wfadaptor-label);
137
148
  }
138
149
  svg .marked .cfill {
139
- fill:#d4d4d4;
150
+ fill: var(--wfadaptor-mark);
140
151
  fill-opacity:1;
141
- stroke:#d4d4d4;
152
+ stroke: var(--wfadaptor-mark);
142
153
  stroke-width:0.2;
143
154
  stroke-linecap:round;
144
155
  stroke-linejoin:round;
@@ -147,7 +158,7 @@ svg .marked .cfill {
147
158
  stroke-dasharray:none;
148
159
  }
149
160
  svg .marked .cline {
150
- stroke:#d4d4d4;
161
+ stroke: var(--wfadaptor-mark);
151
162
  stroke-linecap:round;
152
163
  stroke-linejoin:round;
153
164
  stroke-miterlimit:4;
@@ -155,14 +166,14 @@ svg .marked .cline {
155
166
  stroke-dasharray:none;
156
167
  }
157
168
 
158
- svg .clicked text.label {
159
- color: #f57900;
160
- fill: #f57900;
169
+ svg .selected text.label {
170
+ color: var(--wfadaptor-selected);
171
+ fill: var(--wfadaptor-selected);
161
172
  }
162
- svg .clicked .cfill {
163
- fill:#f57900;
173
+ svg .selected .cfill {
174
+ fill: var(--wfadaptor-selected);
164
175
  fill-opacity:1;
165
- stroke:#f57900;
176
+ stroke: var(--wfadaptor-selected);
166
177
  stroke-width:0.2;
167
178
  stroke-linecap:round;
168
179
  stroke-linejoin:round;
@@ -170,8 +181,8 @@ svg .clicked .cfill {
170
181
  stroke-opacity:1;
171
182
  stroke-dasharray:none;
172
183
  }
173
- svg .clicked .cline {
174
- stroke:#f57900;
184
+ svg .selected .cline {
185
+ stroke: var(--wfadaptor-selected);
175
186
  stroke-linecap:round;
176
187
  stroke-linejoin:round;
177
188
  stroke-miterlimit:4;
@@ -180,9 +191,9 @@ svg .clicked .cline {
180
191
  }
181
192
 
182
193
  svg .unknown {
183
- fill:#FF0000;
194
+ fill: var(--wfadaptor-background);
184
195
  fill-opacity:1;
185
- stroke:#000000;
196
+ stroke: var(--wfadaptor-base);
186
197
  stroke-width:1.6;
187
198
  stroke-linecap:round;
188
199
  stroke-linejoin:round;
@@ -195,7 +206,7 @@ svg .gen {
195
206
  fill:ButtonFace;
196
207
  fill-opacity:1;
197
208
  stroke-opacity:0.7;
198
- stroke:#000000;
209
+ stroke: var(--wfadaptor-base);
199
210
  stroke-width:1.6;
200
211
  stroke-linecap:round;
201
212
  stroke-linejoin:round;
@@ -204,11 +215,11 @@ svg .gen {
204
215
  stroke-dasharray:none;
205
216
  }
206
217
  svg .standwithout {
207
- fill:#ffffff;
218
+ fill: var(--wfadaptor-background);
208
219
  fill-opacity:1;
209
220
  }
210
221
  svg .standtrans {
211
- fill:#ffffff;
222
+ fill: var(--wfadaptor-background);
212
223
  fill-opacity:0;
213
224
  }
214
225
  svg text.normal {
@@ -221,8 +232,8 @@ svg text.normal {
221
232
  line-height:125%;
222
233
  writing-mode:horizontal-tb;
223
234
  text-anchor:middle;
224
- color:#000000;
225
- fill:#000000;
235
+ color: var(--wfadaptor-base);
236
+ fill: var(--wfadaptor-base);
226
237
  fill-opacity:1;
227
238
  stroke:none;
228
239
  font-family:Arial;
@@ -237,8 +248,8 @@ svg text.inverted {
237
248
  line-height:125%;
238
249
  writing-mode:horizontal-tb;
239
250
  text-anchor:middle;
240
- color:#ffffff;
241
- fill:#ffffff;
251
+ color: var(--wfadaptor-background);
252
+ fill: var(--wfadaptor-background);
242
253
  fill-opacity:1;
243
254
  stroke:none;
244
255
  font-family:Arial;
@@ -254,18 +265,18 @@ svg text.super {
254
265
  line-height:100%;
255
266
  writing-mode:horizontal-tb;
256
267
  text-anchor:start;
257
- color:#000000;
258
- fill:#000000;
268
+ color: var(--wfadaptor-base);
269
+ fill: var(--wfadaptor-base);
259
270
  fill-opacity:1;
260
271
  stroke:none;
261
272
  font-family:Arial;
262
273
  }
263
274
  svg tspan.active {
264
- fill:#cc0000;
275
+ fill: var(--wfadaptor-exec-active-text);
265
276
  display: none;
266
277
  }
267
278
  svg tspan.vote {
268
- fill:#73d216;
279
+ fill: var(--wfadaptor-exec-vote-text);
269
280
  display: none;
270
281
  }
271
282
  svg tspan.colon {
@@ -285,8 +296,8 @@ svg text.normallarge {
285
296
  line-height:125%;
286
297
  writing-mode:horizontal-tb;
287
298
  text-anchor:middle;
288
- color:#000000;
289
- fill:#000000;
299
+ color: var(--wfadaptor-base);
300
+ fill: var(--wfadaptor-base);
290
301
  fill-opacity:1;
291
302
  stroke:none;
292
303
  font-family:Arial;
@@ -302,8 +313,8 @@ svg text.small {
302
313
  line-height:125%;
303
314
  writing-mode:horizontal-tb;
304
315
  text-anchor:middle;
305
- color:#000000;
306
- fill:#000000;
316
+ color: var(--wfadaptor-base);
317
+ fill: var(--wfadaptor-base);
307
318
  fill-opacity:1;
308
319
  stroke:none;
309
320
  font-family:Arial;
@@ -318,28 +329,28 @@ svg text.label {
318
329
  line-height:125%;
319
330
  writing-mode:horizontal-tb;
320
331
  text-anchor:left;
321
- color: #a1a1a1;
322
- fill: #a1a1a1;
332
+ color: var(--wfadaptor-text);
333
+ fill: var(--wfadaptor-text);
323
334
  fill-opacity:1;
324
335
  stroke:none;
325
336
  font-family:Arial;
326
337
  }
327
338
 
328
339
  #arrow {
329
- stroke: #000000;
340
+ stroke: var(--wfadaptor-base);
330
341
  stroke-width: 2;
331
- fill: #000000;
342
+ fill: var(--wfadaptor-base);
332
343
  }
333
344
 
334
345
  svg g.element[element-id]:hover .hfill {
335
- fill: #f57900;
346
+ fill: var(--wfadaptor-selected);
336
347
  fill-opacity:1;
337
348
  cursor: pointer;
338
349
  }
339
350
  svg g.element[element-id]:hover .hline {
340
- fill:#f57900;
351
+ fill: var(--wfadaptor-selected);
341
352
  fill-opacity:1;
342
- stroke:#f57900;
353
+ stroke: var(--wfadaptor-selected);
343
354
  stroke-linecap:round;
344
355
  stroke-linejoin:round;
345
356
  stroke-miterlimit:4;
@@ -348,9 +359,9 @@ svg g.element[element-id]:hover .hline {
348
359
  cursor: pointer;
349
360
  }
350
361
  svg g.element[element-id]:hover .htext {
351
- fill:#f57900;
362
+ fill: var(--wfadaptor-selected);
352
363
  fill-opacity:1;
353
- stroke:#f57900;
364
+ stroke: var(--wfadaptor-selected);
354
365
  stroke-width:0.2;
355
366
  stroke-linecap:round;
356
367
  stroke-linejoin:round;
@@ -360,13 +371,13 @@ svg g.element[element-id]:hover .htext {
360
371
  cursor: pointer;
361
372
  }
362
373
  svg g.element[element-id]:hover > text.label {
363
- color: #f57900;
364
- fill: #f57900;
374
+ color: var(--wfadaptor-selected);
375
+ fill: var(--wfadaptor-selected);
365
376
  }
366
377
  svg g.element[element-id]:hover .cfill {
367
- fill:#000000;
378
+ fill: var(--wfadaptor-base);
368
379
  fill-opacity:1;
369
- stroke:#000000;
380
+ stroke: var(--wfadaptor-base);
370
381
  stroke-width:0.2;
371
382
  stroke-linecap:round;
372
383
  stroke-linejoin:round;
@@ -375,7 +386,7 @@ svg g.element[element-id]:hover .cfill {
375
386
  stroke-dasharray:none;
376
387
  }
377
388
  svg g.element[element-id]:hover .cline {
378
- stroke:#000000;
389
+ stroke: var(--wfadaptor-base);
379
390
  stroke-linecap:round;
380
391
  stroke-linejoin:round;
381
392
  stroke-miterlimit:4;
data/cockpit/index.html CHANGED
@@ -182,13 +182,17 @@
182
182
  <td>State:</td>
183
183
  <td id='state'>
184
184
  <span id="state_text"></span>
185
- <span> ⇒ </span>
186
- <button name="state_start" title='start'>Start</button>
187
- <button name="state_stop" title='stop'>Stop</button>
188
- <span> / </span>
189
- <button name="state_sim" title='simulate'>Sim</button>
190
- <span> / </span>
191
- <button name="state_abandon" title='abandon'>Abandon</button>
185
+ <span id="state_any">
186
+ <span> ⇒ </span>
187
+ <button name="state_start" title='start'>Start</button>
188
+ <button name="state_stop" title='stop'>Stop</button>
189
+ <span id="state_extended">
190
+ <span> / </span>
191
+ <button name="state_sim" title='simulate'>Sim</button>
192
+ <span> / </span>
193
+ <button name="state_abandon" title='abandon'>Abandon</button>
194
+ </span>
195
+ </span>
192
196
  </td>
193
197
  </tr>
194
198
  <tr>
@@ -234,7 +238,10 @@
234
238
  </ui-tabbar>
235
239
  <ui-content>
236
240
  <ui-area data-belongs-to-tab="details" id='graphcolumn'>
237
- <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
241
+ <div id='graphgrid'>
242
+ <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
243
+ <div class='graphspacer'></div>
244
+ </div>
238
245
  </ui-area>
239
246
  <ui-resizehandle data-belongs-to-tab="details" data-label="drag to resize"></ui-resizehandle>
240
247
  <ui-area data-belongs-to-tab="details" id="detailcolumn">