Add icon links also to talk overview page

DigitaleGesellschaft · Nov 1, 2020 · 3fa6513 · 3fa6513
1 parent 264fdf9
commit 3fa6513
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 21 deletions.
diff --git a/_includes/partials/footer.html b/_includes/partials/footer.html
@@ -2,6 +2,25 @@
   </main>
   <footer class="container"></footer>
 
+  <div class="modal fade" id="link-modal" tabindex="-1" role="dialog" aria-labelledby="link-modal-label" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="link-modal-label"></h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <div class="modal-body">
+          <iframe src="" frameborder="0" allowfullscreen></iframe>
+        </div>
+        <div class="modal-footer">
+          <p class="modal-description"></p>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <script src="{{ site.baseurl }}/assets/js/main.js"></script>
 
 </body>

diff --git a/_layouts/talk-overview.html b/_layouts/talk-overview.html
@@ -30,6 +30,29 @@ <h3 class="mt-4 mb-3">
               </p>
               <p class="mb-0">
                 {% include partials/list_sub_categories.html %}
+
+                {% assign has_icon_links = false %}
+                {% for link in talk.links %}
+                  {% if link.icon %}
+                    {% assign has_icon_links = true %}
+                  {% endif %}
+                {% endfor %}
+
+                {% if has_icon_links %}
+                  <span class="{% if has_sub_categories %}ml-1{% endif %}">
+                    {% for link in talk.links %}
+                      {% if link.icon %}
+                        {% include partials/get_link_href.html %}
+                        {%- if link.iframe -%}
+                          <a class="text-secondary ml-1 cursor-pointer" data-toggle="modal" data-target="#link-modal" data-title="{{ link.name }}" data-href="{{ link_href }}" title="{{ link.name }}">
+                        {%- else -%}
+                          <a class="text-secondary ml-1" href="{{ link_href }}" title="{{ link.name }}">
+                        {%- endif -%}
+                          <i class="fas fa-{{ link.icon }} pr-1"></i></a>
+                      {% endif %}
+                    {% endfor %}
+                  </span>
+                {% endif %}
               </p>
 
               {% if talk.hide %}

diff --git a/_layouts/talk.html b/_layouts/talk.html
@@ -58,7 +58,6 @@ <h1 class="font-weight-light">{{ talk.name }}</h1>
 
   {% assign has_icon_links = false %}
   {% assign has_regular_links = false %}
-  {% assign has_iframe_links = false %}
   {% for link in talk.links %}
     {% if link.icon %}
       {% assign has_icon_links = true %}
@@ -108,25 +107,6 @@ <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].more_information }
     </ul>
   {% endif %}
 
-  <div class="modal fade" id="link-modal" tabindex="-1" role="dialog" aria-labelledby="link-modal-label" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title" id="link-modal-label"></h5>
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
-          </button>
-        </div>
-        <div class="modal-body">
-          <iframe src="" frameborder="0" allowfullscreen></iframe>
-        </div>
-        <div class="modal-footer">
-          <p class="modal-description"></p>
-        </div>
-      </div>
-    </div>
-  </div>
-
   <p class="d-print-none mt-5">
     <a href="{{ page.collection | prepend: '/' | prepend: site.baseurl }}" class="btn btn-light">
       <i class="fas fa-bullhorn"></i>

diff --git a/jekyll-theme-conference.gemspec b/jekyll-theme-conference.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-theme-conference"
-  spec.version       = "2.1.0"
+  spec.version       = "2.1.1"
   spec.authors       = ["Lorenz Schmid"]
   spec.email         = ["lorenzschmid@users.noreply.github.com"]