Merge remote-tracking branch 'ORIGIN/release26.3-SNAPSHOT' into 26.3_fb_lovcombo_timeofday_1266

Author: labkey-martyp

CageUI/resources/schemas/dbscripts/postgresql/cageui-26.000-26.001.sql

@@ -0,0 +1,57 @@
+/*
+ *
+ *  * Copyright (c) 2026 Board of Regents of the University of Wisconsin System
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *     http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+INSERT INTO ehr_lookups.lookup_sets (setname, label, description, keyField, container)
+select 'cageui_svg_urls' as setname,
+       'SVG Urls Field Values' as label,
+       'List of URLS for room items' as description,
+       'value' as keyField,
+       container from ehr_lookups.lookup_sets where setname='ancestry';
+
+insert into ehr_lookups.lookups (set_name,container,value, title)
+select setname, container, 'cage' as value, '/cageui/static/cage.svg' as title from ehr_lookups.lookup_sets where setname='cageui_svg_urls';
+
+insert into ehr_lookups.lookups (set_name,container,value, title)
+select setname, container, 'pen' as value, '/cageui/static/pen.svg' as title from ehr_lookups.lookup_sets where setname='cageui_svg_urls';
+
+insert into ehr_lookups.lookups (set_name,container,value, title)
+select setname, container, 'tempCage' as value, '/cageui/static/cage.svg' as title from ehr_lookups.lookup_sets where setname='cageui_svg_urls';
+
+insert into ehr_lookups.lookups (set_name,container,value, title)
+select setname, container, 'playCage' as value, '/cageui/static/pen.svg' as title from ehr_lookups.lookup_sets where setname='cageui_svg_urls';
+
+insert into ehr_lookups.lookups (set_name,container,value, title)
+select setname, container, 'roomDivider' as value, '/cageui/static/roomDivider.svg' as title from ehr_lookups.lookup_sets where setname='cageui_svg_urls';
+
+insert into ehr_lookups.lookups (set_name,container,value, title)
+select setname, container, 'drain' as value, '/cageui/static/drain.svg' as title from ehr_lookups.lookup_sets where setname='cageui_svg_urls';
+
+insert into ehr_lookups.lookups (set_name,container,value, title)
+select setname, container, 'door' as value, '/cageui/static/door.svg' as title from ehr_lookups.lookup_sets where setname='cageui_svg_urls';
+
+insert into ehr_lookups.lookups (set_name,container,value, title)
+select setname, container, 'gateClosed' as value, '/cageui/static/gateClosed.svg' as title from ehr_lookups.lookup_sets where setname='cageui_svg_urls';
+
+insert into ehr_lookups.lookups (set_name,container,value, title)
+select setname, container, 'gateOpen' as value, '/cageui/static/gateOpen.svg' as title from ehr_lookups.lookup_sets where setname='cageui_svg_urls';
+
+insert into ehr_lookups.lookups (set_name,container,value, title)
+select setname, container, 'top' as value, '/cageui/static/top.svg' as title from ehr_lookups.lookup_sets where setname='cageui_svg_urls';
+
+insert into ehr_lookups.lookups (set_name,container,value, title)
+select setname, container, 'bottom' as value, '/cageui/static/bottom.svg' as title from ehr_lookups.lookup_sets where setname='cageui_svg_urls';

CageUI/resources/web/CageUI/static/legend.svg

@@ -1148,7 +1148,7 @@
 
 .room-list-items {
   overflow-y: auto;
-  padding: 5px;
+  padding: 5px 15px 5px 5px;
 }
 
 .arrow {
@@ -1166,28 +1166,40 @@
   border: 1px solid black;
 }
 
+.room-dir-header-container {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
 .room-dir-header {
   cursor: pointer;
   font-weight: bold;
   display: flex;
   align-items: center;
-  justify-content: space-between;
   font-size: x-large;
+  flex-grow: 1;
 }
 
 .room-dir-room-obj {
   margin: 15px 10px 15px 5px;
   border-bottom: 1px solid lightgrey;
 }
 
+.room-dir-rack-obj-container {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
 .room-dir-rack-obj {
   cursor: pointer;
   font-size: large;
   font-weight: bold;
   display: flex;
   align-items: center;
-  justify-content: space-between;
   margin: 15px 10px 15px 5px;
+  flex-grow: 1;
 }
 
 .room-dir-cage-obj {
@@ -1199,12 +1211,12 @@
   margin: 15px 10px 15px 5px;
 }
 
-.room-dir-header.open .arrow {
+.room-dir-header-container.open .arrow {
   transform: rotate(135deg);
 }
 
 
-.room-dir-rack-obj.open .arrow {
+.room-dir-rack-obj-container.open .arrow {
   transform: rotate(135deg);
 }
 

CageUI/src/client/cageui.scss

@@ -22,11 +22,12 @@ import { createPortal } from 'react-dom';
 
 interface LoadingScreenProps {
     isVisible: boolean;
+    message: string;
     targetElement?: HTMLElement | null;
 }
 
 export const LoadingScreen: FC<LoadingScreenProps> = (props) => {
-    const {isVisible, targetElement} = props;
+    const {isVisible, message, targetElement} = props;
 
     const [container, setContainer] = useState<HTMLElement | null>(null);
 
@@ -44,7 +45,7 @@ export const LoadingScreen: FC<LoadingScreenProps> = (props) => {
         <div className="loading-overlay">
             <div className="loading-content">
                 <div className="spinner"></div>
-                <p className="loading-message">Saving...</p>
+                <p className="loading-message">{message}</p>
             </div>
         </div>,
         container