From de11f318e9cba582289fd75504627a5a803e057b Mon Sep 17 00:00:00 2001
From: Andy Bunce <bunce.andy@gmail.com>
Date: Sun, 5 Oct 2025 21:56:56 +0100
Subject: [PATCH] [mod] tidy

---
 webapp/static/clients/codemirror/grail.css  |  7 +-
 webapp/static/clients/codemirror/grail.html | 91 +++++++++++----------
 2 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/webapp/static/clients/codemirror/grail.css b/webapp/static/clients/codemirror/grail.css
index b43ee53..3fca926 100644
--- a/webapp/static/clients/codemirror/grail.css
+++ b/webapp/static/clients/codemirror/grail.css
@@ -14,6 +14,9 @@ body {
   height: 100vh;
   margin: 0;
 }
+form header {
+  background-color: burlywood;
+}
 
 .page-wrap {
   background: white;
@@ -29,9 +32,7 @@ body {
   .navbar * {
     box-sizing: content-box;
   }
-form header {
-  background-color: burlywood;
-}
+
  details {
   padding:2px;
   padding-left: 3px;
diff --git a/webapp/static/clients/codemirror/grail.html b/webapp/static/clients/codemirror/grail.html
index f4a6cac..a174fb9 100644
--- a/webapp/static/clients/codemirror/grail.html
+++ b/webapp/static/clients/codemirror/grail.html
@@ -26,16 +26,37 @@
                             <a class="nav-link active" aria-current="page" href="#">Editor</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" href="#">Msgs</a>
+                            <a class="nav-link" href="#">LSP UI</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" href="/dba/logs" target="dba">Dba</a>
                         </li>
-                        <li class="nav-item">
-                            <a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
-                        </li>
+                       
                     </ul>
+<select id="load">
+                    <option selected value="">load..</option>
+                    <optgroup label="XQuery3">
+                        <option
+                            value="https://raw.githubusercontent.com/expkg-zone58/pdfbox/refs/heads/main/src/Pdfbox3.xqm">
+                            Pdfbox3.xqm</option>
+                        <option
+                            value="https://raw.githubusercontent.com/Quodatum/xqdoca/refs/heads/master/src/main/lib/model.xqm">
+                            model.xqm</option>
+                    </optgroup>
+                    <optgroup label="XQuery4">
+                        <option
+                            value="https://git.quodatum.duckdns.org/quodatum/basex-lsp/raw/branch/main/webapp/lsp/lsp-text.xqm">
+                            lsp-text.xqm</option>
+                        <option value="../../../lsp/lsp-text.xqm">
+                            lsp-text.xqm</option>
+                    </optgroup>
 
+                    <optgroup label="xpath">
+                        <option
+                            value="https://raw.githubusercontent.com/dnovatchev/Articles/refs/heads/main/Generators/Code/generator.xq">
+                            generator.xquery</option>
+                    </optgroup>
+                </select>
                 </div>
             </nav>
         </header>
@@ -98,32 +119,9 @@
 
         <aside class="page-sidebar">
 
-            <details id="workspacePanel" open="open" >
+            <details id="workspacePanel" open="open">
                 <summary class='bg-info'>Workspace <b>0</b></summary>
-                <select id="load">
-                    <option selected value="">load..</option>
-                    <optgroup label="XQuery3">
-                        <option
-                            value="https://raw.githubusercontent.com/expkg-zone58/pdfbox/refs/heads/main/src/Pdfbox3.xqm">
-                            Pdfbox3.xqm</option>
-                        <option
-                            value="https://raw.githubusercontent.com/Quodatum/xqdoca/refs/heads/master/src/main/lib/model.xqm">
-                            model.xqm</option>
-                    </optgroup>
-                    <optgroup label="XQuery4">
-                        <option
-                            value="https://git.quodatum.duckdns.org/quodatum/basex-lsp/raw/branch/main/webapp/lsp/lsp-text.xqm">
-                            lsp-text.xqm</option>
-                        <option value="../../../lsp/lsp-text.xqm">
-                            lsp-text.xqm</option>
-                    </optgroup>
-
-                    <optgroup label="xpath">
-                        <option
-                            value="https://raw.githubusercontent.com/dnovatchev/Articles/refs/heads/main/Generators/Code/generator.xq">
-                            generator.xquery</option>
-                    </optgroup>
-                </select>
+                
 
                 <ul id="traffic" style="overflow: scroll;">
                     <li>-</li>
@@ -131,12 +129,12 @@
             </details>
 
             <details id="symPanel">
-                <summary >OutLine <b>0</b></summary>
-                <json-list id="symList" ></json-list>
+                <summary>OutLine <b>0</b></summary>
+                <json-list id="symList"></json-list>
             </details>
 
-            <details id="msgPanel" >
-                <summary >Messages <b>0</b></summary>
+            <details id="msgPanel">
+                <summary>Messages <b>0</b></summary>
                 <div id="msg">(msgs)<i class='codicon codicon-symbol-method'></i></div>
             </details>
         </aside>
@@ -153,16 +151,19 @@
     </div>
     <!-- Popovers -->
     <dialog id="popConnect" popover>
-        <header>Connect to LSP
-            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-        </header>
-        <div class="modal-body">
-            <div id="state">🔴</div>
-            <input id="iServer" type="text" style="width:25em" />
-        </div>
-        <div class="modal-footer">
-            <button id="connect">connect</button>
-        </div>
+        <form>
+            <header>Connect to LSP
+                <button type="button" class="btn-close"  aria-label="Close"
+                 onclick="$('popConnect').hidePopover(); "></button>
+            </header>
+            <div class="modal-body">
+                <div id="state">🔴</div>
+                <input id="iServer" type="text" style="width:25em" />
+            </div>
+            <div class="modal-footer">
+                <button id="connect">connect</button>
+            </div>
+        </form>
     </dialog>
 
     <!--  <popup-info id="popHelp">hhhh</popup-info> -->
@@ -170,7 +171,7 @@
     <dialog id="popSettings" popover>
         <form id="fSettings">
             <header>Editor configuration
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"
+                <button type="button" class="btn-close"  aria-label="Close"
                     onclick="$('popSettings').hidePopover(); "></button>
             </header>
             <div class="modal-body">
@@ -179,7 +180,7 @@
                     <input name="wrapLines" type="checkbox" class="form-check-input" id="lineWrap">
                     <label class="form-check-label" for="lineWrap">Wrap lines</label>
                 </div>
-               <div class="mb-3 form-check">
+                <div class="mb-3 form-check">
                     <input name="minimap" type="checkbox" class="form-check-input" id="minimap">
                     <label class="form-check-label" for="minimap">Show minimap</label>
                 </div>