Merge pull request #39 from RMHogervorst/merge-speaker-talk-data-file

Merge speaker talk data file
satRdays · Oct 29, 2020 · e2f4e09 · e2f4e09
2 parents 82afca2 + 528224b
commit e2f4e09
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 34 deletions.
diff --git a/data/schedule/Talk01.toml b/data/schedule/Talk01.toml
@@ -0,0 +1,26 @@
+modalID= 1
+
+[talk_details]
+title = "First Talk"
+subtitle = "First Subtitle"
+date = 1970-01-01
+startsAt = "00:00:00"
+endsAt = "00:01:00"
+img = "roundicons.png"
+preview = "faceholder.png"
+category = "Category 1"
+description = "Describe 1"
+talk = true
+
+[speaker]
+name = "Speaker Name 01"
+organisation = "Company 1"
+role = "Role 1"
+img = "faceholder.png"
+social = [
+        ["fa-twitter", "#"],
+        ["fa-github", "#"],
+        ["fa-linkedin", "#"],
+        ["fa-globe", "#"]
+      ]
+link = "#"
diff --git a/data/schedule/Talk02.toml b/data/schedule/Talk02.toml
@@ -0,0 +1,26 @@
+modalID= 2
+
+[talk_details]
+title = "Second Talk"
+subtitle = "second Subtitle"
+date = 1970-01-01
+startsAt = "00:01:00"
+endsAt = "00:02:00"
+img = "roundicons.png"
+preview = "faceholder.png"
+category = "Category 1"
+description = "Describe 1"
+talk = true
+
+[speaker]
+name = "Speaker Name 02"
+organisation = "Company 2"
+role = "Role 1"
+img = "faceholder.png"
+social = [
+        ["fa-twitter", "#"],
+        ["fa-github", "#"],
+        ["fa-linkedin", "#"],
+        ["fa-globe", "#"]
+      ]
+link = "#"
diff --git a/layouts/index.html b/layouts/index.html
@@ -53,6 +53,10 @@
   {{ partial "team.html" . }}
   {{ end }}
 
+  {{ if .Site.Params.team.enable }}
+  {{ partial "team.html" . }}
+  {{ end }}
+
   {{ if .Site.Params.diversity.enable }}
   {{ partial "diversity.html" . }}
   {{ end }}
@@ -76,4 +80,4 @@
   {{ partial "js.html" . }}
 </body>
 
-</html>
+</html>
diff --git a/layouts/partials/hackathon.html b/layouts/partials/hackathon.html
@@ -20,8 +20,8 @@ <h4 class="section-heading">
           {{ with .Site.Params.hackathon.location}}<li>{{ . | markdownify}}</li>{{ end }}
           {{ with .Site.Params.hackathon.dates }}<li>{{ . | markdownify}}</li>{{ end }}
           {{ with .Site.Params.hackathon.times}}<li>{{ . | markdownify}}</li>{{ end }}
-          {{ with .Site.Params.hackathon.website_name}}<li><a href="www.yahoo.com">{{ .}}</a></li>{{ end }} 
-        </ul>  
+          {{ with .Site.Params.hackathon.website_name}}<li><a href="www.yahoo.com">{{ .}}</a></li>{{ end }}
+        </ul>
           {{ with .Site.Params.hackathon.brief2 }}{{ . | markdownify}}{{ end }}
         </p>
     </div>

diff --git a/layouts/partials/modals.html b/layouts/partials/modals.html
@@ -1,7 +1,7 @@
 {{ "<!-- Portfolio Modals -->" | safeHTML }}
-{{ range .Site.Data.projects }}
-{{ if eq .talk true }}
-  <div class="portfolio-modal modal fade" id="portfolioModal{{ .modalID }}" tabindex="-1" role="dialog" aria-hidden="true">
+{{ range .Site.Data.schedule }}
+{{ if eq .talk_details.talk true }}
+  <div class="portfolio-modal modal fade" id="portfolioModal{{ .talk_details.modalID }}" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-content">
       <div class="close-modal" data-dismiss="modal">
         <div class="lr">
@@ -13,15 +13,15 @@
         <div class="row">
           <div class="col-lg-8 col-lg-offset-2">
             <div class="modal-body">
-              <h2>{{ .title  | markdownify }}</h2>
-              <!--<p class="item-intro text-muted">{{ .subtitle | markdownify }}</p>
-              <img class="img-responsive img-centered" src="img/portfolio/{{ .img }}" alt=""> -->
-              <p>{{ .description | markdownify }}</p>
+              <h2>{{ .talk_details.title  | markdownify }}</h2>
+              <p class="item-intro text-muted">{{ .talk_details.subtitle | markdownify }}</p>
+              <img class="img-responsive img-centered" src="img/portfolio/{{ .talk_details.img }}" alt="">
+              <p>{{ .talk_details.description | markdownify }}</p>
               <ul class="list-inline">
-              <!--  <li>{{ with $.Site.Params.portfolio.modal.date }}{{ . }}{{ end }}: {{ .date }}</li>
-                <li>{{ with $.Site.Params.portfolio.modal.client }}{{ . | markdownify }}{{ end }}: <a href="{{ .clientLink }}">{{ .client }}</a></li>
-                <li>{{ with $.Site.Params.portfolio.modal.category }}{{ . | markdownify }}{{ end }}: {{ .category  | markdownify }}</li> -->
+                <li> {{ .speaker.organisation | markdownify}} </li>
+                <li> {{ .speaker.role | markdownify }} </li>
               </ul>
+              <p class="item-intro"> {{ .speaker.bio | markdownify }}</p>
               <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>
             </div>
           </div>

diff --git a/layouts/partials/portfolio.html b/layouts/partials/portfolio.html
@@ -10,17 +10,17 @@ <h3 class="section-subheading text-muted">{{ with .Site.Params.portfolio.subtitl
       </div>
     </div>
     <div class="Talks">
-      {{ range .Site.Data.projects}}
-      {{ if eq .talk true }}
-      <a href="#portfolioModal{{ .modalID }}" class="Talk" data-toggle="modal">
-        <img src="img/portfolio/{{ .preview }}" class="Talk-image" alt="">
+      {{ range .Site.Data.schedule}}
+      {{ if eq .talk_details.talk true }}
+      <a href="#portfolioModal{{ .talk_details.modalID }}" class="Talk" data-toggle="modal">
+        <img src="img/portfolio/{{ .talk_details.preview }}" class="Talk-image" alt="">
         <div class="Talk-title">
-          <h4>{{ .title | markdownify }}</h4>
-          <p class="text-muted">{{ .client | markdownify }}</p>
+          <h4>{{ .talk_details.title | markdownify }}</h4>
+          <p class="text-muted">{{ .speaker.name | markdownify }}</p>
         </div>
       </a>
       {{ end }}
       {{ end }}
     </div>
   </div>
-</section>
+</section>
diff --git a/layouts/partials/schedule.html b/layouts/partials/schedule.html
@@ -9,13 +9,13 @@ <h2 class="section-heading">{{ with .Site.Params.schedule.title }}{{ . | markdow
       </div>
     </div>
     <div class="Schedule">
-      {{ range sort .Site.Data.projects "startsAt" "asc" }}
-      <div class="ScheduleItem {{ if ne .talk true }}ScheduleItem--service{{ end }}">
+      {{ range sort .Site.Data.schedule ".talk_details.startsAt" "asc" }}
+      <div class="ScheduleItem {{ if ne .talk_details.talk true }}ScheduleItem--service{{ end }}">
         <div class="ScheduleItem-time">
-          <p>{{ .startsAt }}</p>
-          <p>{{ .endsAt }} </p>
+          <p>{{ .talk_details.startsAt }}</p>
+          <p>{{ .talk_details.endsAt }} </p>
         </div>
-        <h4 class="ScheduleItem-title">{{ .title | markdownify }}</h4>
+        <h4 class="ScheduleItem-title">{{ .talk_details.title | markdownify }}</h4>
         <p> {{ partial "tweetthis.html" . }} </p>
       </div>
       {{ end }}

diff --git a/layouts/partials/team.html b/layouts/partials/team.html
@@ -61,28 +61,28 @@ <h2 class="section-heading">{{ with .Site.Params.team.speakers }}{{ . | markdown
       </div>
     </div>
     <div class="row flexbox{{ if .Site.Params.team.center }} flexbox-center{{ end }}">
-        {{ range .Site.Data.speakers }}
+        {{ range .Site.Data.schedule }}
         <div class="col-sm-4 col">
             <div class="team-member">
-                {{ $url := printf "img/team/%s" .img }}
+                {{ $url := printf "img/team/%s" .speaker.img }}
                 <img src="{{ $url | absURL }}" class="img-responsive img-circle" alt="{{ .name }}">
-              <h3>{{ .name | markdownify }}</h3>
-              
-              {{ with .organisation }}
+              <h3>{{ .speaker.name | markdownify }}</h3>
+
+              {{ with .speaker.organisation }}
               <h4>{{ . | markdownify }}</h4>
               {{ end }}
 
-              {{ with .role }}
+              {{ with .speaker.role }}
               <h5 class="report">{{ . | markdownify }}</h5>
               {{ end }}
 
               <ul class="list-inline social-buttons">
-                {{ range .social }}
+                {{ range .speaker.social }}
                   <li><a href="{{ index . 1 }}"><i class="fa {{ index . 0 }}"></i></a></li>
                 {{ end }}
               </ul>
 
-              {{ with .bio }}
+              {{ with .speaker.bio }}
               <p class="team-bio">{{ . | markdownify }}</p>
             {{ end }}
             </div>

diff --git a/layouts/partials/tweetthis.html b/layouts/partials/tweetthis.html
@@ -1,3 +1,3 @@
 <a class="btn-twitter"
-  href="https://twitter.com/intent/tweet?text={{ .title }}&hashtags=satRdays">
+  href="https://twitter.com/intent/tweet?text={{ .talk_details.title }} by {{.speaker.name }}&hashtags=satRdays">
 Tweet this!</a>