Skip to content

Commit 6aa5be2

Browse files
SergeyKanzhelevSergeyKanzhelev
committed
allow to specify the calendar link and properly escape the time url query
1 parent a952fbf commit 6aa5be2

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

‎generator/app.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ type Meeting struct {
229229
URL string `yaml:",omitempty"`
230230
ArchiveURL string `yaml:"archive_url,omitempty"`
231231
RecordingsURL string `yaml:"recordings_url,omitempty"`
232+
CalendarURL string `yaml:"calendar_url,omitempty"`
232233
}
233234

234235
// Contact represents the various contact points for a group.

‎generator/committee_readme.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name}
1414
{{- end }}
1515

1616
{{- range .Meetings }}
17-
* {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}).
17+
* {{.Description}}{{if .CalendarURL}} ([calendar]({{.CalendarURL}})){{end}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time | urlquery}}&tz={{.TZ | tzUrlEncode}}).
1818
{{- if .ArchiveURL }}
1919
* [Meeting notes and Agenda]({{.ArchiveURL}}).
2020
{{- end }}
@@ -99,7 +99,7 @@ The following [subprojects][subproject-definition] are owned by the {{.Name}} Co
9999
{{- if .Meetings }}
100100
- **Meetings:**
101101
{{- range .Meetings }}
102-
- {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}).
102+
- {{.Description}}{{if .CalendarURL}} ([calendar]({{.CalendarURL}})){{end}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time | urlquery}}&tz={{.TZ | tzUrlEncode}}).
103103
{{- if .ArchiveURL }}
104104
- [Meeting notes and Agenda]({{.ArchiveURL}}).
105105
{{- end }}

‎generator/list.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
2727
|------|-------|--------|---------|----------|
2828
{{- range .Sigs}}
2929
|[{{.Name}}]({{.Dir}}/README.md)|[{{.Label}}](https://github.com/kubernetes/kubernetes/labels/sig%2F{{.Label}})|{{range .Leadership.Chairs}}* [{{.Name}}](https://github.com/{{.GitHub}}){{if .Company}}, {{.Company}}{{end}}<br>{{end}}|* [Slack](https://kubernetes.slack.com/messages/{{.Contact.Slack}})<br>* [Mailing List]({{.Contact.MailingList}})|{{- range .Meetings -}}
30-
* {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}} ({{.Frequency}})]({{.URL}})<br>
30+
* {{.Description}}{{if .CalendarURL}} ([calendar]({{.CalendarURL}})){{end}}: [{{.Day}}s at {{.Time}} {{.TZ}} ({{.Frequency}})]({{.URL}})<br>
3131
{{- end -}}
3232
{{- range .Subprojects -}}
3333
{{ $name := .Name }}
3434
{{- range .Meetings -}}
35-
* ({{ $name }}) {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}} ({{.Frequency}})]({{.URL}})<br>
35+
* ({{ $name }}) {{.Description}}{{if .CalendarURL}} ([calendar]({{.CalendarURL}})){{end}}: [{{.Day}}s at {{.Time}} {{.TZ}} ({{.Frequency}})]({{.URL}})<br>
3636
{{- end -}}
3737
{{- end -}}
3838
{{- end }}
@@ -42,7 +42,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
4242
| Name | Label | Stakeholder SIGs |Organizers | Contact | Meetings |
4343
|------|-------|------------------|-----------|---------|----------|
4444
{{- range .WorkingGroups}}
45-
|[{{.Name}}]({{.Dir}}/README.md)|[{{.Label}}](https://github.com/kubernetes/kubernetes/labels/wg%2F{{.Label}})|{{range .StakeholderSIGs}}* {{.}}<br>{{end }}|{{range .Leadership.Chairs}}* [{{.Name}}](https://github.com/{{.GitHub}}){{if .Company}}, {{.Company}}{{end}}<br>{{end}}|* [Slack](https://kubernetes.slack.com/messages/{{.Contact.Slack}})<br>* [Mailing List]({{.Contact.MailingList}})|{{range .Meetings}}* {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}} ({{.Frequency}})]({{.URL}})<br>{{end}}
45+
|[{{.Name}}]({{.Dir}}/README.md)|[{{.Label}}](https://github.com/kubernetes/kubernetes/labels/wg%2F{{.Label}})|{{range .StakeholderSIGs}}* {{.}}<br>{{end }}|{{range .Leadership.Chairs}}* [{{.Name}}](https://github.com/{{.GitHub}}){{if .Company}}, {{.Company}}{{end}}<br>{{end}}|* [Slack](https://kubernetes.slack.com/messages/{{.Contact.Slack}})<br>* [Mailing List]({{.Contact.MailingList}})|{{range .Meetings}}* {{.Description}}{{if .CalendarURL}} ([calendar]({{.CalendarURL}})){{end}}: [{{.Day}}s at {{.Time}} {{.TZ}} ({{.Frequency}})]({{.URL}})<br>{{end}}
4646
{{- end }}
4747

4848
### Committees

‎generator/sig_readme.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name}
1313
{{- end }}
1414

1515
{{- range .Meetings }}
16-
* {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}).
16+
* {{.Description}}{{if .CalendarURL}} ([calendar]({{.CalendarURL}})) {{end}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time | urlquery}}&tz={{.TZ | tzUrlEncode}}).
1717
{{- if .ArchiveURL }}
1818
* [Meeting notes and Agenda]({{.ArchiveURL}}).
1919
{{- end }}
@@ -109,7 +109,7 @@ The following [subprojects][subproject-definition] are owned by sig-{{.Label}}:
109109
- [Mailing List]({{.Contact.MailingList}})
110110
{{- end }}
111111
{{- if .Contact.GithubTeams }}
112-
- GitHub Teams:
112+
- GitHub Teams:
113113
{{- range .Contact.GithubTeams }}
114114
- [@kubernetes/{{.Name}}](https://github.com/orgs/kubernetes/teams/{{.Name}}) {{- if .Description }} - {{.Description}}{{- end}}
115115
{{- end }}
@@ -118,7 +118,7 @@ The following [subprojects][subproject-definition] are owned by sig-{{.Label}}:
118118
{{- if .Meetings }}
119119
- **Meetings:**
120120
{{- range .Meetings }}
121-
- {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}).
121+
- {{.Description}}{{if .CalendarURL}} ([calendar]({{.CalendarURL}})){{end}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time | urlquery}}&tz={{.TZ | tzUrlEncode}}).
122122
{{- if .ArchiveURL }}
123123
- [Meeting notes and Agenda]({{.ArchiveURL}}).
124124
{{- end }}

‎generator/wg_readme.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name}
1919
{{- end }}
2020

2121
{{- range .Meetings }}
22-
* {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}).
22+
* {{.Description}}{{if .CalendarURL}} ([calendar]({{.CalendarURL}})){{end}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time | urlquery}}&tz={{.TZ | tzUrlEncode}}).
2323
{{- if .ArchiveURL }}
2424
* [Meeting notes and Agenda]({{.ArchiveURL}}).
2525
{{- end }}

0 commit comments

Comments
 (0)