Use bio in modal and remove custom close text from config to close sa…

…tRdays/satRday_site_template#25
satRdays · Oct 31, 2020 · 31a7e4b · 31a7e4b
1 parent e2f4e09
commit 31a7e4b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/data/schedule/Talk01.toml b/data/schedule/Talk01.toml
@@ -17,6 +17,7 @@ name = "Speaker Name 01"
 organisation = "Company 1"
 role = "Role 1"
 img = "faceholder.png"
+bio = "Speaker Name 02 did stuff"
 social = [
         ["fa-twitter", "#"],
         ["fa-github", "#"],

diff --git a/data/schedule/Talk02.toml b/data/schedule/Talk02.toml
@@ -17,6 +17,7 @@ name = "Speaker Name 02"
 organisation = "Company 2"
 role = "Role 1"
 img = "faceholder.png"
+bio = "Speaker Name 02 did stuff"
 social = [
         ["fa-twitter", "#"],
         ["fa-github", "#"],

diff --git a/layouts/partials/modals.html b/layouts/partials/modals.html
@@ -1,33 +1,34 @@
 {{ "<!-- Portfolio Modals -->" | safeHTML }}
 {{ 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">
-          <div class="rl">
-          </div>
+<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">
+        <div class="rl">
         </div>
       </div>
-      <div class="container">
-        <div class="row">
-          <div class="col-lg-8 col-lg-offset-2">
-            <div class="modal-body">
-              <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> {{ .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>
+    <div class="container">
+      <div class="row">
+        <div class="col-lg-8 col-lg-offset-2">
+          <div class="modal-body">
+            <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> {{ .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>Close details</button>
           </div>
         </div>
       </div>
     </div>
   </div>
+</div>
 {{ end }}
 {{ end }}