Commit 35755b9c authored by Andrew Gerrand's avatar Andrew Gerrand

dashboard: improve formatting of build status page

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5493077
parent 9b3799aa
...@@ -148,7 +148,9 @@ var uiTemplate = template.Must( ...@@ -148,7 +148,9 @@ var uiTemplate = template.Must(
template.New("ui"). template.New("ui").
Funcs(template.FuncMap{ Funcs(template.FuncMap{
"builderTitle": builderTitle, "builderTitle": builderTitle,
"shortDesc": shortDesc,
"shortHash": shortHash, "shortHash": shortHash,
"shortUser": shortUser,
"repoURL": repoURL, "repoURL": repoURL,
}). }).
ParseFile("build/ui.html"), ParseFile("build/ui.html"),
...@@ -159,7 +161,15 @@ func builderTitle(s string) string { ...@@ -159,7 +161,15 @@ func builderTitle(s string) string {
return strings.Replace(s, "-", " ", -1) return strings.Replace(s, "-", " ", -1)
} }
// shortHash returns a the short version of a hash. // shortDesc returns the first line of a description.
func shortDesc(desc string) string {
if i := strings.Index(desc, "\n"); i != -1 {
desc = desc[:i]
}
return desc
}
// shortHash returns a short version of a hash.
func shortHash(hash string) string { func shortHash(hash string) string {
if len(hash) > 12 { if len(hash) > 12 {
hash = hash[:12] hash = hash[:12]
...@@ -167,6 +177,17 @@ func shortHash(hash string) string { ...@@ -167,6 +177,17 @@ func shortHash(hash string) string {
return hash return hash
} }
// shortUser returns a shortened version of a user string.
func shortUser(user string) string {
if i, j := strings.Index(user, "<"), strings.Index(user, ">"); i != -1 && j > i {
user = user[i+1 : j]
if k := strings.Index(user, "@golang.org"); k != -1 {
user = user[:k]
}
}
return user
}
// repoRe matches Google Code repositories and subrepositories (without paths). // repoRe matches Google Code repositories and subrepositories (without paths).
var repoRe = regexp.MustCompile(`^code\.google\.com/p/([a-z0-9\-]+)(\.[a-z0-9\-]+)?$`) var repoRe = regexp.MustCompile(`^code\.google\.com/p/([a-z0-9\-]+)(\.[a-z0-9\-]+)?$`)
......
...@@ -29,11 +29,15 @@ ...@@ -29,11 +29,15 @@
.build tr:nth-child(2n) { .build tr:nth-child(2n) {
background-color: #f0f0f0; background-color: #f0f0f0;
} }
.build .hash {
font-family: monospace;
}
.build .result { .build .result {
text-align: center; text-align: center;
width: 50px; width: 50px;
} }
.build .time { .build .time {
font-family: monospace;
color: #666; color: #666;
} }
.build .descr, .build .time, .build .user { .build .descr, .build .time, .build .user {
...@@ -83,9 +87,9 @@ ...@@ -83,9 +87,9 @@
{{end}} {{end}}
</td> </td>
{{end}} {{end}}
<td class="user">{{.User}}</td> <td class="user">{{shortUser .User}}</td>
<td class="time">{{.Time.Time}}</td> <td class="time">{{.Time.Time.Format "02 Jan 2006 15:04"}}</td>
<td class="desc">{{.Desc}}</td> <td class="desc">{{shortDesc .Desc}}</td>
</tr> </tr>
{{end}} {{end}}
</table> </table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment