cpee-model-management 1.2.8 → 1.2.10

data/ui/js/moma.js

@@ -86,6 +86,19 @@ function duplicate_it(name) {
     });
   }
 }
+function mark_it(tar) {
+  tar.toggleClass('selected');
+  if (tar.hasClass('selected')) {
+    selections.push(tar.attr('data-path'));
+  } else {
+    selections = selections.filter(item => item !== tar.attr('data-path'));
+  }
+  if (selections.length > 0) {
+    $('[data-class=special]').attr('class','');
+  } else {
+    $('[data-class=special]').attr('class','invisible');
+  }
+}
 function delete_it(name) {
   if (confirm('Are you really, really, REALLY sure!')) {
     $.ajax({
@@ -195,28 +208,47 @@ $(document).ready(function() {
   const queryString = window.location.search;
   const urlParams = new URLSearchParams(queryString);
 
-  gstage = urlParams.get('stage') || 'draft';
-  gdir = urlParams.get('dir') ? (urlParams.get('dir') + '/').replaceAll(/\/+/g,'/') : '';
-
-  moma_init();
-
   var shifts = []
+  var default_view;
+
   $.ajax({
     type: "GET",
     url: "server/",
-    data: { stages: 'stages' },
+    data: { stages: 'default' },
     success: (r) => {
-      shifts = shifts.concat(r);
-      shifts = shifts.filter(item => item !== gstage);
+      default_view = r[0];
+      console.log(default_view);
+
+      gstage = urlParams.get('stage') || default_view;
+      gdir = urlParams.get('dir') ? (urlParams.get('dir') + '/').replaceAll(/\/+/g,'/') : '';
+
+      moma_init();
+
+      $('ui-behind span').text(gstage);
+
+      paint(gdir,gstage);
+      setInterval(possibly_paint,1000);
+
+      $.ajax({
+        type: "GET",
+        url: "server/",
+        data: { stages: 'all' },
+        success: (r) => {
+          shifts = shifts.concat(r);
+          shifts = shifts.filter(item => item !== gstage);
+          if (shifts.length == 0) {
+            $('ui-behind span').hide();
+          }
+        }
+      });
     }
   });
 
   window.onpopstate = function(e){
-    let d = e.state || { gstage: 'draft', 'gdir': '' };
+    let d = e.state || { gstage: default_view, 'gdir': '' };
     paint(d.gdir,d.gstage,false);
   };
 
-  $('ui-behind span').text(gstage);
   $('ui-behind span').click((e) => {
     if (shifts.length > 0) {
       var menu = {};
@@ -226,7 +258,7 @@ $(document).ready(function() {
           {
             'label': ele,
             'function_call': change_it,
-            'text_icon': '➔',
+            'text_icon': '<i class="uidash-icon uidash-icon-value"></i>',
             'type': undefined,
             'class': 'capitalized',
             'params': [gdir,ele]
@@ -238,41 +270,32 @@ $(document).ready(function() {
   });
 
   $('#models').on('click','[data-class=model]',(e) => {
-    const tar = $(e.currentTarget);
-    tar.toggleClass('selected');
-    if (tar.hasClass('selected')) {
-      selections.push(tar.attr('data-path'));
-    } else {
-      selections = selections.filter(item => item !== tar.attr('data-path'));
-    }
-    if (selections.length > 0) {
-      $('[data-class=special]').attr('class','');
-    } else {
-      $('[data-class=special]').attr('class','invisible');
-    }
+    mark_it($(e.currentTarget));
   });
   $('#models').on('click','th[data-class=special]',(e) => {
     var menu = {};
     var name = $(e.currentTarget).parents('tr').find('td[data-class=name]').attr('data-full-name');
-    menu['Operations'] = [
+    var dirs = new Set(selections.map(item => item.replace(/[^\/]*$/,''))).size;
+    var head = 'Operations (' + selections.length + (selections.length == 1 ? ' entry' : ' entries') + ' in ' + dirs + (dirs == 1 ? ' dir' : ' dirs') + ' marked)';
+    menu[head] = [
       {
         'label': 'Move all marked entries to the current directory',
         'function_call': move_all,
-        'text_icon': '⨀',
+        'text_icon': '<i class="uidash-icon uidash-icon-move"></i>',
         'type': undefined,
         'params': []
       },
       {
         'label': 'Copy all marked entries to the current directory',
         'function_call': copy_all,
-        'text_icon': '⨁',
+        'text_icon': '<i class="uidash-icon uidash-icon-copy"></i>',
         'type': undefined,
         'params': []
       },
       {
         'label': 'Delete all marked entries',
         'function_call': delete_all,
-        'text_icon': '❌',
+        'text_icon': '<i class="uidash-icon uidash-icon-delete"></i>',
         'type': undefined,
         'params': []
       },
@@ -280,7 +303,7 @@ $(document).ready(function() {
         'label': 'Unmarked all marked entries',
         'function_call': unmark_all,
         'type': undefined,
-        'text_icon': '🟥',
+        'text_icon': '<i class="uidash-icon uidash-icon-checkox"></i>',
         'params': []
       }
     ];
@@ -291,7 +314,7 @@ $(document).ready(function() {
           {
             'label': 'Shift all marked entries to ' + ele,
             'function_call': shift_all,
-            'text_icon': '➔',
+            'text_icon': '<i class="uidash-icon uidash-icon-shift"></i>',
             'type': undefined,
             'params': [ele]
           }
@@ -301,15 +324,22 @@ $(document).ready(function() {
     new CustomMenu(e).contextmenu(menu);
   });
 
-  $('#models').on('click','td[data-class=ops]',(e) => {
+  $(document).on('contextmenu',(e) => { e.preventDefault(); });
+  $(document).on('mousedown',(e) => { $('#models tr.active').removeClass('active'); }); // CustomMenu closes on mousedown
+
+  $('#models').on('click','td[data-class=ops]',ops_menu);
+  $('#models').on('contextmenu','tbody tr',ops_menu);
+  function ops_menu(e) {
+    e.preventDefault();
     var menu = {};
-    var name = $(e.currentTarget).parents('tr').find('td[data-class=name]').attr('data-full-name');
-    var is_model = $(e.currentTarget).parents('tr').find('td[data-class=model]').length > 0 ? true : false;
+    var name = $(e.currentTarget).closest('tr').find('td[data-class=name]').attr('data-full-name');
+    var mark = $(e.currentTarget).closest('tr').find('td[data-class=model]');
+    var is_model = mark.length > 0 ? true : false;
     menu['Operations'] = [
       {
         'label': 'Delete',
         'function_call': delete_it,
-        'text_icon': '❌',
+        'text_icon': '<i class="uidash-icon uidash-icon-delete"></i>',
         'type': undefined,
         'params': [name]
       },
@@ -317,7 +347,7 @@ $(document).ready(function() {
         'label': 'Rename',
         'function_call': rename_it,
         'type': undefined,
-        'text_icon': '📛',
+        'text_icon': '<i class="uidash-icon uidash-icon-rename"></i>',
         'params': [name]
       }
     ];
@@ -326,12 +356,23 @@ $(document).ready(function() {
         {
           'label': 'Duplicate',
           'function_call': duplicate_it,
-          'text_icon': '➕',
+          'text_icon': '<i class="uidash-icon uidash-icon-copy"></i>',
           'type': undefined,
           'params': [name]
         }
       );
     }
+    if (is_model) {
+      menu['Marking'] = [
+        {
+          'label': mark.hasClass('selected') ? 'Unmark' : 'Mark',
+          'function_call': mark_it,
+          'text_icon': '<i class="uidash-icon uidash-icon-' + (mark.hasClass('selected') ? 'checkox' : 'checkox-checked') + '"></i>',
+          'type': undefined,
+          'params': [mark]
+        }
+      ];
+    }
     if (shifts.length > 0 && is_model) {
       menu['Shifting'] = [];
       shifts.forEach(ele => {
@@ -339,17 +380,16 @@ $(document).ready(function() {
           {
             'label': 'Shift to ' + ele,
             'function_call': shift_it,
-            'text_icon': '➔',
+            'text_icon': '<i class="uidash-icon uidash-icon-shift"></i>',
             'type': undefined,
             'params': [name,ele]
           }
         );
       });
     }
+    $(e.currentTarget).closest('tr').addClass('active');
     new CustomMenu(e).contextmenu(menu);
-  });
-
-  paint(gdir,gstage);
+  }
 
   $('#newmod').on('submit',(e) => {
     $.ajax({
@@ -374,6 +414,4 @@ $(document).ready(function() {
     });
     return false;
   });
-
-  setInterval(possibly_paint,1000);
 });

data/ui/resources.html

@@ -26,32 +26,14 @@
     <!-- libs, do not modify. When local than load local libs. -->
     <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
-    <script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
-    <script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
-    <script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
-    <script type="text/javascript" src="/js_libs/util.js"></script>
-    <script type="text/javascript" src="/js_libs/printf.js"></script>
-    <script type="text/javascript" src="/js_libs/strftime.min.js"></script>
-    <script type="text/javascript" src="/js_libs/parsequery.js"></script>
-    <script type="text/javascript" src="/js_libs/underscore.min.js"></script>
-    <script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
-    <script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
     <script type="text/javascript" src="/js_libs/plotly.min.js"></script>
 
-    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.qrcode/1.0/jquery.qrcode.min.js"></script>
-
-    <script type="text/javascript" src="/js_libs/relaxngui.js"></script>
-
     <script type="text/javascript" src="/js_libs/uidash.js"></script>
-    <script type="text/javascript" src="/js_libs/custommenu.js"></script>
 
-    <link   rel="stylesheet"      href="/js_libs/custommenu.css" type="text/css"/>
     <link   rel="stylesheet"      href="/js_libs/uidash.css" type="text/css"/>
 
     <link   rel="stylesheet"      href="/global_ui/ui.css" type="text/css"/>
 
-    <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
-
     <!-- custom stuff, play arround  -->
     <link   rel="stylesheet"      href="css/stats.css" type="text/css"/>
     <link   rel="stylesheet"      href="css/stats_standalone.css" type="text/css"/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-model-management
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.10
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -99,7 +99,7 @@ files:
 - ui/resources.html
 homepage: http://cpee.org/
 licenses:
-- LGPL-3.0
+- GPL-3.0-or-later
 metadata: {}
 rdoc_options: []
 require_paths: