allow to specify the calendar link and properly escape the time url query

This commit is contained in:
Sergey Kanzhelev 2024-05-22 20:24:40 +00:00
parent a952fbf925
commit 6aa5be2bcc
5 changed files with 10 additions and 9 deletions

View File

@ -229,6 +229,7 @@ type Meeting struct {
URL string `yaml:",omitempty"` URL string `yaml:",omitempty"`
ArchiveURL string `yaml:"archive_url,omitempty"` ArchiveURL string `yaml:"archive_url,omitempty"`
RecordingsURL string `yaml:"recordings_url,omitempty"` RecordingsURL string `yaml:"recordings_url,omitempty"`
CalendarURL string `yaml:"calendar_url,omitempty"`
} }
// Contact represents the various contact points for a group. // Contact represents the various contact points for a group.

View File

@ -14,7 +14,7 @@ The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name}
{{- end }} {{- end }}
{{- range .Meetings }} {{- range .Meetings }}
* {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}). * {{.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}}).
{{- if .ArchiveURL }} {{- if .ArchiveURL }}
* [Meeting notes and Agenda]({{.ArchiveURL}}). * [Meeting notes and Agenda]({{.ArchiveURL}}).
{{- end }} {{- end }}
@ -99,7 +99,7 @@ The following [subprojects][subproject-definition] are owned by the {{.Name}} Co
{{- if .Meetings }} {{- if .Meetings }}
- **Meetings:** - **Meetings:**
{{- range .Meetings }} {{- range .Meetings }}
- {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}). - {{.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}}).
{{- if .ArchiveURL }} {{- if .ArchiveURL }}
- [Meeting notes and Agenda]({{.ArchiveURL}}). - [Meeting notes and Agenda]({{.ArchiveURL}}).
{{- end }} {{- end }}

View File

@ -27,12 +27,12 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
|------|-------|--------|---------|----------| |------|-------|--------|---------|----------|
{{- range .Sigs}} {{- range .Sigs}}
|[{{.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 -}} |[{{.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 -}}
* {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}} ({{.Frequency}})]({{.URL}})<br> * {{.Description}}{{if .CalendarURL}} ([calendar]({{.CalendarURL}})){{end}}: [{{.Day}}s at {{.Time}} {{.TZ}} ({{.Frequency}})]({{.URL}})<br>
{{- end -}} {{- end -}}
{{- range .Subprojects -}} {{- range .Subprojects -}}
{{ $name := .Name }} {{ $name := .Name }}
{{- range .Meetings -}} {{- range .Meetings -}}
* ({{ $name }}) {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}} ({{.Frequency}})]({{.URL}})<br> * ({{ $name }}) {{.Description}}{{if .CalendarURL}} ([calendar]({{.CalendarURL}})){{end}}: [{{.Day}}s at {{.Time}} {{.TZ}} ({{.Frequency}})]({{.URL}})<br>
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end }} {{- end }}
@ -42,7 +42,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
| Name | Label | Stakeholder SIGs |Organizers | Contact | Meetings | | Name | Label | Stakeholder SIGs |Organizers | Contact | Meetings |
|------|-------|------------------|-----------|---------|----------| |------|-------|------------------|-----------|---------|----------|
{{- range .WorkingGroups}} {{- range .WorkingGroups}}
|[{{.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}} |[{{.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}}
{{- end }} {{- end }}
### Committees ### Committees

View File

@ -13,7 +13,7 @@ The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name}
{{- end }} {{- end }}
{{- range .Meetings }} {{- range .Meetings }}
* {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}). * {{.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}}).
{{- if .ArchiveURL }} {{- if .ArchiveURL }}
* [Meeting notes and Agenda]({{.ArchiveURL}}). * [Meeting notes and Agenda]({{.ArchiveURL}}).
{{- end }} {{- end }}
@ -118,7 +118,7 @@ The following [subprojects][subproject-definition] are owned by sig-{{.Label}}:
{{- if .Meetings }} {{- if .Meetings }}
- **Meetings:** - **Meetings:**
{{- range .Meetings }} {{- range .Meetings }}
- {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}). - {{.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}}).
{{- if .ArchiveURL }} {{- if .ArchiveURL }}
- [Meeting notes and Agenda]({{.ArchiveURL}}). - [Meeting notes and Agenda]({{.ArchiveURL}}).
{{- end }} {{- end }}

View File

@ -19,7 +19,7 @@ The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name}
{{- end }} {{- end }}
{{- range .Meetings }} {{- range .Meetings }}
* {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}). * {{.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}}).
{{- if .ArchiveURL }} {{- if .ArchiveURL }}
* [Meeting notes and Agenda]({{.ArchiveURL}}). * [Meeting notes and Agenda]({{.ArchiveURL}}).
{{- end }} {{- end }}