Skip to content

Commit 4b2a00d

Browse files
dmitshurdmitshur
committed
cmd/coordinator: unify headers visually
A header is displayed on 3 pages: • farmer.golang.org - the coordinator status page • farmer.golang.org/builders - list of builders • build.golang.org - the build dashboard page (now served by coordinator) They look slightly different visually. There's also no good way to navigate from the dashboard back to coordinator status page. This change makes them all look the same, making it easier to refactor them in the future, and improves ability to navigate. Apply the same change to the work-in-progress dashboard V2 page, to keep it in sync. For golang/go#34744. Fixes golang/go#47477. Change-Id: Ib17d3e2955fa42afbb4bccb249ec5a8786ceab6e Reviewed-on: https://go-review.googlesource.com/c/build/+/340116 Run-TryBot: Dmitri Shuralyov <[email protected]> TryBot-Result: Go Bot <[email protected]> Trust: Dmitri Shuralyov <[email protected]> Trust: Alexander Rakoczy <[email protected]> Reviewed-by: Alexander Rakoczy <[email protected]> Reviewed-by: Carlos Amedee <[email protected]>
1 parent a3a479a commit 4b2a00d

File tree

6 files changed

+61
-17
lines changed

6 files changed

+61
-17
lines changed

‎cmd/coordinator/builders.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,14 @@ var buildersTmpl = template.Must(template.New("builders").Parse(`
4747
<head><link rel="stylesheet" href="/style.css"/><title>Go Farmer</title></head>
4848
<body>
4949
<header>
50-
<h1>Go Build Coordinator</h1>
50+
<h1>
51+
<a href="/">Go Build Coordinator</a>
52+
</h1>
5153
<nav>
52-
<a href="https://build.golang.org">Dashboard</a>
53-
<a href="/builders">Builders</a>
54+
<ul>
55+
<li><a href="https://build.golang.org/">Dashboard</a></li>
56+
<li><a href="/builders">Builders</a></li>
57+
</ul>
5458
</nav>
5559
<div class="clear"></div>
5660
</header>

‎cmd/coordinator/internal/dashboard/dashboard.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,15 @@
4040

4141
<body class="Dashboard">
4242
<header class="Dashboard-topbar">
43-
<h1>Go Dashboard</h1>
43+
<h1>
44+
<a href="/">Go Build Coordinator</a>
45+
</h1>
46+
<nav>
47+
<ul>
48+
<li><a href="/dashboard">Dashboard</a></li>
49+
<li><a href="/builders">Builders</a></li>
50+
</ul>
51+
</nav>
4452
</header>
4553

4654
<form action="../.." method="GET">

‎cmd/coordinator/internal/legacydash/static/style.css

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,31 @@ dd { margin: 2px 20px; }
6969
background: #E0EBF5;
7070
}
7171

72-
#topbar a {
73-
color: #222;
74-
}
7572
#topbar h1 {
76-
float: left;
73+
display: inline;
7774
margin: 0;
7875
padding-top: 5px;
7976
}
77+
#topbar h1 a {
78+
color: #375EAB;
79+
text-decoration: none;
80+
}
81+
#topbar h1 a:hover {
82+
text-decoration: underline;
83+
}
8084

8185
#topbar nav {
82-
float: left;
86+
display: inline-block;
8387
margin-left: 20px;
8488
}
89+
#topbar nav ul {
90+
list-style: none;
91+
margin: 0;
92+
padding: 0;
93+
}
94+
#topbar nav ul li {
95+
display: inline-block;
96+
}
8597
#topbar nav a {
8698
display: inline-block;
8799
padding: 10px;

‎cmd/coordinator/internal/legacydash/ui.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,15 @@
2020

2121
<body>
2222
<header id="topbar">
23-
<h1>Go Dashboard</h1>
23+
<h1>
24+
<a href="https://farmer.golang.org/">Go Build Coordinator</a>
25+
</h1>
26+
<nav>
27+
<ul>
28+
<li><a href="/">Dashboard</a></li>
29+
<li><a href="https://farmer.golang.org/builders">Builders</a></li>
30+
</ul>
31+
</nav>
2432
<div class="clear"></div>
2533
</header>
2634

‎cmd/coordinator/status.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -852,10 +852,14 @@ var statusTmpl = template.Must(template.New("status").Parse(`
852852
<head><link rel="stylesheet" href="/style.css"/><title>Go Farmer</title></head>
853853
<body>
854854
<header>
855-
<h1>Go Build Coordinator</h1>
855+
<h1>
856+
<a href="/">Go Build Coordinator</a>
857+
</h1>
856858
<nav>
857-
<a href="https://build.golang.org">Dashboard</a>
858-
<a href="/builders">Builders</a>
859+
<ul>
860+
<li><a href="https://build.golang.org/">Dashboard</a></li>
861+
<li><a href="/builders">Builders</a></li>
862+
</ul>
859863
</nav>
860864
<div class="clear"></div>
861865
</header>

‎cmd/coordinator/style.css

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,26 @@ header {
4949
margin: -10px -10px 0 -10px;
5050
padding: 10px 10px;
5151
}
52-
header a {
53-
color: #222;
54-
}
5552
header h1 {
5653
display: inline;
5754
margin: 0;
5855
padding-top: 5px;
5956
}
57+
header h1 a {
58+
display: initial;
59+
}
6060
header nav {
6161
display: inline-block;
6262
margin-left: 20px;
6363
}
64+
header nav ul {
65+
list-style: none;
66+
margin: 0;
67+
padding: 0;
68+
}
69+
header nav ul li {
70+
display: inline-block;
71+
}
6472
header nav a {
6573
background: #375eab;
6674
border: 1px solid #375eab;
@@ -98,7 +106,7 @@ table thead tr {
98106
}
99107
.Dashboard-topbar {
100108
margin: 0;
101-
padding: 1rem 0.625rem;
109+
padding: 0.625rem 0.625rem;
102110
}
103111
table.Build tbody tr:nth-child(even) {
104112
background-color: #f4f4f4;

0 commit comments

Comments
 (0)