diff --git a/app/app/components/section/github/type-editor.js b/app/app/components/section/github/type-editor.js index e73003c2..1402c23d 100644 --- a/app/app/components/section/github/type-editor.js +++ b/app/app/components/section/github/type-editor.js @@ -41,6 +41,9 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin, branchLines: "100", userId: "", pageId: page.get('id'), + showMilestones: false, + showIssues: false, + showCommits: false, }; try { @@ -50,6 +53,9 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin, config.branchSince = metaConfig.branchSince; config.userId = metaConfig.userId; config.pageId = metaConfig.pageId; + config.showMilestones = metaConfig.showMilestones; + config.showIssues = metaConfig.showIssues; + config.showCommits = metaConfig.showCommits; } catch (e) {} self.set('config', config); @@ -168,12 +174,16 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin, return this.get('isDirty'); }, - onListCheckbox(id) { + onListCheckbox(id) { // select one repository only let lists = this.get('config.lists'); let list = lists.findBy('id', id); + lists.forEach(function (entry) { + Ember.set(entry, 'included', false); + }); + if (list !== null) { - Ember.set(list, 'included', !list.included); + Ember.set(list, 'included', true); } }, diff --git a/app/app/styles/base.scss b/app/app/styles/base.scss index df90c265..e3e1d8a0 100644 --- a/app/app/styles/base.scss +++ b/app/app/styles/base.scss @@ -35,6 +35,8 @@ html { background-color: $color-white; font-size: 14px; height: 100%; + -webkit-font-smoothing: antialiased; + text-shadow: 1px 1px 1px rgba(0,0,0,0.004); } body { @@ -46,6 +48,8 @@ a { color: $color-link; text-decoration: none; cursor: pointer; + -webkit-font-smoothing: antialiased; + text-shadow: 1px 1px 1px rgba(0,0,0,0.004); a:hover, a:focus { text-decoration: underline; diff --git a/app/app/styles/color.scss b/app/app/styles/color.scss index b4bbd8fc..a444b4c4 100644 --- a/app/app/styles/color.scss +++ b/app/app/styles/color.scss @@ -21,10 +21,10 @@ $color-gray: #8b9096; $color-goldy: #cc9933; $color-header: #f3f5f8; -$color-link: #4caf50; +$color-link: #0092d3; $color-border: #e1e1e1; -$color-input: #a1a1a1; +$color-input: #5a5a5a; $color-stroke: #e1e1e1; $color-tooltip: #a1a1a1; diff --git a/app/app/styles/section/github.scss b/app/app/styles/section/github.scss index 3b06d3a6..f3333a40 100644 --- a/app/app/styles/section/github.scss +++ b/app/app/styles/section/github.scss @@ -1,4 +1,8 @@ .section-github-editor { + .github-view label { + margin: 0 10px; + } + .github-repo { width: 100%; padding: 10px; @@ -40,8 +44,13 @@ } .section-github-render { + + a:hover { + text-decoration: underline; + } + .github-table { - margin: 0 !important; + margin: 10px 0 !important; border: none !important; line-height: 30px; @@ -56,63 +65,65 @@ margin: 30px 0 0 0; } + .github-table thead tr th { + padding: 15px 0; + border-bottom: 1px solid #e1e1e1; + text-transform: uppercase; + font-size: 14px; + text-align: left; + + span { + color:#838d94; + } + + } + + .github-table tbody tr td { + border: none!important; + padding: 5px 20px 5px 20px !important; + } + + .github-table .right-column { + text-align: right; + color:#838d94; + } + + span.data { + color:#838d94; + } + .issue-label { - font-size: 11px; - color: $color-white; - padding: 0px 8px; - margin-right: 5px; - border-radius: 2px; - box-shadow: inset 0 -1px 0 rgba(0,0,0,0.12); - display: inline-block; - line-height: 22px; + color:white; + font-size: 11px; + padding: 4px 6px; + border-radius: 4px; + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.12); + margin-left: 10px; } - progress[value] { - background-color: $color-off-white; - border-radius: 3px; - height: 15px; - width: 150px; + .progress-bar { + display: inline-block; border-radius: 3px; + width: 40%; + background-color: #f1f1f1; + height: 8px; + margin-left: 10px; + + .progress { + height: 8px; + border-radius: 4px; + background-color: #4caf50; + } } - .progress-meta { - color: $color-gray; - font-size: 1rem; - font-family: "arial"; + span.issue-state { + float: left; + margin-right: 10px; + margin-top: 3px; } - .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 { + img.github-avatar { + width: 24px; border-radius: 4px; - width: 36px; - height: 36px; - margin-right: 5px; - } - - .branch { - font-family: "open_sanssemibold"; + margin-right: 10px; } } diff --git a/app/app/styles/section/trello.scss b/app/app/styles/section/trello.scss index 893a3ddf..5bbc380b 100644 --- a/app/app/styles/section/trello.scss +++ b/app/app/styles/section/trello.scss @@ -53,140 +53,51 @@ } .section-trello-render { - .trello-table { - border: none!important; - margin: 0px !important; - td { - border: none !important; - vertical-align: top; - } + a:hover { + text-decoration: underline; } .heading { - font-size: 1.6rem; - margin: 30px 0 0 0; + + h3 { + font-size: 22px; + margin: 0; + font-family: "open_sanslight"; + } + + } + + table.trello-single-board { + border: none!important; + text-align: left; + margin:0!important; + } + + .trello-single-board thead tr th { + padding: 15px 0; + border-bottom: 1px solid #e1e1e1; + text-transform: uppercase; + font-size: 14px; + + span { + color:#838d94; + } + + } + + .trello-single-board tbody tr td { + border: none!important; + padding: 5px 20px 5px 20px !important; } .trello-label { + color:white; 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; - } - - .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: 15px 20px; - width: 190px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - display: inline-block; + padding: 4px 6px; border-radius: 4px; - margin-right: 20px; - - span { - display: table; - font-size: 14px; - line-height: 10px; - opacity: 0.5; - padding-bottom: 10px; - margin-bottom: 8px; - } + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.12); + margin-left: 14px; } - .board-summary { - font-size: 1.2rem; - } - - .member-name { - font-size: 1.2rem; - line-height: 15px; - } - - .board-meta, .member-meta { - color: $color-gray; - } - - .trello-avatar { - border-radius: 4px; - width: 36px; - height: 36px; - margin-right: 5px; - } - - > .single-trello-board { - width: 100%; - max-height: 600px; - padding: 10px; - white-space: nowrap; - overflow: auto; - - > a { - > .trello-board-title { - font-weight: bold; - color: #fff; - font-size: 16px; - } - } - - > .trello-list { - background-color: #e2e4e6; - padding: 10px; - border-radius: 3px; - margin: 10px 10px 0 0; - width: 300px; - max-height: 500px; - display: inline-block; - white-space: nowrap; - overflow: auto; - vertical-align: top; - - > .trello-list-title { - font-weight: bold; - color: #4c4c4c; - font-size: 14px; - margin: 0 10px 10px 0; - } - - > a { - > .trello-card { - color: #4c4c4c; - border-bottom: 1px solid #CDD2D4; - background-color: #fff; - border-radius: 3px; - padding: 7px 7px; - margin: 5px 0; - font-size: 14px; - font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; - line-height: 18px; - overflow: hidden; - word-wrap: break-word; - white-space: normal; - cursor: pointer; - vertical-align: top; - } - } - } - } } diff --git a/app/app/templates/components/section/github/type-editor.hbs b/app/app/templates/components/section/github/type-editor.hbs index 76d781c6..a304615c 100644 --- a/app/app/templates/components/section/github/type-editor.hbs +++ b/app/app/templates/components/section/github/type-editor.hbs @@ -7,18 +7,30 @@
-
Select Repositories
+
Select Repository
Choose source of code information to be displayed
-
Select organization or username whose repositories you want to show
+
Select organization or username whose repository you want to show
{{ui-select id="owners-dropdown" content=owners action=(action 'onOwnerChange') optionValuePath="id" optionLabelPath="name" selection=config.owner}}
{{input id="branch-since" value=config.branchSince type="text" }}
+
+ +
Select the views you want to show
+
+ {{input id="show-milestone" checked=config.showMilestones type="checkbox"}} + + {{input id="show-issues" checked=config.showIssues type="checkbox"}} + + {{input id="show-commits" checked=config.showCommits type="checkbox" }} + +
+
@@ -28,7 +40,7 @@
-
Select the repositories to show
+
Select the repository to show
{{#each config.lists as |list|}}
diff --git a/app/app/templates/components/section/trello/type-editor.hbs b/app/app/templates/components/section/trello/type-editor.hbs index f772b9ca..6ea76281 100644 --- a/app/app/templates/components/section/trello/type-editor.hbs +++ b/app/app/templates/components/section/trello/type-editor.hbs @@ -10,7 +10,7 @@
You have no team boards to share - personal boards are never shown.
{{else}} - +
diff --git a/core/product.go b/core/product.go index 74b3b312..13307292 100644 --- a/core/product.go +++ b/core/product.go @@ -26,7 +26,7 @@ type ProdInfo struct { // Product returns product edition details func Product() (p ProdInfo) { p.Major = "0" - p.Minor = "20" + p.Minor = "22" p.Patch = "0" p.Version = fmt.Sprintf("%s.%s.%s", p.Major, p.Minor, p.Patch) p.Edition = "Community" diff --git a/core/section/github/commits.go b/core/section/github/commits.go index 9caaec4d..f197e3dc 100644 --- a/core/section/github/commits.go +++ b/core/section/github/commits.go @@ -90,6 +90,10 @@ const tagCommitsData = "commitsData" func getCommits(client *gogithub.Client, config *githubConfig) ([]githubCommit, []githubAuthorStats, error) { + if !config.ShowCommits { + return nil, nil, nil + } + // first make sure we've got all the branches for _, orb := range config.Lists { if orb.Included { @@ -253,6 +257,11 @@ func getCommits(client *gogithub.Client, config *githubConfig) ([]githubCommit, } func refreshCommits(gr *githubRender, config *githubConfig, client *gogithub.Client) (err error) { + + if !config.ShowCommits { + return nil + } + gr.BranchCommits, gr.AuthorStats, err = getCommits(client, config) if err != nil { log.Error("github refreshCommits:", err) @@ -262,6 +271,11 @@ func refreshCommits(gr *githubRender, config *githubConfig, client *gogithub.Cli } func renderCommits(payload *githubRender, c *githubConfig) error { + + if !c.ShowCommits { + return nil + } + payload.CommitCount = 0 for range payload.BranchCommits { payload.CommitCount++ diff --git a/core/section/github/commits_template.go b/core/section/github/commits_template.go index bb45875f..c1ba6211 100644 --- a/core/section/github/commits_template.go +++ b/core/section/github/commits_template.go @@ -13,6 +13,7 @@ package github const commitsTemplate = `
+ {{if .HasCommits}} -
Commits
-

There are {{len .BranchCommits}} commits by {{.NumContributors}} contributors across {{.RepoCount}} - {{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}} -

-
- +
+ + + + + + {{range $commit := .BranchCommits}} - + {{end}} diff --git a/core/section/github/github.go b/core/section/github/github.go index b3c02e73..26bebe2e 100644 --- a/core/section/github/github.go +++ b/core/section/github/github.go @@ -15,6 +15,7 @@ import ( "bytes" "encoding/json" "errors" + //"fmt" "html/template" "io/ioutil" "net/http" @@ -235,6 +236,9 @@ func (p *Provider) Render(ctx *provider.Context, config, data string) string { if err != nil { log.Error("github render template.Parse error:", err) + //for k, v := range strings.Split(rep.template, "\n") { + // fmt.Println("DEBUG", k+1, v) + //} return "Documize internal github template.Parse error: " + err.Error() } diff --git a/core/section/github/issues.go b/core/section/github/issues.go index c41c5118..9495306a 100644 --- a/core/section/github/issues.go +++ b/core/section/github/issues.go @@ -106,6 +106,10 @@ func wrapLabels(labels []gogithub.Label) (l string, labelNames []string, labelCo func getIssues(client *gogithub.Client, config *githubConfig) ([]githubIssue, error) { + if !config.ShowIssues { + return nil, nil + } + ret := []githubIssue{} hadRepo := make(map[string]bool) @@ -183,6 +187,11 @@ func getIssues(client *gogithub.Client, config *githubConfig) ([]githubIssue, er } func refreshIssues(gr *githubRender, config *githubConfig, client *gogithub.Client) (err error) { + + if !config.ShowIssues { + return nil + } + gr.Issues, err = getIssues(client, config) if err != nil { log.Error("unable to get github issues (cmd)", err) diff --git a/core/section/github/issues_template.go b/core/section/github/issues_template.go index b6905d2a..a33a757c 100644 --- a/core/section/github/issues_template.go +++ b/core/section/github/issues_template.go @@ -13,14 +13,14 @@ package github const ( openIsvg = ` - + ` closedIsvg = ` - + @@ -29,35 +29,34 @@ const ( issuesTemplate = `
{{if .HasIssues}} -
Issues
-

- There are {{.ClosedIssues}} closed - {{if eq 1 .ClosedIssues}}issue{{else}}issues{{end}} - and {{.OpenIssues}} open - {{if eq 1 .OpenIssues}}issue{{else}}issues{{end}} - across {{.RepoCount}} - {{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}} -

+
Commits · {{len .BranchCommits}} commits by {{.NumContributors}} contributors +
- @{{$commit.Name}} - -
{{$commit.Message}}
+ {{$commit.Message}} + {{$commit.Branch}} +
+ @{{$commit.Name}} {{$commit.Name}} - {{if $commit.ShowDate}} · {{$commit.Date}} {{end}} - {{if $commit.ShowBranch}} · {{$commit.Repo}}:{{$commit.Branch}}{{end}} + · {{$commit.Date}}
-
+ + + + + + -
-
+ Issues · {{.ClosedIssues}} closed {{if eq 1 .ClosedIssues}}{{else}}issues{{end}} and {{.OpenIssues}} open + {{if eq 1 .OpenIssues}}issue{{else}}{{end}} +
{{range $data := .Issues}} - - + {{end}} diff --git a/core/section/github/milestones.go b/core/section/github/milestones.go index 2e6fd6c0..6a4ae384 100644 --- a/core/section/github/milestones.go +++ b/core/section/github/milestones.go @@ -79,6 +79,10 @@ func init() { func getMilestones(client *gogithub.Client, config *githubConfig) ([]githubMilestone, error) { + if !config.ShowMilestones { + return nil, nil + } + ret := []githubMilestone{} hadRepo := make(map[string]bool) @@ -115,7 +119,7 @@ func getMilestones(client *gogithub.Client, config *githubConfig) ([]githubMiles 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) + "" + dd = "due " + (*v.DueOn).Format(milestonesTimeFormat) + "" } up := "" if v.UpdatedAt != nil { @@ -156,6 +160,10 @@ func getMilestones(client *gogithub.Client, config *githubConfig) ([]githubMiles func refreshMilestones(gr *githubRender, config *githubConfig, client *gogithub.Client) (err error) { + if !config.ShowMilestones { + return nil + } + gr.Milestones, err = getMilestones(client, config) if err != nil { log.Error("unable to get github milestones", err) @@ -176,6 +184,11 @@ func refreshMilestones(gr *githubRender, config *githubConfig, client *gogithub. } func renderMilestones(payload *githubRender, c *githubConfig) error { + + if !c.ShowMilestones { + return nil + } + hadRepo := make(map[string]bool) payload.RepoCount = 0 for _, orb := range payload.List { @@ -197,10 +210,10 @@ func renderMilestones(payload *githubRender, c *githubConfig) error { } } if issuesClosed+issuesOpen > 0 { - payload.Milestones = append(payload.Milestones, githubMilestone{ - Repo: orb.Repo, Private: orb.Private, Name: noMilestone, IsOpen: true, - OpenIssues: issuesOpen, ClosedIssues: issuesClosed, URL: template.URL(orb.URL), - }) + //payload.Milestones = append(payload.Milestones, githubMilestone{ + // Repo: orb.Repo, Private: orb.Private, Name: noMilestone, IsOpen: true, + // OpenIssues: issuesOpen, ClosedIssues: issuesClosed, URL: template.URL(orb.URL), + //}) } hadRepo[rName] = true diff --git a/core/section/github/milestones_template.go b/core/section/github/milestones_template.go index b8765876..9b194e50 100644 --- a/core/section/github/milestones_template.go +++ b/core/section/github/milestones_template.go @@ -14,15 +14,15 @@ package github const ( rawMSsvg = `` openMSsvg = ` - + ` + rawMSsvg + ` ` closedMSsvg = ` - - + @@ -30,48 +30,40 @@ const ( milestonesTemplate = `
{{if .HasMilestones}} -
Milestones
-

- There are - {{.ClosedMS}} - {{if eq 1 .ClosedMS}} milestone {{else}} milestones {{end}} - closed and {{.OpenMS}} - {{if eq 1 .OpenMS}} milestone {{else}} milestones {{end}} - open across {{.RepoCount}} - {{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}} -

-
-
-
- {{if $data.IsOpen}} - ` + openIsvg + ` - {{else}} - ` + closedIsvg + ` - {{end}} -
-
-
{{$data.Message}}
- #{{$data.ID}} · {{$data.Repo}} · {{$data.Milestone}} · {{$data.Creator}} opened on {{$data.Date}} -
{{$data.Labels}}
+ {{if $data.IsOpen}} + ` + openIsvg + ` + {{else}} + ` + closedIsvg + ` + {{end}} + {{$data.Message}} #{{$data.ID}} + {{$data.Labels}} + 		+
+ {{$data.Milestone}} · + {{$data.Creator}} · {{$data.Date}} +
- +
+ + + + + + + + {{range $data := .Milestones}} - - - - - {{end}} diff --git a/core/section/github/model.go b/core/section/github/model.go index 0c826314..521beb8b 100644 --- a/core/section/github/model.go +++ b/core/section/github/model.go @@ -84,21 +84,24 @@ type githubLabel struct { } type githubConfig struct { - Token string `json:"-"` // NOTE very important that the secret Token is not leaked to the client side, so "-" - UserID string `json:"userId"` - PageID string `json:"pageId"` - Owner string `json:"owner_name"` - BranchSince string `json:"branchSince,omitempty"` - SincePtr *time.Time `json:"-"` - Since string `json:"-"` - BranchLines int `json:"branchLines,omitempty,string"` - OwnerInfo githubOwner `json:"owner"` - ClientID string `json:"clientId"` - CallbackURL string `json:"callbackUrl"` - Lists []githubBranch `json:"lists,omitempty"` - ReportOrder []string `json:"-"` - DateMessage string `json:"-"` - UserNames map[string]string `json:"UserNames"` + Token string `json:"-"` // NOTE very important that the secret Token is not leaked to the client side, so "-" + UserID string `json:"userId"` + PageID string `json:"pageId"` + Owner string `json:"owner_name"` + BranchSince string `json:"branchSince,omitempty"` + SincePtr *time.Time `json:"-"` + Since string `json:"-"` + BranchLines int `json:"branchLines,omitempty,string"` + OwnerInfo githubOwner `json:"owner"` + ClientID string `json:"clientId"` + CallbackURL string `json:"callbackUrl"` + Lists []githubBranch `json:"lists,omitempty"` + ReportOrder []string `json:"-"` + DateMessage string `json:"-"` + UserNames map[string]string `json:"UserNames"` + ShowMilestones bool `json:"showMilestones,omitempty"` + ShowIssues bool `json:"showIssues,omitempty"` + ShowCommits bool `json:"showCommits,omitempty"` } func (c *githubConfig) Clean() { @@ -125,7 +128,18 @@ func (c *githubConfig) Clean() { } c.Since = (*c.SincePtr).Format(issuesTimeFormat) - c.ReportOrder = []string{tagSummaryData, tagMilestonesData, tagIssuesData, tagCommitsData} + c.ReportOrder = []string{tagSummaryData} + + if c.ShowMilestones { + c.ReportOrder = append(c.ReportOrder, tagMilestonesData) + } + if c.ShowIssues { + c.ReportOrder = append(c.ReportOrder, tagIssuesData) + } + if c.ShowCommits { + c.ReportOrder = append(c.ReportOrder, tagCommitsData) + } + c.BranchLines = 100 // overide any existing value with maximum allowable in one call sort.Sort(branchesToSort(c.Lists)) // get the configured branches in a sensible order for display diff --git a/core/section/github/summary_template.go b/core/section/github/summary_template.go index 82d3abac..e738a3da 100644 --- a/core/section/github/summary_template.go +++ b/core/section/github/summary_template.go @@ -13,7 +13,7 @@ package github const summaryTemplate = `
-

Activity since {{.Config.Since}}{{.Config.DateMessage}} for {{.Config.Owner}} repositories: +

Activity since {{.Config.Since}}{{.Config.DateMessage}} for {{.Config.Owner}} repository {{range $data := .Config.Lists}} {{if $data.Included}} @@ -23,6 +23,7 @@ const summaryTemplate = ` {{end}}

+
` diff --git a/core/section/trello/master_template.go b/core/section/trello/master_template.go index 5fb902a1..d3ce657f 100644 --- a/core/section/trello/master_template.go +++ b/core/section/trello/master_template.go @@ -15,13 +15,13 @@ const renderTemplate = ` {{if eq .Since ""}}

Preparing...

{{else}} -

Activity since {{.Since}} for boards: -{{range $idx, $brd := .Boards}}{{if gt $idx 0}}, {{end}}{{$brd.Board.OrgName}}/{{$brd.Board.Name}}{{end}}.

+ {{end}}` + - labelsTemplate + - boardsTemplate + - graphsTemplate + - membersTemplate + - archiveTemplate + + //labelsTemplate + + //boardsTemplate + + //graphsTemplate + + //membersTemplate + + //archiveTemplate + tradTemplate + `` diff --git a/core/section/trello/trad_template.go b/core/section/trello/trad_template.go index 2287bde4..ada42788 100644 --- a/core/section/trello/trad_template.go +++ b/core/section/trello/trad_template.go @@ -14,27 +14,46 @@ package trello const tradTemplate = `
{{if ne .Detail.Board.ID ""}} -
{{.Detail.Board.Name}} Board
+
+

There are {{ .Detail.CardCount }} cards across {{ .Detail.ListCount }} lists on {{.Detail.Board.Name}} Board

+
+

Non-printable

-

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

-
-
{{.Detail.Board.Name}}
 +
+
Milestones · {{.ClosedMS}} closed and {{.OpenMS}} open +
-
- {{if $data.IsMilestone}} - {{if $data.IsOpen}} - ` + openMSsvg + ` - {{else}} - ` + closedMSsvg + ` - {{end}} +
+ {{if $data.IsMilestone}} + {{if $data.IsOpen}} + ` + openMSsvg + ` + {{else}} + ` + closedMSsvg + ` {{end}} - -
-
{{$data.Name}}
- {{$data.Repo}} - {{if $data.IsMilestone}} - · {{$data.DueDate}} {{end}} + {{$data.Name}} + · {{if $data.IsMilestone}} {{$data.DueDate}}{{end}}
+ {{if $data.IsMilestone}} - -
{{$data.CompleteMsg}} complete    {{$data.OpenIssues}} open    {{$data.ClosedIssues}} closed
+ {{$data.CompleteMsg}} complete + {{$data.OpenIssues}} open + {{$data.ClosedIssues}} closed {{else}} -
{{$data.OpenIssues}} open {{$data.ClosedIssues}} closed
+ {{$data.OpenIssues}} open {{$data.ClosedIssues}} closed {{end}} +
+
+
{{range $data := .Detail.Data}} -
-
{{ $data.List.Name }}
- {{range $card := $data.Cards}} - -
- {{ $card.Name }} -
- - {{end}} -
+ + + + + + + + + {{range $card := $data.Cards}} + + + + + {{end}} + {{end}} +
{{ $data.List.Name }} · {{len $data.Cards}} cards
+ +
+ {{ $card.Name }} +
+ + 		+ {{range $label := $card.Labels}} + {{$label.Name}} + {{end}} +
+
{{end}}
+ ` diff --git a/core/section/trello/trello.go b/core/section/trello/trello.go index 4fa3e36f..d18931a1 100644 --- a/core/section/trello/trello.go +++ b/core/section/trello/trello.go @@ -351,7 +351,7 @@ func getBoards(config *trelloConfig) (boards []trelloBoard, err error) { goto foundID } } - boards[bx].Included = true // include boards by default + boards[bx].Included = false // don't include boards by default foundID: }