dashboard/app: tidy up UIs

Show short kernel repo/branch aliases,
also slightly reshuffle and tidy up tables.

7 files changed, 58 insertions, 55 deletions

diff --git a/dashboard/app/bug.html b/dashboard/app/bug.html
index 1836a2bc0..98ca6aff3 100644
--- a/dashboard/app/bug.html
+++ b/dashboard/app/bug.html
@@ -46,7 +46,7 @@ Page with details about a single bug.
 			<tr>
 				<td class="manager">{{$c.Manager}}</td>
 				<td class="time">{{formatTime $c.Time}}</td>
-				<td class="kernel" title="{{$c.KernelRepo}}/{{$c.KernelBranch}}">{{$c.KernelRepo}}/{{$c.KernelBranch}}</td>
+				<td class="kernel" title="{{$c.KernelAlias}}">{{$c.KernelAlias}}</td>
 				<td class="tag">{{$c.KernelCommit}}</td>
 				<td class="tag">{{$c.SyzkallerCommit}}</td>
 				<td class="config"><a href="{{$c.KernelConfigLink}}">.config</a></td>
diff --git a/dashboard/app/common.html b/dashboard/app/common.html
deleted file mode 100644
index 74785b105..000000000
--- a/dashboard/app/common.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{{define "header"}}
-	<header id="topbar">
-		<table class="position_table">
-			<tr>
-				<td>
-					<h1><a href="/">syzkaller</a></h1>
-				</td>
-				<td class="search">
-					<a href="https://github.com/google/syzkaller/blob/master/docs/found_bugs.md" target="_blank">found bugs</a> |
-					<a href="https://groups.google.com/forum/#!forum/syzkaller" target="_blank">mailing list</a> |
-					<a href="https://github.com/google/syzkaller" target="_blank">github</a>
-				</td>
-			</tr>
-		</table>
-	</header>
-	<br>
-{{end}}
diff --git a/dashboard/app/entities.go b/dashboard/app/entities.go
index 8036eb5e4..a444235df 100644
--- a/dashboard/app/entities.go
+++ b/dashboard/app/entities.go
@@ -339,7 +339,11 @@ func bugReportingHash(bugHash, reporting string) string {
 }
 
 func kernelRepoInfo(build *Build) KernelRepo {
-	repoID := build.KernelRepo + "/" + build.KernelBranch
+	return kernelRepoInfoRaw(build.KernelRepo, build.KernelBranch)
+}
+
+func kernelRepoInfoRaw(repo, branch string) KernelRepo {
+	repoID := repo + "/" + branch
 	info := config.KernelRepos[repoID]
 	if info.Alias == "" {
 		info.Alias = repoID
diff --git a/dashboard/app/main.go b/dashboard/app/main.go
index e7cef081b..383ea0cc2 100644
--- a/dashboard/app/main.go
+++ b/dashboard/app/main.go
@@ -54,8 +54,7 @@ type uiManager struct {
 type uiBuild struct {
 	Time             time.Time
 	SyzkallerCommit  string
-	KernelRepo       string
-	KernelBranch     string
+	KernelAlias      string
 	KernelCommit     string
 	KernelConfigLink string
 }
@@ -117,8 +116,7 @@ type uiJob struct {
 	Manager         string
 	BugTitle        string
 	BugID           string
-	KernelRepo      string
-	KernelBranch    string
+	KernelAlias     string
 	KernelCommit    string
 	PatchLink       string
 	Attempts        int
@@ -452,8 +450,7 @@ func makeUIBuild(build *Build) *uiBuild {
 	return &uiBuild{
 		Time:             build.Time,
 		SyzkallerCommit:  build.SyzkallerCommit,
-		KernelRepo:       build.KernelRepo,
-		KernelBranch:     build.KernelBranch,
+		KernelAlias:      kernelRepoInfo(build).Alias,
 		KernelCommit:     build.KernelCommit,
 		KernelConfigLink: textLink("KernelConfig", build.KernelConfig),
 	}
@@ -541,8 +538,7 @@ func loadRecentJobs(c context.Context) ([]*uiJob, error) {
 			Namespace:       job.Namespace,
 			Manager:         job.Manager,
 			BugTitle:        job.BugTitle,
-			KernelRepo:      job.KernelRepo,
-			KernelBranch:    job.KernelBranch,
+			KernelAlias:     kernelRepoInfoRaw(job.KernelRepo, job.KernelBranch).Alias,
 			PatchLink:       textLink("Patch", job.Patch),
 			Attempts:        job.Attempts,
 			Started:         job.Started,
diff --git a/dashboard/app/main.html b/dashboard/app/main.html
index 5007ec533..7be70c538 100644
--- a/dashboard/app/main.html
+++ b/dashboard/app/main.html
@@ -41,7 +41,7 @@ Main page.
 				<td><a href="{{$mgr.Link}}">{{$mgr.Namespace}}/{{$mgr.Name}}</a></td>
 				<td class="stat {{if $mgr.LastActiveBad}}bad{{end}}">{{formatLateness $.Now $mgr.LastActive}}</td>
 				{{if $mgr.CurrentBuild}}
-					<td class="stat" title="{{$mgr.CurrentBuild.KernelRepo}}/{{$mgr.CurrentBuild.KernelBranch}}/{{$mgr.CurrentBuild.KernelCommit}} (syzkaller {{$mgr.CurrentBuild.SyzkallerCommit}})">{{formatLateness $.Now $mgr.CurrentBuild.Time}}</td>
+					<td class="stat" title="{{$mgr.CurrentBuild.KernelAlias}}/{{$mgr.CurrentBuild.KernelCommit}} (syzkaller {{$mgr.CurrentBuild.SyzkallerCommit}})">{{formatLateness $.Now $mgr.CurrentBuild.Time}}</td>
 				{{else}}
 					<td></td>
 				{{end}}
@@ -60,48 +60,44 @@ Main page.
 	<table class="list_table" id="jobs">
 		<caption>Recent jobs:</caption>
 		<tr>
+			<th>Bug</th>
 			<th>Created</th>
 			<th>Started</th>
 			<th>Finished</th>
 			<th>User</th>
-			<th>Bug</th>
 			<th>Patch</th>
-			<th>Reporting</th>
-			<th>Manager</th>
 			<th>Repo</th>
+			<th>Manager</th>
 			<th>Result</th>
 		</tr>
 		{{range $job := $.Jobs}}
 			<tr>
+				<td class="title"><a href="{{$job.BugLink}}">{{$job.BugTitle}}</a></td>
 				<td class="time">{{if $job.ExternalLink}}<a href="{{$job.ExternalLink}}">{{formatTime $job.Created}}</a>{{else}}{{formatTime $job.Created}}{{end}}</td>
 				<td class="time">{{formatTime $job.Started}}{{if gt $job.Attempts 1}} ({{$job.Attempts}}){{end}}</td>
 				<td class="time">{{formatTime $job.Finished}}</td>
 				<td>{{$job.User}}</td>
-				<td class="title"><a href="{{$job.BugLink}}">{{$job.BugTitle}}</a></td>
 				<td><a href="{{$job.PatchLink}}">patch</a></td>
-				<td>{{$job.Namespace}}/{{$job.Reporting}}</td>
-				<td>{{$job.Manager}}</td>
-				<td>{{$job.KernelRepo}}/{{$job.KernelBranch}}</td>
-				<td>
-					{{if $job.ErrorLink}}
-						<a href="{{$job.ErrorLink}}">error</a>
-					{{else if $job.CrashTitle}}
+				<td class="kernel" title="{{$job.KernelAlias}}">{{$job.KernelAlias}}</td>
+				<td title="{{$job.Namespace}}/{{$job.Reporting}}">{{$job.Manager}}</td>
+				{{if $job.ErrorLink}}
+					<td class="result"><a href="{{$job.ErrorLink}}">error</a></td>
+				{{else if $job.CrashTitle}}
+					<td class="result" title="{{$job.CrashTitle}}">
 						{{if $job.CrashReportLink}}
-							<a href="{{$job.CrashReportLink}}">{{$job.CrashTitle}}</a>
-						{{else}}
-							{{$job.CrashTitle}}
+							<a href="{{$job.CrashReportLink}}">report</a>
 						{{end}}
 						{{if $job.CrashLogLink}}
-							 (<a href="{{$job.CrashLogLink}}">log</a>)
+							 <a href="{{$job.CrashLogLink}}">log</a>
 						{{end}}
-					{{else if formatTime $job.Finished}}
-						OK
-					{{else if formatTime $job.Started}}
-						running
-					{{else}}
-						pending
-					{{end}}
-				</td>
+					</td>
+				{{else if formatTime $job.Finished}}
+					<td class="result">OK</td>
+				{{else if formatTime $job.Started}}
+					<td class="result">running</td>
+				{{else}}
+					<td class="result">pending</td>
+				{{end}}
 			</tr>
 		{{end}}
 	</table>
diff --git a/dashboard/app/static/style.css b/dashboard/app/static/style.css
index 5ef180b99..5f0402b27 100644
--- a/dashboard/app/static/style.css
+++ b/dashboard/app/static/style.css
@@ -99,13 +99,18 @@ table td, table th {
 }
 
 .list_table .kernel {
-	width: 200pt;
-	max-width: 200pt;
+	width: 60pt;
+	max-width: 60pt;
 }
 
 .list_table .maintainers {
-	width: 300pt;
-	max-width: 300pt;
+	width: 150pt;
+	max-width: 150pt;
+}
+
+.list_table .result {
+	width: 60pt;
+	max-width: 60pt;
 }
 
 .list_table .stat {
diff --git a/dashboard/app/templates.html b/dashboard/app/templates.html
index 90c0c1555..788a1ce69 100644
--- a/dashboard/app/templates.html
+++ b/dashboard/app/templates.html
@@ -3,6 +3,25 @@ Copyright 2017 syzkaller project authors. All rights reserved.
 Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 */}}
 
+{{/* Common page header, invoked with *uiHeader */}}
+{{define "header"}}
+	<header id="topbar">
+		<table class="position_table">
+			<tr>
+				<td>
+					<h1><a href="/">syzkaller</a></h1>
+				</td>
+				<td class="search">
+					<a href="https://groups.google.com/forum/#!forum/syzkaller-bugs" target="_blank">found bugs</a> |
+					<a href="https://groups.google.com/forum/#!forum/syzkaller" target="_blank">mailing list</a> |
+					<a href="https://github.com/google/syzkaller" target="_blank">github</a>
+				</td>
+			</tr>
+		</table>
+	</header>
+	<br>
+{{end}}
+
 {{/* List of bugs, invoked with *uiBugGroup */}}
 {{define "bug_list"}}
 {{if .}}