Skip to content

Commit e2f4e09

Browse files
DaveParrDaveParr
authored
Merge pull request #39 from RMHogervorst/merge-speaker-talk-data-file
Merge speaker talk data file
2 parents 82afca2 + 528224b commit e2f4e09

File tree

9 files changed

+90
-34
lines changed

9 files changed

+90
-34
lines changed

‎data/schedule/Talk01.toml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
modalID= 1
2+
3+
[talk_details]
4+
title = "First Talk"
5+
subtitle = "First Subtitle"
6+
date = 1970-01-01
7+
startsAt = "00:00:00"
8+
endsAt = "00:01:00"
9+
img = "roundicons.png"
10+
preview = "faceholder.png"
11+
category = "Category 1"
12+
description = "Describe 1"
13+
talk = true
14+
15+
[speaker]
16+
name = "Speaker Name 01"
17+
organisation = "Company 1"
18+
role = "Role 1"
19+
img = "faceholder.png"
20+
social = [
21+
["fa-twitter", "#"],
22+
["fa-github", "#"],
23+
["fa-linkedin", "#"],
24+
["fa-globe", "#"]
25+
]
26+
link = "#"

‎data/schedule/Talk02.toml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
modalID= 2
2+
3+
[talk_details]
4+
title = "Second Talk"
5+
subtitle = "second Subtitle"
6+
date = 1970-01-01
7+
startsAt = "00:01:00"
8+
endsAt = "00:02:00"
9+
img = "roundicons.png"
10+
preview = "faceholder.png"
11+
category = "Category 1"
12+
description = "Describe 1"
13+
talk = true
14+
15+
[speaker]
16+
name = "Speaker Name 02"
17+
organisation = "Company 2"
18+
role = "Role 1"
19+
img = "faceholder.png"
20+
social = [
21+
["fa-twitter", "#"],
22+
["fa-github", "#"],
23+
["fa-linkedin", "#"],
24+
["fa-globe", "#"]
25+
]
26+
link = "#"

‎layouts/index.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@
5353
{{ partial "team.html" . }}
5454
{{ end }}
5555

56+
{{ if .Site.Params.team.enable }}
57+
{{ partial "team.html" . }}
58+
{{ end }}
59+
5660
{{ if .Site.Params.diversity.enable }}
5761
{{ partial "diversity.html" . }}
5862
{{ end }}
@@ -76,4 +80,4 @@
7680
{{ partial "js.html" . }}
7781
</body>
7882

79-
</html>
83+
</html>

‎layouts/partials/hackathon.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ <h4 class="section-heading">
2020
{{ with .Site.Params.hackathon.location}}<li>{{ . | markdownify}}</li>{{ end }}
2121
{{ with .Site.Params.hackathon.dates }}<li>{{ . | markdownify}}</li>{{ end }}
2222
{{ with .Site.Params.hackathon.times}}<li>{{ . | markdownify}}</li>{{ end }}
23-
{{ with .Site.Params.hackathon.website_name}}<li><a href="www.yahoo.com">{{ .}}</a></li>{{ end }}
24-
</ul>
23+
{{ with .Site.Params.hackathon.website_name}}<li><a href="www.yahoo.com">{{ .}}</a></li>{{ end }}
24+
</ul>
2525
{{ with .Site.Params.hackathon.brief2 }}{{ . | markdownify}}{{ end }}
2626
</p>
2727
</div>

‎layouts/partials/modals.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{ "<!-- Portfolio Modals -->" | safeHTML }}
2-
{{ range .Site.Data.projects }}
3-
{{ if eq .talk true }}
4-
<div class="portfolio-modal modal fade" id="portfolioModal{{ .modalID }}" tabindex="-1" role="dialog" aria-hidden="true">
2+
{{ range .Site.Data.schedule }}
3+
{{ if eq .talk_details.talk true }}
4+
<div class="portfolio-modal modal fade" id="portfolioModal{{ .talk_details.modalID }}" tabindex="-1" role="dialog" aria-hidden="true">
55
<div class="modal-content">
66
<div class="close-modal" data-dismiss="modal">
77
<div class="lr">
@@ -13,15 +13,15 @@
1313
<div class="row">
1414
<div class="col-lg-8 col-lg-offset-2">
1515
<div class="modal-body">
16-
<h2>{{ .title | markdownify }}</h2>
17-
<!--<p class="item-intro text-muted">{{ .subtitle | markdownify }}</p>
18-
<img class="img-responsive img-centered" src="img/portfolio/{{ .img }}" alt=""> -->
19-
<p>{{ .description | markdownify }}</p>
16+
<h2>{{ .talk_details.title | markdownify }}</h2>
17+
<p class="item-intro text-muted">{{ .talk_details.subtitle | markdownify }}</p>
18+
<img class="img-responsive img-centered" src="img/portfolio/{{ .talk_details.img }}" alt="">
19+
<p>{{ .talk_details.description | markdownify }}</p>
2020
<ul class="list-inline">
21-
<!-- <li>{{ with $.Site.Params.portfolio.modal.date }}{{ . }}{{ end }}: {{ .date }}</li>
22-
<li>{{ with $.Site.Params.portfolio.modal.client }}{{ . | markdownify }}{{ end }}: <a href="{{ .clientLink }}">{{ .client }}</a></li>
23-
<li>{{ with $.Site.Params.portfolio.modal.category }}{{ . | markdownify }}{{ end }}: {{ .category | markdownify }}</li> -->
21+
<li> {{ .speaker.organisation | markdownify}} </li>
22+
<li> {{ .speaker.role | markdownify }} </li>
2423
</ul>
24+
<p class="item-intro"> {{ .speaker.bio | markdownify }}</p>
2525
<button type="button" class="btn btn-primary" data-dismiss="modal"><i class="fa fa-times"></i> {{ with $.Site.Params.portfolio.modal.buttonText }}{{ . | markdownify }}{{ end }}</button>
2626
</div>
2727
</div>

‎layouts/partials/portfolio.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ <h3 class="section-subheading text-muted">{{ with .Site.Params.portfolio.subtitl
1010
</div>
1111
</div>
1212
<div class="Talks">
13-
{{ range .Site.Data.projects}}
14-
{{ if eq .talk true }}
15-
<a href="#portfolioModal{{ .modalID }}" class="Talk" data-toggle="modal">
16-
<img src="img/portfolio/{{ .preview }}" class="Talk-image" alt="">
13+
{{ range .Site.Data.schedule}}
14+
{{ if eq .talk_details.talk true }}
15+
<a href="#portfolioModal{{ .talk_details.modalID }}" class="Talk" data-toggle="modal">
16+
<img src="img/portfolio/{{ .talk_details.preview }}" class="Talk-image" alt="">
1717
<div class="Talk-title">
18-
<h4>{{ .title | markdownify }}</h4>
19-
<p class="text-muted">{{ .client | markdownify }}</p>
18+
<h4>{{ .talk_details.title | markdownify }}</h4>
19+
<p class="text-muted">{{ .speaker.name | markdownify }}</p>
2020
</div>
2121
</a>
2222
{{ end }}
2323
{{ end }}
2424
</div>
2525
</div>
26-
</section>
26+
</section>

‎layouts/partials/schedule.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ <h2 class="section-heading">{{ with .Site.Params.schedule.title }}{{ . | markdow
99
</div>
1010
</div>
1111
<div class="Schedule">
12-
{{ range sort .Site.Data.projects "startsAt" "asc" }}
13-
<div class="ScheduleItem {{ if ne .talk true }}ScheduleItem--service{{ end }}">
12+
{{ range sort .Site.Data.schedule ".talk_details.startsAt" "asc" }}
13+
<div class="ScheduleItem {{ if ne .talk_details.talk true }}ScheduleItem--service{{ end }}">
1414
<div class="ScheduleItem-time">
15-
<p>{{ .startsAt }}</p>
16-
<p>{{ .endsAt }} </p>
15+
<p>{{ .talk_details.startsAt }}</p>
16+
<p>{{ .talk_details.endsAt }} </p>
1717
</div>
18-
<h4 class="ScheduleItem-title">{{ .title | markdownify }}</h4>
18+
<h4 class="ScheduleItem-title">{{ .talk_details.title | markdownify }}</h4>
1919
<p> {{ partial "tweetthis.html" . }} </p>
2020
</div>
2121
{{ end }}

‎layouts/partials/team.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,28 +61,28 @@ <h2 class="section-heading">{{ with .Site.Params.team.speakers }}{{ . | markdown
6161
</div>
6262
</div>
6363
<div class="row flexbox{{ if .Site.Params.team.center }} flexbox-center{{ end }}">
64-
{{ range .Site.Data.speakers }}
64+
{{ range .Site.Data.schedule }}
6565
<div class="col-sm-4 col">
6666
<div class="team-member">
67-
{{ $url := printf "img/team/%s" .img }}
67+
{{ $url := printf "img/team/%s" .speaker.img }}
6868
<img src="{{ $url | absURL }}" class="img-responsive img-circle" alt="{{ .name }}">
69-
<h3>{{ .name | markdownify }}</h3>
70-
71-
{{ with .organisation }}
69+
<h3>{{ .speaker.name | markdownify }}</h3>
70+
71+
{{ with .speaker.organisation }}
7272
<h4>{{ . | markdownify }}</h4>
7373
{{ end }}
7474

75-
{{ with .role }}
75+
{{ with .speaker.role }}
7676
<h5 class="report">{{ . | markdownify }}</h5>
7777
{{ end }}
7878

7979
<ul class="list-inline social-buttons">
80-
{{ range .social }}
80+
{{ range .speaker.social }}
8181
<li><a href="{{ index . 1 }}"><i class="fa {{ index . 0 }}"></i></a></li>
8282
{{ end }}
8383
</ul>
8484

85-
{{ with .bio }}
85+
{{ with .speaker.bio }}
8686
<p class="team-bio">{{ . | markdownify }}</p>
8787
{{ end }}
8888
</div>

‎layouts/partials/tweetthis.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<a class="btn-twitter"
2-
href="https://twitter.com/intent/tweet?text={{ .title }}&hashtags=satRdays">
2+
href="https://twitter.com/intent/tweet?text={{ .talk_details.title }} by {{.speaker.name }}&hashtags=satRdays">
33
Tweet this!</a>

0 commit comments

Comments
 (0)