diff --git a/app/app/styles/section/trello.scss b/app/app/styles/section/trello.scss index 31c09bee..e679962d 100644 --- a/app/app/styles/section/trello.scss +++ b/app/app/styles/section/trello.scss @@ -36,13 +36,18 @@ table.trello-table { border:none!important; - margin-left: 0 !important; + margin-left: 20px !important; margin-bottom: 20px !important; } table.trello-table td { border:none!important; padding: 20px 20px 0 0 !important; + vertical-align: top; + } + + tbody.board-stats td { + padding-right: 40px!important; } span.trello-label { @@ -52,8 +57,21 @@ text-shadow: 0 0 5px rgba(0,0,0,.2),0 0 2px #000; } + span.trello-board { + color: white; + padding: 20px 20px; + width: 190px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + display: inline-block; + border-radius: 4px; + margin-right: 20px; + } + .trello-avatar { border-radius: 3px; + margin-right: 10px; } h6 { @@ -61,6 +79,16 @@ margin: 0; } + p.board-stats { + font-size: 18px; + } + + span.stat-number { + font-family: "open_sanslight"; + font-size: 50px; + margin-right: 15px; + } + > .trello-board { width: 100%; max-height: 600px; diff --git a/core/section/trello/archive_template.go b/core/section/trello/archive_template.go index dae8b02e..d690e2d3 100644 --- a/core/section/trello/archive_template.go +++ b/core/section/trello/archive_template.go @@ -14,29 +14,32 @@ package trello const archiveTemplate = `

Deleted and Archived Cards

Changes since {{.Since}}.

-{{range $b := .Boards}} -
-

For board - - {{$b.Board.Name}} - -

-
- {{range $act := $b.Actions}} - {{if eq $act.Type "deleteCard" }} - Deleted: - {{$act.Data.List.Name}}/{{$act.Data.Card.Name}} - {{$act.Data.Text}} -
- {{end}} - {{end}} - {{range $arch := $b.Archived}} - Archived: - {{$arch.Name}} - {{$arch.Desc}} -
- {{end}} -
-
-{{end}} - -
+
+ + + {{range $b := .Boards}} + + + + + {{end}} + +
+ + {{$b.Board.Name}} + + + {{range $act := $b.Actions}} + {{if eq $act.Type "deleteCard" }} + Deleted: + {{$act.Data.List.Name}} : {{$act.Data.Card.Name}} - {{$act.Data.Text}} + {{end}} + {{end}} + {{range $arch := $b.Archived}} + Archived: + {{$arch.Name}} - {{$arch.Desc}} +
+ {{end}} +
+
` diff --git a/core/section/trello/boards_template.go b/core/section/trello/boards_template.go index 58ac7067..062fd4d5 100644 --- a/core/section/trello/boards_template.go +++ b/core/section/trello/boards_template.go @@ -15,27 +15,49 @@ const boardsTemplate = `

All Boards

Changes since {{.Since}}.

- -

{{len .Boards}} Boards, {{.ListTotal}} Lists, {{.CardTotal}} Cards, {{len .MemberBoardAssign}} Members

- -{{range $b := .Boards}} -
- - {{$b.Board.Name}} - -

There are {{ len $b.Actions }} actions for board

-
- {{range $act, $tot := $b.ActionSummary}} - {{$act}} ({{$tot}}), - {{end}} - {{if gt (len $b.Archived) 0}} - archive card ({{len $b.Archived}}). -
- {{end}} -
-
-{{end}} - - -
+
+ + + + + + + + + +
+ {{len .Boards}} Boards + + {{.ListTotal}} Lists + + {{.CardTotal}} Cards + + {{len .MemberBoardAssign}} Members +
+ + + {{range $b := .Boards}} + + + + + {{end}} + +
+ + {{$b.Board.Name}} + + +
There are {{ len $b.Actions }} actions for this board.
+

+ {{range $act, $tot := $b.ActionSummary}} + {{$act}} ({{$tot}}), + {{end}} + {{if gt (len $b.Archived) 0}} + archive card ({{len $b.Archived}}). +
+ {{end}} +

+
+
` diff --git a/core/section/trello/labels_template.go b/core/section/trello/labels_template.go index a0fb090e..60b809f4 100644 --- a/core/section/trello/labels_template.go +++ b/core/section/trello/labels_template.go @@ -14,7 +14,7 @@ package trello const labelsTemplate = `

Labels

There are {{len .SharedLabels}} common labels across the boards.

-
+
{{range $l := .SharedLabels}} diff --git a/core/section/trello/members_template.go b/core/section/trello/members_template.go index 9527a6dd..9e24671c 100644 --- a/core/section/trello/members_template.go +++ b/core/section/trello/members_template.go @@ -17,20 +17,22 @@ const membersTemplate = ` There are {{len .MemberBoardAssign}} members assigned to {{.CardAssignTotal}} cards of the total {{.CardTotal}} cards across {{len .Boards}} boards.

-
+
{{range $m := .MemberBoardAssign}} - - {{end}}
+ Member Avatar +
{{$m.MemberName}}
- {{range $ac := $m.AssignCounts}} - {{$ac.BoardName}} ({{$ac.Count}}), - {{end}} +

+ {{range $ac := $m.AssignCounts}} + {{$ac.BoardName}} ({{$ac.Count}}), + {{end}} +