@a83/orbiter-admin 0.3.41 → 0.3.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a83/orbiter-admin",
-  "version": "0.3.41",
+  "version": "0.3.43",
   "description": "Standalone admin server for Orbiter CMS",
   "type": "module",
   "main": "./src/server.js",

package/public/style.css

@@ -2063,12 +2063,17 @@ html[data-dock-pos="left"] .xfce-col-preview.visible {
 .xfce-preview-date { font-size: 9px; color: var(--muted); flex-shrink: 0; }
 .xfce-preview-empty { padding: 6px 12px; font-size: 10px; color: var(--muted); }
 .xfce-preview-loading { padding: 10px 12px; font-size: 10px; color: var(--muted); }
-.xfce-preview-new {
-  display: block; padding: 6px 12px; font-size: 10px;
-  color: var(--accent); text-decoration: none; border-top: 1px solid var(--line);
-  transition: background .1s;
+.xfce-preview-actions {
+  display: flex; border-top: 1px solid var(--line);
+}
+.xfce-preview-action {
+  flex: 1; padding: 6px 8px; font-size: 10px; font-family: var(--mono);
+  color: var(--accent); text-decoration: none; text-align: center;
+  background: none; border: none; cursor: pointer;
+  transition: background .1s; white-space: nowrap;
 }
-.xfce-preview-new:hover { background: color-mix(in srgb, var(--accent) 10%, transparent); }
+.xfce-preview-action + .xfce-preview-action { border-left: 1px solid var(--line); }
+.xfce-preview-action:hover { background: color-mix(in srgb, var(--accent) 10%, transparent); }
 
 /* ── Command Palette ─────────────────────────────────────── */
 .xfce-palette {
@@ -2147,8 +2152,13 @@ html[data-dock-pos="left"] .xfce-col-preview.visible {
 
 /* ── Status bar build indicator ──────────────────────────── */
 .xfce-sb-build { font-size: 9px; font-family: var(--mono); color: var(--muted); white-space: nowrap; }
-.xfce-sb-g-ind { font-size: 10px; font-family: var(--mono); color: var(--accent); font-weight: 600; letter-spacing: .05em; animation: xfce-blink .7s step-end infinite; }
-@keyframes xfce-blink { 0%,100% { opacity:1; } 50% { opacity:.3; } }
+.xfce-sb-g-ind {
+  font-size: 10px; font-family: var(--mono); font-weight: 700; white-space: nowrap;
+  color: var(--bg1); background: var(--accent);
+  border-radius: 4px; padding: 1px 6px; letter-spacing: .04em;
+  animation: xfce-blink .6s step-end infinite;
+}
+@keyframes xfce-blink { 0%,100% { opacity:1; } 50% { opacity:.4; } }
 
 /* ── Left dock mode ───────────────────────────────────────── */
 html[data-style="xfce"][data-dock-pos="left"] .main {
@@ -2179,27 +2189,12 @@ html[data-style="xfce"][data-dock-pos="left"] .xfce-toast-host {
 html[data-style="xfce"][data-dock-pos="left"] .xfce-palette {
   padding-bottom: 20px; padding-left: 100px; align-items: center;
 }
-
-/* ── Dock context menu ───────────────────────────────────── */
-.xfce-ctx-menu {
-  display: none; position: fixed; z-index: 100000;
-  background: var(--bg1); border: 1px solid var(--line);
-  border-top: 2px solid var(--accent);
-  border-radius: 8px; padding: 4px 0;
-  box-shadow: 0 4px 24px rgba(0,0,0,.25);
-  min-width: 160px;
-  opacity: 0; transform: scale(.96); transform-origin: top left;
-  transition: opacity .1s, transform .1s;
+html[data-style="xfce"][data-dock-pos="left"] .xfce-tools-popup {
+  bottom: auto;
 }
-.xfce-ctx-menu.open { opacity: 1; transform: scale(1); }
-.xfce-ctx-item {
-  display: flex; align-items: center; gap: 10px;
-  width: 100%; background: none; border: none; cursor: pointer;
-  padding: 7px 14px; font-size: 12px; font-family: var(--mono);
-  color: var(--body); text-align: left; transition: background .1s;
+html[data-style="xfce"][data-dock-pos="left"] .xfce-ws-overlay {
+  bottom: auto; left: 110px; top: 50%; transform: translateY(-50%);
 }
-.xfce-ctx-item:hover { background: color-mix(in srgb, var(--accent) 12%, transparent); color: var(--heading); }
-.xfce-ctx-icon { width: 16px; text-align: center; color: var(--accent); flex-shrink: 0; }
 
 /* ── Toast host (above dock) ─────────────────────────────── */
 .xfce-toast-host {

package/public/xfce.js

@@ -63,7 +63,7 @@
       '</div>',
       '<div class="xfce-sb-center" id="xfce-sb-title"></div>',
       '<div class="xfce-sb-right">',
-        '<span id="xfce-sb-g-ind" class="xfce-sb-g-ind" style="display:none" title="g — type destination key">g_</span>',
+        '<span id="xfce-sb-g-ind" class="xfce-sb-g-ind" style="display:none" title="g mode: d=dashboard m=media s=settings u=users b=build i=import h=schema a=account">g ›</span>',
         '<button id="xfce-sb-palette-btn" class="xfce-sb-palette-btn" title="Command palette (⌘K)">⌘</button>',
         '<span class="xfce-sb-div">·</span>',
         '<span id="xfce-sb-build" class="xfce-sb-build" title="Last build"></span>',
@@ -158,6 +158,13 @@
       a.innerHTML = '<span class="xfce-tools-icon">' + t.icon + '</span><span>' + t.label + '</span>';
       toolsPopup.appendChild(a);
     });
+    var settingsSep = document.createElement('div');
+    settingsSep.className = 'xfce-tools-sep';
+    toolsPopup.appendChild(settingsSep);
+    var settingsLink = el('a', 'xfce-tools-item' + (page === 'settings' ? ' active' : ''));
+    settingsLink.href = '/settings.html';
+    settingsLink.innerHTML = '<span class="xfce-tools-icon">⚙</span><span>Settings</span>';
+    toolsPopup.appendChild(settingsLink);
     var sep = document.createElement('div');
     sep.className = 'xfce-tools-sep';
     toolsPopup.appendChild(sep);
@@ -204,10 +211,23 @@
 
   function toggleToolsPopup() {
     if (!toolsPopup) buildToolsPopup();
-    var btn = document.getElementById('xfce-tools-btn');
-    if (btn) {
-      var rect = btn.getBoundingClientRect();
-      toolsPopup.style.left = Math.round(rect.left + rect.width / 2) + 'px';
+    var btn  = document.getElementById('xfce-tools-btn');
+    var dock = document.getElementById('xfce-dock');
+    var isLeft = document.documentElement.dataset.dockPos === 'left';
+    if (btn && dock) {
+      var bRect = btn.getBoundingClientRect();
+      var dRect = dock.getBoundingClientRect();
+      if (isLeft) {
+        toolsPopup.style.left   = Math.round(dRect.right + 10) + 'px';
+        toolsPopup.style.top    = Math.round(bRect.top + bRect.height / 2) + 'px';
+        toolsPopup.style.bottom = 'auto';
+        toolsPopup.style.transform = 'translateY(-50%)';
+      } else {
+        toolsPopup.style.left      = Math.round(bRect.left + bRect.width / 2) + 'px';
+        toolsPopup.style.top       = '';
+        toolsPopup.style.bottom    = '';
+        toolsPopup.style.transform = '';
+      }
     }
     toolsPopup.classList.toggle('open');
   }
@@ -268,7 +288,23 @@
       _previewEl.innerHTML =
         '<div class="xfce-preview-head"><a href="' + entriesHref + '">' + escHtml(col.label) + '</a></div>'
         + '<div class="xfce-preview-entries">' + rows + '</div>'
-        + '<a class="xfce-preview-new" href="' + newHref + '">+ new entry</a>';
+        + '<div class="xfce-preview-actions">'
+        +   '<a class="xfce-preview-action" href="' + newHref + '">+ new entry</a>'
+        +   '<a class="xfce-preview-action" href="' + entriesHref + '">◫ view all</a>'
+        +   '<button class="xfce-preview-action xfce-preview-export" data-col="' + escHtml(col.id) + '">↓ export</button>'
+        + '</div>';
+      var expBtn = _previewEl.querySelector('.xfce-preview-export');
+      if (expBtn) expBtn.addEventListener('click', function (ev) {
+        ev.preventDefault();
+        fetch('/api/terminal/export?col=' + encodeURIComponent(col.id) + '&format=json&drafts=0', { credentials: 'include' })
+          .then(function (r) { return r.blob(); })
+          .then(function (blob) {
+            var a = document.createElement('a');
+            a.href = URL.createObjectURL(blob); a.download = col.id + '.json';
+            document.body.appendChild(a); a.click(); a.remove();
+          });
+        hideColPreview();
+      });
       _previewEl.classList.add('visible');
       place();
     }
@@ -1145,9 +1181,6 @@
             item.addEventListener('mouseenter', function () { showColPreview(col, item); });
             item.addEventListener('mouseleave', function () { _previewTimer = setTimeout(hideColPreview, 150); });
 
-            // Right-click context menu
-            addDockCtxMenu(item, col);
-
             colGroup.appendChild(item);
 
             // Add to palette fuzzy search and command list
@@ -1314,81 +1347,6 @@
       });
   }
 
-  // ── Dock right-click context menu ─────────────────────────────────────
-  var _ctxMenu = null;
-
-  function buildCtxMenu() {
-    _ctxMenu = document.createElement('div');
-    _ctxMenu.className = 'xfce-ctx-menu';
-    _ctxMenu.id = 'xfce-ctx-menu';
-    document.body.appendChild(_ctxMenu);
-    document.addEventListener('click', function (e) {
-      if (_ctxMenu && !_ctxMenu.contains(e.target)) closeCtxMenu();
-    }, true);
-    document.addEventListener('keydown', function (e) {
-      if (e.key === 'Escape') closeCtxMenu();
-    });
-  }
-
-  function openCtxMenu(x, y, items) {
-    if (!_ctxMenu) buildCtxMenu();
-    _ctxMenu.innerHTML = items.map(function (it) {
-      return '<button class="xfce-ctx-item" data-href="' + (it.href || '') + '">'
-        + '<span class="xfce-ctx-icon">' + it.icon + '</span>'
-        + '<span>' + it.label + '</span>'
-        + '</button>';
-    }).join('');
-    _ctxMenu.querySelectorAll('.xfce-ctx-item').forEach(function (btn) {
-      btn.addEventListener('click', function () {
-        var href = btn.dataset.href;
-        closeCtxMenu();
-        if (href) location.href = href;
-      });
-    });
-    var vw = window.innerWidth, vh = window.innerHeight;
-    _ctxMenu.style.display = 'block';
-    var w = _ctxMenu.offsetWidth, h = _ctxMenu.offsetHeight;
-    _ctxMenu.style.left = Math.min(x, vw - w - 8) + 'px';
-    _ctxMenu.style.top  = Math.min(y, vh - h - 8) + 'px';
-    _ctxMenu.classList.add('open');
-  }
-
-  function closeCtxMenu() {
-    if (!_ctxMenu) return;
-    _ctxMenu.classList.remove('open');
-    setTimeout(function () { if (_ctxMenu) _ctxMenu.style.display = 'none'; }, 120);
-  }
-
-  function addDockCtxMenu(item, col) {
-    item.addEventListener('contextmenu', function (e) {
-      e.preventDefault();
-      var entriesHref = col.singleton
-        ? '/editor.html?collection=' + encodeURIComponent(col.id) + '&singleton=1'
-        : '/entries.html?col=' + encodeURIComponent(col.id) + '&label=' + encodeURIComponent(col.label);
-      var newHref = '/editor.html?collection=' + encodeURIComponent(col.id);
-      openCtxMenu(e.clientX, e.clientY, [
-        { icon: '◫', label: 'View entries', href: entriesHref },
-        { icon: '+', label: 'New entry',    href: newHref },
-        { icon: '↓', label: 'Export JSON',  href: '' },
-      ]);
-      // Wire export separately (needs fetch, not href)
-      var exportBtn = _ctxMenu.querySelectorAll('.xfce-ctx-item')[2];
-      if (exportBtn) {
-        exportBtn.addEventListener('click', function (ev) {
-          ev.stopImmediatePropagation();
-          closeCtxMenu();
-          fetch('/api/terminal/export?col=' + encodeURIComponent(col.id) + '&format=json&drafts=0', { credentials: 'include' })
-            .then(function (r) { return r.blob(); })
-            .then(function (blob) {
-              var a = document.createElement('a');
-              a.href = URL.createObjectURL(blob);
-              a.download = col.id + '.json';
-              document.body.appendChild(a); a.click(); a.remove();
-            });
-        }, { once: true });
-      }
-    });
-  }
 
   // ── Init ──────────────────────────────────────────────────────────────
   function init() {