cockpit/js/instance.js in cpee-2.0.25 vs cockpit/js/instance.js in cpee-2.0.26

@@ -80,11 +80,11 @@
                'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
 
 function cockpit() { //{{{
   $("button[name=base]").click(function(){ create_instance($("input[name=base-url]").val(),null,false,false); });
-  $("button[name=instance]").click(function(){ ui_activate_tab("#tabinstance"); monitor_instance($("input[name=instance-url]").val(),$("input[name=res-url]").val(),false,false); });
+  $("button[name=instance]").click(function(){ uidash_activate_tab("#tabinstance"); monitor_instance($("input[name=instance-url]").val(),$("input[name=res-url]").val(),false,false); });
   $("button[name=loadtestset]").click(function(e){new CustomMenu(e).menu($('#templates'),function(){ load_testset(false) } ); });
   $("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=savetestsetfile]").click(function(){ save_testsetfile(); });
@@ -105,55 +105,55 @@
           $('#templates').append($("<div class='menuitem'></div>").text(this.name.replace(/\.xml/,'')));
         }
       });
       var q = $.parseQuerySimple();
       if (q.min || q.min == "") {
-        ui_toggle_vis_tab($('#instance'));
-        ui_toggle_vis_tab($('#parameters'));
+        uidash_toggle_vis_tab($('#instance'));
+        uidash_toggle_vis_tab($('#parameters'));
       }
       if (q.monitor && q.load) {
         if (q.load.match(/https?:\/\//)) {
           $('body').attr('load-testset',q.load);
         } else {
           $("#templates div.menuitem").each(function(k,v){
             if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
           });
         }
-        ui_activate_tab("#tabexecution");
+        uidash_activate_tab("#tabexecution");
         monitor_instance(q.monitor,$("body").attr('current-resources'),true,false);
       } else if (q.load) {
         if (q.load.match(/https?:\/\//)) {
           $('body').attr('load-testset',q.load);
         } else {
           $("#templates div.menuitem").each(function(k,v){
             if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
           });
         }
-        ui_activate_tab("#tabexecution");
+        uidash_activate_tab("#tabexecution");
         create_instance($("body").attr('current-base'),q.load,true,false);
       } else if (q.instantiate) {
         if (q.instantiate.match(/https?:\/\//)) {
-          ui_activate_tab("#tabexecution");
+          uidash_activate_tab("#tabexecution");
           create_instance_from($("body").attr('current-base'),q.instantiate,false);
         } else {
           alert('Nope. Url!');
         }
       } else if (q.new || q.new == "") {
-        ui_activate_tab("#tabinstance");
+        uidash_activate_tab("#tabinstance");
         create_instance($("body").attr('current-base'),"Plain Instance",false,false);
       } else if (q.monitor) {
-        ui_activate_tab("#tabexecution");
+        uidash_activate_tab("#tabexecution");
         monitor_instance(q.monitor,$("body").attr('current-resources'),false,false);
       } else if (q.exec) {
         if (q.exec.match(/https?:\/\//)) {
           $('body').attr('load-testset',q.load);
         } else {
           $("#templates div.menuitem").each(function(k,v){
             if ($(v).text() == q.exec) { $(v).attr('data-selected','selected'); }
           });
         }
-        ui_activate_tab("#tabexecution");
+        uidash_activate_tab("#tabexecution");
         create_instance($("body").attr('current-base'),q.exec,true,true);
       }
     }
   });
   $.ajax({
@@ -322,11 +322,11 @@
   $("body").attr('current-resources',sanitize_url(rep));
 
   $("input[name=instance-url]").val($("body").attr('current-instance'));
   $("input[name=res-url]").val($("body").attr('current-resources'));
 
-  $('.tabbehind button').hide();
+  $('#parameters ui-content ui-area > button').attr('disabled','disabled');
   $('#dat_details').empty();
 
   url = $("body").attr('current-instance');
 
   $.ajax({
@@ -378,11 +378,11 @@
         }
       });
     },
     error: function(a,b,c) {
       alert("This ain't no CPEE instance");
-      ui_activate_tab("#tabnew");
+      uidash_activate_tab("#tabnew");
     }
   });
 }// }}}
 
 function monitor_instance_values(val) {// {{{
@@ -724,14 +724,15 @@
       localStorage.removeItem('marked');
       localStorage.removeItem('marked_from');
     }
 
     if (notification != "ready" && notification != "stopped" && notification != "running") {
-      $('.tabbehind button').hide();
+      console.log('rrr');
+      $('#parameters ui-content ui-area > button').attr('disabled','disabled');
       $('#state_any').hide();
     } else {
-      $('#parameters .tabbehind button').show();
+      $('#parameters ui-content ui-area > button').removeAttr('disabled');
       $('#state_any').show();
     }
 
     $("#state_text").text(notification);
   }
@@ -1024,11 +1025,10 @@
       cache: false,
       dataType: 'xml',
       url: url,
       success: function(res){
         save['dsl'] = null; // reload dsl and position under all circumstances
-        $('#main .tabbehind button').hide();
         $('#dat_details').empty();
 
         document.title = "Untitled";
         set_testset(res,exec);
       },
@@ -1208,11 +1208,13 @@
   $("#votes").empty();
  }//}}}
 
 function format_instance_pos() { //{{{
   $(save['instance_pos']).each(function(){
-    var what = this.nodeName;
-    format_visual_add(what,save['state'] == 'running' ? 'active' : 'passive');
+    console.log(this);
+    var taskname = this.nodeName;
+    var taskstate = this.textContent;
+    format_visual_add(taskname,save['state'] == 'running' ? (taskstate == 'at' ? 'active' : 'passive') : 'passive');
   });
 } //}}}
 
 function format_visual_forms() { //{{{
   if (save['state'] != "ready" && save['state'] != "stopped") {