cpee 1.3.223 → 1.3.224

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c641212b9e2b621bf1d0434c67f5967e9b2255c8
-  data.tar.gz: f705d06f0d262566f6891292c57737b25d5df6dd
+  metadata.gz: ce2f2888804d0868122fbcfd26f63b6845d157ad
+  data.tar.gz: ef8225299e50b439e22365ddfb3801c355cf3b70
 SHA512:
-  metadata.gz: 8454a32470b18571417cb2a63ecb7fe541a1e68d1fa61a4c2af9caef21541c16115cc7ad3eeeaa5ebc28a123a28dc2c5d7af56fec45da733fd81d0081ae7da47
-  data.tar.gz: a51ae838383b2f32c55084120504fc118dd091235a4af1aeb8c5dbde7f5a3645b3e5864f8fe8db0ce746d66826049e67202c1e8aa47898a88fdf4413ba25939e
+  metadata.gz: af3f3e3c8e11ffe0b09333194247a13e1f77468c22c3d3ea285c46cb23a517b0809010180b6ee54feae35d55b50611f2bdcedb424151dc1c18430fcb93d74feb
+  data.tar.gz: 33a265bd3ebf2658f80ba79c121627a0b9c37621eb4db8fefe66bad8b32c7466cbdfe21304e84e15bf8840418bda32c962e45bc2b8b5c629b95d9e70d727f91b

data/cockpit/css/ui.css

@@ -49,20 +49,20 @@ ui-tabbed ui-tabbar ui-behind button {
 
 #areainstance input[type=file]         { display: none; }
 #areainstance div.section              { display: table-cell; vertical-align: middle; }
-#areainstance div.section:nth-child(1) {                                      padding: 0 0.5em 0 0; }
-#areainstance div.section:nth-child(2) { border-left: 1px solid #a1a1a1;      padding: 0 0.5em; }
-#areainstance div.section:nth-child(3) { border-left: 1px solid #a1a1a1;      padding: 0 0 0 0.5em; }
-
-#areainstance div.section:nth-child(1) div                          { vertical-align: middle; margin: 0; padding: 0; }
-#areainstance div.section:nth-child(1) button                       { vertical-align: middle; margin: 0; padding: 0; }
-#areainstance div.section:nth-child(1) div:nth-child(2)             { text-align: right; }
-#areainstance div.section:nth-child(1) button[name=loadtestset]     { width: 10em; height: 3.5em; }
-#areainstance div.section:nth-child(1) button[name=loadtestsetfile] { width: 10em; height: 3.5em; margin-left: 0.2em; }
-#areainstance div.section:nth-child(1) button[name=loadmodelfile]   { width: 10em; height: 2em;   margin-top: 0.2em; }
-
-#areainstance div.section:nth-child(2) button                       { width: 6em; height: 4.5em; vertical-align: middle; margin: 0; padding: 0; }
-#areainstance div.section:nth-child(3) div                          { vertical-align: middle; margin: 0; padding: 0; }
-#areainstance div.section:nth-child(3) button[name=loadmodeltype]   { width: 10em; height: 2em; }
+#areainstance div.section:nth-child(1) {                                      padding: 0 0.5em 0 0; white-space: nowrap; }
+#areainstance div.section:nth-child(2) { border-left: 1px solid #a1a1a1;      padding: 0 0.5em;     white-space: nowrap; }
+#areainstance div.section:nth-child(3) { border-left: 1px solid #a1a1a1;      padding: 0 0 0 0.5em; white-space: nowrap; }
+
+#areainstance div.section:nth-child(1) div                          { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
+#areainstance div.section:nth-child(1) button                       { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
+#areainstance div.section:nth-child(1) div:nth-child(2)             { white-space: normal; text-align: right; }
+#areainstance div.section:nth-child(1) button[name=loadtestset]     { white-space: normal; width: 10em; height: 3.5em; }
+#areainstance div.section:nth-child(1) button[name=loadtestsetfile] { white-space: normal; width: 10em; height: 3.5em; margin-left: 0.2em; }
+#areainstance div.section:nth-child(1) button[name=loadmodelfile]   { white-space: normal; width: 10em; height: 2em;   margin-top: 0.2em; }
+
+#areainstance div.section:nth-child(2) button                       { white-space: normal; width: 6em; height: 4.5em; vertical-align: middle; margin: 0; padding: 0; }
+#areainstance div.section:nth-child(3) div                          { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
+#areainstance div.section:nth-child(3) button[name=loadmodeltype]   { white-space: normal; width: 10em; height: 2em; }
 
 #areaexecution input { padding: 0; margin:0; }
 #areaexecution table.compact { width: 100%; }

data/cockpit/css/wfadaptor.css

@@ -42,6 +42,11 @@ svg g.vote .rfill {
   fill-opacity:1;
 }
 
+svg .rfill.menu {
+  fill: #ff7f7f;
+  fill-opacity:1;
+}
+
 svg line.ourline, svg path.ourline {
   stroke-opacity:1;
   stroke:#000000;
@@ -106,6 +111,31 @@ svg .black {
   stroke-dasharray:none;
 }
 
+svg .marked text.label {
+  color: #d4d4d4;
+  fill: #d4d4d4;
+}
+svg .marked .cfill {
+  fill:#d4d4d4;
+  fill-opacity:1;
+  stroke:#d4d4d4;
+  stroke-width:0.2;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
+}
+svg .marked .cline {
+  stroke:#d4d4d4;
+  stroke-width:2.06896567;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
+}
+
 svg .clicked text.label {
   color: #f57900;
   fill: #f57900;
@@ -316,3 +346,23 @@ svg g.element[element-id]:hover > text.label {
   color: #f57900;
   fill: #f57900;
 }
+svg g.element[element-id]:hover .cfill {
+  fill:#000000;
+  fill-opacity:1;
+  stroke:#000000;
+  stroke-width:0.2;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
+}
+svg g.element[element-id]:hover .cline {
+  stroke:#000000;
+  stroke-width:2.06896567;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
+}

data/cockpit/graph.html

@@ -0,0 +1,116 @@
+<!--
+  This file is part of CPEE.
+
+  CPEE is free software: you can redistribute it and/or modify it under the terms
+  of the GNU General Public License as published by the Free Software Foundation,
+  either version 3 of the License, or (at your option) any later version.
+
+  CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along with
+  CPEE (file COPYING in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+-->
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>CPEE Cockpit</title>
+
+    <!-- libs, do not modify. When local than load local libs. -->
+    <script type="text/javascript">
+      if ((document.location.host == 'localhost') && (document.location.protocol == 'http:')) {
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.browser.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.svg.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.svgdom.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/vkbeautify.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/util.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/printf.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/strftime.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/parsequery.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/underscore.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.caret.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.cookie.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/relaxngui.js">\x3C/script>');
+
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/ui.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://localhost/js_libs/custommenu.js">\x3C/script>');
+
+        document.write('<link rel="stylesheet" href="http://localhost/js_libs/custommenu.css" type="text/css"/>');
+        document.write('<link rel="stylesheet" href="http://localhost/js_libs/ui.css" type="text/css"/>');
+
+        document.write('<link rel="stylesheet" href="http://localhost/js_libs/relaxngui.css" type="text/css"/>');
+      } else if ((document.location.host == 'localhost') && (document.location.protocol == 'https:')) {
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/jquery.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/jquery.browser.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/jquery.svg.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/jquery.svgdom.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/vkbeautify.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/util.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/printf.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/strftime.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/parsequery.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/underscore.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/jquery.caret.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/jquery.cookie.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/relaxngui.js">\x3C/script>');
+
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/ui.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://localhost/js_libs/custommenu.js">\x3C/script>');
+
+        document.write('<link rel="stylesheet" href="https://localhost/js_libs/custommenu.css" type="text/css"/>');
+        document.write('<link rel="stylesheet" href="https://localhost/js_libs/ui.css" type="text/css"/>');
+
+        document.write('<link rel="stylesheet" href="https://localhost/js_libs/relaxngui.css" type="text/css"/>');
+      } else {
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.browser.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.svg.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.svgdom.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/vkbeautify.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/util.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/printf.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/strftime.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/parsequery.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/underscore.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.caret.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.cookie.js">\x3C/script>');
+
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/relaxngui.js">\x3C/script>');
+
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/ui.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/custommenu.js">\x3C/script>');
+
+        document.write('<link rel="stylesheet" href="http://gruppe.wst.univie.ac.at/js_libs/custommenu.css" type="text/css"/>');
+        document.write('<link rel="stylesheet" href="http://gruppe.wst.univie.ac.at/js_libs/ui.css" type="text/css"/>');
+
+        document.write('<link rel="stylesheet" href="http://gruppe.wst.univie.ac.at/js_libs/relaxngui.css" type="text/css"/>');
+      }
+    </script>
+
+    <!-- modelling ui -->
+    <script type="text/javascript" src="js/wfadaptor.js"></script>
+    <link rel="stylesheet" href="css/wfadaptor.css" type="text/css"/>
+
+    <!-- custom stuff, play arround  -->
+    <script type="text/javascript" src="js/ui.js"></script>
+    <script type="text/javascript" src="js/instance.js"></script>
+    <script type="text/javascript" src="js/details.js"></script>
+    <script type="text/javascript" src="js/parameters.js"></script>
+    <link rel="stylesheet" href="css/ui.css" type="text/css"/>
+  </head>
+  <body data-defaultport="9298" data-theme-base="themes" is="x-ui">
+    <div class='hidden'>
+       <input name="base-url" type="text" value=""/>
+       <input name="instance-url" type="text" value=""/>
+       <a id='current-instance' href=''></a>
+    </div>
+    <div id='graphcolumn' style='overflow: auto'>
+      <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>
+    </div>
+  </body>
+</html>

data/cockpit/index.html

@@ -22,50 +22,50 @@
 
     <!-- libs, do not modify. When local than load local libs. -->
     <script type="text/javascript">
-      if ((document.location.host == 'localhost') && (document.location.protocol == 'http:')) {
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.min.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.browser.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.svg.min.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.svgdom.min.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/vkbeautify.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/util.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/printf.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/strftime.min.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/parsequery.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/underscore.min.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.caret.min.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.cookie.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/relaxngui.js">\x3C/script>');
+      if ((document.location.hostname == 'localhost') && (document.location.protocol == 'http:')) {
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/jquery.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/jquery.browser.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/jquery.svg.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/jquery.svgdom.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/vkbeautify.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/util.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/printf.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/strftime.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/parsequery.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/underscore.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/jquery.caret.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/jquery.cookie.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/relaxngui.js">\x3C/script>');
 
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/ui.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="http://localhost/js_libs/custommenu.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/ui.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="http://' + document.location.host + '/js_libs/custommenu.js">\x3C/script>');
 
-        document.write('<link rel="stylesheet" href="http://localhost/js_libs/custommenu.css" type="text/css"/>');
-        document.write('<link rel="stylesheet" href="http://localhost/js_libs/ui.css" type="text/css"/>');
+        document.write('<link rel="stylesheet"        href="http://' + document.location.host + '/js_libs/custommenu.css" type="text/css"/>');
+        document.write('<link rel="stylesheet"        href="http://' + document.location.host + '/js_libs/ui.css" type="text/css"/>');
 
-        document.write('<link rel="stylesheet" href="http://localhost/js_libs/relaxngui.css" type="text/css"/>');
-      } else if ((document.location.host == 'localhost') && (document.location.protocol == 'https:')) {
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/jquery.min.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/jquery.browser.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/jquery.svg.min.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/jquery.svgdom.min.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/vkbeautify.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/util.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/printf.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/strftime.min.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/parsequery.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/underscore.min.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/jquery.caret.min.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/jquery.cookie.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/relaxngui.js">\x3C/script>');
+        document.write('<link rel="stylesheet"        href="http://' + document.location.host + '/js_libs/relaxngui.css" type="text/css"/>');
+      } else if ((document.location.hostname == 'localhost') && (document.location.protocol == 'https:')) {
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/jquery.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/jquery.browser.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/jquery.svg.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/jquery.svgdom.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/vkbeautify.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/util.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/printf.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/strftime.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/parsequery.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/underscore.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/jquery.caret.min.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/jquery.cookie.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/relaxngui.js">\x3C/script>');
 
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/ui.js">\x3C/script>');
-        document.write('<script type="text/javascript" src="https://localhost/js_libs/custommenu.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/ui.js">\x3C/script>');
+        document.write('<script type="text/javascript" src="https://' + document.location.host + '/js_libs/custommenu.js">\x3C/script>');
 
-        document.write('<link rel="stylesheet" href="https://localhost/js_libs/custommenu.css" type="text/css"/>');
-        document.write('<link rel="stylesheet" href="https://localhost/js_libs/ui.css" type="text/css"/>');
+        document.write('<link rel="stylesheet"        href="https://' + document.location.host + '/js_libs/custommenu.css" type="text/css"/>');
+        document.write('<link rel="stylesheet"        href="https://' + document.location.host + '/js_libs/ui.css" type="text/css"/>');
 
-        document.write('<link rel="stylesheet" href="https://localhost/js_libs/relaxngui.css" type="text/css"/>');
+        document.write('<link rel="stylesheet"        href="https://' + document.location.host + '/js_libs/relaxngui.css" type="text/css"/>');
       } else {
         document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.min.js">\x3C/script>');
         document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.browser.js">\x3C/script>');
@@ -85,10 +85,10 @@
         document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/ui.js">\x3C/script>');
         document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/custommenu.js">\x3C/script>');
 
-        document.write('<link rel="stylesheet" href="http://gruppe.wst.univie.ac.at/js_libs/custommenu.css" type="text/css"/>');
-        document.write('<link rel="stylesheet" href="http://gruppe.wst.univie.ac.at/js_libs/ui.css" type="text/css"/>');
+        document.write('<link   rel="stylesheet"      href="http://gruppe.wst.univie.ac.at/js_libs/custommenu.css" type="text/css"/>');
+        document.write('<link   rel="stylesheet"      href="http://gruppe.wst.univie.ac.at/js_libs/ui.css" type="text/css"/>');
 
-        document.write('<link rel="stylesheet" href="http://gruppe.wst.univie.ac.at/js_libs/relaxngui.css" type="text/css"/>');
+        document.write('<link   rel="stylesheet"      href="http://gruppe.wst.univie.ac.at/js_libs/relaxngui.css" type="text/css"/>');
       }
     </script>
 

data/cockpit/js/instance.js

@@ -58,7 +58,7 @@ var sub_less = 'topic'  + '=' + 'activity' + '&' +// {{{
                'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
 
-$(document).ready(function() {// {{{
+function cockpit() {
   if (location.protocol.match(/^file/)) {
     $("input[name=base-url]").val("http://localhost:" + $('body').data('defaultport'));
   } else {
@@ -125,7 +125,16 @@ $(document).ready(function() {// {{{
       });
     }
   });
-});// }}}
+}
+
+function sanitize_url() {
+  var url = $("input[name=instance-url]").val();
+  var lastChar = url.substr(url.length - 1)
+  if (lastChar != '/') {
+    $("input[name=instance-url]").val(url + '/');
+  }
+  return $("input[name=instance-url]").val();
+}
 
 function check_subscription() { // {{{
   var url = $("#current-instance").text();
@@ -183,7 +192,7 @@ function create_instance(ask,exec) {// {{{
 }// }}}
 
 function monitor_instance(load,exec) {// {{{
-  var url = $("input[name=instance-url]").val();
+  var url = sanitize_url();
 
   $('.tabbehind button').hide();
   $('#dat_details').empty();
@@ -345,7 +354,7 @@ function monitor_graph_change(force) { //{{{
             adaptor_init(url,$('value',res).text(),dslx);
           },
           error: function() {
-            adaptor_init(url,'default',dslx);
+            adaptor_init(url,'labels',dslx);
           }
         });
       }
@@ -572,7 +581,8 @@ function save_testset() {// {{{
                           pars.append($(res.documentElement).children());
                           pars.find('uuid').remove();
                           testset.append(pars);
-                          $('#savetestset').attr('download',name + '.xml');
+                          var ct = new Date();
+                          $('#savetestset').attr('download',name + '_' + ct.strftime("%Y-%m-%dT%H%M%S%z") + '.xml');
                           $('#savetestset').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(testset.serializePrettyXML()));
                           document.getElementById('savetestset').click();
                         },

data/cockpit/js/ui.js

@@ -1,15 +1,7 @@
 $(document).ready(function() {
-  if (!($.cookie('cpee_iagree'))) {
-    var skip = false;
-
-    $('body').children().each(function(key,c){
-      if (skip) {
-        $(c).remove();
-      } else {
-        $(c).removeClass('hidden');
-      }
-      skip = true;
-    });
+  if (!($.cookie('cpee_iagree')) && $("body > div[id='disclaimer']").length > 0) {
+    $("body > :not([id='disclaimer'])").remove();
+    $("body > [id='disclaimer']").removeClass('hidden');
 
     $("#iagree").click(function(){
       if($(this).is(':checked')){
@@ -22,5 +14,7 @@ $(document).ready(function() {
       $.cookie('cpee_iagree','yes');
       location.reload();
     });
+  } else {
+    cockpit();
   }
 });

data/cockpit/js/wfadaptor.js

@@ -77,6 +77,19 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
       }
     }
     // doit
+    for(element in manifestation.resources) {
+      deferreds.push(
+        $.ajax({
+          type: "GET",
+          dataType: "xml",
+          url: manifestation.resources[element],
+          context: element,
+          success: function(res){
+            manifestation.resources[this] = $(res.documentElement);
+          }
+        })
+      );
+    }
     for(element in manifestation.elements) {
       if (manifestation.elements[element].illustrator) {
         if (manifestation.elements[element].illustrator.svg) {
@@ -402,35 +415,35 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
   } // }}}
   // }}}
   // Adaption functions {{{
-  this.insert_after = function(new_node, target) { // {{{
+  this.insert_after = function(new_node, target, source_opts) { // {{{
     if ($.isArray(new_node)) {
       $.each(new_node,function(k,v){
-        var nn = self.source(v);
+        var nn = self.source(v,source_opts);
         target.after(nn);
         nn.attr('new','true');
       });
     } else {
-      var nn = self.source(new_node);
+      var nn = self.source(new_node,source_opts);
       target.after(nn);
       nn.attr('new','true');
     }
     update();
   } // }}}
-  this.insert_first_into = function(new_node, target, selector) { // {{{
+  this.insert_first_into = function(new_node, target, source_opts) { // {{{
     if ($.isArray(new_node)) {
       $.each(new_node,function(k,v){
-        var nn = self.source(v);
+        var nn = self.source(v,source_opts);
         target.prepend(nn);
         nn.attr('new','true');
       });
     } else {
-      var nn = self.source(new_node);
+      var nn = self.source(new_node,source_opts);
       target.prepend(nn);
       nn.attr('new','true');
     }
     update();
   } // }}}
-  this.insert_last_into = function(new_node, target, selector) { // {{{
+  this.insert_last_into = function(new_node, target) { // {{{
     if ($.isArray(new_node)) {
       $.each(new_node,function(k,v){
         var nn = self.source(v);