github UI tidy

core/section/github/commits_template.go

@@ -13,81 +13,82 @@ package github
 
 const commitsTemplate = `
 <div class="section-github-render">
-{{if .HasAuthorStats}}
-	<h3>Contributors</h3>
+	{{if .HasAuthorStats}}
+		<div class="heading">Contributors</div>
+		<p>
+			There
+			{{if eq 1 .NumContributors}}is{{else}}are{{end}}
+			{{.NumContributors}}
+			{{if eq 1 .NumContributors}}contributor{{else}}contributors{{end}}
+			across {{.RepoCount}}
+			{{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}}
+		</p>
 
-	<p>
-		There
-		{{if eq 1 .NumContributors}}is{{else}}are{{end}}
-		{{.NumContributors}}
-		{{if eq 1 .NumContributors}}contributor{{else}}contributors{{end}}
-		across {{.RepoCount}}
-		{{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}}
-	</p>
+		<div class="margin-top-20"></div>
+		<table class="github-table no-width">
+			<tbody>
+				{{range $stats := .AuthorStats}}
+					<tr>
+						<td class="no-width">
+							<img class="github-avatar" alt="@{{$stats.Author}}" src="{{$stats.Avatar}}" />
+						</td>
+						<td>
+							<div class="contributor-name">{{$stats.Author}}</div>
+							<div class="contributor-meta">
+								{{if gt $stats.OpenIssues 0}}
+									assigned {{$stats.OpenIssues}}
+									{{if eq 1 $stats.OpenIssues}} issue
+								 	{{else}} issues {{end}}
+								{{end}}
+								{{if gt $stats.ClosedIssues 0}}
+									 &middot; {{$stats.ClosedIssues}} closed
+								{{end}}
+								{{if gt $stats.CommitCount 0}}
+									{{if gt $stats.OpenIssues 0}} &middot; {{end}}
+									{{if gt $stats.ClosedIssues 0}} &middot; {{end}}
+									made {{$stats.CommitCount}}
+									{{if eq 1 $stats.CommitCount}} commit {{else}} commits {{end}}
+									on {{len $stats.Repos}} {{if eq 1 (len $stats.Repos)}} branch {{else}} branches {{end}}
+									{{range $repo := $stats.Repos}}	&middot; {{$repo}} {{end}}
+								{{end}}
+							</div>
+							<div class="margin-top-10"></div>
+						</td>
+					</tr>
+				{{end}}
+			</tbody>
+		</table>
+	{{end}}
 
-	<table class="contributor-table" style="width:100%;">
-		<tbody class="github">
-		{{range $stats := .AuthorStats}}
-			<tr>
-				<td class="width-5">
-					<img class="github-avatar" alt="@{{$stats.Author}}" src="{{$stats.Avatar}}" height="36" width="36">
-				</td>
-
-				<td class="width-95">
-					<h6>{{$stats.Author}}</h6>
-					{{if gt $stats.OpenIssues 0}}
-						has been assigned {{$stats.OpenIssues}}
-						{{if eq 1 $stats.OpenIssues}} issue,
-					 	{{else}} issues, {{end}}
-					 {{end}}
-					 {{if gt $stats.ClosedIssues 0}}
-						{{$stats.ClosedIssues}} have been closed,
-					{{end}}
-
-					{{if gt $stats.CommitCount 0}}
-						has made {{$stats.CommitCount}}
-						{{if eq 1 $stats.CommitCount}} commit {{else}} commits {{end}}
-						on {{len $stats.Repos}} {{if eq 1 (len $stats.Repos)}} branch. {{else}} branches. {{end}}
-						<br>
-						{{range $repo := $stats.Repos}}	{{$repo}}, {{end}}
-					{{end}}
-				</td>
-
-			</tr>
-		{{end}}
-		</tbody>
-	</table>
-{{end}}
-
-{{if .HasCommits}}
-	<h3>Commits</h3>
-	<p> There are {{len .BranchCommits}} commits by {{.NumContributors}} contributors
-		across {{.RepoCount}}
-		{{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}}
-	</p>
-	<table class="contributor-table" style="width:100%;">
-		<tbody class="github">
-		{{range $commit := .BranchCommits}}
-			<tr>
-				<td style="width:5%;">
-					<img class="github-avatar" alt="@{{$commit.Name}}" src="{{$commit.Avatar}}" height="36" width="36">
-				</td>
-				<td style="width:45%;">
-					{{if $commit.ShowUser}}
-						<h6>{{$commit.Name}}</h6>
-					{{end}}
-					<a class="link" href="{{$commit.URL}}">{{$commit.Message}}</a><br>
-					<span class="date-meta">{{if $commit.ShowDate}}{{$commit.Date}}{{end}}</span>
-				</td>
-				<td style="width:55%;">
-					{{if $commit.ShowBranch}}{{$commit.Repo}}:<span class="branch">{{$commit.Branch}}</span>{{end}}
-					<br>
-				</td>
-			</tr>
-		{{end}}
-		</tbody>
-	</table>
-{{end}}
+	{{if .HasCommits}}
+		<div class="heading">Commits</div>
+		<p>There are {{len .BranchCommits}} commits by {{.NumContributors}} contributors across {{.RepoCount}}
+			{{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}}
+		</p>
+		<div class="margin-top-20"></div>
+		<table class="github-table no-width">
+			<tbody>
+				{{range $commit := .BranchCommits}}
+					<tr>
+						<td style="no-width">
+							<img class="github-avatar" alt="@{{$commit.Name}}" src="{{$commit.Avatar}}" />
+						</td>
+						<td>
+							{{if $commit.ShowUser}}
+								<div class="contributor-name"><a href="{{$commit.URL}}">{{$commit.Message}}</a></div>
+							{{end}}
+							<div class="contributor-meta">
+								{{$commit.Name}}
+								{{if $commit.ShowDate}}	&middot; {{$commit.Date}} {{end}}
+								{{if $commit.ShowBranch}} &middot; {{$commit.Repo}}:<span class="bold">{{$commit.Branch}}</span>{{end}}
+							</div>
+							<div class="margin-top-10"></div>
+						</td>
+					</tr>
+				{{end}}
+			</tbody>
+		</table>
+	{{end}}
 
 </div>
 `

core/section/github/issues.go

@@ -99,7 +99,7 @@ func wrapLabels(labels []gogithub.Label) (l string, labelNames []string, labelCo
 	for _, ll := range labels {
 		labelNames = append(labelNames, *ll.Name)
 		labelColors = append(labelColors, *ll.Color)
-		l += `<span class="github-issue-label" style="background-color:#` + *ll.Color + `">` + *ll.Name + `</span> `
+		l += `<span class="issue-label" style="background-color:#` + *ll.Color + `">` + *ll.Name + `</span> `
 	}
 	return l, labelNames, labelColors
 }

core/section/github/issues_template.go

@@ -29,7 +29,7 @@ const (
 	issuesTemplate = `
 <div class="section-github-render">
 {{if .HasIssues}}
-	<h3>Issues</h3>
+	<div class="heading">Issues</div>
 	<p>
 		There are {{.ClosedIssues}} closed
 			{{if eq 1 .ClosedIssues}}issue{{else}}issues{{end}}
@@ -38,47 +38,31 @@ const (
 		 across {{.RepoCount}}
 		{{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}}
 	</p>
-	<p>
-		{{if .ShowList}}
-			Including issues labelled
-			{{range $label := .List}}
-				{{if $label.Included}}
-					<span class="github-issue-label" style="background-color:#{{$label.Color}}">{{$label.Name}}</span>
-				{{end}}
+
+	<div class="margin-top-20"></div>
+	<table class="github-table no-width">
+		<tbody>
+			{{range $data := .Issues}}
+				<tr>
+					<td class="no-width">
+						<div class="issue-symbol">
+							{{if $data.IsOpen}}
+								` + openIsvg + `
+							{{else}}
+								` + closedIsvg + `
+							{{end}}
+						</div>
+					</td>
+					<td><div class="margin-left-10"></div></td>
+					<td class="no-width">
+						<div class="issue-name"><a href="{{$data.URL}}">{{$data.Message}} <span class="dataid"></span></a></div>
+						<span class="milestone-meta">#{{$data.ID}} &middot; {{$data.Repo}} &middot; {{$data.Milestone}} &middot; {{$data.Creator}} opened on {{$data.Date}}</span>
+						<div>{{$data.Labels}}</div>
+					</td>
+				</tr>
 			{{end}}
-		{{end}}
-	</p>
-	<div class="github-board">
-
-	<table class="issue-table width-100">
-	    <tbody class="github">
-		{{range $data := .Issues}}
-	        <tr>
-				<td class="width-5">
-					<div class="issue-avatar">
-						{{if $data.IsOpen}}
-							` + openIsvg + `
-						{{else}}
-							` + closedIsvg + `
-						{{end}}
-					</div>
-				</td>
-
-	            <td class="width-55">
-					<h6><a class="link" href="{{$data.URL}}">{{$data.Message}} <span class="dataid">#{{$data.ID}}</span></a></h6> </br>
-					<span class="milestone">{{$data.Milestone}}</span> <span class="issue-label">{{$data.Labels}}</span>
-				</td>
-
-				<td class="width-40">
-					<h6>{{$data.Repo}}</h6> <br>
-					<span class="date-meta">{{$data.Creator}} opened on {{$data.Date}}</span>
-				</td>
-	        </tr>
-		{{end}}
-	    </tbody>
-
+		</tbody>
 	</table>
-	</div>
 {{end}}
 </div>
 `

core/section/github/milestones.go

@@ -111,7 +111,7 @@ func getMilestones(client *gogithub.Client, config *githubConfig) ([]githubMiles
 							}
 						}
 						if include {
-							dd := "No due date."
+							dd := "no due date"
 							if v.DueOn != nil {
 								// TODO refactor to add message in red if the milestone is overdue
 								dd = "due on " + (*v.DueOn).Format(milestonesTimeFormat) + ""

core/section/github/milestones_template.go

@@ -28,10 +28,9 @@ const (
 		</span>
 		`
 	milestonesTemplate = `
-
-	<div class="section-github-render">
+<div class="section-github-render">
 	{{if .HasMilestones}}
-		<h3>Milestones</h3>
+		<div class="heading">Milestones</div>
 		<p>
 			There are
 			{{.ClosedMS}}
@@ -41,40 +40,43 @@ const (
 			open across {{.RepoCount}}
 			{{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}}
 		</p>
-		<div class="github-board">
-		<table class="milestone-table width-100">
-		    <tbody class="github">
-			{{range $data := .Milestones}}
-		        <tr>
-					<td style="width:5%;">
-						{{if $data.IsMilestone}}
-							{{if $data.IsOpen}}
-								` + openMSsvg + `
-							{{else}}
-								` + closedMSsvg + `
+		<div class="margin-top-20"></div>
+		<table class="github-table no-width">
+		    <tbody>
+				{{range $data := .Milestones}}
+			        <tr>
+						<td class="no-width">
+							<div class="milestone-symbol">
+								{{if $data.IsMilestone}}
+									{{if $data.IsOpen}}
+										` + openMSsvg + `
+									{{else}}
+										` + closedMSsvg + `
+									{{end}}
+								{{end}}
+							</div>
+						</td>
+						<td><div class="margin-left-10"></div></td>
+			            <td class="no-width">
+							<div class="milestone-name"><a class="link" href="{{$data.URL}}">{{$data.Name}}</a></div>
+							<span class="milestone-meta">{{$data.Repo}}</span>
+							{{if $data.IsMilestone}}
+								<span class="milestone-meta">&middot; {{$data.DueDate}}</span>
 							{{end}}
-						{{end}}
-					</td>
-		            <td class="width-55">
-					<h6>{{$data.Name}}</h6>
-						{{if $data.IsMilestone}}
-							<span class="date-meta">{{$data.DueDate}}</span>
-						{{end}}<br>
-						<span class="repo"><a class="link" href="{{$data.URL}}">{{$data.Repo}}</a></span>
-					</td>
-		            <td class="width-40">
-						{{if $data.IsMilestone}}
-							<progress value="{{$data.Progress}}" max="100"></progress> <br>
-							{{$data.CompleteMsg}} complete {{$data.OpenIssues}} open {{$data.ClosedIssues}} closed
-						{{else}}
-							{{$data.OpenIssues}} open {{$data.ClosedIssues}} closed
-						{{end}}
-					</td>
-		        </tr>
-			{{end}}
+						</td>
+						<td><div class="margin-left-150"></div></td>
+			            <td class="no-width">
+							{{if $data.IsMilestone}}
+								<progress value="{{$data.Progress}}" max="100"></progress>
+								<div class="progress-meta"><span class="bold color-off-black">{{$data.CompleteMsg}}</span> complete &nbsp;&nbsp;&nbsp;<span class="bold color-off-black">{{$data.OpenIssues}}</span> open &nbsp;&nbsp;&nbsp;<span class="bold color-off-black">{{$data.ClosedIssues}}</span> closed</div>
+							{{else}}
+								<div class="progress-meta"><span class="bold color-off-black">{{$data.OpenIssues}}</span> open <span class="bold color-off-black">{{$data.ClosedIssues}}</span> closed</div>
+							{{end}}
+						</td>
+			        </tr>
+				{{end}}
 		    </tbody>
 		</table>
-		</div>
 	{{end}}
 </div>
 `

core/section/github/summary_template.go

@@ -13,9 +13,7 @@ package github
 
 const summaryTemplate = `
 <div class="section-github-render">
-
-	<p>
-	Activity since {{.Config.Since}}{{.Config.DateMessage}} for {{.Config.Owner}} repositories:
+	<p>Activity since {{.Config.Since}}{{.Config.DateMessage}} for {{.Config.Owner}} repositories:
 		{{range $data := .Config.Lists}}
 			{{if $data.Included}}
 				<a class="link" href="{{$data.URL}}">
@@ -26,22 +24,21 @@ const summaryTemplate = `
 	</p>
 
 	{{if .HasSharedLabels}}
-		<h3>Common Labels</h3>
+		<div class="heading">Labels</div>
 		<p>There
 		{{if eq 1 (len .SharedLabels)}} is {{else}} are {{end}}
 		{{len .SharedLabels}}
 		shared
 		{{if eq 1 (len .SharedLabels)}} label {{else}} labels {{end}}
 		across the repositories.</p>
-		<table class="width-100">
-		    <tbody class="github">
-			{{range $slabel := .SharedLabels}}
-		        <tr>
-		            <td class="width-100">
-						<span class="github-issue-label" style="background-color:#{{$slabel.Color}}">{{$slabel.Name}} ({{$slabel.Count}})</span> in {{$slabel.Repos}}
-					</td>
-		        </tr>
-			{{end}}
+		<table class="github-table">
+		    <tbody>
+				{{range $slabel := .SharedLabels}}
+			        <tr>
+			            <td class="no-width"><span class="issue-label" style="background-color:#{{$slabel.Color}}">{{$slabel.Name}} ({{$slabel.Count}})</span></td>
+						<td>{{$slabel.Repos}}</td>
+			        </tr>
+				{{end}}
 		    </tbody>
 		</table>
 	{{end}}