cpee-model-management 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4430fd225a84ddf6d4023c904490a86c25297a0843bd033a88e78007fb9df8bc
-  data.tar.gz: 193403968732591b1dc2274f6106041efecc8da3440efe50540fc175031ac7df
+  metadata.gz: 7844d39f8bdb0619c97fc35b4b4f030cb200cab9fbf74182db415cd8ca601ae3
+  data.tar.gz: 97ca85020b275d58fc533173c824f44c239dfcd967eee996e8ed85c0f86b14f9
 SHA512:
-  metadata.gz: 86d21dfba406d9f4a4ad52d1b05de835cb58ee21c1779901057e3f0e637c42bbf7d6bf862ba96db1d0246c6ebfc2cc24199af3469d4eacb3c59f6e6a00847dcb
-  data.tar.gz: 52b53c7da24cbcd8ebc45bfce9860763befbaa62b5a130ddc350e32380b0b0d7b11d8e698a30751699770bb1bf86890ea94bf60f46a57799e055718cda1aa8fb
+  metadata.gz: fdf7e58b10267d03897965ece7f14f01c3868d1ff1a5814acc85573d52d38b2e072ebaa4fbaeeb69ab76e4dcd97fdac50355a2f514739a6a698030611352bcec
+  data.tar.gz: 557f02d4df9dc953dd0cb17328c2b33b9a75930bd4df4f0bea3dc3e0da322f53dfd7a54fec8aee36f5934e8b976661d9454a3a8d1ebc1f3b8a3a174dba6982cf

data/cpee-model-management.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-model-management"
-  s.version          = "1.1.4"
+  s.version          = "1.2.0"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "(Lifecycle) manage your process models in a directory or git repo."

data/lib/cpee-model-management/implementation.rb

@@ -26,6 +26,7 @@ require 'pathname'
 require 'shellwords'
 require 'securerandom'
 require 'cpee/redis'
+require 'digest/sha1'
 
 module CPEE
   module ModelManagement
@@ -180,7 +181,7 @@ module CPEE
 
     class GetList < Riddl::Implementation #{{{
       def response
-        where = @a[0] == :main ? '' : Riddl::Protocols::Utils::unescape(@r.last)
+        where = @a[0] == :main ? '' : @r.map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         views = @a[1]
         models = @a[2]
         stage = [@p[0]&.value] || ['draft']
@@ -195,7 +196,10 @@ module CPEE
           { :type => :file, :name => File.basename(f), :creator => attrs['creator'], :author => attrs['author'], :guarded => attrs['guarded'], :guarded_id => attrs['guarded_id'], :stage => fstage, :date => File.mtime(f).xmlschema } if stage.include?(fstage)
         end.compact.uniq.sort_by{ |e| e[:name] }
 
-        Riddl::Parameter::Complex.new('list','application/json',JSON::pretty_generate(names))
+        ret = JSON::pretty_generate(names)
+        @headers << Riddl::Header.new('CPEE-MOMA-FINGERPRINT', Digest::SHA1.hexdigest(ret))
+
+        Riddl::Parameter::Complex.new('list','application/json',ret)
       end
     end #}}}
     class GetListFull < Riddl::Implementation #{{{
@@ -226,7 +230,7 @@ module CPEE
 
     class ShiftItem < Riddl::Implementation #{{{
       def response
-        where = @a[0] == :main ? '' : Riddl::Protocols::Utils::unescape(@r[-2])
+        where = @a[0] == :main ? '' : @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         conns = @a[1]
         themes = @a[2]
         models = @a[3]
@@ -263,7 +267,7 @@ module CPEE
 
     class RenameItem < Riddl::Implementation #{{{
       def response
-        where = @a[0] == :main ? '' : Riddl::Protocols::Utils::unescape(@r[-2])
+        where = @a[0] == :main ? '' : @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         conns = @a[1]
         models = @a[2]
         name  = File.basename(@r.last,'.xml')
@@ -302,10 +306,11 @@ module CPEE
     end #}}}
     class RenameDir < Riddl::Implementation #{{{
       def response
+        where = @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         conns = @a[0]
         models = @a[1]
-        name  = File.basename(@r.last,'.dir')
-        nname = @p[0].value
+        name  = File.join(where,File.basename(@r.last,'.dir'))
+        nname = File.join(where,@p[0].value)
         fname  = File.join(models,name + '.dir')
         fnname = File.join(models,nname + '.dir')
         counter = 0
@@ -342,15 +347,16 @@ module CPEE
 
     class CreateDir < Riddl::Implementation #{{{
       def response
+        where = @a[0] == :main ? '' : @r.map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         name = @p[0].value
-        conns = @a[0]
-        models = @a[1]
+        conns = @a[1]
+        models = @a[2]
 
-        fname = File.join(models,name + '.dir')
+        fname = File.join(models,where,name + '.dir')
         counter = 0
         while File.exist?(fname)
           counter += 1
-          fname = File.join(models,name + counter.to_s + '.dir')
+          fname = File.join(models,where,name + counter.to_s + '.dir')
         end
 
         dn = CPEE::ModelManagement::get_dn @h['DN']
@@ -371,19 +377,23 @@ module CPEE
     end #}}}
     class Create < Riddl::Implementation #{{{
       def response
-        where = @a[0] == :main ? '' : Riddl::Protocols::Utils::unescape(@r.last)
-        stage = if @a[1] == :cre
-          @p.shift.value
+        models = @a[4]
+        views = @a[1]
+        conns = @a[2]
+        templates = @a[3]
+        if  @p.first.name == 'stage'
+          where = @a[0] == :main ? '' : @r.map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
+          stage = @p.shift.value
+          name = @p[0].value
+          source = templates[stage] ? templates[stage] : 'testset.xml'
         else
-          nil
+          where = @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
+          stage = nil
+          name = @r[-1].sub(/\.xml$/,'')
+          source = File.join(models,where,name + '.xml')
+          where = @p[0].value
         end
-        views = @a[2]
-        conns = @a[3]
-        templates = @a[4]
-        models = @a[5]
 
-        name = @p[0].value
-        source = @p[1] ? File.join(models,where,@p[1].value) : (templates[stage] ? templates[stage] : 'testset.xml')
         fname = File.join(models,where,name + '.xml')
 
         attrs = JSON::load File.open(fname + '.attrs') rescue {}
@@ -436,7 +446,7 @@ module CPEE
 
     class GetItem < Riddl::Implementation #{{{
       def response
-        where = @a[0] == :main ? '' : Riddl::Protocols::Utils::unescape(@r[-2])
+        where = @a[0] == :main ? '' : @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         models = @a[1]
         name   = File.basename(@r[-1],'.xml')
         fname = File.join(models,where,name + '.xml')
@@ -449,7 +459,7 @@ module CPEE
     end #}}}
     class OpenItem < Riddl::Implementation #{{{
       def response
-        where = @a[0] == :main ? '' : Riddl::Protocols::Utils::unescape(@r[-3])
+        where = @a[0] == :main ? '' : @r[0..-3].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         name   = File.basename(@r[-2],'.xml')
         insta  = @a[1]
         cock   = @a[2]
@@ -530,7 +540,7 @@ module CPEE
 
     class MoveItem < Riddl::Implementation #{{{
       def response
-        where = @a[0] == :main ? '' : Riddl::Protocols::Utils::unescape(@r[-2])
+        where = @a[0] == :main ? '' : @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         conns = @a[1]
         models = @a[2]
 
@@ -560,7 +570,7 @@ module CPEE
     end #}}}
     class PutItem < Riddl::Implementation #{{{
       def response
-        where = @a[0] == :main ? '' : Riddl::Protocols::Utils::unescape(@r[-2])
+        where = @a[0] == :main ? '' : @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         conns = @a[1]
         models = @a[2]
         name  = File.basename(@r.last,'.xml')
@@ -569,6 +579,8 @@ module CPEE
 
         fname = File.join(models,where,name + '.xml')
 
+        p fname
+
         if File.exist?(fname)
           author = dn['GN'] + ' ' + dn['SN']
           attrs = {}
@@ -599,7 +611,7 @@ module CPEE
     end #}}}
     class DeleteItem < Riddl::Implementation #{{{
       def response
-        where = @a[0] == :main ? '' : Riddl::Protocols::Utils::unescape(@r[-2])
+        where = @a[0] == :main ? '' : @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         conns = @a[1]
         models = @a[2]
         name  = File.basename(@r.last,'.xml')
@@ -614,15 +626,16 @@ module CPEE
     end #}}}
     class DeleteDir < Riddl::Implementation #{{{
       def response
+        where = @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         conns = @a[0]
         models = @a[1]
         name  = File.basename(@r.last,'.dir')
-        fname = File.join(models,name + '.dir')
+        fname = File.join(models,where,name + '.dir')
 
         dn     = CPEE::ModelManagement::get_dn @h['DN']
         author = dn['GN'] + ' ' + dn['SN']
 
-        CPEE::ModelManagement::op author, 'rm', models, File.join(name + '.dir')
+        CPEE::ModelManagement::op author, 'rm', models, File.join(where,name + '.dir')
         CPEE::ModelManagement::notify conns, 'delete', models, fname
       end
     end #}}}
@@ -856,30 +869,47 @@ module CPEE
 
       CPEE::redis_connect opts, 'Server Main'
 
+      opts[:sse_keepalive_frequency]    ||= 10
+
       Proc.new do
+
+        parallel do
+          EM.add_periodic_timer(opts[:sse_keepalive_frequency]) do
+            opts[:management_receivers].each do |sse|
+              sse.send_with_id('heartbeat', '42') unless sse&.closed?
+            end
+            opts[:stat_receivers].each do |sse|
+              sse.send_with_id('heartbeat', '42') unless sse&.closed?
+            end
+          end
+        end
+
         interface 'events' do
           run StatReceive, opts[:redis], opts[:stat_receivers] if post 'event'
         end
+
         interface 'implementation' do
           run GetList, :main, opts[:views], opts[:models] if get 'stage'
           run GetListFull, opts[:views], opts[:models] if get 'full'
           run GetStages, opts[:themes] if get 'stages'
-          run Create, :main, :cre, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'item'
-          run Create, :main, :dup, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'duplicate'
-          run CreateDir, opts[:management_receivers], opts[:models] if post 'dir'
-          run ManagementSend, opts[:management_receivers] if sse
+          run Create, :main, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'item'
+          run CreateDir, :main, opts[:management_receivers], opts[:models] if post 'dir'
+          on resource 'management' do
+            run ManagementSend, opts[:management_receivers] if sse
+          end
           on resource '[a-zA-Z0-9öäüÖÄÜ _-]+\.dir' do
             run GetList, :sub, opts[:views], opts[:models] if get 'stage'
-            run Create, :sub, :cre, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'item'
-            run Create, :sub, :dup, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'duplicate'
+            run Create, :sub, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'item'
             run DeleteDir, opts[:management_receivers], opts[:models] if delete
             run RenameDir, opts[:management_receivers], opts[:models] if put 'name'
+            run CreateDir, :sub, opts[:management_receivers], opts[:models] if post 'dir'
             on resource '[a-zA-Z0-9öäüÖÄÜ _-]+\.xml' do
               run DeleteItem, :sub, opts[:management_receivers], opts[:models] if delete
               run GetItem, :sub, opts[:models] if get
               run PutItem, :sub, opts[:management_receivers], opts[:models] if put 'content'
               run RenameItem, :sub, opts[:management_receivers], opts[:models] if put 'name'
-              run MoveItem, :sub, opts[:management_receivers], opts[:models] if put 'dirname'
+              run MoveItem, :sub, opts[:management_receivers], opts[:models] if put 'movedir'
+              run Create, :sub, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if put 'dupdir'
               run ShiftItem, :sub, opts[:management_receivers], opts[:themes], opts[:models] if put 'newstage'
               on resource 'open' do
                 run OpenItem, :sub, opts[:instantiate], opts[:cockpit], opts[:views], false, opts[:models] if get 'stage'
@@ -894,7 +924,8 @@ module CPEE
             run GetItem, :main, opts[:models] if get
             run PutItem, :main, opts[:management_receivers], opts[:models] if put 'content'
             run RenameItem, :main, opts[:management_receivers], opts[:models] if put 'name'
-            run MoveItem, :main, opts[:management_receivers], opts[:models] if put 'dirname'
+            run MoveItem, :main, opts[:management_receivers], opts[:models] if put 'movedir'
+            run Create, :main, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if put 'dupdir'
             run ShiftItem, :main, opts[:management_receivers], opts[:themes], opts[:models] if put 'newstage'
             on resource 'open' do
               run OpenItem, :main, opts[:instantiate], opts[:cockpit], opts[:views], false, opts[:models] if get 'stage'

data/lib/cpee-model-management/implementation.xml

@@ -32,17 +32,14 @@
       <param name="pattern">([a-zA-Z0-9öäüÖÄÜ _-]+)|</param>
     </parameter>
   </message>
-  <message name="dirname">
-    <parameter name="dir" type="string">
-      <param name="pattern">([a-zA-Z0-9öäüÖÄÜ _-]+)\.dir|</param>
+  <message name="movedir">
+    <parameter name="movedir" type="string">
+      <param name="pattern">(([a-zA-Z0-9öäüÖÄÜ _-]+)\.dir(\/([a-zA-Z0-9öäüÖÄÜ _-]+)\.dir)*)(\/?)|</param>
     </parameter>
   </message>
-  <message name="duplicate">
-    <parameter name="new" type="string">
-      <param name="pattern">[a-zA-Z0-9öäüÖÄÜ _-]+</param>
-    </parameter>
-    <parameter name="old" type="string">
-      <param name="pattern">[a-zA-Z0-9öäüÖÄÜ _-]+\.xml</param>
+  <message name="dupdir">
+    <parameter name="dupdir" type="string">
+      <param name="pattern">(([a-zA-Z0-9öäüÖÄÜ _-]+)\.dir(\/([a-zA-Z0-9öäüÖÄÜ _-]+)\.dir)*)(\/?)|</param>
     </parameter>
   </message>
   <message name="stages">
@@ -77,14 +74,15 @@
   <resource>
     <post in="item"/>
     <post in="dir"/>
-    <post in="duplicate"/>
     <get in="stage" out="list"/>
     <get in="full" out="list"/>
     <get in="stages" out="list"/>
-    <sse/>
-    <resource relative="[a-zA-Z0-9&#xF6;&#xE4;&#xFC;&#xD6;&#xC4;&#xDC; _-]+\.dir">
+    <resource relative="management">
+      <sse/>
+    </resource>
+    <resource relative="[a-zA-Z0-9&#xF6;&#xE4;&#xFC;&#xD6;&#xC4;&#xDC; _-]+\.dir" recursive="true">
       <post in="item"/>
-      <post in="duplicate"/>
+      <post in="dir"/>
       <get in="stage" out="list"/>
       <delete/>
       <put in="name"/> <!-- rename -->
@@ -93,8 +91,9 @@
         <delete/>
         <put in="content"/>
         <put in="name"/> <!-- rename -->
-        <put in="dirname"/> <!-- move -->
+        <put in="movedir"/> <!-- move -->
         <put in="newstage"/> <!-- shift -->
+        <put in="dupdir"/> <!-- duplicate -->
         <resource relative="open"><get in="stage"/></resource>
         <resource relative="open-new"><get in="stage"/></resource>
       </resource>
@@ -104,7 +103,8 @@
       <delete/>
       <put in="content"/>
       <put in="name"/> <!-- rename -->
-      <put in="dirname"/> <!-- move -->
+      <put in="movedir"/> <!-- move -->
+      <put in="dupdir"/> <!-- duplicate -->
       <put in="newstage"/> <!-- shift -->
       <resource relative="open"><get in="stage"/></resource>
       <resource relative="open-new"><get in="stage"/></resource>

data/ui/css/moma.css

@@ -0,0 +1,114 @@
+:root {
+  --x-ui-selection-background-light: #ef29297f;
+  --x-ui-selection-background: #ef2929;
+}
+
+[data-class=model] { min-width: 1.5em; text-align: center; font-size: 1.7em; cursor: pointer; }
+[data-class=folder] { min-width: 1.5em; text-align: center; font-size: 1.7em; }
+[data-class=model]:hover { background-color: var(--x-ui-selection-background-light) !important; }
+[data-class=ops] { cursor: pointer; }
+[data-class=special] { cursor: pointer; min-width: 1.5em; text-align: center !important; font-size: 1.7em; }
+[data-class=special].invisible { cursor: auto; visibility: hidden; }
+[data-class=special]:hover { background-color: var(--x-ui-selection-background-light) !important; }
+
+[data-class=special] {
+  position: relative;
+  z-index: 0;
+  animation: important 0.2s infinite;
+}
+@keyframes important {
+   0%  { transform: rotate(0deg); }
+
+   8%  { transform: rotate(3deg); }
+  16%  { transform: rotate(6deg); }
+  24%  { transform: rotate(9deg); }
+  32%  { transform: rotate(6deg); }
+  38%  { transform: rotate(3deg); }
+
+  50%  { transform: rotate(0deg); }
+
+  58%  { transform: rotate(-3deg); }
+  66%  { transform: rotate(-6deg); }
+  74%  { transform: rotate(-9deg); }
+  82%  { transform: rotate(-6deg); }
+  88%  { transform: rotate(-3deg); }
+
+  100% { transform: rotate(0deg); }
+}
+
+td.selected {
+  background-color: var(--x-ui-selection-background) !important;
+}
+
+div.fixed {
+  position: sticky;
+  z-index: 1;
+  top: 0;
+  width: 100%;
+  background-color: var(--x-ui-background-color);
+}
+div.text { padding-top: 1em; }
+div.breadcrumb { padding-top: 0.5em; padding-bottom: 1em; }
+div.breadcrumb span.separator {
+  padding-left: 1em;
+  padding-right: 1em;
+}
+div.breadcrumb span.crumb:last-child { }
+div.breadcrumb span.crumb:not(:last-child) {
+  color: var(--x-ui-link-color);
+  cursor: pointer;
+}
+div.breadcrumb span.crumb:not(:last-child):hover {
+  color: var(--x-ui-light-text-color);
+  text-decoration: underline;
+}
+
+form input {
+  width: 45em !important;
+}
+
+ui-behind {
+  text-transform: capitalize;
+  font-weight: bold;
+  color: #d0d0d0;
+}
+
+ui-behind span {
+  cursor: pointer;
+}
+
+[is="x-ui-"] table.ui-table {
+  border-collapse: collapse;
+}
+[is="x-ui-"] table.ui-table thead th {
+  font-weight: bold;
+  text-align: left;
+  padding: 0.3em 0.5em;
+}
+
+[is="x-ui-"] table.ui-table tbody td {
+  padding: 0.1em 0.5em;
+}
+[is="x-ui-"] table.ui-table tbody tr:nth-child(odd) td {
+  background-color: var(--x-ui-content-light-background);
+}
+[is="x-ui-"] table.ui-table tbody tr:hover td {
+  background-color: var(--x-ui-content-hover-background);
+}
+[is="x-ui-"] table.ui-table tbody td[data-class=ops] {
+  text-align: center;
+}
+[is="x-ui-"] table.ui-table tbody tr:nth-child(odd) td[data-class=ops] {
+  background-color: #d0d0d0;
+}
+[is="x-ui-"] table.ui-table tbody tr:hover td[data-class=ops] {
+  background-color: #99cee6b0;
+}
+
+[is="x-ui-"] ui-rest > ui-content > ui-area {
+  padding: 0em 1em 1em 1em;
+}
+
+tr.contextmenuitem .capitalized {
+  text-transform: capitalize;
+}

data/ui/index.html

@@ -20,7 +20,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>Process Hub</title>
+    <title data-orig="Process Hub">Process Hub</title>
     <link rel="icon" type="image/x-icon" href="favicon.ico">
 
     <!-- libs, do not modify. When local than load local libs. -->
@@ -53,9 +53,9 @@
     <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
 
     <!-- custom stuff, play arround  -->
-    <link   rel="stylesheet"      href="css/design.css" type="text/css"/>
+    <link   rel="stylesheet"      href="css/moma.css" type="text/css"/>
     <link   rel="stylesheet"      href="css/stats.css" type="text/css"/>
-    <script type="text/javascript" src="js/design.js"></script>
+    <script type="text/javascript" src="js/moma.js"></script>
     <script type="text/javascript" src="js/stats.js"></script>
   </head>
   <body is="x-ui-">
@@ -73,10 +73,13 @@
       </ui-tabbar>
       <ui-content class="noselect">
         <ui-area data-belongs-to-tab="models">
-          <p>Your Models are saved/versioned in <a target='_blank' href='https://git-scm.com/'>GIT</a>. So fret not. Just send an email to <a href="mail:helpdesk@cpee.org">helpdesk@cpee.org</a> if you are lost. And as always: <a target='_blank' href='https://www.youtube.com/watch?v=kkxj5xVLyj0&feature=youtu.be&t=56'>get dressed for success</a>.</p>
+          <div class="fixed">
+            <div class="text">Your Models are saved/versioned in <a target='_blank' href='https://git-scm.com/'>GIT</a>. So fret not. Just send an email to <a href="mail:helpdesk@cpee.org">helpdesk@cpee.org</a> if you are lost. Click on <strong>Icons</strong> of directory entries, to mark them. Then change to a different directory and move/copy them there. And as always: <a target='_blank' href='https://www.youtube.com/watch?v=kkxj5xVLyj0&feature=youtu.be&t=56'>get dressed for success</a>.</div>
+            <div class="breadcrumb"><span class="crumb" onclick="">⌂ Home</span></div>
+          </div>
           <table id="models" class='ui-table'>
             <thead>
-              <th></th>
+              <th data-class='special' class='invisible' title='click for operations'>🔧</th>
               <th>Name</th>
               <th><abbr title='force new instance'>F</abbr></th>
               <th><abbr title='link to model source'>M</abbr></th>
@@ -86,22 +89,9 @@
               <th>Changed At</th>
               <th><abbr title='Operations'>Op</abbr></th>
             </thead>
-            <template id="up">
-              <tr>
-                <td data-class='folder' class="noselect">📁</td>
-                <td data-class='name' data-full-name=''><a href=''></a></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td data-class='date'></td>
-                <td data-class=''></td>
-              </tr>
-            </template>
             <template id="folder">
               <tr>
-                <td data-class='folder' class="noselect">📁</td>
+                <td data-class='folder' class="noselect" title='click to mark'>📁</td>
                 <td data-class='name' data-full-name=''><a href=''></a></td>
                 <td></td>
                 <td></td>
@@ -109,12 +99,12 @@
                 <td></td>
                 <td></td>
                 <td data-class='date'></td>
-                <td data-class='ops' class="noselect"><span>…</span></td>
+                <td data-class='ops' class="noselect" title='click for operations'><span>🔧</span></td>
               </tr>
             </template>
             <template id="model">
               <tr>
-                <td data-class='model' class="noselect" draggable="true" title='drag to folders to move'>𝌭</td>
+                <td data-class='model' class="noselect" title='click to mark'>𝌭</td>
                 <td data-class='name' data-full-name=''><a target='_blank' href=''></a></td>
                 <td data-class='force'>[<a target='_blank' href='' title='force new instance'>F</a>]</td>
                 <td data-class='raw'>[<a target='_blank' href='' title='link to model source'>M</a>]</td>
@@ -122,7 +112,7 @@
                 <td data-class='guarded'><abbr title=''></abbr></td>
                 <td data-class='resource'></td>
                 <td data-class='date'></td>
-                <td data-class='ops' class="noselect"><span>…</span></td>
+                <td data-class='ops' class="noselect" title='click for operations'><span>🔧</span></td>
               </tr>
             </template>
             <tbody>
@@ -130,18 +120,17 @@
           </table>
         </ui-area>
         <ui-area data-belongs-to-tab="newmodel" class="inactive">
-          <p>
+          <div class="text">
             Create an empty model. Beware, if a model of the same name already
             exists in one of the categories (e.g. draft, development,
             production, archive) it can not be created. To protect you from
             getting confused and shooting yourself in the foot in your little
             modelling world we allow only unique names. Better safe than sorry.
-          </p>
+          </div>
+          <div class="breadcrumb"><span class="crumb" onclick="">⌂ Home</span></div>
           <form id="newmod">
-            <input type="hidden" name="stage" value=""/>
-            <input type="hidden" name="dir" value=""/>
             <p>
-              <input type="text" name="new" required pattern="^[a-zA-Z0-9öäüÖÄÜ _-]+" placeholder="Filename (no extension necessary). Only use characters, spaces, underlines and dashes."/>
+              <input type="text" name="new" required pattern="^[a-zA-Z0-9öäüÖÄÜ _\-]+" placeholder="Filename (no extension necessary). Only use characters, spaces, underlines and dashes."/>
             </p>
             <p>
               <button>New Model</button>
@@ -149,17 +138,14 @@
           </form>
         </ui-area>
         <ui-area data-belongs-to-tab="newdir" class="inactive">
-          <p>
+          <div class="text">
             Create an empty directory. Beware, if a directory of the same name
-            already exists in one of the categories (e.g. draft, development,
-            production, archive) it can not be created. To protect you from
-            getting confused and shooting yourself in the foot in your little
-            modelling world we allow only unique names. Better safe than sorry.
-          </p>
+            already exists it can not be created.
+          </div>
+          <div class="breadcrumb"><span class="crumb" onclick="">⌂ Home</span></div>
           <form id="newdir">
-            <input type="hidden" name="stage" value=""/>
             <p>
-              <input type="text" name="newdir" required pattern="^[a-zA-Z0-9öäüÖÄÜ _-]+" placeholder="Directory name. Only use characters, spaces, underlines and dashes."/>
+              <input type="text" name="newdir" required pattern="^[a-zA-Z0-9öäüÖÄÜ _\-]+" placeholder="Directory name. Only use characters, spaces, underlines and dashes."/>
             </p>
             <p>
               <button>New Directory</button>

data/ui/instances.html

@@ -53,7 +53,7 @@
     <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
 
     <!-- custom stuff, play arround  -->
-    <link   rel="stylesheet"      href="css/design.css" type="text/css"/>
+    <link   rel="stylesheet"      href="css/moma.css" type="text/css"/>
     <link   rel="stylesheet"      href="css/stats.css" type="text/css"/>
     <link   rel="stylesheet"      href="css/stats_standalone.css" type="text/css"/>
     <script type="text/javascript" src="js/stats.js"></script>

data/ui/instances_view.html

@@ -53,7 +53,7 @@
     <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
 
     <!-- custom stuff, play arround  -->
-    <link   rel="stylesheet"      href="css/design.css" type="text/css"/>
+    <link   rel="stylesheet"      href="css/moma.css" type="text/css"/>
     <link   rel="stylesheet"      href="css/stats.css" type="text/css"/>
     <link   rel="stylesheet"      href="css/stats_standalone.css" type="text/css"/>
     <script type="text/javascript" src="js/stats.js"></script>