pinokiod 7.5.45 → 7.5.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "7.5.45",
+  "version": "7.5.50",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/views/app.ejs

@@ -70,9 +70,22 @@ body.dark .app-header-identity {
     0 1px 2px rgba(2, 6, 23, 0.35);
   color: rgba(248, 250, 252, 0.94);
 }
+body.app-page > header.navheader h1 {
+  width: 100%;
+  max-width: 100%;
+  min-width: 0;
+  box-sizing: border-box;
+  flex-wrap: nowrap;
+}
+body.app-page > header.navheader h1 > .home,
+body.app-page > header.navheader h1 > .btn2,
+body.app-page > header.navheader h1 > .sep,
+body.app-page > header.navheader h1 > .home-server-popover {
+  flex: 0 0 auto;
+}
 .app-header-info {
   position: relative;
-  flex: 0 1 auto;
+  flex: 1 1 auto;
   min-width: 0;
   display: inline-flex;
   align-items: center;
@@ -87,7 +100,8 @@ body.dark .app-header-identity {
   align-items: center;
   gap: 8px;
   min-width: 0;
-  max-width: min(260px, 32vw);
+  width: 100%;
+  max-width: none;
   height: 22px;
   padding: 0 4px;
   margin: 0 -4px;
@@ -266,6 +280,7 @@ body.dark .app-header-identity-separator {
 body.app-page header.navheader h1 > .flexible {
   flex: 0 0 0;
   min-width: 0;
+  margin-left: auto;
 }
 body.app-page header.navheader .nav-labeled-action {
   width: auto;
@@ -309,9 +324,17 @@ body.app-page header.navheader .nav-labeled-action:focus-visible {
   background: var(--pinokio-sidebar-tab-active-bg);
   color: var(--pinokio-sidebar-tab-active-color);
 }
+@media only screen and (max-width: 1180px) {
+  body.app-page header.navheader .app-header-identity-separator,
+  body.app-page header.navheader .resource-chip--cpu,
+  body.app-page header.navheader .resource-chip--ram,
+  body.app-page header.navheader .resource-chip--vram {
+    display: none !important;
+  }
+}
 .resource-usage {
   position: relative;
-  flex: 0 0 auto;
+  flex: 0 1 auto;
   min-width: 0;
   display: inline-flex;
   align-items: center;
@@ -327,6 +350,8 @@ body.app-page header.navheader .nav-labeled-action:focus-visible {
   gap: 8px;
   height: 22px;
   min-width: 0;
+  max-width: 100%;
+  overflow: hidden;
   padding: 0 7px;
   margin: 0;
   border-radius: 999px;

package/server/views/download.ejs

@@ -122,30 +122,7 @@ body.frozen {
 <header class='grabbable'>
 <h1>
 <a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
-<button class='btn2' id='minimize-header' data-tippy-content="fullscreen" title='fullscreen'>
-  <div><i class="fa-solid fa-expand"></i></div>
-</button>
-<a class='btn2 pinokio-explore-nav-button' href="/home?mode=explore" data-pinokio-explore-nav="true" data-tippy-content="Explore" title="Explore" aria-label="Explore">
-  <div><i class="fa-solid fa-globe" aria-hidden="true"></i></div>
-</a>
-<button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
-<button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
-<button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>
-<button class='btn2' id='screenshot' data-tippy-content="screen capture"><i class="fa-solid fa-camera"></i></button>
-<button class='btn2' id='inspector' data-tippy-content="X-ray mode"><i class="fa-solid fa-eye"></i></button>
 <div class='flexible'></div>
-<a class='btn2' href="/columns" data-tippy-content="split into 2 columns">
-  <div><i class="fa-solid fa-table-columns"></i></div>
-</a>
-<a class='btn2' href="/rows" data-tippy-content="split into 2 rows">
-  <div><i class="fa-solid fa-table-columns fa-rotate-270"></i></div>
-</a>
-<button class='btn2' id='new-window' data-tippy-content="open a new window" title='open a new window' data-agent="<%=agent%>">
-  <div><i class="fa-solid fa-plus"></i></div>
-</button>
-<button class='btn2 hidden' id='close-window' data-tippy-content='close this section'>
-  <div><i class="fa-solid fa-xmark"></i></div>
-</button>
 </h1>
 </header>
 <% if (requirements_pending) { %>

package/test/launch-settings-ui.test.js

@@ -636,6 +636,33 @@ test("navbar URL picker is hidden without removing URL dropdown behavior", async
   assert.match(script, /showMobileModal/)
 })
 
+test("app navbar stays on one line when app identity and Home Server controls are present", async () => {
+  const appView = await fs.readFile(path.resolve(root, "server/views/app.ejs"), "utf8")
+
+  assert.match(appView, /body\.app-page > header\.navheader h1\s*\{[\s\S]*box-sizing:\s*border-box;[\s\S]*flex-wrap:\s*nowrap;/)
+  assert.match(appView, /body\.app-page > header\.navheader h1 > \.home,[\s\S]*body\.app-page > header\.navheader h1 > \.home-server-popover\s*\{[\s\S]*flex:\s*0 0 auto;/)
+  assert.match(appView, /body\.app-page header\.navheader h1 > \.flexible\s*\{[\s\S]*flex:\s*0 0 0;[\s\S]*margin-left:\s*auto;/)
+  assert.match(appView, /\.app-header-identity\s*\{[\s\S]*flex:\s*1 1 auto;[\s\S]*max-width:\s*none;/)
+  assert.doesNotMatch(appView, /nav-action-label\s*\{[^}]*display:\s*none;/)
+  assert.match(appView, /@media only screen and \(max-width: 1180px\)\s*\{[\s\S]*\.resource-chip--vram[\s\S]*display:\s*none !important;/)
+})
+
+test("download page header does not show browser chrome controls", async () => {
+  const downloadView = await fs.readFile(path.resolve(root, "server/views/download.ejs"), "utf8")
+
+  assert.match(downloadView, /<header class='grabbable'>[\s\S]*<a class='home' href="\/home">[\s\S]*<div class='flexible'><\/div>[\s\S]*<\/header>/)
+  assert.doesNotMatch(downloadView, /id=['"]minimize-header['"]/)
+  assert.doesNotMatch(downloadView, /pinokio-explore-nav-button/)
+  assert.doesNotMatch(downloadView, /id=['"]back['"]/)
+  assert.doesNotMatch(downloadView, /id=['"]forward['"]/)
+  assert.doesNotMatch(downloadView, /id=['"]refresh-page['"]/)
+  assert.doesNotMatch(downloadView, /id=['"]screenshot['"]/)
+  assert.doesNotMatch(downloadView, /id=['"]inspector['"]/)
+  assert.doesNotMatch(downloadView, /href="\/columns"/)
+  assert.doesNotMatch(downloadView, /href="\/rows"/)
+  assert.doesNotMatch(downloadView, /id=['"]new-window['"]/)
+})
+
 test("home server dropdown exposes router-discovered non-Pinokio routes separately", () => {
   const server = Object.create(Server.prototype)
   const routes = server.collectHomeServerRoutes({