Layout tweaks

NASA-AMMOS · May 1, 2024 · 1ac33b0 · 1ac33b0
1 parent ff236b7
commit 1ac33b0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/cws-ui/src/main/webapp/css/dashboard.css b/cws-ui/src/main/webapp/css/dashboard.css
@@ -435,3 +435,11 @@ a.nav-link img {
 :target {
   scroll-margin-top: 56px;
 }
+
+.dt-input {
+  margin-right: 5px;
+}
+
+#datepicker-div {
+  width: 150px;
+}
diff --git a/install/cws-ui/initiators-table.ftl b/install/cws-ui/initiators-table.ftl
@@ -21,7 +21,7 @@
 						<img id="enable_${x.initiatorId}_icon"  src="/${base}/images/play.20.png" onClick="setEnabled('${x.initiatorId}', true);" style="display: none;" />-->
 						<div class="form-check form-switch">
 						  <input class="form-check-input" type="checkbox" role="switch" id="toggle_${x.initiatorId}" onClick="setEnabled('${x.initiatorId}');">
-						  <label class="form-check-label" for="toggle_${x.initiatorId}">Power</label>
+						  <label class="form-check-label" for="toggle_${x.initiatorId}"></label>
 						</div>
 					</td>
 				</tr>

diff --git a/install/cws-ui/initiators.ftl b/install/cws-ui/initiators.ftl
@@ -76,7 +76,7 @@
 								<label>Enable All</label>
 								<div class="form-check form-switch" id="active-all">
 								  <input class="form-check-input" type="checkbox" role="switch" id="activate-all-inits">
-								  <label class="form-check-label" for="activate-all-inits">Power</label>
+								  <label class="form-check-label" for="activate-all-inits"></label>
 								</div>
 							</td>
 						</tr>
@@ -323,9 +323,11 @@
 		//if there is no "false" in the list, then all are enabled.
 		if (Object.values(initiatorEnabled).indexOf("false") == -1) {
 			$("#active-all input").prop('checked', true);
+			$("#active-all label").text("On");
 		}
 		else {
 			$("#active-all input").prop('checked', false);
+			$("#active-all label").text("Off");
 		}
 
 		//

diff --git a/install/cws-ui/sidebar.ftl b/install/cws-ui/sidebar.ftl
@@ -10,22 +10,11 @@ const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstra
 <div class="sidebar show" id="sidebar">
 	<ul class="nav nav-sidebar">
 
-<!----		
-<li <#if springMacroRequestContext.requestUri?contains("/deployments")> class="active"</#if>><a href="/${base}/deployments">Deployments</a></li>
-		<li <#if springMacroRequestContext.requestUri?contains("/workers")> class="active"</#if>><a href="/${base}/workers">Workers</a></li>
-		<li <#if springMacroRequestContext.requestUri?contains("/snippets")> class="active"</#if>><a href="/${base}/snippets">Snippets</a></li>
-		<li <#if springMacroRequestContext.requestUri?contains("/initiators")> class="active"</#if>><a href="/${base}/initiators">Initiators</a></li>
-		<li <#if springMacroRequestContext.requestUri?contains("/logs")> class="active"</#if>><a href="/${base}/logs?logLevel=ERROR">Logs</a></li>
-		<li <#if springMacroRequestContext.requestUri?contains("/processes")> class="active"</#if>><a href="/${base}/processes?superProcInstId=null">Processes</a></li>
-		<li <#if springMacroRequestContext.requestUri?contains("/configuration")> class="active"</#if>><a href="/${base}/configuration">Configuration</a></li>
-		<li <#if springMacroRequestContext.requestUri?contains("/documentation")> class="active"</#if>><a href="/${base}/documentation">Documentation</a></li>
-		<li <#if springMacroRequestContext.requestUri?contains("/summary")> class="active"</#if>><a href="/${base}/summary">System Summary</a></li>
------->
 
 		<li <#if springMacroRequestContext.requestUri?contains("/deployments")> class="active"</#if>><a href="/${base}/deployments" data-bs-toggle="tooltip" data-bs-title="Deployments"><img height="32" width="32" src="/${base}/images/locate.svg" /></a></li>
 		<li <#if springMacroRequestContext.requestUri?contains("/workers")> class="active"</#if>><a href="/${base}/workers" data-bs-toggle="tooltip" data-bs-title="Workers"><img height="32" width="32" src="/${base}/images/cpu.svg" /></a></li>
 		<li <#if springMacroRequestContext.requestUri?contains("/snippets")> class="active"</#if>><a href="/${base}/snippets" data-bs-toggle="tooltip" data-bs-title="Snippets"><img height="32" width="32" src="/${base}/images/snippet.svg" /></a></li>
-		<li <#if springMacroRequestContext.requestUri?contains("/initiators")> class="active"</#if>><a href="/${base}/initiators" data-bs-toggle="tooltip" data-bs-title="Initiators"><img height="32" width="32" src="/${base}/images/double_chevron_right.svg" /></a></li>
+		<li <#if springMacroRequestContext.requestUri?contains("/initiators")> class="active"</#if>><a href="/${base}/initiators" data-bs-toggle="tooltip" data-bs-title="Initiators"><img height="32" width="32" src="/${base}/images/play.svg" /></a></li>
 		<li <#if springMacroRequestContext.requestUri?contains("/logs")> class="active"</#if>><a href="/${base}/logs?logLevel=ERROR" data-bs-toggle="tooltip" data-bs-title="Logs"><img height="32" width="32" src="/${base}/images/history.svg" /></a></li>
 		<li <#if springMacroRequestContext.requestUri?contains("/processes")> class="active"</#if>><a href="/${base}/processes?superProcInstId=null" data-bs-toggle="tooltip" data-bs-title="Processes"><img height="32" width="32" src="/${base}/images/checklist.svg" /></a></li>
 		<li <#if springMacroRequestContext.requestUri?contains("/configuration")> class="active"</#if>><a href="/${base}/configuration" data-bs-toggle="tooltip" data-bs-title="Configuration"><img height="32" width="32" src="/${base}/images/utility_wrench-dark.svg" /></a></li>