@a83/orbiter-admin 0.3.17 → 0.3.19

package/package.json

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

package/public/router.js

@@ -24,7 +24,10 @@
   function updateActiveNav(href) {
     var target;
     try { target = new URL(href, location.origin); } catch (e) { return; }
-    document.querySelectorAll('.nav-item').forEach(function (a) {
+    var pg = target.pathname.split('/').pop().replace('.html', '');
+
+    // Update classic sidebar + xfce dock/HUD link items
+    document.querySelectorAll('.nav-item, a.xfce-dock-item, a.xfce-hud-nav-item, a.xfce-tools-item').forEach(function (a) {
       var raw = a.getAttribute('href');
       if (!raw) return;
       var itemUrl;
@@ -37,6 +40,12 @@
       }
       a.classList.toggle('active', match);
     });
+
+    // xfce tools button is a <button> (not an <a>), update separately
+    var toolsBtn = document.getElementById('xfce-tools-btn');
+    if (toolsBtn) {
+      toolsBtn.classList.toggle('active', ['schema', 'build', 'import'].indexOf(pg) !== -1);
+    }
   }
 
   function swapPageStyle(doc) {

package/public/settings.html

@@ -10,14 +10,29 @@
   <link rel="stylesheet" href="/style.css" />
   <script src="/theme.js"></script>
   <style>
-    .settings-wrap { max-width:720px; padding-bottom:40px; }
+    .settings-wrap { max-width:1100px; padding-bottom:40px; }
+
+    /* Two-column grid for settings groups */
+    .settings-grid {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      gap: 12px;
+      align-items: start;
+      margin-bottom: 12px;
+    }
+    .settings-grid .settings-group { margin-bottom: 0; }
+    .settings-wrap > .settings-group { margin-bottom: 12px; }
+
+    @media (max-width: 720px) {
+      .settings-wrap { max-width: 720px; }
+      .settings-grid { grid-template-columns: 1fr; }
+    }
 
     /* Card — einheitliches bg2, eine Farbe, kein Alternieren */
     .settings-group {
       background: var(--bg2);
       border: 1px solid var(--line);
       border-radius: 10px;
-      margin-bottom: 12px;
       overflow: hidden;
     }
 
@@ -250,8 +265,9 @@
       </div>
     </nav>
     <main class="main">
-      <div class="page-header glass-card">
+      <div class="page-header glass-card" style="display:flex;align-items:center;justify-content:space-between;">
         <h1 class="page-title">Settings</h1>
+        <button type="submit" form="site-form" class="btn-save" id="header-save-btn">Save settings</button>
       </div>
       <div class="settings-wrap" id="settings-content">
         <div class="empty"><div class="spinner"></div></div>
@@ -301,6 +317,7 @@
 
       <!-- Site + Build + GitHub + API — one form -->
       <form id="site-form">
+        <div class="settings-grid">
         <div class="settings-group">
           <div class="group-header">Site</div>
           <div class="setting-row">
@@ -485,9 +502,7 @@
           </div>
         </div>
 
-        <div class="save-row">
-          <button type="submit" class="btn-save">Save settings</button>
-        </div>
+        </div><!-- /settings-grid -->
       </form>
 
       <!-- GitHub Sync (conditional) -->
@@ -508,8 +523,9 @@
       </div>
       ` : ''}
 
-      <!-- Account -->
+      <!-- Account + Interface language (two-column) -->
       <div id="account-banner" class="banner" style="display:none"></div>
+      <div class="settings-grid">
       <div class="settings-group">
         <div class="group-header">Account — ${me.user.username}</div>
         <form id="pw-form">
@@ -555,8 +571,9 @@
           </div>
         </div>
       </div>
+      </div><!-- /settings-grid account+lang -->
 
-      <!-- Appearance -->
+      <!-- Appearance (full width) -->
       <div class="settings-group">
         <div class="group-header">Appearance</div>
         <div style="padding:16px 28px;border-bottom:1px solid var(--line2)">
@@ -654,7 +671,8 @@
         </div>
       </div>
 
-      <!-- Data + Import -->
+      <!-- Data + Pod (two-column) -->
+      <div class="settings-grid">
       <div class="settings-group">
         <div class="group-header">Data</div>
         <div class="setting-row">
@@ -666,7 +684,6 @@
         </div>
       </div>
 
-      <!-- Pod info -->
       <div class="settings-group" id="pod-info-group">
         <div class="group-header">Pod</div>
         <div class="pod-meta">
@@ -677,6 +694,11 @@
           <div class="pod-col-row"><span class="pod-col-name" style="color:var(--muted)">Loading…</span></div>
         </div>
       </div>
+      </div><!-- /settings-grid data+pod -->
+
+      <div class="save-row">
+        <button type="submit" form="site-form" class="btn-save">Save settings</button>
+      </div>
 
       <!-- Support widget -->
       <div class="support-widget">

package/public/style.css

@@ -1040,7 +1040,7 @@ html[data-style="xfce"] {
   --glass-shadow:  0 8px 40px rgba(0,0,0,.22), inset 0 1px 0 rgba(255,255,255,.07);
   --sb-h: 26px;
   --dock-h: 76px;
-  --dock-item-base: 44px;
+  --dock-item-base: 50px;
 }
 
 html[data-style="xfce"][data-scheme="light"],
@@ -1158,8 +1158,8 @@ html[data-style="xfce"] .editor-shell {
   flex-direction: column;
   align-items: center;
   justify-content: flex-end;
-  width: var(--dock-item-base, 44px);
-  padding: 5px 4px 4px;
+  width: var(--dock-item-base, 50px);
+  padding: 8px 7px 7px;
   background: transparent;
   border: none;
   border-radius: 12px;
@@ -1217,7 +1217,7 @@ html[data-style="xfce"] .editor-shell {
   font-size: 18px;
   line-height: 1;
   display: block;
-  opacity: .35;
+  opacity: .58;
   transition: filter .12s, transform .12s cubic-bezier(.34,1.5,.64,1), opacity .12s, color .12s;
 }
 .xfce-dock-item:hover .xfce-dock-icon {
@@ -1239,7 +1239,7 @@ html[data-style="xfce"] .editor-shell {
   color: var(--mid);
   white-space: nowrap;
   transition: color .12s, opacity .12s;
-  opacity: .32;
+  opacity: .48;
 }
 .xfce-dock-item:hover .xfce-dock-lbl {
   opacity: 1;
@@ -1637,7 +1637,13 @@ html[data-style="xfce"] .table-wrap {
 }
 
 /* Settings / Import content: center within padded main */
-html[data-style="xfce"] .settings-wrap,
+html[data-style="xfce"] .settings-wrap {
+  width: 100%;
+  max-width: 1100px;
+  margin: 0 auto;
+  padding-left: 0;
+  padding-right: 0;
+}
 html[data-style="xfce"] .import-wrap {
   width: 100%;
   max-width: 720px;

package/public/xfce.js

@@ -564,7 +564,7 @@
         var r   = item.getBoundingClientRect();
         var mid = r.left + r.width / 2;
         var d   = Math.abs(cx - mid);
-        var s   = d < 96 ? 1 + (1 - d / 96) * 0.95 : 1;
+        var s   = d < 80 ? 1 + (1 - d / 80) * 0.50 : 1;
         item.style.setProperty('--ds', s.toFixed(3));
       });
     }

package/src/cli.js

@@ -8,12 +8,16 @@ if (portIdx !== -1 && process.argv[portIdx + 1]) {
   process.env.PORT = process.argv[portIdx + 1];
 }
 
+// When run via `npm run --workspace=...`, npm sets CWD to the workspace dir.
+// INIT_CWD is where the user actually ran npm — use that as base for relative paths.
+const baseCwd = process.env.INIT_CWD || process.cwd();
+
 // Resolve ORBITER_POD to absolute path (server.js does chdir, so must happen first)
 if (process.env.ORBITER_POD) {
-  process.env.ORBITER_POD = resolve(process.env.ORBITER_POD);
+  process.env.ORBITER_POD = resolve(baseCwd, process.env.ORBITER_POD);
 } else {
-  // Auto-detect a single .pod file in cwd
-  const pods = readdirSync('.').filter(f => f.endsWith('.pod'));
+  // Auto-detect a single .pod file in the directory where npm was invoked
+  const pods = readdirSync(baseCwd).filter(f => f.endsWith('.pod'));
   if (pods.length === 0) {
     console.error('Error: No .pod file found in current directory.');
     console.error('Set ORBITER_POD=/path/to/content.pod or run from the directory containing your .pod file.');
@@ -21,10 +25,10 @@ if (process.env.ORBITER_POD) {
   }
   if (pods.length > 1) {
     console.error('Multiple .pod files found. Specify one with ORBITER_POD:');
-    pods.forEach(p => console.error('  ORBITER_POD=' + resolve(p)));
+    pods.forEach(p => console.error('  ORBITER_POD=' + resolve(baseCwd, p)));
     process.exit(1);
   }
-  process.env.ORBITER_POD = resolve(pods[0]);
+  process.env.ORBITER_POD = resolve(baseCwd, pods[0]);
 }
 
 await import('./server.js');