From 75a6efec10f9d8124356b4cf8105c82a03d5ef8f Mon Sep 17 00:00:00 2001
From: Elliott Stoneham <elliott.stoneham@gmail.com>
Date: Wed, 29 Jun 2016 18:10:38 +0100
Subject: [PATCH] add issue numbers

---
 .../components/section/github/type-editor.hbs |  2 +-
 documize/section/github/github.go             | 13 ++++--------
 documize/section/github/model.go              | 21 +++++++++++--------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/app/app/templates/components/section/github/type-editor.hbs b/app/app/templates/components/section/github/type-editor.hbs
index c0f5c770..40fe2d70 100644
--- a/app/app/templates/components/section/github/type-editor.hbs
+++ b/app/app/templates/components/section/github/type-editor.hbs
@@ -70,7 +70,7 @@
 										{{else}}
 											<i class="material-icons widget-checkbox checkbox-gray github-list-checkbox">check_box_outline_blank</i>
 										{{/if}}
-										<span style="background-color:#{{list.color}}" class="github-list-title">{{list.name}}</span>
+										<span class="github-list-title"><span class="github-issue-label" style="background-color:#{{list.color}}">{{list.name}}</span></span>
 									</div>
 								{{/each}}
 								<div class="clearfix" />
diff --git a/documize/section/github/github.go b/documize/section/github/github.go
index aed62619..378c0ec1 100644
--- a/documize/section/github/github.go
+++ b/documize/section/github/github.go
@@ -409,14 +409,10 @@ func (*Provider) getIssues(client *gogithub.Client, config githubConfig) ([]gith
 
 	for _, v := range guff {
 		n := ""
-		a := ""
-		p := v.User
-		if p != nil {
-			if p.Name != nil {
-				n = *p.Name
-			}
-			if p.AvatarURL != nil {
-				a = *p.AvatarURL
+		ptr := v.User
+		if ptr != nil {
+			if ptr.Login != nil {
+				n = *ptr.Login
 			}
 		}
 		l := ""
@@ -427,7 +423,6 @@ func (*Provider) getIssues(client *gogithub.Client, config githubConfig) ([]gith
 			Name:    n,
 			Message: *v.Title,
 			Date:    v.CreatedAt.Format("January 2 2006, 15:04"),
-			Avatar:  a,
 			URL:     template.URL(*v.HTMLURL),
 			Labels:  template.HTML(l),
 			ID:      *v.Number,
diff --git a/documize/section/github/model.go b/documize/section/github/model.go
index 2d086ded..03b262a6 100644
--- a/documize/section/github/model.go
+++ b/documize/section/github/model.go
@@ -114,15 +114,18 @@ var renderTemplates = map[string]string{
 	<ul class="github-list">
 		{{range $data := .IssueNumActivity}}
 			<li class="github-commit-item">
-				<a class="link" href="{{$data.URL}}">
-					<div class="github-avatar">
-						<img alt="@{{$data.Name}}" src="{{$data.Avatar}}" height="36" width="36">
-					</div>
-					<div class="github-commit-body">
-						<div class="github-commit-title">{{$data.Event}}: {{$data.Message}}</div>
-						<div class="github-commit-meta">{{$data.Name}} committed on {{$data.Date}}</div>
-					</div>
-				</a>
+				<div class="github-avatar">
+					<img alt="@{{$data.Name}}" src="{{$data.Avatar}}" height="36" width="36">
+				</div>
+				<div class="github-commit-body">
+					<div class="github-commit-title">
+						<a class="link" href="{{$data.URL}}">
+							{{$data.Event}}: 
+						</a>
+						{{$data.Message}}
+					</div> 
+					<div class="github-commit-meta">{{$data.Name}} committed on {{$data.Date}}</div>
+				</div>
 				<div class="clearfix" />
 			</li>
 		{{end}}