cpee 1.3.173 → 1.3.174

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 634af027b5d421c3970d9b0a4c9ca41dd7e591f4
-  data.tar.gz: c7f933eb5da1e8caca0840f04e8261c6ddc87943
+  metadata.gz: 57b2bcb0a54d9ba22dfe122a16356af176febe0d
+  data.tar.gz: b268f6cedef78bc4265d8564fdb72f7f940daaf6
 SHA512:
-  metadata.gz: 46c1fe5f626db906f673df9ff082c15ab03aae33fc79ad1feb4b2a873cf804f97b54d50c403b726d8399891c4058377dd2a14eee3f0ff6a79bbbcc58f758cd4b
-  data.tar.gz: 898e37f45da9d133ddcf0c10392c347ab88832387873a314892a85b679a7ddcb230ab3f7c7c382425762c624d45bbef1831b7bb2e567d216ce4abe69feeebb2a
+  metadata.gz: 37cc26d6baf204364d8b6852e8948c1a49bf6c47729aa7a8d323d5fc9e552d5e099e451562cfa5f58d747e629659f22829e8329b7690a3f384c8ee022bbe5e8e
+  data.tar.gz: a018352784375f69df6129f536d6d10a35cfc355c64b07b922962250165f4efc1174351d27763214f4e10fafc44bfaf25ed85037572b0de1b20ba9b8eb809500

data/cockpit/css/ui.css

@@ -3,8 +3,23 @@ body {
   -moz-user-select: -moz-none;
   -ms-user-select: none;
   user-select: none;
+  font-family: sans-serif;
+  font-size: 1em;
 }
 
+button { 
+  padding: .5em 2em .55em;
+  border: 1px solid ButtonShadow;  
+  border-radius: 0.2em;
+  padding: 0px; 
+  margin: 0; 
+  font-family: sans-serif; 
+  font-size: 0.9em; 
+  background: ButtonFace;
+  background: -webkit-gradient(linear, left top, left bottom, from(ButtonHighlight), to(ButtonFace));
+  background: -moz-linear-gradient(top, ButtonHighlight, ButtonFace);
+}
+input { font-family: sans-serif; font-size: 1em; }
 
 #areanew                       { height: 7em; } 
 #areanew td:nth-child(1)       { width: 7em; padding-right: 1em; }
@@ -20,7 +35,6 @@ div.tabbed table.tabbar td.tabbehind input {
 }
 
 div.tabbed table.tabbar td.tabbehind button {
-  border: 1pt solid buttonshadow;
   margin-left: 0.5em;
 }
 
@@ -31,22 +45,22 @@ button.highlight { background-color: #cc0000; }
 #areadataelements { height: 100%; overflow-x: hidden; overflow-y: scroll; }
 #areaendpoints    { height: 100%; overflow: auto; }
 
-#areainstance                       { height: 7em; overflow: hidden; }
-#areainstance input                 { padding: 0; margin:0; }
-#areainstance button                { white-space:nowrap; }
-#areainstance select                { width: 18em; }
-#areainstance input[type=file]      { width: 18em; }
-
-
-#areainstance table.compact tbody.loadsave td:nth-child(2)        { padding-right: 0.5em; }
-#areainstance table.compact tbody.loadsave td:nth-child(3)        { padding: 0 0.5em; border-left: 1px solid ButtonShadow; }
-#areainstance table.compact tbody.loadsave td:nth-child(3) button { height: 5em; }
-#areainstance table.compact tbody.loadsave td:nth-child(4)        { padding: 0 0.5em; border-left: 1px solid ButtonShadow; }
-#areainstance table.compact tbody.loadsave td:nth-child(4) button { height: 5em; }
-
-#areainstance table.compact button[name=loadmodeltype]  { width: 10em; }
-#areainstance table.compact button[name=loadtestset]    { width: 10em; }
-#areainstance table.compact button[name=loadmodelfile]  { width: 10em; }
+#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 ButtonShadow; padding: 0 0.5em; }
+#areainstance div.section:nth-child(3) { border-left: 1px solid ButtonShadow; 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; }
 
 #areaexecution { height: 7em; overflow: auto; }
 #areaexecution input { padding: 0; margin:0; }

data/cockpit/index.html

@@ -36,12 +36,12 @@
     <script type="text/javascript" src="lib/jquery.cookie.js"></script>
     <script type="text/javascript" src="lib/jquery.redraw.js"></script>
 
-    <script type="text/javascript" src="lib/contextmenu.js"></script>
+    <script type="text/javascript" src="lib/custommenu.js"></script>
     <script type="text/javascript" src="lib/wfadaptor.js"></script>
     <script type="text/javascript" src="lib/ui.js"></script>
 
     <link rel="stylesheet" href="lib/wfadaptor.css" type="text/css"/>
-    <link rel="stylesheet" href="lib/contextmenu.css" type="text/css"/>
+    <link rel="stylesheet" href="lib/custommenu.css" type="text/css"/>
     <link rel="stylesheet" href="lib/ui.css" type="text/css"/>
 
     <!-- custom stuff, play arround  -->
@@ -104,7 +104,6 @@
         <button id='icontinue' disabled='disabled'>Continue</button>
        </p>
     </div>
-       
 
     <!-- The following six are templates that get used during ui generation, change them carefully -->
     <table id="dat_template_pair" class='hidden'> <!--{{{-->
@@ -164,6 +163,9 @@
       </tr>
     </table> <!--}}}-->
 
+    <div class='menu' id='predefinedtestsets'></div>  
+    <div class='menu' id='modeltypes'></div>  
+
     <div class="tabbed" id="instance">
       <table class="tabbar">
         <tr>
@@ -191,24 +193,28 @@
           </table>
         </div> <!--}}}-->
         <div id="areainstance" class="inactive"> <!--{{{-->
-          <table class='compact'>
-            <tbody class='loadsave'>
-              <tr>
-                <td><input type='file' name='testsetfile' id='testsetfile' style='display:none'/><select title='a testset includes various setting, subscriptions and a model' name="testset-names"><optgroup label='Local Files'><option value='###'>Select file ...</option></optgroup><optgroup label='Predefined examples'></optgroup></select></td>
-                <td><button title='a testset includes various setting, subscriptions and a model' name="loadtestset">load testset</button></td>
-                <td rowspan='3'><button title='a testset includes various setting, subscriptions and a model' name="savetestset">save testset</button><a id="savetestset" href="" download=""></a></td>
-                <td rowspan='3'><button title='a testset includes various setting, subscriptions and a model' name="savesvg">save svg graph</button><a id="savesvg" href="" download=""></a></td>
-              </tr>
-              <tr>
-                <td><select title='the model type affects the transformation property of an instance' name="transformation-names"><option value='???'>???</option></select></td>
-                <td><button title='a testset includes various setting, subscriptions and a model' name="loadmodeltype">set model type</button></td>
-              </tr>
-              <tr>
-                <td><input type='file' name='modelfile' id='modelfile' style='display:none'/></td>
-                <td><button title='a standalone process model is only loadable if the currently loaded testset sucessfully prepared the current instance for the type of model' name="loadmodelfile">load model</button></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class='section'>
+            <div>
+              <input type='file' name='testsetfile' id='testsetfile'/>
+              <button title='a testset includes various setting, subscriptions and a model' name="loadtestset">load predefined testset</button><button title='a testset includes various setting, subscriptions and a model' name="loadtestsetfile">load testset file</button>
+            </div>
+            <div>
+              <input type='file' name='modelfile' id='modelfile'/>
+              <button title='a standalone process model is only loadable if the currently loaded testset sucessfully prepared the current instance for the type of model' name="loadmodelfile">load model</button>
+            </div>    
+          </div><div class='section'>
+            <a id="savetestset" href="" download=""></a>
+            <a id="savesvg" href="" download=""></a>
+            <button title='a testset includes various setting, subscriptions and a model' name="savetestset">save testset</button>
+            <button title='a testset includes various setting, subscriptions and a model' name="savesvg">save svg graph</button>
+          </div><div class='section'>
+            <div>
+              Current model: <span id='currentmodel'></span>
+            </div>
+            <div>
+              <button title='a testset includes various setting, subscriptions and a model' name="loadmodeltype">set model type</button>
+            </div>  
+          </div>
         </div> <!--}}}-->
         <div id="areaexecution" class='inactive'> <!--{{{-->
           <table class='compact'>

data/cockpit/js/instance.js

@@ -24,6 +24,8 @@ var sub_more = 'topic'  + '=' + 'running' + '&' +// {{{
                'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'properties/endpoints' + '&' +
                'events' + '=' + 'change' + '&' +
+               'topic'  + '=' + 'properties/transformation' + '&' +
+               'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'properties/handlerwrapper' + '&' +
                'events' + '=' + 'result' + '&' +
                'topic'  + '=' + 'properties/handlers' + '&' +
@@ -40,6 +42,8 @@ var sub_less = 'topic'  + '=' + 'running' + '&' +// {{{
                'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'properties/endpoints' + '&' +
                'events' + '=' + 'change' + '&' +
+               'topic'  + '=' + 'properties/transformation' + '&' +
+               'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'properties/handlerwrapper' + '&' +
                'events' + '=' + 'result' + '&' +
                'topic'  + '=' + 'properties/handlers' + '&' +
@@ -49,9 +53,10 @@ $(document).ready(function() {// {{{
   $("input[name=base-url]").val(location.protocol + "//" + location.host + ":" + $('body').data('defaultport'));
   $("button[name=base]").click(function(){ create_instance(null); });
   $("button[name=instance]").click(function(){ ui_tab_click("#tabinstance"); monitor_instance(false); });
-  $("button[name=loadtestset]").click(load_testset);
-  $("button[name=loadmodeltype]").click(load_modeltype);
-  $("button[name=loadmodelfile]").click(load_model);
+  $("button[name=loadtestset]").click(function(e){new CustomMenu(e).menu($('#predefinedtestsets'),load_testset); });
+  $("button[name=loadtestsetfile]").click(load_testsetfile);
+  $("button[name=loadmodelfile]").click(load_modelfile);
+  $("button[name=loadmodeltype]").click(function(e){new CustomMenu(e).menu($('#modeltypes'),load_modeltype, $("button[name=loadmodeltype]")); });
   $("button[name=savetestset]").click(function(){ save_testset(); });
   $("button[name=savesvg]").click(function(){ save_svg(); });
   $("input[name=votecontinue]").click(check_subscription);
@@ -64,11 +69,8 @@ $(document).ready(function() {// {{{
     success: function(res){
       $('testset',res).each(function(){
         var ts = $(this).text();
-        $('select[name=testset-names] optgroup:last-child').append(
-          $("<option></option>").attr("value",ts).text(ts)
-        );
+        $('#predefinedtestsets').append($("<div class='menuitem'></div>").text(ts));
       });
-      $('select[name=testset-names] optgroup:last-child option:first-child').attr('selected','selected');
       var q = $.parseQuery();
       if (q.monitor && q.load) {
         $("input[name=instance-url]").val(q.monitor);
@@ -93,9 +95,7 @@ $(document).ready(function() {// {{{
     success: function(res){
       $('transformation',res).each(function(){
         var ts = $(this).text();
-        $('select[name=transformation-names]').append(
-          $("<option></option>").attr("value",ts).text(ts)
-        );
+        $('#modeltypes').append($("<div class='menuitem'></div>").text(ts));
       });
     }
   });
@@ -216,6 +216,9 @@ function monitor_instance(load) {// {{{
                 case 'properties/position':
                   monitor_instance_pos_change($('event > notification',data).text());
                   break;
+                case 'properties/transformation':
+                  monitor_instance_transformation();
+                  break;
                 case 'running':
                   monitor_instance_running($('event > notification',data).text(),$('event > event',data).text());
                   break;
@@ -237,6 +240,7 @@ function monitor_instance(load) {// {{{
 
       monitor_instance_dataelements();
       monitor_instance_endpoints();
+      monitor_instance_transformation();
       monitor_instance_dsl();
       monitor_instance_state();
     },
@@ -355,6 +359,19 @@ function monitor_instance_state() {// {{{
     }
   });
 }// }}}
+function monitor_instance_transformation() {// {{{
+  var url = $("input[name=current-instance]").val();
+  $.ajax({
+    type: "GET", 
+    url: url + "/properties/values/attributes/modeltype",
+    success: function(res){
+      $("#currentmodel").text($(res.documentElement).text());
+    },
+    error: function() {
+      $("#currentmodel").text('???');
+    }
+  });
+}// }}}
 
 function monitor_instance_pos() {// {{{
   var url = $("input[name=current-instance]").val();
@@ -520,9 +537,13 @@ function save_testset() {// {{{
                       testset.append(pars);
                       $.ajax({
                         type: "GET", 
-                        url: base + "/properties/values/info/",
+                        url: base + "/properties/values/attributes/",
                         success: function(res){
-                          var name = res;
+                          var pars = $X('<attributes/>');
+                          pars.append($(res.documentElement));
+                          testset.append(pars);
+                          var name = $("values > info",res);
+                          console.log(res);
                           $('#savetestset').attr('download',name + '.xml');
                           $('#savetestset').attr('href','data:application/xml;charset=utf-8;base64,' + window.btoa(testset.serializeXML()));
                           document.getElementById('savetestset').click();
@@ -557,7 +578,7 @@ function save_svg() {// {{{
       gc.prepend($X('<style xmlns="http://www.w3.org/2000/svg" type="text/css"><![CDATA[' + res + ']]></style>'));
       $.ajax({
         type: "GET", 
-        url: base + "/properties/values/info/",
+        url: base + "/properties/values/attributes/info/",
         success: function(res){
           var name = res;
 
@@ -626,7 +647,8 @@ function set_testset(testset) {// {{{
     }
   });
  }// }}}
-function load_testsetfile() { //{{{
+
+function load_testsetfile_after() { //{{{
   if (running) return;
   running = true;
   if (typeof window.FileReader !== 'function') {
@@ -643,7 +665,12 @@ function load_testsetfile() { //{{{
   reader.onabort = function(){ running  = false; }  
   reader.readAsText(files[0]);
 } //}}}
-function load_modelfile() { //{{{
+function load_testsetfile() {// {{{
+  if (running) return;
+  document.getElementById('testsetfile').click();
+}// }}}
+
+function load_modelfile_after() { //{{{
   if (running) return;
   running = true;
   if (typeof window.FileReader !== 'function') {
@@ -661,52 +688,53 @@ function load_modelfile() { //{{{
   reader.onabort = function(){ running  = false; }  
   reader.readAsText(files[0]);
 } //}}}
+function load_modelfile() {// {{{
+  if (running) return;
+  document.getElementById('modelfile').click();
+}// }}}
+
 function load_testset() {// {{{
   if (running) return;
   running  = true;
-  save['dsl'] = null; // reload dsl and position under all circumstances
-  
-  $('#main .tabbehind button').hide();
-  $('#dat_details').empty();
 
-  var name = $("select[name=testset-names]").val();
-
-  if (name == '###') {
-    running = false;
-    document.getElementById('testsetfile').click();
-  } else {  
-    $.ajax({ 
-      cache: false,
-      dataType: 'xml',
-      url: "testsets/" + name + ".xml",
-      success: function(res){ 
-        document.title = name;
-        set_testset(res);
-      },
-      complete: function() {
-        running  = false;
-      }
-    });
-  }  
-}// }}}
+  var name = $("#predefinedtestsets div.menuitem[data-selected=selected]").text();
+  $.ajax({ 
+    cache: false,
+    dataType: 'xml',
+    url: "testsets/" + name + ".xml",
+    success: function(res){ 
+      save['dsl'] = null; // reload dsl and position under all circumstances
+      $('#main .tabbehind button').hide();
+      $('#dat_details').empty();
 
-function load_model() {// {{{
-  if (running) return;
-  document.getElementById('modelfile').click();
+      document.title = name;
+      set_testset(res);
+    },
+    complete: function() {
+      running  = false;
+    }
+  });
 }// }}}
-
 function load_modeltype() {// {{{
   if (running) return;
+  var url = $("input[name=current-instance]").val();
   running  = true;
   
-  var name = $("select[name=transformation-names]").val();
-
+  var name = $("#modeltypes div.menuitem[data-selected=selected]").text();
   $.ajax({ 
     cache: false,
     dataType: 'xml',
     url: "testsets/" + name + ".xml",
     success: function(res){ 
-      set_testset(res);
+      $.ajax({
+        type: "PUT", 
+        url: url + "/properties/values/attributes/modeltype",
+        data: ({value: name}),
+        success: function(){
+          set_testset(res);
+        },
+        error: report_failure
+      });
     },
     complete: function() {
       running  = false;

data/cockpit/js/wfadaptor.cpee.js

@@ -108,7 +108,7 @@ function CPEE(adaptor) {
                         },
                         'params': ['> manipulate', xml_node]});
       }
-      contextmenu(menu, e);
+      new CustomMenu(e).contextmenu(menu);
     }
     return false;
   } // }}} 

data/cockpit/lib/{contextmenu.css → custommenu.css}

@@ -14,17 +14,18 @@
   <http://www.gnu.org/licenses/>.
 */
 
-div.contextmenu {
+div.contextmenu, div.menu {
   padding: 0;
   margin: 0;
   z-index: 100000;
   position: absolute;
   display:none;
   background: Menu;
-  border: 1px solid ButtonShadow;
+  border: 1px solid ActiveBorder;
   -moz-box-sizing:    border-box;
   -webkit-box-sizing: border-box;
   box-sizing:         border-box;
+  box-shadow: 0.1em 0.1em 0.1em ThreeDShadow;
 }
 
 table.contextmenu {
@@ -46,22 +47,28 @@ tr.contextmenuheader > td{
   padding-right: 1em;
 }
 tr.contextmenuheader:not(:first-child) {
-  border-top: 1px solid ButtonShadow;
+  border-top: 1px solid ActiveBorder;
 }
 
-tr.contextmenuitem {
+div.menu > div { 
+  height: 1.5em;
+}
+
+tr.contextmenuitem, div.menu > div {
   font-size: small;
   color: MenuText;
 }
-tr.contextmenuitem:hover {
+tr.contextmenuitem:hover, div.menu > div:hover {
   background-color:Highlight;
   color: HighlightText;
 }
-tr.contextmenuitem > td{
+tr.contextmenuitem > td, div.menu > div {
+  padding: 0;
+  margin: 0;
   padding-left: 0.5em;
   padding-right: 1em;
 }
-tr.contextmenuitem > .contextmenuicon{
+tr.contextmenuitem > .contextmenuicon {
   margin-left: 0.7em;
   padding-right: 0em;
 }
@@ -75,4 +82,3 @@ tr.contextmenuitem > .contextmenuicon div svg {
   width: 1.5em;
   vertical-align:bottom;
 }
-