cockpit/js/instance.js in cpee-1.5.24 vs cockpit/js/instance.js in cpee-1.5.25

@@ -69,11 +69,11 @@
                '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=loadtestset]").click(function(e){new CustomMenu(e).menu($('#predefinedtestsets'),function(){ load_testset(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(); });
   $("button[name=savesvgfile]").click(function(){ save_svgfile(); });
@@ -89,32 +89,32 @@
     url: $('body').attr('current-testsets') + "testsets.xml",
     dataType: 'xml',
     success: function(res){
       $('testset',res).each(function(){
         var ts = $(this).text();
-        $('#predefinedtestsets').append($("<div class='menuitem'></div>").text(ts));
+        $('#templates').append($("<div class='menuitem'></div>").text(ts));
       });
       var q = $.parseQuerySimple();
       if (q.min || q.min == "") {
         ui_toggle_vis_tab($('#instance'));
         ui_toggle_vis_tab($('#parameters'));
       }
       if (q.monitor && q.load) {
         if (q.load.match(/https?:\/\//)) {
           $('body').attr('load-testset',q.load);
         } else {
-          $("#predefinedtestsets div.menuitem").each(function(k,v){
+          $("#templates div.menuitem").each(function(k,v){
             if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
           });
         }
         ui_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 {
-          $("#predefinedtestsets div.menuitem").each(function(k,v){
+          $("#templates div.menuitem").each(function(k,v){
             if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
           });
         }
         ui_activate_tab("#tabexecution");
         create_instance($("body").attr('current-base'),q.load,true,false);
@@ -133,11 +133,11 @@
         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 {
-          $("#predefinedtestsets div.menuitem").each(function(k,v){
+          $("#templates div.menuitem").each(function(k,v){
             if ($(v).text() == q.exec) { $(v).attr('data-selected','selected'); }
           });
         }
         ui_activate_tab("#tabexecution");
         create_instance($("body").attr('current-base'),q.exec,true,true);
@@ -999,10 +999,10 @@
 
 function load_testset(exec) {// {{{
   if (loading) return;
   loading = true;
 
-  var name = $("#predefinedtestsets div.menuitem[data-selected=selected]").text();
+  var name = $("#templates div.menuitem[data-selected=selected]").text();
   var url;
   if (name) {
     url = $('body').attr('current-testsets') + name + ".xml";
   } else {
     if ($('body').attr('load-testset').length > 0) {