Merge pull request #323 from dittybijil/main

revert custom shell changes
surveilr · Jan 27, 2025 · ab82743 · ab82743
2 parents d21781d + ff813e9
commit ab82743
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/service/qualityfolio/package.auto.sql b/lib/service/qualityfolio/package.auto.sql
@@ -2292,6 +2292,7 @@ INSERT INTO sqlpage_files (path, contents, last_modified) VALUES (
                 <!-- Sidebar logic here -->
             {{else}}
                 <nav class="navbar navbar-expand-md navbar-light{{#if fixed_top_menu}} fixed-top{{/if}}">
+                 <h1 class="mb-0 w-0 fs-2">{{title}}</h1>
                     <!-- Navbar content here -->
                 </nav>
             {{/if}}
@@ -4265,7 +4266,7 @@ GROUP BY view_name;
 INSERT INTO sqlpage_files (path, contents, last_modified) VALUES (
       'shell/shell.json',
       '{
-  "component": "case when sqlpage.environment_variable(''EOH_INSTANCE'')=1 then ''shell-custom'' else ''shell'' END",
+  "component": "shell",
   "title": "Qualityfolio",
   "icon": "",
   "favicon": "https://www.surveilr.com/assets/brand/qf-favicon.ico",
@@ -4291,7 +4292,7 @@ INSERT INTO sqlpage_files (path, contents, last_modified) VALUES (
   ON CONFLICT(path) DO UPDATE SET contents = EXCLUDED.contents, last_modified = CURRENT_TIMESTAMP;
 INSERT INTO sqlpage_files (path, contents, last_modified) VALUES (
       'shell/shell.sql',
-      'SELECT case when sqlpage.environment_variable(''EOH_INSTANCE'')=1 then ''shell-custom'' else ''shell'' END AS component,
+      'SELECT ''shell'' AS component,
        ''Qualityfolio'' AS title,
        NULL AS icon,
        ''https://www.surveilr.com/assets/brand/qf-favicon.ico'' AS favicon,

diff --git a/lib/service/qualityfolio/package.sql.ts b/lib/service/qualityfolio/package.sql.ts
@@ -3,11 +3,11 @@ import { sqlPageNB as spn } from "./deps.ts";
 import {
   console as c,
   orchestration as orch,
-  //shell as sh,
+  shell as sh,
   uniformResource as ur,
   docs as d
 } from "../../std/web-ui-content/mod.ts";
-import * as sh from "./custom_shell.ts";
+//import * as sh from "./custom_shell.ts";
 
 const WEB_UI_TITLE = "Qualityfolio";
 const WE_UI_LOGO = "qf-logo.png";
@@ -1231,6 +1231,7 @@ WHERE rn.id = $id;
                       <!-- Sidebar logic here -->
                   {{else}}
                       <nav class="navbar navbar-expand-md navbar-light{{#if fixed_top_menu}} fixed-top{{/if}}">
+                       <h1 class="mb-0 w-0 fs-2">{{title}}</h1>
                           <!-- Navbar content here -->
                       </nav>
                   {{/if}}