mirror of
https://github.com/documize/community.git
synced 2025-07-22 06:39:43 +02:00
github UI tidy
This commit is contained in:
Harvey Kandola
parent
9e39153108
commit
bf1b75a527
8 changed files with 214 additions and 247 deletions
|
|
@ -40,77 +40,26 @@
|
|||
}
|
||||
|
||||
.section-github-render {
|
||||
|
||||
h3 {
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
h6 {
|
||||
font-size: 18px;
|
||||
margin: 0;
|
||||
display: inline;
|
||||
}
|
||||
|
||||
h6 a {
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
p {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.github-board {
|
||||
margin-top: 30px;
|
||||
}
|
||||
|
||||
table {
|
||||
margin-left: 0px!important;
|
||||
border: none!important;
|
||||
}
|
||||
|
||||
thead.github th {
|
||||
background-color: #f8f8f8;
|
||||
text-align: left;
|
||||
padding: 4px 30px;
|
||||
font-family: "open_sanssemibold";
|
||||
border-bottom: 1px solid #e1e1e1 !important;
|
||||
}
|
||||
|
||||
tbody.github td {
|
||||
.github-table {
|
||||
margin: 0 !important;
|
||||
border: none !important;
|
||||
line-height: 30px;
|
||||
|
||||
td {
|
||||
border: none !important;
|
||||
padding: 8px 30px !important;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
span.label-private {
|
||||
font-weight: normal;
|
||||
color: #4c4a42;
|
||||
background-color: #ffefc6;
|
||||
padding: 3px 4px;
|
||||
font-size: 12px;
|
||||
border-radius: 2px;
|
||||
box-shadow: inset 0 -1px 0 rgba(0,0,0,0.12);
|
||||
line-height: 1;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
table.label-table {
|
||||
margin-top:30px !important;
|
||||
.heading {
|
||||
font-size: 1.6rem;
|
||||
margin: 30px 0 0 0;
|
||||
}
|
||||
|
||||
table.milestone-table {
|
||||
progress[value] {
|
||||
background-color: #eeeeee;
|
||||
border-radius: 3px;
|
||||
height: 15px;
|
||||
width: 50%;
|
||||
}
|
||||
}
|
||||
|
||||
.github-issue-label {
|
||||
.issue-label {
|
||||
font-size: 11px;
|
||||
color: white;
|
||||
padding: 0px 4px;
|
||||
color: $color-white;
|
||||
padding: 0px 8px;
|
||||
margin-right: 5px;
|
||||
border-radius: 2px;
|
||||
box-shadow: inset 0 -1px 0 rgba(0,0,0,0.12);
|
||||
|
|
@ -118,29 +67,63 @@
|
|||
line-height: 22px;
|
||||
}
|
||||
|
||||
.date-meta {
|
||||
color: #767676;
|
||||
font-size: 13px;
|
||||
}
|
||||
.dataid {
|
||||
color: #767676;
|
||||
font-size: 13px;
|
||||
progress[value] {
|
||||
background-color: $color-off-white;
|
||||
border-radius: 3px;
|
||||
height: 15px;
|
||||
width: 150px;
|
||||
}
|
||||
|
||||
.repo {
|
||||
font-size: 16px;
|
||||
.progress-meta {
|
||||
color: $color-gray;
|
||||
font-size: 1rem;
|
||||
font-family: "arial";
|
||||
}
|
||||
|
||||
.contributor-name {
|
||||
line-height: 15px;
|
||||
}
|
||||
|
||||
.milestone-name, .issue-name, .contributor-name {
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
|
||||
.milestone-symbol {
|
||||
padding-top: 3px;
|
||||
}
|
||||
|
||||
.issue-symbol {
|
||||
padding-top: 3px;
|
||||
}
|
||||
|
||||
.contributor-meta {
|
||||
line-height: 30px;
|
||||
}
|
||||
|
||||
.milestone-meta, .issue-meta, .contributor-meta {
|
||||
color: $color-gray;
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
||||
.github-avatar {
|
||||
border-radius: 4px;
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
}
|
||||
|
||||
.branch {
|
||||
font-family: "open_sanssemibold";
|
||||
}
|
||||
|
||||
.milestone {
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
.github-avatar {
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
// span.label-private {
|
||||
// font-weight: normal;
|
||||
// color: #4c4a42;
|
||||
// background-color: #ffefc6;
|
||||
// padding: 3px 4px;
|
||||
// font-size: 12px;
|
||||
// border-radius: 2px;
|
||||
// box-shadow: inset 0 -1px 0 rgba(0,0,0,0.12);
|
||||
// line-height: 1;
|
||||
// margin-left: 10px;
|
||||
// }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,9 +13,8 @@ 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}}
|
||||
|
|
@ -25,69 +24,71 @@ const commitsTemplate = `
|
|||
{{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}}
|
||||
</p>
|
||||
|
||||
<table class="contributor-table" style="width:100%;">
|
||||
<tbody class="github">
|
||||
<div class="margin-top-20"></div>
|
||||
<table class="github-table no-width">
|
||||
<tbody>
|
||||
{{range $stats := .AuthorStats}}
|
||||
<tr>
|
||||
<td class="width-5">
|
||||
<img class="github-avatar" alt="@{{$stats.Author}}" src="{{$stats.Avatar}}" height="36" width="36">
|
||||
<td class="no-width">
|
||||
<img class="github-avatar" alt="@{{$stats.Author}}" src="{{$stats.Avatar}}" />
|
||||
</td>
|
||||
|
||||
<td class="width-95">
|
||||
<h6>{{$stats.Author}}</h6>
|
||||
<td>
|
||||
<div class="contributor-name">{{$stats.Author}}</div>
|
||||
<div class="contributor-meta">
|
||||
{{if gt $stats.OpenIssues 0}}
|
||||
has been assigned {{$stats.OpenIssues}}
|
||||
{{if eq 1 $stats.OpenIssues}} issue,
|
||||
{{else}} issues, {{end}}
|
||||
assigned {{$stats.OpenIssues}}
|
||||
{{if eq 1 $stats.OpenIssues}} issue
|
||||
{{else}} issues {{end}}
|
||||
{{end}}
|
||||
{{if gt $stats.ClosedIssues 0}}
|
||||
{{$stats.ClosedIssues}} have been closed,
|
||||
· {{$stats.ClosedIssues}} closed
|
||||
{{end}}
|
||||
|
||||
{{if gt $stats.CommitCount 0}}
|
||||
has made {{$stats.CommitCount}}
|
||||
{{if gt $stats.OpenIssues 0}} · {{end}}
|
||||
{{if gt $stats.ClosedIssues 0}} · {{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}}
|
||||
<br>
|
||||
{{range $repo := $stats.Repos}} {{$repo}}, {{end}}
|
||||
on {{len $stats.Repos}} {{if eq 1 (len $stats.Repos)}} branch {{else}} branches {{end}}
|
||||
{{range $repo := $stats.Repos}} · {{$repo}} {{end}}
|
||||
{{end}}
|
||||
</div>
|
||||
<div class="margin-top-10"></div>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
</table>
|
||||
{{end}}
|
||||
{{end}}
|
||||
|
||||
{{if .HasCommits}}
|
||||
<h3>Commits</h3>
|
||||
<p> There are {{len .BranchCommits}} commits by {{.NumContributors}} contributors
|
||||
across {{.RepoCount}}
|
||||
{{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>
|
||||
<table class="contributor-table" style="width:100%;">
|
||||
<tbody class="github">
|
||||
<div class="margin-top-20"></div>
|
||||
<table class="github-table no-width">
|
||||
<tbody>
|
||||
{{range $commit := .BranchCommits}}
|
||||
<tr>
|
||||
<td style="width:5%;">
|
||||
<img class="github-avatar" alt="@{{$commit.Name}}" src="{{$commit.Avatar}}" height="36" width="36">
|
||||
<td style="no-width">
|
||||
<img class="github-avatar" alt="@{{$commit.Name}}" src="{{$commit.Avatar}}" />
|
||||
</td>
|
||||
<td style="width:45%;">
|
||||
<td>
|
||||
{{if $commit.ShowUser}}
|
||||
<h6>{{$commit.Name}}</h6>
|
||||
<div class="contributor-name"><a href="{{$commit.URL}}">{{$commit.Message}}</a></div>
|
||||
{{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>
|
||||
<div class="contributor-meta">
|
||||
{{$commit.Name}}
|
||||
{{if $commit.ShowDate}} · {{$commit.Date}} {{end}}
|
||||
{{if $commit.ShowBranch}} · {{$commit.Repo}}:<span class="bold">{{$commit.Branch}}</span>{{end}}
|
||||
</div>
|
||||
<div class="margin-top-10"></div>
|
||||
</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
</table>
|
||||
{{end}}
|
||||
{{end}}
|
||||
|
||||
</div>
|
||||
`
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,24 +38,14 @@ 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}}
|
||||
{{end}}
|
||||
{{end}}
|
||||
</p>
|
||||
<div class="github-board">
|
||||
|
||||
<table class="issue-table width-100">
|
||||
<tbody class="github">
|
||||
<div class="margin-top-20"></div>
|
||||
<table class="github-table no-width">
|
||||
<tbody>
|
||||
{{range $data := .Issues}}
|
||||
<tr>
|
||||
<td class="width-5">
|
||||
<div class="issue-avatar">
|
||||
<td class="no-width">
|
||||
<div class="issue-symbol">
|
||||
{{if $data.IsOpen}}
|
||||
` + openIsvg + `
|
||||
{{else}}
|
||||
|
|
@ -63,22 +53,16 @@ const (
|
|||
{{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><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}} · {{$data.Repo}} · {{$data.Milestone}} · {{$data.Creator}} opened on {{$data.Date}}</span>
|
||||
<div>{{$data.Labels}}</div>
|
||||
</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
|
||||
</table>
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
`
|
||||
|
|
|
|||
|
|
@ -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) + ""
|
||||
|
|
|
|||
|
|
@ -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,12 +40,13 @@ 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">
|
||||
<div class="margin-top-20"></div>
|
||||
<table class="github-table no-width">
|
||||
<tbody>
|
||||
{{range $data := .Milestones}}
|
||||
<tr>
|
||||
<td style="width:5%;">
|
||||
<td class="no-width">
|
||||
<div class="milestone-symbol">
|
||||
{{if $data.IsMilestone}}
|
||||
{{if $data.IsOpen}}
|
||||
` + openMSsvg + `
|
||||
|
|
@ -54,27 +54,29 @@ const (
|
|||
` + closedMSsvg + `
|
||||
{{end}}
|
||||
{{end}}
|
||||
</div>
|
||||
</td>
|
||||
<td class="width-55">
|
||||
<h6>{{$data.Name}}</h6>
|
||||
<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="date-meta">{{$data.DueDate}}</span>
|
||||
{{end}}<br>
|
||||
<span class="repo"><a class="link" href="{{$data.URL}}">{{$data.Repo}}</a></span>
|
||||
<span class="milestone-meta">· {{$data.DueDate}}</span>
|
||||
{{end}}
|
||||
</td>
|
||||
<td class="width-40">
|
||||
<td><div class="margin-left-150"></div></td>
|
||||
<td class="no-width">
|
||||
{{if $data.IsMilestone}}
|
||||
<progress value="{{$data.Progress}}" max="100"></progress> <br>
|
||||
{{$data.CompleteMsg}} complete {{$data.OpenIssues}} open {{$data.ClosedIssues}} closed
|
||||
<progress value="{{$data.Progress}}" max="100"></progress>
|
||||
<div class="progress-meta"><span class="bold color-off-black">{{$data.CompleteMsg}}</span> complete <span class="bold color-off-black">{{$data.OpenIssues}}</span> open <span class="bold color-off-black">{{$data.ClosedIssues}}</span> closed</div>
|
||||
{{else}}
|
||||
{{$data.OpenIssues}} open {{$data.ClosedIssues}} closed
|
||||
<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>
|
||||
`
|
||||
|
|
|
|||
|
|
@ -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,20 +24,19 @@ 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">
|
||||
<table class="github-table">
|
||||
<tbody>
|
||||
{{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>
|
||||
<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>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue