diff --git a/app/app/styles/section/trello.scss b/app/app/styles/section/trello.scss index e679962d..09be15e8 100644 --- a/app/app/styles/section/trello.scss +++ b/app/app/styles/section/trello.scss @@ -1,3 +1,8 @@ +.section-trello-editor { + +} + + .section-trello-board { width: 100%; padding: 10px; @@ -5,7 +10,6 @@ overflow: auto } - .section-trello-board-title { font-weight: bold; color: #fff; @@ -31,35 +35,51 @@ vertical-align: text-bottom; } - .section-trello-render { + .trello-table { + border: none!important; + margin: 0px !important; - table.trello-table { - border:none!important; - margin-left: 20px !important; - margin-bottom: 20px !important; + td { + border: none !important; + vertical-align: top; + } } - table.trello-table td { - border:none!important; - padding: 20px 20px 0 0 !important; - vertical-align: top; + .heading { + font-size: 1.6rem; + margin: 30px 0 0 0; } - tbody.board-stats td { - padding-right: 40px!important; - } - - span.trello-label { - padding: 4px 10px; - color: white; - border-radius: 3px; + .trello-label { + font-size: 11px; + color: #fff; + padding: 0 8px; + margin-right: 5px; + border-radius: 2px; + box-shadow: inset 0 -1px 0 rgba(0,0,0,.12); + display: inline-block; + line-height: 22px; text-shadow: 0 0 5px rgba(0,0,0,.2),0 0 2px #000; } - span.trello-board { + .board-stats { + margin-bottom: 10px; + td { + color: $color-gray; + padding: 20px 40px 30px 0px !important; + } + .stat-number { + font-family: "open_sanslight"; + font-size: 40px; + margin-right: 20px; + color: black; + } + } + + .trello-board { color: white; - padding: 20px 20px; + padding: 15px 20px; width: 190px; white-space: nowrap; overflow: hidden; @@ -69,27 +89,22 @@ margin-right: 20px; } + .board-summary, .member-name { + font-size: 1.2rem; + } + + .board-meta, .member-meta { + color: $color-gray; + } + .trello-avatar { - border-radius: 3px; - margin-right: 10px; + border-radius: 4px; + width: 36px; + height: 36px; + margin-right: 5px; } - h6 { - font-size: 18px; - margin: 0; - } - - p.board-stats { - font-size: 18px; - } - - span.stat-number { - font-family: "open_sanslight"; - font-size: 50px; - margin-right: 15px; - } - - > .trello-board { + > .single-trello-board { width: 100%; max-height: 600px; padding: 10px; diff --git a/core/section/trello/archive_template.go b/core/section/trello/archive_template.go index 8b6c6aa3..bab5179f 100644 --- a/core/section/trello/archive_template.go +++ b/core/section/trello/archive_template.go @@ -12,6 +12,8 @@ package trello const archiveTemplate = ` +
+ {{if gt (len .Boards) 0}}
Deleted and Archived Cards

Changes since {{.Since}}.

@@ -30,9 +32,9 @@ const archiveTemplate = ` {{if eq $act.Type "deleteCard" }} Deleted: {{$act.Data.List.Name}} - {{if ne $act.Data.Card.Name ""}} - : {{$act.Data.Card.Name}} - {{if ne $act.Data.Text ""}} + {{if ne $act.Data.Card.Name ""}} + : {{$act.Data.Card.Name}} + {{if ne $act.Data.Text ""}} - {{$act.Data.Text}} {{end}} {{end}} @@ -41,7 +43,7 @@ const archiveTemplate = ` {{end}} {{range $arch := $b.Archived}} Archived: - {{$arch.Name}} + {{$arch.Name}} {{if ne $arch.Desc ""}} - {{$arch.Desc}} {{end}} @@ -54,4 +56,5 @@ const archiveTemplate = `
{{end}} + ` diff --git a/core/section/trello/boards_template.go b/core/section/trello/boards_template.go index 7add14f8..b6f923b8 100644 --- a/core/section/trello/boards_template.go +++ b/core/section/trello/boards_template.go @@ -12,55 +12,57 @@ package trello const boardsTemplate = ` -{{if gt (len .Boards) 0}} -
Boards
-

Changes since {{.Since}}.

-
- - - - - - - - - -
- {{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}}). - {{else}} - no cards archived. - {{end}} -
-

-
-
-{{end}} +
+ {{if gt (len .Boards) 0}} +
Boards
+

Changes since {{.Since}}.

+
+ + + + + + + + + +
+ {{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}}). + {{else}} + no cards archived. + {{end}} +
+ +
+
+ {{end}} +
` diff --git a/core/section/trello/labels_template.go b/core/section/trello/labels_template.go index 91e811b6..eb8b00cd 100644 --- a/core/section/trello/labels_template.go +++ b/core/section/trello/labels_template.go @@ -12,24 +12,29 @@ package trello const labelsTemplate = ` -{{if gt (len .SharedLabels) 0}} -
Labels
-

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

-
- - - {{range $l := .SharedLabels}} - - - - - {{end}} - -
- {{ $l.Name }} ({{len $l.Boards}}) - - {{range $idx, $brd := $l.Boards}}{{if gt $idx 0}}, {{end}}{{ $brd }}{{end}}. -
-
-{{end}} +
+ +

Activity since #date for team Documize boards: Board Name

+ + {{if gt (len .SharedLabels) 0}} +
Labels
+

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

+
+ + + {{range $l := .SharedLabels}} + + + + + {{end}} + +
+ {{ $l.Name }} ({{len $l.Boards}}) + + {{range $idx, $brd := $l.Boards}}{{if gt $idx 0}}, {{end}}{{ $brd }}{{end}}. +
+
+ {{end}} +
` diff --git a/core/section/trello/members_template.go b/core/section/trello/members_template.go index 22c72c1d..a9baba8b 100644 --- a/core/section/trello/members_template.go +++ b/core/section/trello/members_template.go @@ -12,31 +12,33 @@ package trello const membersTemplate = ` -{{if gt (len .Boards) 0}} -
Member Stats
-

- There are {{len .MemberBoardAssign}} members assigned to {{.CardAssignTotal}} cards of the total {{.CardTotal}} cards across {{len .Boards}} boards. -

+
+ {{if gt (len .Boards) 0}} +
Member Stats
+

+ 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 $idx, $ac := $m.AssignCounts}}{{if gt $idx 0}}, {{end}}{{$ac.BoardName}} ({{$ac.Count}}){{end}}. -

-
-
-{{end}} + {{range $m := .MemberBoardAssign}} + + + Member Avatar + + +
{{$m.MemberName}}
+
+ {{range $idx, $ac := $m.AssignCounts}}{{if gt $idx 0}}, {{end}}{{$ac.BoardName}} ({{$ac.Count}}){{end}}. +
+ + + {{end}} + + +
+ {{end}} + ` diff --git a/core/section/trello/trad_template.go b/core/section/trello/trad_template.go index 721cad08..871314be 100644 --- a/core/section/trello/trad_template.go +++ b/core/section/trello/trad_template.go @@ -12,27 +12,29 @@ package trello const tradTemplate = ` -{{if ne .Detail.Board.ID ""}} -
Board: {{.Detail.Board.Name}}
-

Non-printable

-
-

There are {{ .Detail.CardCount }} cards across {{ .Detail.ListCount }} lists - for board {{.Detail.Board.Name}}.

-
-
{{.Detail.Board.Name}}
 - {{range $data := .Detail.Data}} -
-
{{ $data.List.Name }}
- {{range $card := $data.Cards}} - -
- {{ $card.Name }} -
- - {{end}} -
- {{end}} +
+ {{if ne .Detail.Board.ID ""}} +
Board: {{.Detail.Board.Name}}
+

Non-printable

+
+

There are {{ .Detail.CardCount }} cards across {{ .Detail.ListCount }} lists + for board {{.Detail.Board.Name}}.

+
+
{{.Detail.Board.Name}}
 + {{range $data := .Detail.Data}} +
+
{{ $data.List.Name }}
+ {{range $card := $data.Cards}} + +
+ {{ $card.Name }} +
+ + {{end}} +
+ {{end}} +
-
-{{end}} + {{end}} +
`