cpee 1.3.176 → 1.3.177
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/cockpit/css/ui.css +26 -65
- data/cockpit/index.html +60 -77
- data/cockpit/js/details.js +8 -3
- data/cockpit/js/instance.js +24 -23
- data/cockpit/js/ui.js +1 -18
- data/cockpit/js/wfadaptor.cpee.js +452 -598
- data/cockpit/lib/ui.css +120 -124
- data/cockpit/lib/ui.js +84 -34
- data/cockpit/lib/wfadaptor.css +5 -5
- data/cockpit/lib/wfadaptor.js +5 -11
- data/cockpit/testsets/Worklist Parallel.xml +97 -0
- data/cockpit/testsets/Worklist Test CPEE.xml +39 -0
- data/cpee.gemspec +5 -5
- data/lib/cpee/controller.rb +1 -1
- data/lib/cpee/processtransformation/cpee.rb +2 -3
- data/server/instances/38/properties.xml +46 -0
- data/server/instances/39/properties.xml +58 -0
- data/server/instances/40/properties.xml +148 -0
- data/server/instances/41/properties.xml +46 -0
- data/server/instances/42/properties.xml +148 -0
- data/server/instances/43/notifications/9e7d05164a8539415d008b5bca3e0672/consumer-secret +1 -0
- data/server/instances/43/notifications/9e7d05164a8539415d008b5bca3e0672/producer-secret +1 -0
- data/server/instances/{37/notifications/2b67c793efcea22d88beaa28249001be → 43/notifications/9e7d05164a8539415d008b5bca3e0672}/subscription.xml +0 -0
- data/server/instances/43/properties.xml +148 -0
- data/server/instances/44/properties.xml +148 -0
- data/server/instances/45/notifications/442ed76f5da42dc9c57713840d713510/consumer-secret +1 -0
- data/server/instances/45/notifications/442ed76f5da42dc9c57713840d713510/producer-secret +1 -0
- data/server/instances/45/notifications/442ed76f5da42dc9c57713840d713510/subscription.xml +34 -0
- data/server/instances/45/properties.xml +148 -0
- data/server/instances/46/properties.xml +46 -0
- data/server/instances/47/notifications/63fba892899cc92fca381a666089e8d9/consumer-secret +1 -0
- data/server/instances/47/notifications/63fba892899cc92fca381a666089e8d9/producer-secret +1 -0
- data/server/instances/47/notifications/63fba892899cc92fca381a666089e8d9/subscription.xml +34 -0
- data/server/instances/47/notifications/e0cdacd3147aa31b0478a3ab1155db6c/consumer-secret +1 -0
- data/server/instances/47/notifications/e0cdacd3147aa31b0478a3ab1155db6c/producer-secret +1 -0
- data/server/instances/47/notifications/e0cdacd3147aa31b0478a3ab1155db6c/subscription.xml +34 -0
- data/server/instances/47/properties.xml +148 -0
- data/server/resources/transformation_dslx.xsl +4 -4
- data/server/server.pid +1 -0
- data/test/cb.rb +3 -3
- metadata +39 -20
- data/cockpit/lib/jquery-ui.custom.min.js +0 -8
- data/cockpit/lib/jquery-ui.custom.min.txt +0 -16
- data/cockpit/lib/jquery.redraw.js +0 -3
- data/server/instances/37/notifications/2b67c793efcea22d88beaa28249001be/consumer-secret +0 -1
- data/server/instances/37/notifications/2b67c793efcea22d88beaa28249001be/producer-secret +0 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 05618c8b92cfaf7fabbc492235bace1375db7c94
|
|
4
|
+
data.tar.gz: 2507bd5d658bf606ec0114d2a0a2a2356668787f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2121c9e9a2678b1631316c949682492c253b90088da45379faad31c015b14f6e07b11dba2090cf7ee756f368371c25bc02c5a36ea3d33ad1568c81d50752b09b
|
|
7
|
+
data.tar.gz: 8b8acfd02ae9147d91dcb4badfddb7c719b0e77d7792c8d4eb0d0f37776d0403581f4a76b1fd68e9f202d0291553b670c38077dbf0059a6aaa24623f4da5949e
|
data/cockpit/css/ui.css
CHANGED
|
@@ -7,40 +7,28 @@ body {
|
|
|
7
7
|
font-size: 1em;
|
|
8
8
|
}
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
padding: .5em 2em .55em;
|
|
12
|
-
border: 1px solid ButtonShadow;
|
|
13
|
-
border-radius: 0.2em;
|
|
14
|
-
padding: 0px;
|
|
15
|
-
margin: 0;
|
|
16
|
-
font-family: sans-serif;
|
|
17
|
-
font-size: 0.9em;
|
|
18
|
-
background: ButtonFace;
|
|
19
|
-
background: -webkit-gradient(linear, left top, left bottom, from(ButtonHighlight), to(ButtonFace));
|
|
20
|
-
background: -moz-linear-gradient(top, ButtonHighlight, ButtonFace);
|
|
21
|
-
}
|
|
22
|
-
input { font-family: sans-serif; font-size: 1em; }
|
|
10
|
+
#instance ui-content { height: 7em; }
|
|
23
11
|
|
|
24
|
-
#areanew { height: 7em; }
|
|
25
12
|
#areanew td:nth-child(1) { width: 7em; padding-right: 1em; }
|
|
26
13
|
#areanew td:nth-child(3) { width: 16em; padding-left: 1em; }
|
|
27
14
|
#areanew input { width: 100%; }
|
|
28
15
|
#areanew button[name=base] { width: 100%; }
|
|
29
16
|
#areanew button[name=instance] { width: 100%; }
|
|
30
17
|
|
|
31
|
-
|
|
32
|
-
border: 0 none;
|
|
33
|
-
text-align: right;
|
|
34
|
-
width: 100%;
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
div.tabbed table.tabbar td.tabbehind button {
|
|
18
|
+
ui-tabbed ui-tabbar ui-behind button {
|
|
38
19
|
margin-left: 0.5em;
|
|
39
20
|
}
|
|
40
21
|
|
|
22
|
+
#current-instance-properties[href]:after {
|
|
23
|
+
content: "|";
|
|
24
|
+
}
|
|
25
|
+
#current-instance-subscriptions[href]:after {
|
|
26
|
+
content: "|";
|
|
27
|
+
}
|
|
28
|
+
|
|
41
29
|
button.highlight { background-color: #cc0000; }
|
|
42
30
|
|
|
43
|
-
#parameters
|
|
31
|
+
#parameters ui-content { height: 9em; min-height: 1.7em; }
|
|
44
32
|
|
|
45
33
|
#areadataelements { height: 100%; overflow-x: hidden; overflow-y: scroll; }
|
|
46
34
|
#areaendpoints { height: 100%; overflow: auto; }
|
|
@@ -62,23 +50,17 @@ button.highlight { background-color: #cc0000; }
|
|
|
62
50
|
#areainstance div.section:nth-child(3) div { vertical-align: middle; margin: 0; padding: 0; }
|
|
63
51
|
#areainstance div.section:nth-child(3) button[name=loadmodeltype] { width: 10em; height: 2em; }
|
|
64
52
|
|
|
65
|
-
#areaexecution { height: 7em; overflow: auto; }
|
|
66
53
|
#areaexecution input { padding: 0; margin:0; }
|
|
67
54
|
#areaexecution table.compact { width: 100%; }
|
|
68
55
|
#areaexecution table.compact tr td:nth-child(1) { width: 15ex; }
|
|
69
56
|
|
|
70
57
|
#areaexecution table.compact tbody.debug tr:last-child td { padding-bottom: 0.5em; }
|
|
58
|
+
#areaexecution table.compact tbody.debug tr:last-child td input { vertical-align: middle; }
|
|
71
59
|
#areaexecution table.compact tbody.exe tr:first-child td { padding-top: 0.5em; }
|
|
72
|
-
#areaexecution table.compact tbody.exe {
|
|
60
|
+
#areaexecution table.compact tbody.exe { border-top: 1px solid ButtonShadow; }
|
|
73
61
|
|
|
74
62
|
#areaexecution table.compact tbody.exe td { height: 2.2em; }
|
|
75
63
|
|
|
76
|
-
#dat_log { width:100%; }
|
|
77
|
-
#dat_log td { vertical-align: top; }
|
|
78
|
-
#dat_log tr:nth-child(odd) { background-color: ButtonFace; color: ButtonText; }
|
|
79
|
-
|
|
80
|
-
#areadetails { table-layout: fixed; }
|
|
81
|
-
|
|
82
64
|
#dat_endpoints {
|
|
83
65
|
border-collapse:collapse;
|
|
84
66
|
border-spacing:0;
|
|
@@ -115,8 +97,10 @@ button.highlight { background-color: #cc0000; }
|
|
|
115
97
|
#dat_dataelements input:first-child { border: 0 none; width: 8em; }
|
|
116
98
|
#dat_dataelements input:last-child { border: 0 none; width: 100%; }
|
|
117
99
|
|
|
100
|
+
#areadsl div { padding: 0 1em; }
|
|
101
|
+
#areadsl div:first-child { padding-top: 1em; }
|
|
102
|
+
#areadsl div:last-child { padding-bottom: 1em; }
|
|
118
103
|
#areadsl pre {
|
|
119
|
-
margin: 1em;
|
|
120
104
|
font-family: monospace;
|
|
121
105
|
font-size:1.3em;
|
|
122
106
|
}
|
|
@@ -134,45 +118,22 @@ span.vote {
|
|
|
134
118
|
color: #73d216;
|
|
135
119
|
}
|
|
136
120
|
|
|
137
|
-
#
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
.ui-resizable-handle {
|
|
143
|
-
z-index: 99999;
|
|
144
|
-
color: ButtonShadow;
|
|
145
|
-
position: absolute;
|
|
146
|
-
white-space:nowrap;
|
|
147
|
-
}
|
|
148
|
-
.ui-resizable-w {
|
|
149
|
-
cursor: w-resize;
|
|
150
|
-
-webkit-transform: rotate(90deg);
|
|
151
|
-
-webkit-transform-origin: 0% 100%;
|
|
152
|
-
-moz-transform: rotate(90deg);
|
|
153
|
-
-moz-transform-origin: left bottom;
|
|
154
|
-
margin-top: -1em;
|
|
155
|
-
margin-left: 0.3em;
|
|
121
|
+
#graphcolumn {
|
|
122
|
+
margin: 0;
|
|
123
|
+
padding: 0;
|
|
124
|
+
border-right: 1px solid ButtonShadow;
|
|
125
|
+
min-width: 9em;
|
|
156
126
|
}
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
cursor: s-resize;
|
|
160
|
-
text-align: right;
|
|
161
|
-
margin-top: 1.1em;
|
|
127
|
+
#detailcolumn {
|
|
128
|
+
padding-left: 1.5em;
|
|
162
129
|
}
|
|
163
130
|
|
|
164
|
-
#
|
|
165
|
-
|
|
166
|
-
border-spacing:0;
|
|
167
|
-
border:0 none;
|
|
168
|
-
margin:0;
|
|
169
|
-
padding:0;
|
|
170
|
-
width: 100%;
|
|
171
|
-
}
|
|
131
|
+
#dat_log tr:nth-child(odd) { background-color: ButtonFace; color: ButtonText; }
|
|
132
|
+
|
|
172
133
|
#dat_details td.del { width: 1.2em; font-size: 1.3em; font-weight: bold; }
|
|
173
134
|
#dat_details td.pname { width: 7em; }
|
|
174
|
-
#dat_details td.cname { width: 10.2em;
|
|
175
|
-
#dat_details td.sep { width: 1em;
|
|
135
|
+
#dat_details td.cname { width: 10.2em; }
|
|
136
|
+
#dat_details td.sep { width: 1em; }
|
|
176
137
|
#dat_details tr.indent td:nth-child(1) { padding-left: 2em;}
|
|
177
138
|
#dat_details tr:nth-child(odd) input { background-color: ButtonFace; }
|
|
178
139
|
#dat_details tr:nth-child(odd) textarea { background-color: ButtonFace; }
|
data/cockpit/index.html
CHANGED
|
@@ -21,12 +21,12 @@
|
|
|
21
21
|
<title>CPEE Cockpit</title>
|
|
22
22
|
|
|
23
23
|
<!-- libs, do not modify -->
|
|
24
|
+
<script src="http://code.jquery.com/jquery-1.10.2.js"></script>
|
|
25
|
+
<script src="http://code.jquery.com/ui/1.11.3/jquery-ui.js"></script>
|
|
24
26
|
|
|
25
|
-
<script type="text/javascript" src="lib/jquery.min.js"></script>
|
|
26
27
|
<script type="text/javascript" src="lib/jquery.browser.js"></script>
|
|
27
28
|
<script type="text/javascript" src="lib/jquery.svg.min.js"></script>
|
|
28
29
|
<script type="text/javascript" src="lib/jquery.svgdom.min.js"></script>
|
|
29
|
-
<script type="text/javascript" src="lib/jquery-ui.custom.min.js"></script>
|
|
30
30
|
<script type="text/javascript" src="lib/util.js"></script>
|
|
31
31
|
<script type="text/javascript" src="lib/printf.js"></script>
|
|
32
32
|
<script type="text/javascript" src="lib/strftime.min.js"></script>
|
|
@@ -34,7 +34,6 @@
|
|
|
34
34
|
<script type="text/javascript" src="lib/underscore.min.js"></script>
|
|
35
35
|
<script type="text/javascript" src="lib/jquery.caret.min.js"></script>
|
|
36
36
|
<script type="text/javascript" src="lib/jquery.cookie.js"></script>
|
|
37
|
-
<script type="text/javascript" src="lib/jquery.redraw.js"></script>
|
|
38
37
|
|
|
39
38
|
<script type="text/javascript" src="lib/custommenu.js"></script>
|
|
40
39
|
<script type="text/javascript" src="lib/wfadaptor.js"></script>
|
|
@@ -52,9 +51,8 @@
|
|
|
52
51
|
<script type="text/javascript" src="js/parameters.js"></script>
|
|
53
52
|
<script type="text/javascript" src="js/wfadaptor.cpee.js"></script>
|
|
54
53
|
<link rel="stylesheet" href="css/ui.css" type="text/css"/>
|
|
55
|
-
<link rel="stylesheet" href="css/ui.css" type="text/css"/>
|
|
56
54
|
</head>
|
|
57
|
-
<body data-defaultport="9298">
|
|
55
|
+
<body data-defaultport="9298" is="x-ui">
|
|
58
56
|
<div id='disclaimer' class='hidden'>
|
|
59
57
|
<h1>Disclaimer</h1>
|
|
60
58
|
|
|
@@ -98,7 +96,7 @@
|
|
|
98
96
|
</p>
|
|
99
97
|
|
|
100
98
|
<p>
|
|
101
|
-
<input id='iagree' type='checkbox'/><label for'iagree'><strong>OK, I Agree with this terms. I will be a happy person, and do no evil.</strong></label>
|
|
99
|
+
<input id='iagree' type='checkbox'/><label for='iagree'><strong>OK, I Agree with this terms. I will be a happy person, and do no evil.</strong></label>
|
|
102
100
|
</p>
|
|
103
101
|
<p>
|
|
104
102
|
<button id='icontinue' disabled='disabled'>Continue</button>
|
|
@@ -164,21 +162,18 @@
|
|
|
164
162
|
</table> <!--}}}-->
|
|
165
163
|
|
|
166
164
|
<div class='menu' id='predefinedtestsets'></div>
|
|
167
|
-
<div class='menu' id='modeltypes'></div>
|
|
165
|
+
<div class='menu' id='modeltypes'></div>
|
|
168
166
|
|
|
169
|
-
<
|
|
170
|
-
<
|
|
171
|
-
<
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
<
|
|
179
|
-
</table>
|
|
180
|
-
<div class="tabbelow">
|
|
181
|
-
<div id="areanew"> <!--{{{-->
|
|
167
|
+
<ui-tabbed id="instance">
|
|
168
|
+
<ui-tabbar>
|
|
169
|
+
<ui-tab class="switch" ></ui-tab>
|
|
170
|
+
<ui-tab class="" data-tab="new" id="tabnew" >New</ui-tab>
|
|
171
|
+
<ui-tab class="inactive hidden" data-tab="instance" id="tabinstance" >Instance</ui-tab>
|
|
172
|
+
<ui-tab class="inactive hidden" data-tab="execution" id="tabexecution">Execution</ui-tab>
|
|
173
|
+
<ui-behind ><a id='current-instance'></a><a id='current-instance-properties'></a><a id='current-instance-subscriptions'></a><a id='current-instance-callbacks'></a></ui-behind>
|
|
174
|
+
</ui-tabbar>
|
|
175
|
+
<ui-content>
|
|
176
|
+
<ui-area data-belongs-to-tab="new" id="areanew"> <!--{{{-->
|
|
182
177
|
<table class='layout'>
|
|
183
178
|
<tr>
|
|
184
179
|
<td>Base Url:</td>
|
|
@@ -191,8 +186,8 @@
|
|
|
191
186
|
<td><button name="instance">monitor instance</button></td>
|
|
192
187
|
</tr>
|
|
193
188
|
</table>
|
|
194
|
-
</
|
|
195
|
-
<
|
|
189
|
+
</ui-area> <!--}}}-->
|
|
190
|
+
<ui-area data-belongs-to-tab="instance" id="areainstance" class="inactive"> <!--{{{-->
|
|
196
191
|
<div class='section'>
|
|
197
192
|
<div>
|
|
198
193
|
<input type='file' name='testsetfile' id='testsetfile'/>
|
|
@@ -215,8 +210,8 @@
|
|
|
215
210
|
<button title='a testset includes various setting, subscriptions and a model' name="loadmodeltype">set model type</button>
|
|
216
211
|
</div>
|
|
217
212
|
</div>
|
|
218
|
-
</
|
|
219
|
-
<
|
|
213
|
+
</ui-area> <!--}}}-->
|
|
214
|
+
<ui-area data-belongs-to-tab="execution" id="areaexecution" class='inactive'> <!--{{{-->
|
|
220
215
|
<table class='compact'>
|
|
221
216
|
<tbody class='debug'>
|
|
222
217
|
<tr>
|
|
@@ -235,63 +230,51 @@
|
|
|
235
230
|
</tr>
|
|
236
231
|
</tbody>
|
|
237
232
|
</table>
|
|
238
|
-
</
|
|
239
|
-
</
|
|
240
|
-
</
|
|
233
|
+
</ui-area> <!--}}}-->
|
|
234
|
+
</ui-content>
|
|
235
|
+
</ui-tabbed>
|
|
241
236
|
|
|
242
|
-
<
|
|
243
|
-
<
|
|
244
|
-
<
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
<
|
|
251
|
-
</table>
|
|
252
|
-
<div class="tabbelow">
|
|
253
|
-
<div id="areadataelements"> <!--{{{-->
|
|
237
|
+
<ui-tabbed class="hidden" id='parameters'>
|
|
238
|
+
<ui-tabbar>
|
|
239
|
+
<ui-tab class="switch" ></ui-tab>
|
|
240
|
+
<ui-tab class="" data-tab="dataelements" id="tabdataelements">Data Elements</ui-tab>
|
|
241
|
+
<ui-tab class="inactive" data-tab="endpoints" id="tabendpoints" >Endpoints</ui-tab>
|
|
242
|
+
<ui-behind ><button title='Ctrl-N while editing entry'>New</button><button title='Ctrl-S while editing entry'>Save</button></ui-behind>
|
|
243
|
+
</ui-tabbar>
|
|
244
|
+
<ui-content>
|
|
245
|
+
<ui-area data-belongs-to-tab="dataelements" id="areadataelements"> <!--{{{-->
|
|
254
246
|
<table id="dat_dataelements"></table>
|
|
255
|
-
</
|
|
256
|
-
<
|
|
247
|
+
</ui-area> <!--}}}-->
|
|
248
|
+
<ui-area data-belongs-to-tab="endpoints" id="areaendpoints" class="inactive"> <!--{{{-->
|
|
257
249
|
<table id="dat_endpoints"></table>
|
|
258
|
-
</
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
</div>
|
|
250
|
+
</ui-area> <!--}}}-->
|
|
251
|
+
</ui-content>
|
|
252
|
+
</ui-tabbed>
|
|
262
253
|
|
|
263
|
-
<
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
</
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
</tr>
|
|
288
|
-
</table>
|
|
289
|
-
<div id="areadsl" class="tabbelow inactive"></div>
|
|
290
|
-
<div id="arealog" class="tabbelow inactive"> <!--{{{-->
|
|
291
|
-
<table id="dat_log" class="layout">
|
|
292
|
-
</table>
|
|
293
|
-
</div> <!--}}}-->
|
|
294
|
-
</div>
|
|
254
|
+
<ui-resizehandle class="hidden">drag to resize</ui-resizehandle>
|
|
255
|
+
|
|
256
|
+
<ui-rest id="main" class="hidden">
|
|
257
|
+
<ui-tabbar>
|
|
258
|
+
<ui-before ></ui-before>
|
|
259
|
+
<ui-tab class="" data-tab="details" id="tabdetails">Graph</ui-tab>
|
|
260
|
+
<ui-tab class="inactive" data-tab="dsl" id="tabdsl" >Description</ui-tab>
|
|
261
|
+
<ui-tab class="inactive" data-tab="log" id="tablog" >Log</ui-tab>
|
|
262
|
+
<ui-behind ><button title='Ctrl-S while editing entry'>Save</button></ui-behind>
|
|
263
|
+
</ui-tabbar>
|
|
264
|
+
<ui-content>
|
|
265
|
+
<ui-area data-belongs-to-tab="details" id='graphcolumn'>
|
|
266
|
+
<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>
|
|
267
|
+
</ui-area>
|
|
268
|
+
<ui-resizehandle data-belongs-to-tab="details">drag to resize</ui-resizehandle>
|
|
269
|
+
<ui-area data-belongs-to-tab="details" id="detailcolumn">
|
|
270
|
+
<table id="dat_details" class='layout'></table>
|
|
271
|
+
</ui-area>
|
|
272
|
+
<ui-area data-belongs-to-tab="dsl" id="areadsl" class="inactive"></ui-area>
|
|
273
|
+
<ui-area data-belongs-to-tab="log" id="arealog" class="inactive"> <!--{{{-->
|
|
274
|
+
<table id="dat_log" class="layout"></table>
|
|
275
|
+
</ui-area> <!--}}}-->
|
|
276
|
+
</ui-content>
|
|
277
|
+
</ui-rest>
|
|
295
278
|
|
|
296
279
|
</body>
|
|
297
280
|
</html>
|
data/cockpit/js/details.js
CHANGED
|
@@ -105,9 +105,14 @@ function serialize_details(parent) { //{{{
|
|
|
105
105
|
});
|
|
106
106
|
}
|
|
107
107
|
|
|
108
|
-
if ($('textarea.
|
|
109
|
-
var mani = $X('<
|
|
110
|
-
mani.text($('textarea.
|
|
108
|
+
if ($('textarea.pname_finalize',parent).length > 0) {
|
|
109
|
+
var mani = $X('<finalize xmlns="http://cpee.org/ns/description/1.0"/>');
|
|
110
|
+
mani.text($('textarea.pname_finalize',parent).val());
|
|
111
|
+
xml.append(mani);
|
|
112
|
+
}
|
|
113
|
+
if ($('textarea.pname_update',parent).length > 0) {
|
|
114
|
+
var mani = $X('<update xmlns="http://cpee.org/ns/description/1.0"/>');
|
|
115
|
+
mani.text($('textarea.pname_update',parent).val());
|
|
111
116
|
xml.append(mani);
|
|
112
117
|
}
|
|
113
118
|
break;
|
data/cockpit/js/instance.js
CHANGED
|
@@ -102,7 +102,7 @@ $(document).ready(function() {// {{{
|
|
|
102
102
|
});// }}}
|
|
103
103
|
|
|
104
104
|
function check_subscription() { // {{{
|
|
105
|
-
var url = $("
|
|
105
|
+
var url = $("#current-instance").text();
|
|
106
106
|
var num = 0;
|
|
107
107
|
if ($("input[name=votecontinue]").is(':checked')) num += 1;
|
|
108
108
|
if (num > 0 && subscription_state == 'less') {
|
|
@@ -166,16 +166,19 @@ function monitor_instance(load) {// {{{
|
|
|
166
166
|
type: "GET",
|
|
167
167
|
url: url + "/properties/schema/",
|
|
168
168
|
success: function(res){
|
|
169
|
-
$("
|
|
170
|
-
$(".
|
|
169
|
+
$("ui-tabbed.hidden, ui-rest.hidden").removeClass("hidden");
|
|
170
|
+
$("ui-resizehandle.hidden").removeClass("hidden");
|
|
171
|
+
$("ui-tabbed ui-tab.hidden, ui-rest ui-tab.hidden").removeClass("hidden");
|
|
171
172
|
|
|
172
173
|
// Change url to return to current instance when reloading
|
|
173
|
-
$("input[name=current-instance]").val(url);
|
|
174
174
|
$("#current-instance").text(url);
|
|
175
175
|
$("#current-instance").attr('href',url);
|
|
176
176
|
$("#current-instance-properties").attr('href',url + 'properties/');
|
|
177
|
+
$("#current-instance-properties").text('P');
|
|
177
178
|
$("#current-instance-subscriptions").attr('href',url + 'subscriptions/');
|
|
179
|
+
$("#current-instance-subscriptions").text('S');
|
|
178
180
|
$("#current-instance-callbacks").attr('href',url + 'callbacks/');
|
|
181
|
+
$("#current-instance-callbacks").text('C');
|
|
179
182
|
history.replaceState({}, '', '?monitor='+url);
|
|
180
183
|
|
|
181
184
|
// Change url to return to current instance when reloading (because new subscription is made)
|
|
@@ -255,7 +258,7 @@ function monitor_instance(load) {// {{{
|
|
|
255
258
|
}// }}}
|
|
256
259
|
|
|
257
260
|
function monitor_instance_dataelements() {// {{{
|
|
258
|
-
var url = $("
|
|
261
|
+
var url = $("#current-instance").text();
|
|
259
262
|
$.ajax({
|
|
260
263
|
type: "GET",
|
|
261
264
|
url: url + "/properties/values/dataelements/",
|
|
@@ -283,7 +286,7 @@ function monitor_instance_dataelements() {// {{{
|
|
|
283
286
|
} // }}}
|
|
284
287
|
|
|
285
288
|
function monitor_instance_endpoints() {// {{{
|
|
286
|
-
var url = $("
|
|
289
|
+
var url = $("#current-instance").text();
|
|
287
290
|
$.ajax({
|
|
288
291
|
type: "GET",
|
|
289
292
|
url: url + "/properties/values/endpoints/",
|
|
@@ -312,7 +315,7 @@ function monitor_instance_endpoints() {// {{{
|
|
|
312
315
|
}// }}}
|
|
313
316
|
|
|
314
317
|
function monitor_instance_dsl() {// {{{
|
|
315
|
-
var url = $("
|
|
318
|
+
var url = $("#current-instance").text();
|
|
316
319
|
$.ajax({
|
|
317
320
|
type: "GET",
|
|
318
321
|
dataType: "text",
|
|
@@ -337,12 +340,10 @@ function monitor_instance_dsl() {// {{{
|
|
|
337
340
|
graphrealization.set_svg_container($('#graphcanvas'));
|
|
338
341
|
graphrealization.set_description($(res), true);
|
|
339
342
|
graphrealization.notify = function(svgid) {
|
|
343
|
+
console.log('rrr');
|
|
340
344
|
save_description();
|
|
341
345
|
manifestation.events.click(svgid,undefined);
|
|
342
346
|
};
|
|
343
|
-
$('#graphcanvas').redraw();
|
|
344
|
-
$('#graphcolumn div').redraw();
|
|
345
|
-
|
|
346
347
|
monitor_instance_pos();
|
|
347
348
|
}
|
|
348
349
|
});
|
|
@@ -352,7 +353,7 @@ function monitor_instance_dsl() {// {{{
|
|
|
352
353
|
}// }}}
|
|
353
354
|
|
|
354
355
|
function monitor_instance_state() {// {{{
|
|
355
|
-
var url = $("
|
|
356
|
+
var url = $("#current-instance").text();
|
|
356
357
|
$.ajax({
|
|
357
358
|
type: "GET",
|
|
358
359
|
url: url + "/properties/values/state/",
|
|
@@ -363,7 +364,7 @@ function monitor_instance_state() {// {{{
|
|
|
363
364
|
});
|
|
364
365
|
}// }}}
|
|
365
366
|
function monitor_instance_transformation() {// {{{
|
|
366
|
-
var url = $("
|
|
367
|
+
var url = $("#current-instance").text();
|
|
367
368
|
$.ajax({
|
|
368
369
|
type: "GET",
|
|
369
370
|
url: url + "/properties/values/attributes/modeltype",
|
|
@@ -377,7 +378,7 @@ function monitor_instance_transformation() {// {{{
|
|
|
377
378
|
}// }}}
|
|
378
379
|
|
|
379
380
|
function monitor_instance_pos() {// {{{
|
|
380
|
-
var url = $("
|
|
381
|
+
var url = $("#current-instance").text();
|
|
381
382
|
$.ajax({
|
|
382
383
|
type: "GET",
|
|
383
384
|
url: url + "/properties/values/positions/",
|
|
@@ -459,7 +460,7 @@ function monitor_instance_vote_add(notification) {// {{{
|
|
|
459
460
|
format_visual_add(parts.activity,"vote")
|
|
460
461
|
}// }}}
|
|
461
462
|
function monitor_instance_vote_remove(activity,callback,value) {//{{{
|
|
462
|
-
var url = $("
|
|
463
|
+
var url = $("#current-instance").text();
|
|
463
464
|
$.ajax({
|
|
464
465
|
type: "PUT",
|
|
465
466
|
url: url + "/callbacks/" + callback,
|
|
@@ -471,7 +472,7 @@ function monitor_instance_vote_remove(activity,callback,value) {//{{{
|
|
|
471
472
|
}//}}}
|
|
472
473
|
|
|
473
474
|
function start_instance() {// {{{
|
|
474
|
-
var url = $("
|
|
475
|
+
var url = $("#current-instance").text();
|
|
475
476
|
$.ajax({
|
|
476
477
|
type: "PUT",
|
|
477
478
|
url: url + "/properties/values/state",
|
|
@@ -480,7 +481,7 @@ function start_instance() {// {{{
|
|
|
480
481
|
});
|
|
481
482
|
}// }}}
|
|
482
483
|
function sim_instance() {// {{{
|
|
483
|
-
var url = $("
|
|
484
|
+
var url = $("#current-instance").text();
|
|
484
485
|
$.ajax({
|
|
485
486
|
type: "PUT",
|
|
486
487
|
url: url + "/properties/values/state",
|
|
@@ -489,7 +490,7 @@ function sim_instance() {// {{{
|
|
|
489
490
|
});
|
|
490
491
|
}// }}}
|
|
491
492
|
function stop_instance() {// {{{
|
|
492
|
-
var url = $("
|
|
493
|
+
var url = $("#current-instance").text();
|
|
493
494
|
$.ajax({
|
|
494
495
|
type: "PUT",
|
|
495
496
|
url: url + "/properties/values/state",
|
|
@@ -499,7 +500,7 @@ function stop_instance() {// {{{
|
|
|
499
500
|
}// }}}
|
|
500
501
|
|
|
501
502
|
function save_testset() {// {{{
|
|
502
|
-
var base = $("
|
|
503
|
+
var base = $("#current-instance").text();
|
|
503
504
|
var testset = $X('<testset/>');
|
|
504
505
|
|
|
505
506
|
$.ajax({
|
|
@@ -569,7 +570,7 @@ function save_testset() {// {{{
|
|
|
569
570
|
});
|
|
570
571
|
}// }}}
|
|
571
572
|
function save_svg() {// {{{
|
|
572
|
-
var base = $("
|
|
573
|
+
var base = $("#current-instance").text();
|
|
573
574
|
var params = { mimetype: 'image/svg+xml' };
|
|
574
575
|
|
|
575
576
|
var gc = $('#graphcanvas').clone();
|
|
@@ -594,7 +595,7 @@ function save_svg() {// {{{
|
|
|
594
595
|
});
|
|
595
596
|
}// }}}
|
|
596
597
|
function set_testset(testset) {// {{{
|
|
597
|
-
var url = $("
|
|
598
|
+
var url = $("#current-instance").text();
|
|
598
599
|
|
|
599
600
|
$.ajax({
|
|
600
601
|
type: "GET",
|
|
@@ -684,7 +685,7 @@ function load_modelfile_after() { //{{{
|
|
|
684
685
|
var files = $('#modelfile').get(0).files;
|
|
685
686
|
var reader = new FileReader();
|
|
686
687
|
reader.onload = function(){
|
|
687
|
-
var url = $("
|
|
688
|
+
var url = $("#current-instance").text();
|
|
688
689
|
load_des(url,reader.result);
|
|
689
690
|
running = false;
|
|
690
691
|
}
|
|
@@ -721,7 +722,7 @@ function load_testset() {// {{{
|
|
|
721
722
|
}// }}}
|
|
722
723
|
function load_modeltype() {// {{{
|
|
723
724
|
if (running) return;
|
|
724
|
-
var url = $("
|
|
725
|
+
var url = $("#current-instance").text();
|
|
725
726
|
running = true;
|
|
726
727
|
|
|
727
728
|
var name = $("#modeltypes div.menuitem[data-selected=selected]").text();
|
|
@@ -997,7 +998,7 @@ function append_to_log(what,type,message) {//{{{
|
|
|
997
998
|
message = message.replace(/:\"/g,': "');
|
|
998
999
|
message = message.replace(/:\{/g,': {');
|
|
999
1000
|
message = message.replace(/:\[/g,': [');
|
|
1000
|
-
$("#dat_log").append("<tr><td class='fixed'><a title=\"" + d.strftime("[%d/%b/%Y %H:%M:%S]") + "\">D</a></td><td class='fixed'> - </td><td class='fixed'><a title=\"" + what + "\">T</a></td><td class='fixed'> - </td><td class='fixed'>" + type + "</td><td class='fixed'> - </td><td class='long'>" + message + "</td></tr>");
|
|
1001
|
+
$("#dat_log").append("<tr><td class='fixed top'><a title=\"" + d.strftime("[%d/%b/%Y %H:%M:%S]") + "\">D</a></td><td class='fixed'> - </td><td class='fixed'><a title=\"" + what + "\">T</a></td><td class='fixed'> - </td><td class='fixed'>" + type + "</td><td class='fixed'> - </td><td class='long'>" + message + "</td></tr>");
|
|
1001
1002
|
}//}}}
|
|
1002
1003
|
|
|
1003
1004
|
function report_failure(){}
|