final fixes1

pradip-allwyn · Apr 23, 2024 · 78ef940 · 78ef940
1 parent 432a04e
commit 78ef940
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/htdocs/css/style.css b/htdocs/css/style.css
@@ -801,8 +801,8 @@ td.table_label {
 		.upcoming.grid-container {
             display: grid;
             grid-template-columns: repeat(auto-fill, minmax(290px, 1fr)); 
-            gap: 12px;
-            padding: 10px;
+            gap: 9px;
+            padding: 8px;
 			direction: ltr;
         }
 
@@ -944,6 +944,10 @@ td.table_label {
 			animation: 4s focus;
 		}
 
+		.upcoming.grid-item.disabled {
+			text-decoration: line-through;
+		}
+
 
 		body.dark .upcoming.schedule.grid-item {
             background-color: #44444444			

diff --git a/htdocs/js/pages/Base.class.js b/htdocs/js/pages/Base.class.js
@@ -80,7 +80,7 @@ Class.subclass(Page, "Page.Base", {
 
 		if (extraTooltip) {
 			if (title.plugin == 'dockerplug') icon = `<span title="${tooltip}" class="mdi mdi-docker"></span>`
-			if (title.plugin == 'shellplug') icon = `<span title="${tooltip}" class="mdi mdi-script"></span>`
+			// if (title.plugin == 'shellplug') icon = `<span title="${tooltip}" class="mdi mdi-script"></span>`
 			if (title.plugin == 'sshxplug' || title.plugin == 'sshplug') icon = `<span title="${tooltip}" class="mdi mdi-console"></span>`
 			if (title.plugin == 'urlplug') icon = `<span title="${tooltip}" class="mdi mdi-web"></span>`
 		}

diff --git a/htdocs/js/pages/Home.class.js b/htdocs/js/pages/Home.class.js
@@ -43,7 +43,7 @@ Class.subclass( Page.Base, "Page.Home", {
 		  <div class="clear"></div>
 		</div>
 
-		<canvas id="d_home_completed_jobs" height="40px"></canvas>
+		<canvas id="d_home_completed_jobs" height="35px"></canvas>
 		<div style="height:10px;"></div>
 
 		<!-- Active jobs -->
@@ -403,7 +403,7 @@ Class.subclass( Page.Base, "Page.Home", {
 					if (stub.epoch - now <= 60) proximity = 'minute'
 
 					xhtml += `
-				<div id="${stub.id}" class="upcoming ${proximity} grid-item">
+				<div id="${stub.id}" class="upcoming ${proximity} grid-item ${tds.className || ''}">
 				 <div class="flex-container">
 				  <div style="text-overflow:ellipsis;overflow:hidden;white-space: nowrap;">${tds[0]}</div>
 				 <div style="font-size:14px"><b>${nice_countdown}</b></div>

diff --git a/htdocs/js/pages/Schedule.class.js b/htdocs/js/pages/Schedule.class.js
@@ -1003,10 +1003,10 @@ Class.subclass(Page.Base, "Page.Schedule", {
 			//<div ><span style="font-size:0.8em" class="color_label green">✓</span></div>	
 			let itemVisibility =  eventView === 'grid' && (!item.active || args.collapse) ? 'none' : 'true'
 			// link item to it's group, avoid for disabled event on basic grid view
-			let itemClass = eventView === 'grid' && !item.active ? '' : tds.className 
+			let itemClass = eventView === 'grid' && !item.active ? '' : (tds.className || '')
 
 			xhtml += `
-			<div id="${item.id}" style="display:${itemVisibility}" class="upcoming schedule grid-item ${itemClass}" onclick="">
+			<div id="${item.id}" style="display:${itemVisibility}" class="upcoming schedule grid-item ${itemClass }" onclick="">
 			 <div class="flex-container schedule">
 			  <div style="text-overflow:ellipsis;overflow:hidden;white-space: nowrap;">${tds[1]}</div>