cmd/coordinator, perf/app: prepare a placeholder banner

dmitshur · gopherbot · commit f15cdea17d84 · 2024-02-29T21:53:05.000Z
We initially intended for a banner to show up to notify users about a migration affecting the old dashboard. A banner turned out not to be needed at this time. Since it was already prepared and might end up being useful later on, add an invisible placeholder for now. Unfortunately, it would take more refactoring than I was willing to take on at this stage to make it possible for the unified banner to be implemented in one place, so it is instead implemented inline in multiple places. For golang/go#65913. Change-Id: I86fbf17b56711f0855e206e803eff8271019b6a8 Reviewed-on: https://go-review.googlesource.com/c/build/+/567498 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Michael Knyszek <mknyszek@google.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/cmd/coordinator/internal/dashboard/dashboard.html b/cmd/coordinator/internal/dashboard/dashboard.html
@@ -45,6 +45,12 @@
 </head>
 
 <body class="Dashboard">
+{{if false}}<header class="Dashboard-topbar" style="background: antiquewhite;">
+  <div>
+    A banner isn't actively displayed at this time. This serves as a placeholder
+    that can be used if a banner does need to be displayed.
+  </div>
+</header>{{end}}
 <header class="Dashboard-topbar">
   <h1>
     <a href="/">Go Build Coordinator</a>
diff --git a/cmd/coordinator/internal/legacydash/static/style.css b/cmd/coordinator/internal/legacydash/static/style.css
@@ -70,7 +70,7 @@ dd { margin: 2px 20px; }
 
 /* navigation bar */
 
-#topbar {
+.Dashboard-topbar, #topbar {
   padding: 10px 10px;
   background: #E0EBF5;
 }
diff --git a/cmd/coordinator/internal/legacydash/ui.html b/cmd/coordinator/internal/legacydash/ui.html
@@ -37,6 +37,12 @@
   </head>
 
   <body>
+    {{if false}}<header class="Dashboard-topbar" style="background: antiquewhite;">
+      <div>
+        A banner isn't actively displayed at this time. This serves as a placeholder
+        that can be used if a banner does need to be displayed.
+      </div>
+    </header>{{end}}
     <header id="topbar">
       <h1>
         <a href="https://farmer.golang.org/">Go Build Coordinator</a>
diff --git a/cmd/coordinator/style.css b/cmd/coordinator/style.css
@@ -10,7 +10,6 @@ body {
   color: #222;
   font-family: sans-serif;
   margin: 0;
-  padding: 10px;
 }
 h1,
 h2,
@@ -45,7 +44,6 @@ pre {
 }
 header {
   background: #e0ebf5;
-  margin: -10px -10px 0;
   padding: 10px;
 }
 header h1 {
@@ -80,6 +78,9 @@ header nav a {
   padding: 10px;
   text-decoration: none;
 }
+div.page {
+  padding: 10px;
+}
 table {
   border-collapse: collapse;
   font-size: 9pt;
diff --git a/cmd/coordinator/templates/base.html b/cmd/coordinator/templates/base.html
@@ -4,7 +4,14 @@
  license that can be found in the LICENSE file.
 -->
 
-{{define "build-header"}}<header>
+{{define "build-header"}}
+{{if false}}<header class="Dashboard-topbar" style="background: antiquewhite;">
+  <div>
+    A banner isn't actively displayed at this time. This serves as a placeholder
+    that can be used if a banner does need to be displayed.
+  </div>
+</header>{{end}}
+<header>
   <h1>
     <a href="/">Go Build Coordinator</a>
   </h1>
diff --git a/cmd/coordinator/templates/builders.html b/cmd/coordinator/templates/builders.html
@@ -10,6 +10,8 @@
 <body>
 {{template "build-header"}}
 
+<div class="page">
+
 <h2 id='builders'>Defined Builders</h2>
 
 <table>
@@ -40,6 +42,7 @@ <h2 id='hosts'>Defined Host Types (pools)</h2>
     {{end}}
 </table>
 
+</div>
 
 </body>
 </html>
diff --git a/cmd/coordinator/templates/queues.html b/cmd/coordinator/templates/queues.html
@@ -12,6 +12,7 @@
   </head>
   <body class="QueueStats-body">
     {{template "build-header"}}
+    <div class="page">
     <h2>Queues</h2>
     <div class="QueueStats">
       {{range $name, $stats := .Queues}}
@@ -87,5 +88,6 @@ <h2>Queues</h2>
         </div>
       {{end}}
     </div>
+    </div>
   </body>
 </html>
diff --git a/cmd/coordinator/templates/status.html b/cmd/coordinator/templates/status.html
@@ -10,6 +10,8 @@
 <body>
 {{template "build-header"}}
 
+<div class="page">
+
 <h2>Running</h2>
 <p>{{printf "%d" .Total}} total builds; {{printf "%d" .ActiveBuilds}} active ({{.ActiveReverse}} reverse). Uptime {{printf "%s" .Uptime}}. Version {{.Version}}.
 
@@ -81,5 +83,7 @@ <h2 id=disk>Disk Space <a href='#disk'>¶</a></h2>
 <h2 id=fd>File Descriptors <a href='#fd'>¶</a></h2>
 <p>{{.NumFD}}</p>
 
+</div>
+
 </body>
 </html>
diff --git a/perf/app/dashboard/index.html b/perf/app/dashboard/index.html
@@ -16,6 +16,12 @@
 </head>
 
 <body class="Dashboard">
+<!-- header class="Dashboard-topbar" style="background: antiquewhite;">
+	<div>
+		A banner isn't actively displayed at this time. This serves as a placeholder
+		that can be used if a banner does need to be displayed.
+	</div>
+</header -->
 <header class="Dashboard-topbar">
 	<h1>
 		<a href="https://farmer.golang.org/">Go Build Coordinator</a>

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ dd { margin: 2px 20px; }`
`70`	`70`
`71`	`71`	`/* navigation bar */`
`72`	`72`
`73`		`-#topbar {`
	`73`	`+.Dashboard-topbar, #topbar {`
`74`	`74`	`padding: 10px 10px;`
`75`	`75`	`background: #E0EBF5;`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ body {`
`10`	`10`	`color: #222;`
`11`	`11`	`font-family: sans-serif;`
`12`	`12`	`margin: 0;`
`13`		`- padding: 10px;`
`14`	`13`	`}`
`15`	`14`	`h1,`
`16`	`15`	`h2,`
`@@ -45,7 +44,6 @@ pre {`
`45`	`44`	`}`
`46`	`45`	`header {`
`47`	`46`	`background: #e0ebf5;`
`48`		`- margin: -10px -10px 0;`
`49`	`47`	`padding: 10px;`
`50`	`48`	`}`
`51`	`49`	`header h1 {`
`@@ -80,6 +78,9 @@ header nav a {`
`80`	`78`	`padding: 10px;`
`81`	`79`	`text-decoration: none;`
`82`	`80`	`}`
	`81`	`+div.page {`
	`82`	`+ padding: 10px;`
	`83`	`+}`
`83`	`84`	`table {`
`84`	`85`	`border-collapse: collapse;`
`85`	`86`	`font-size: 9pt;`