jekyll-theme-conference 2.1.0 → 2.4.0

data/_includes/partials/navbar.html

@@ -16,30 +16,23 @@
                 {{ link.name }}
               </a>
               <div class="dropdown-menu" aria-labelledby="navbar-dropdown{{ forloop.index0 }}">
-                {% for sublink in link.menu %}
-                  {% if sublink.disabled %}
-                    <a class="dropdown-item disabled" href="#">
-                      {{ sublink.name }}
-                    </a>
-                  {% else %}
-                    <a class="dropdown-item" href="{% if sublink.absolute_url %}{{ sublink.absolute_url }}{% else %}{{ sublink.relative_url | prepend: site.baseurl }}{% endif %}">
-                      {{ sublink.name }}
-                    </a>
-                  {% endif %}
+                {% assign parent_link = link %}
+                {% for link in parent_link.menu %}
+                  {% assign link_styleclass = "dropdown-item" %}
+                  {% include partials/get_link.html %}
+                  {{ link_tag }}
+                    {{ link.name }}
+                  </a>
                 {% endfor %}
               </div>
             </li>
           {% else %}
             <li class="nav-item {% if page.url contains link.relative_url %}active{% endif %}">
-              {% if link.disabled %}
-                <a class="nav-link disabled" href="#">
-                  {{ link.name }}
-                </a>
-              {% else %}
-                <a class="nav-link" href="{% if link.absolute_url %}{{ link.absolute_url }}{% else %}{{ link.relative_url | prepend: site.baseurl }}{% endif %}">
-                  {{ link.name }}
-                </a>
-              {% endif %}
+              {% assign link_styleclass = "nav-link" %}
+              {% include partials/get_link.html %}
+              {{ link_tag }}
+                {{ link.name }}
+              </a>
             </li>
           {% endif %}
         {% endfor %}

data/_includes/partials/navbar_rooms.html

@@ -1,7 +1,7 @@
 <ul class="nav nav-pills d-print-none mb-3">
   <li class="nav-item">
     <a class="nav-link {% if page.name contains 'index' %}active{% endif %}" href="{{ site.conference.location.url | prepend: site.baseurl }}">
-      {{ site.data.lang[site.conference.lang].location.directions }}
+      {{ site.data.lang[site.conference.lang].location.directions | default: "Directions" }}
     </a>
   </li>
   {% for r in site.data.program %}

data/_layouts/home.html

@@ -24,15 +24,11 @@
     {% if site.conference.main.links %}
       <p class="lead d-print-none">
       {% for link in site.conference.main.links %}
-        {% if link.disabled %}
-          <a class="btn btn-outline-primary btn-lg mt-2 disabled" href="#">
-            {{ link.name }}
-          </a>
-        {% else %}
-          <a class="btn btn-outline-primary btn-lg mt-2" href="{% if link.absolute_url %}{{ link.absolute_url }}{% else %}{{ link.relative_url | prepend: site.baseurl }}{% endif %}" role="button">
-            {{ link.name }}
-          </a>
-        {% endif %}
+        {% assign link_styleclass = "btn btn-outline-primary btn-lg mt-2" %}
+        {% include partials/get_link.html %}
+        {{ link_tag }}
+          {{ link.name }}
+        </a>
       {% endfor %}
       </p>
     {% endif %}

data/_layouts/location.html

@@ -6,7 +6,7 @@
     {% if page.title %}
       {{ page.title }}
     {% else %}
-      {{ site.data.lang[site.conference.lang].location.title }}
+      {{ site.data.lang[site.conference.lang].location.title | default: "Location" }}
     {% endif %}
   </h1>
 

data/_layouts/program.html

@@ -50,14 +50,14 @@
     {% if page.title %}
       {{ page.title }}
     {% else %}
-      {{ site.data.lang[site.conference.lang].program.title }}
+      {{ site.data.lang[site.conference.lang].program.title | default: "Program" }}
     {% endif %}
   </h1>
 
   {{ content }}
 
   <div class="sticky-top syncscroll overflow-hidden" name="sync-table">
-    <table class="table">
+    <table class="table mb-0">
       <thead>
         <tr>
           <th scope="col" class="text-center">#</th>
@@ -190,7 +190,7 @@
   </div>
 
   {% if site.conference.talks.main_categories %}
-    <h5 class="mt-4">{{ site.data.lang[site.conference.lang].talks.legend }}</h5>
+    <h5 class="mt-4">{{ site.data.lang[site.conference.lang].program.legend | default: "Caption" }}</h5>
       {% for main_cat in site.conference.talks.main_categories %}
         <div class="d-block d-sm-inline-block m-1 p-1 pl-2 pr-2 border-soft-{{ main_cat.color }} bg-soft-{{ main_cat.color }} font-weight-normal">
           {{ main_cat.name }}

data/_layouts/room.html

@@ -7,7 +7,7 @@
 
   <!-- title shown in browser: -->
   <h1 class="display-5 mb-3 d-print-none">
-    {{ site.data.lang[site.conference.lang].location.title }}
+    {{ site.data.lang[site.conference.lang].location.title | default: "Location" }}
   </h1>
 
   {% assign this_room = page %}
@@ -16,7 +16,7 @@
   {{ content }}
 
   <h5 class="mt-4 mb-2">
-    {{ site.data.lang[site.conference.lang].location.talks }}:
+    {{ site.data.lang[site.conference.lang].location.talks | default: "Talks in this room" }}:
   </h5>
   <ul class="list-program list-unstyled">
     {% for r in site.data.program %}
@@ -51,7 +51,7 @@
     {% endfor %}
     {% unless room_talks %}
       <li>
-        <em>{{ site.data.lang[site.conference.lang].location.no_talks }}</em>
+        <em>{{ site.data.lang[site.conference.lang].location.no_talks | default: "no talks planned" }}</em>
       </li>
     {% endunless %}
 

data/_layouts/speaker-overview.html

@@ -4,7 +4,7 @@
     {% if page.title %}
       {{ page.title }}
     {% else %}
-      {{ site.data.lang[site.conference.lang].speaker.overview }}
+      {{ site.data.lang[site.conference.lang].speaker.overview | default: "Speakers" }}
     {% endif %}
   </h1>
 

data/_layouts/speaker.html

@@ -3,7 +3,7 @@
   {% assign speaker = page %}
 
   <p class="h6">
-    {{ site.data.lang[site.conference.lang].speaker.title }}
+    {{ site.data.lang[site.conference.lang].speaker.title | default: "Speaker" }}
   </p>
 
   <h1 class="font-weight-light mb-3">
@@ -12,16 +12,41 @@
 
   {{ content }}
 
-  {% if speaker.links %}
-    <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].more_information }}:</h5>
+  {% include partials/get_link_types.html %}
+
+  {% if has_icon_links %}
     <ul class="list-unstyled">
       {% for link in speaker.links %}
-        <li class="mb-1 ml-2 pl-2 border-soft-primary">
-          {% include partials/get_link_href.html %}
-          <a class="text-reset" href="{{ link_href }}">
-            {{ link.name }}
-          </a>
-        </li>
+        {% assign link_styleclass = "" %}
+        {% include partials/get_link.html %}
+
+        {% if link_icon %}
+          <li class="mb-1 ml-2">
+            {{ link_tag }}
+              <i class="fas fa-{{ link_icon }} pr-1"></i>
+              {{ link.name }}
+            </a>
+          </li>
+        {% endif %}
+      {% endfor %}
+    </ul>
+  {% endif %}
+
+  {% if has_regular_links %}
+    <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].more_information | default: "More Information" }}:</h5>
+
+    <ul class="list-unstyled">
+      {% for link in speaker.links %}
+        {% assign link_styleclass = "text-reset" %}
+        {% include partials/get_link.html %}
+
+        {% unless link_icon %}
+          <li class="mb-1 ml-2 pl-2 border-soft-primary">
+            {{ link_tag }}
+              {{ link.name }}
+            </a>
+          </li>
+        {% endunless %}
       {% endfor %}
     </ul>
   {% endif %}
@@ -37,7 +62,7 @@
   {% endfor %}
 
   {% if active_speaker %}
-    <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].speaker.talks }}:</h5>
+    <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].speaker.talks | default: "Talks at this conference" }}:</h5>
 
     <ul class="list-program list-unstyled">
       {% for r in site.data.program %}
@@ -73,7 +98,7 @@
   <p class="d-print-none mt-5">
     <a href="{{ page.collection | prepend: '/' | prepend: site.baseurl }}" class="btn btn-light">
       <i class="fas fa-users"></i>
-      {{ site.data.lang[site.conference.lang].overview }}
+      {{ site.data.lang[site.conference.lang].overview | default: "Overview" }}
     </a>
   </p>
 

data/_layouts/talk-overview.html

@@ -4,7 +4,7 @@
     {% if page.title %}
       {{ page.title }}
     {% else %}
-      {{ site.data.lang[site.conference.lang].talk.overview }}
+      {{ site.data.lang[site.conference.lang].talk.overview | default: "Talks" }}
     {% endif %}
   </h1>
 
@@ -30,6 +30,20 @@
               </p>
               <p class="mb-0">
                 {% include partials/list_sub_categories.html %}
+
+                {% include partials/get_link_types.html %}
+                {% if has_icon_links and site.conference.talks.hide_icons != true %}
+                  <span class="ml-1">
+                    {% for link in talk.links %}
+                      {% assign link_styleclass = "text-secondary" %}
+                      {% include partials/get_link.html %}
+                      {% if link_icon %}
+                        {{ link_tag -}}
+                          <i class="fas fa-{{ link_icon }} pr-1"></i></a>
+                      {% endif %}
+                    {% endfor %}
+                  </span>
+                {% endif %}
               </p>
 
               {% if talk.hide %}
@@ -44,9 +58,9 @@
                     {% endfor %}
                   {% endfor %}
 
-                  {{ site.data.lang[site.conference.lang].pronoun.at }} {% include partials/show_talk_time.html %}
+                  {{ site.data.lang[site.conference.lang].pronoun.at | default: "at" }} {% include partials/show_talk_time.html %}
 
-                  {{ site.data.lang[site.conference.lang].pronoun.in }} {% include partials/show_room.html %}
+                  {{ site.data.lang[site.conference.lang].pronoun.in | default: "in"  }} {% include partials/show_room.html %}
                 </p>
               {% endif %}
 

data/_layouts/talk.html

@@ -34,18 +34,18 @@
 
           {% include partials/get_talk_time.html %}
           <span class="d-none d-sm-inline">
-            {{ site.data.lang[site.conference.lang].pronoun.at }}
+            {{ site.data.lang[site.conference.lang].pronoun.at | default: "at" }}
           </span>
           {% include partials/show_talk_time.html %}
 
           {% assign room = site.rooms | where: 'name', r.room | first %}
           <span class="d-none d-sm-inline ml-1">
-            {{ site.data.lang[site.conference.lang].pronoun.in }}
+            {{ site.data.lang[site.conference.lang].pronoun.in | default: "in" }}
           </span>
           {% include partials/show_room.html %}
 
           <span class="d-none d-sm-inline ml-1">
-            {{ site.data.lang[site.conference.lang].pronoun.for }}
+            {{ site.data.lang[site.conference.lang].pronoun.for | default: "for" }}
           </span>
           {% include partials/show_talk_duration.html %}
 
@@ -56,29 +56,18 @@
 
   {{ content }}
 
-  {% 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 %}
-    {% else %}
-      {% assign has_regular_links = true %}
-    {% endif %}
-  {% endfor %}
+  {% include partials/get_link_types.html %}
 
   {% if has_icon_links %}
     <ul class="list-unstyled">
       {% for link in talk.links %}
-        {% if link.icon %}
+        {% assign link_styleclass = "text-reset" %}
+        {% include partials/get_link.html %}
+
+        {% if link_icon %}
           <li class="mb-1 ml-2">
-            {% include partials/get_link_href.html %}
-            {% if link.iframe %}
-              <a class="cursor-pointer" data-toggle="modal" data-target="#link-modal" data-title="{{ link.name }}" data-href="{{ link_href }}">
-            {% else %}
-              <a href="{{ link_href }}">
-            {% endif %}
-              <i class="fas fa-{{ link.icon }} pr-1"></i>
+            {{ link_tag }}
+              <i class="fas fa-{{ link_icon }} pr-1 text-{{ main_cat_color }}"></i>
               {{ link.name }}
             </a>
           </li>
@@ -88,18 +77,16 @@
   {% endif %}
 
   {% if has_regular_links %}
-    <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].more_information }}:</h5>
+    <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].more_information | default: "More information" }}:</h5>
 
     <ul class="list-unstyled">
       {% for link in talk.links %}
-        {% unless link.icon %}
-          <li class="mb-1 ml-2 pl-2 border-soft-primary">
-            {% include partials/get_link_href.html %}
-            {% if link.iframe %}
-              <a class="cursor-pointer text-reset" data-toggle="modal" data-target="#link-modal" data-title="{{ link.name }}" data-href="{{ link_href }}">
-            {% else %}
-              <a class="text-reset" href="{{ link_href }}">
-            {% endif %}
+        {% assign link_styleclass = "text-reset" %}
+        {% include partials/get_link.html %}
+
+        {% unless link_icon %}
+          <li class="mb-1 ml-2 pl-2 border-soft-{{ main_cat_color }}">
+            {{ link_tag }}
               {{ link.name }}
             </a>
           </li>
@@ -108,34 +95,15 @@
     </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>
-      {{ site.data.lang[site.conference.lang].overview }}
+      {{ site.data.lang[site.conference.lang].overview | default: "Overview" }}
     </a>
 
     <a href="{{ site.conference.program.url | prepend: site.baseurl }}" class="btn btn-light">
       <i class="far fa-calendar-alt"></i>
-      {{ site.data.lang[site.conference.lang].program.title }}
+      {{ site.data.lang[site.conference.lang].program.title | default: "Program" }}
     </a>
   </p>
 

data/assets/js/main.js

@@ -4,19 +4,7 @@
 {% include js/conference.js %}
 
 (function() {
-    var map_provider = "{{ site.conference.location.map.map_provider | default: 'OpenStreetMap.Mapnik' }}";
-    var home_coord = [{{ site.conference.location.map.home_coord }}];
-    var default_zoom = {{ site.conference.location.map.default_zoom | default: 17 }};
+    if (typeof map !== 'undefined') {
 
-    if (document.getElementById('map')) {
-        var map = L.map('map').setView(home_coord, default_zoom);
-
-        L.tileLayer.provider(map_provider).addTo(map);
-
-        L.easyButton('far fa-star', function(){
-            map.setView(home_coord, default_zoom);
-        }).addTo(map);
-
-        L.control.locate().addTo(map);
     }
 })();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-conference
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Lorenz Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-31 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -62,6 +62,8 @@ files:
 - LICENSE.md
 - README.md
 - _includes/js/bootstrap.js
+- _includes/js/conference-map.js
+- _includes/js/conference-modal.js
 - _includes/js/conference.js
 - _includes/js/jquery-3.2.1.slim.min.js
 - _includes/js/leaflet-easybutton.js
@@ -72,7 +74,8 @@ files:
 - _includes/js/syncscroll.js
 - _includes/partials/checks.html
 - _includes/partials/footer.html
-- _includes/partials/get_link_href.html
+- _includes/partials/get_link.html
+- _includes/partials/get_link_types.html
 - _includes/partials/get_main_category.html
 - _includes/partials/get_talk_time.html
 - _includes/partials/header.html

data/_includes/partials/get_link_href.html

@@ -1,5 +0,0 @@
-{% if link.file %}
-  {% assign link_href = link.file | prepend: '/documents/' | prepend: site.baseurl %}
-{% else %}
-  {% assign link_href = link.href %}
-{% endif %}