cpee 1.3.209 → 1.3.211

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a77dac895eb3b43e3a4ff6003396bcfb96891dd7
-  data.tar.gz: 6ad70edf841754df24eb208b3a6566bdba9b4ec5
+  metadata.gz: f9dfbc4a7336bc2c8c2362dcbf908e405513651b
+  data.tar.gz: 1a598ec52063b0be720385d56ad43a6a34a5675b
 SHA512:
-  metadata.gz: 1f39786faa2ebe4521088503fc27596d9ae59bf3d732704102e6dd42e2c2852142bb6cdb8e94eec546d98ea95def01b4c101235a976d22eef06468b8c5c0467e
-  data.tar.gz: 6bf701d6ec695824c3019ee40ef80e7d781d3e23c64b3ad1b728409f924da0e59f572a737a708f68306907309f8c1833e66a6c2d4b5a62e5a1c78828d376e07b
+  metadata.gz: 51fa98d57404c06840e661579968c1972320fa78c164e972a2d3d29c85a8fc2aeff9ecc82b397b4a093e1d6acc76e025cdf5f97989f97492255e5eb4daa1804c
+  data.tar.gz: c44f85f3d3596ffc9fb9c8b70d3ee1570a37c0a8121e156d3b67c00485a8a2b265a0e316604f7dca675850594c413eb05db20c18fe488e847aa2f77c65116dda

data/Rakefile

@@ -18,15 +18,15 @@ end
 
 task :push => :gem do |r|
   `gem push pkg/cpee.gem`
-end  
+end
 
 task :install => :gem do |r|
-  `sudo gem install pkg/cpee.gem`
-end  
+  `gem install pkg/cpee.gem`
+end
 
 desc "Clean instances"
 task :clean do
   Dir.glob("server/instances/*").collect{ |i| i if i =~ /\/\d+$/ }.compact.each do |i|
-    rm_rf i if File.exists?(i) 
+    rm_rf i if File.exists?(i)
   end
-end  
+end

data/cockpit/contrib/transformation1.xsl

@@ -10,7 +10,7 @@
       <xsl:template match="//d:description">
         <xsl:apply-templates>
           <xsl:with-param name="myspace"><xsl:value-of select="-1*$myspacemultiplier"/></xsl:with-param>
-        </xsl:apply-templates>  
+        </xsl:apply-templates>
       </xsl:template>
 
       <xsl:template match="*">
@@ -20,7 +20,7 @@
           <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
         </xsl:call-template>
         <xsl:if test="name()='call' or name()='manipulate'">
-          <xsl:choose>  
+          <xsl:choose>
             <xsl:when test="@lay">
               <xsl:text>activity [:</xsl:text>
               <xsl:value-of select="@id"/>
@@ -106,7 +106,7 @@
           <xsl:call-template name="print-newline"/>
         </xsl:if>
       </xsl:template>
-      
+
       <xsl:template match="d:alternative">
         <xsl:param name="myspace"/>
         <xsl:call-template name="print-space">
@@ -179,12 +179,12 @@
       <xsl:template match="d:parameters">
         <xsl:apply-templates select="d:*" mode="parameter"/>
       </xsl:template>
-        
+
       <xsl:template match="d:*" mode="parameter">
         <xsl:text>, :</xsl:text>
         <xsl:value-of select="name()"/>
         <xsl:text> => </xsl:text>
-        <xsl:choose>  
+        <xsl:choose>
           <xsl:when test="count(*) > 0">
             <xsl:text>[</xsl:text>
             <xsl:apply-templates select="d:*" mode="sub-parameter"/>
@@ -195,23 +195,23 @@
             <xsl:value-of select="text()"/>
             <xsl:text>"</xsl:text>
           </xsl:otherwise>
-        </xsl:choose>  
+        </xsl:choose>
       </xsl:template>
-      
+
       <xsl:template match="d:*" mode="sub-parameter">
         <xsl:text> { :</xsl:text>
         <xsl:value-of select="name()"/>
         <xsl:text> => </xsl:text>
         <xsl:value-of select="text()"/>
         <xsl:text> }</xsl:text>
-        <xsl:choose>  
+        <xsl:choose>
           <xsl:when test=". = ../*[last()]">
             <xsl:text> </xsl:text>
           </xsl:when>
           <xsl:otherwise>
             <xsl:text>,</xsl:text>
           </xsl:otherwise>
-        </xsl:choose>  
+        </xsl:choose>
       </xsl:template>
 
       <xsl:template match="d:manipulate" mode="part-of-call">

data/cockpit/index.html

@@ -189,7 +189,9 @@
         <ui-area data-belongs-to-tab="instance" id="areainstance" class="inactive"> <!--{{{-->
           <div class='section'>
             <div>
-              <input type='file' name='testsetfile' id='testsetfile'/>
+              <form id='fuckchrome'>
+                <input type='file' name='testsetfile' id='testsetfile'/>
+              </form>
               <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>
@@ -220,7 +222,7 @@
             </tbody>
             <tbody class='exe'>
               <tr>
-                <td>Execution State:</td>
+                <td>State:</td>
                 <td id='state'></td>
               </tr>
               <tr>
@@ -239,7 +241,7 @@
         <ui-tab class=""         data-tab="dataelements" id="tabdataelements">Data Elements</ui-tab>
         <ui-tab class="inactive" data-tab="endpoints"    id="tabendpoints"   >Endpoints</ui-tab>
         <ui-tab class="inactive" data-tab="attributes"   id="tabattributes"  >Attributes</ui-tab>
-        <ui-behind                                                           ><button title='Ctrl-N while editing entry'>New</button><button title='Ctrl-S while editing entry'>Save</button></ui-behind>
+        <ui-behind                                                           ><button title='add entry'>New</button></ui-behind>
       </ui-tabbar>
       <ui-content>
         <ui-area data-belongs-to-tab="dataelements" id="areadataelements"> <!--{{{-->
@@ -262,7 +264,7 @@
         <ui-tab class=""         data-tab="details" id="tabdetails">Graph</ui-tab>
         <ui-tab class="inactive" data-tab="dsl"     id="tabdsl"    >Description</ui-tab>
         <ui-tab class="inactive" data-tab="log"     id="tablog"    >Log</ui-tab>
-        <ui-behind                                                 ><button title='Ctrl-S while editing entry'>Save</button></ui-behind>
+        <ui-behind                                                 ></ui-behind>
       </ui-tabbar>
       <ui-content>
         <ui-area data-belongs-to-tab="details" id='graphcolumn'>

data/cockpit/js/details.js

@@ -1,65 +1,63 @@
 $(document).ready(function() {
-  $('#main ui-tabbar ui-behind button').hide();
-
-  // save button shown or not //{{{
-  $('#main ui-tabbar ui-tab:not(.switch)').click(function(event){
-    var me = $(event.target);
-    if ($('#state').text() != 'finished') {
-      if (me.data('tab') == 'details') {
-        if (!$("#dat_details").is(':empty')) {
-          $('#main ui-tabbar ui-behind button').show();
-        }
-      } else {
-        $('#main ui-tabbar ui-behind button').hide();
-      }
+  var timer;
+
+  $(document).on('input','#dat_details input, #dat_details textarea',function(e){
+    clearTimeout(timer);
+    timer = setTimeout(do_main_save, 5000);
+  });
+  $(document).on('change','#dat_details select',function(e){
+    clearTimeout(timer);
+    do_main_save();
+  });
+  $(document).on('blur','#dat_details input, #dat_details textarea',function(e){
+    clearTimeout(timer);
+    do_main_save();
+  });
+  $(document).on('keypress','#dat_details input',function(e){
+    if (e.keyCode == 13) {
+      clearTimeout(timer);
+      do_main_save();
     }
-  }); //}}}
-
-  $('#main ui-tabbar ui-behind button').click(function(event){
-    if (save['details'].has_changed()) {
-      var visid = 'details';
-      var svgid = save[visid + '_target'].svgid;
-      var desc  = save[visid + '_target'].model;
-      var node  = desc.get_node_by_svg_id(svgid);
-
-      var url = $("#current-instance").text();
-      $('#main ui-tabbar ui-behind button').removeClass('highlight');
-      save['details'].set_checkpoint();
-
-      // pull out xml and add XMLNS
-      // sadly we have to serialze, add in string and then parse again
-      // as adding namespaces to nodes is not supported
-      // serialization and reparsing is faster and more robust than xslt option
-      var nnew = $(save['details'].save().documentElement);
-          nnew.attr('svg-id',svgid);
-          nnew.attr('trans-xmlns','http://cpee.org/ns/description/1.0');
-
-      if ($('*[svg-id]',node).length > 0) {
-        // TODO maybe not all children. Maybe only thingies that have svg-id but nothing with svg-id between it and node.
-        nnew.append(node.children());
-      }
-
-      var ntxt = nnew.serializeXML();
-          ntxt = ntxt.replace(/trans-xmlns/,'xmlns');
+  });
+  $(document).on('relaxngui_remove', '#dat_details', function(e){
+    clearTimeout(timer);
+    do_main_save();
+  });
+});
 
-      node.replaceWith($X(ntxt));
+function do_main_save() { //{{{
+  if (save['details'].has_changed()) {
+    var visid = 'details';
+    var svgid = save[visid + '_target'].svgid;
+    var desc  = save[visid + '_target'].model;
+    var node  = desc.get_node_by_svg_id(svgid);
 
-      $.ajax({
-        type: "PUT",
-        url: url + "/properties/values/description/",
-				data: ({'content': '<content>' + desc.get_description() + '</content>'})
-      });
+    var url = $("#current-instance").text();
+    $('#main ui-tabbar ui-behind button').removeClass('highlight');
+    save['details'].set_checkpoint();
+
+    // pull out xml and add XMLNS
+    // sadly we have to serialze, add in string and then parse again
+    // as adding namespaces to nodes is not supported
+    // serialization and reparsing is faster and more robust than xslt option
+    var nnew = $(save['details'].save().documentElement);
+        nnew.attr('svg-id',svgid);
+        nnew.attr('trans-xmlns','http://cpee.org/ns/description/1.0');
+
+    if ($('*[svg-id]',node).length > 0) {
+      // TODO maybe not all children. Maybe only thingies that have svg-id but nothing with svg-id between it and node.
+      nnew.append(node.children());
     }
-  }); //}}}
 
-  $(document).on('input','#dat_details input, #dat_details textarea, #dat_details select',function(e){ mark_main_save(); });
-  $(document).on('change','#dat_details select',function(e){ mark_main_save(); });
-});
+    var ntxt = nnew.serializeXML();
+        ntxt = ntxt.replace(/trans-xmlns/,'xmlns');
 
-function mark_main_save() { //{{{
-  if (save['details'].has_changed()) {
-    $('#main ui-tabbar ui-behind button').addClass('highlight');
-  } else {
-    $('#main ui-tabbar ui-behind button').removeClass('highlight');
+    node.replaceWith($X(ntxt));
+
+    $.ajax({
+      type: "PUT",
+      url: url + "/properties/values/description/",
+      data: ({'content': '<content>' + desc.get_description() + '</content>'})
+    });
   }
 } //}}}

data/cockpit/js/instance.js

@@ -56,7 +56,12 @@ var sub_less = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'change';// }}}
 
 $(document).ready(function() {// {{{
-  $("input[name=base-url]").val(location.protocol + "//" + location.host + ":" + $('body').data('defaultport'));
+  console.log(location.protocol);
+  if (location.protocol.match(/^file/)) {
+    $("input[name=base-url]").val("http://localhost:" + $('body').data('defaultport'));
+  } else {
+    $("input[name=base-url]").val(location.protocol + "//" + location.host + ":" + $('body').data('defaultport'));
+  }
   $("button[name=base]").click(function(){ create_instance(null,false); });
   $("button[name=instance]").click(function(){ ui_activate_tab("#tabinstance"); monitor_instance(false,false); });
   $("button[name=loadtestset]").click(function(e){new CustomMenu(e).menu($('#predefinedtestsets'),function(){ load_testset(false) } ); });
@@ -78,6 +83,10 @@ $(document).ready(function() {// {{{
         $('#predefinedtestsets').append($("<div class='menuitem'></div>").text(ts));
       });
       var q = $.parseQuerySimple();
+      if (q.min || q.min == "") {
+        ui_toggle_vis_tab($('#instance ui-tabbar'));
+        ui_toggle_vis_tab($('#parameters ui-tabbar'));
+      }
       if (q.monitor && q.load) {
         $("input[name=instance-url]").val(q.monitor);
         $("#predefinedtestsets div.menuitem").each(function(k,v){
@@ -194,7 +203,8 @@ function monitor_instance(load,exec) {// {{{
       $("#current-instance-subscriptions").text('S');
       $("#current-instance-callbacks").attr('href',url + 'callbacks/');
       $("#current-instance-callbacks").text('C');
-      history.replaceState({}, '', '?monitor='+url);
+      var q = $.parseQuerySimple();
+      history.replaceState({}, '', '?' + (q.min || q.min=="" ? "min&" : "") + 'monitor='+url);
 
       // Change url to return to current instance when reloading (because new subscription is made)
       $("input[name=votecontinue]").removeAttr('checked');
@@ -597,7 +607,6 @@ function save_svg() {// {{{
   });
 }// }}}
 function set_testset(testset,exec) {// {{{
-  console.log(exec);
   var url = $("#current-instance").text();
 
   $.ajax({
@@ -669,10 +678,11 @@ function load_testsetfile_after() { //{{{
   var reader = new FileReader();
   reader.onload = function(){
     set_testset($.parseXML(reader.result),false);
+    document.getElementById("fuckchrome").reset();
     running  = false;
   }
-  reader.onerror = function(){ running  = false; }
-  reader.onabort = function(){ running  = false; }
+  reader.onerror = function(){ console.log('error reading file'); running  = false; }
+  reader.onabort = function(){ console.log('abort reading file'); running  = false; }
   reader.readAsText(files[0]);
 } //}}}
 function load_testsetfile() {// {{{

data/cockpit/js/parameters.js

@@ -27,26 +27,6 @@ $(document).ready(function() {
     }
   }); //}}}
 
-  // color of save button when changeing tabs //{{{
-  $('#parameters ui-tabbar ui-tab:not(.switch)').click(function(event){
-    highlight_save_button(event);
-  }); //}}}
-
-  // save entries //{{{
-  $('#parameters ui-behind button:nth-child(2)').click(function(event){
-    var visid = $('ui-tabbar ui-tab',$(event.target).parents('ui-tabbed')).not('.switch').not('.inactive').attr('data-tab');
-    if (save[visid].has_changed()) {
-      var url = $("#current-instance").text();
-      $('#parameters ui-tabbar ui-behind button:nth-child(2)').removeClass('highlight');
-      save[visid].set_checkpoint();
-      $.ajax({
-        type: "PUT",
-        url: url + "/properties/values/" + visid + "/",
-        data: ({'content': save[visid].save_text()}),
-      });
-    }
-  }); //}}}
-
   // new entry //{{{
   $('#parameters ui-behind button:nth-child(1)').click(function(event){
     var but = $(document).find('#parameters ui-content ui-area:not(.inactive) button');
@@ -56,17 +36,37 @@ $(document).ready(function() {
         are.animate({ scrollTop: tab.height() }, "slow");
   }); //}}}
 
-  // when keyup in one of the inputs, highlight the save button //{{{
-  $(document).on('keyup','#dat_dataelements input, #dat_endpoints input, #dat_attributes input',function(event){
-    highlight_save_button(event);
+  var timer;
+  // when input in one of the inputs, save
+  $(document).on('input','#dat_dataelements input, #dat_endpoints input, #dat_attributes input',function(event){
+    clearTimeout(timer);
+    timer = setTimeout(function(){ do_parameters_save(event); }, 5000);
+  });
+  $(document).on('blur','#dat_dataelements input, #dat_endpoints input, #dat_attributes input',function(event){
+    clearTimeout(timer);
+    do_parameters_save(event);
+  }); //}}}
+  $(document).on('keypress','#dat_dataelements input, #dat_endpoints input, #dat_attributes input',function(event){
+    if (event.keyCode == 13) {
+      clearTimeout(timer);
+      do_parameters_save(event);
+    }
   }); //}}}
+  $(document).on('relaxngui_remove', '#dat_dataelements, #dat_endpoints, #dat_attributes', function(event){
+    clearTimeout(timer);
+    do_parameters_save(event);
+  });
 });
 
-function highlight_save_button(event) {
+function do_parameters_save(event) { //{{{
   var visid = $('ui-tabbar ui-tab',$(event.target).parents('ui-tabbed')).not('.switch').not('.inactive').attr('data-tab');
   if (save[visid].has_changed()) {
-    $('#parameters ui-tabbar ui-behind button:nth-child(2)').addClass('highlight');
-  } else {
-    $('#parameters ui-tabbar ui-behind button:nth-child(2)').removeClass('highlight');
+    var url = $("#current-instance").text();
+    save[visid].set_checkpoint();
+    $.ajax({
+       type: "PUT",
+       url: url + "/properties/values/" + visid + "/",
+       data: ({'content': save[visid].save_text()}),
+    });
   }
-}
+} //}}}

data/cockpit/js/wfadaptor.js

@@ -59,6 +59,7 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
   $.getScript(theme_base, function() {
     manifestation = new WFAdaptorManifestation(self);
     illustrator.noarrow = manifestation.noarrow;
+    illustrator.compact = manifestation.compact == true ? true : false;
     description.source = manifestation.source;
     var deferreds = [];
     // copy parent stuff
@@ -135,6 +136,7 @@ function WfIllustrator(wf_adaptor) { // View  {{{
     this.elements = {}; // the svgs
     this.svg = {};
     this.draw = {};
+    this.compact = true;
     // private
     var self = this;
     var adaptor = null;
@@ -226,31 +228,38 @@ function WfIllustrator(wf_adaptor) { // View  {{{
       );
     } else if (end['row']-start['row'] > 0) { // downwards
       if (end['col']-start['col'] > 0) {// left - right
-        line.attr("d", "M " + String(start['col']*self.width) + "," + String(start['row']*self.height-15) +" "+
-                                      String(start['col']*self.width+14) + "," + String((end['row']-1)*self.height) +" "+ // first turn of hotizontal-line going away from node
-                                      String(end['col']*self.width) + "," + String((end['row']-1)*self.height) +" "+
-                                      String(end['col']*self.width) + "," + String(end['row']*self.height-15)
-        );
+        if (self.compact) {
+          line.attr("d", "M " + String(start['col']*self.width) + "," + String(start['row']*self.height-15) +" "+
+                                String(start['col']*self.width+14) + "," + String((end['row']-1)*self.height) +" "+ // first turn of hotizontal-line going away from node
+                                String(end['col']*self.width) + "," + String((end['row']-1)*self.height) +" "+
+                                String(end['col']*self.width) + "," + String(end['row']*self.height-15)
+          );
+        } else {
+          line.attr("d", "M " + String(start['col']*self.width) + "," + String(start['row']*self.height-15) +" "+
+                                String(end['col']*self.width) + "," + String(start['row']*self.height-15) +" "+
+                                String(end['col']*self.width) + "," + String(end['row']*self.height-15)
+          );
+        }
       } else { // right - left
         line.attr("d", "M " + String(start['col']*self.width) + "," + String(start['row']*self.height-15) +" "+
-                                      String(start['col']*self.width) + "," + String(end['row']*self.height-35) +" "+
-                                      String(end['col']*self.width+14) + "," + String(end['row']*self.height-35) +" "+ // last turn of horizontal-line going into the node
-                                      String(end['col']*self.width) + "," + String(end['row']*self.height-15)
+                              String(start['col']*self.width) + "," + String(end['row']*self.height-35) +" "+
+                              String(end['col']*self.width+14) + "," + String(end['row']*self.height-35) +" "+ // last turn of horizontal-line going into the node
+                              String(end['col']*self.width) + "," + String(end['row']*self.height-15)
         );
       }
     } else if(end['row']-start['row'] < 0) { // upwards
       if(num_lines > 1) {// ??? no idea
         line.attr("d", "M " + String(start['col']*self.width) + "," + String(start['row']*self.height-15) +" "+
-                                      String(start['col']*self.width) + "," + String((max_line-1)*self.height+5) +" "+
-                                      String(end['col']*self.width+20) + "," + String((max_line-1)*self.height+5) +" "+
-                                      String(end['col']*self.width+20) + "," + String(end['row']*self.height+25)+" "+
-                                      String(end['col']*self.width) + "," + String(end['row']*self.height-15)
+                              String(start['col']*self.width) + "," + String((max_line-1)*self.height+5) +" "+
+                              String(end['col']*self.width+20) + "," + String((max_line-1)*self.height+5) +" "+
+                              String(end['col']*self.width+20) + "," + String(end['row']*self.height+25)+" "+
+                              String(end['col']*self.width) + "," + String(end['row']*self.height-15)
         );
       } else {
         line.attr("d", "M " + String(start['col']*self.width) + "," + String(start['row']*self.height-15) +" "+
-                                      String(end['col']*self.width+20) + "," + String(start['row']*self.height-15) +" "+
-                                      String(end['col']*self.width+20) + "," + String(end['row']*self.height+25)+" "+
-                                      String(end['col']*self.width) + "," + String(end['row']*self.height-15)
+                              String(end['col']*self.width+20) + "," + String(start['row']*self.height-15) +" "+
+                              String(end['col']*self.width+20) + "," + String(end['row']*self.height+25)+" "+
+                              String(end['col']*self.width) + "," + String(end['row']*self.height-15)
         );
       }
     }
@@ -449,7 +458,14 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       if($(this).attr('collapsed') == undefined || $(this).attr('collapsed') == 'false') { collapsed = false; }
       else { collapsed = true; }
       if(root_expansion == 'vertical')  pos.row++;
-      if(root_expansion == 'horizontal')  pos.col++;
+      if(root_expansion == 'horizontal')  {
+        pos.col++;
+        if (!illustrator.compact) {
+          if (block.max.row) {
+            pos.row = block.max.row + 1;
+          }
+        }
+      }
       if(illustrator.elements[tname] != undefined && illustrator.elements[tname].type == 'complex' && !collapsed) {
         if(illustrator.elements[tname] != undefined && !illustrator.elements[tname].svg) pos.row--;
         // TODO: Remaining problem is the order inside the svg. Thats why the connection is above the icon