jekyll-theme-conference 2.5.4 → 3.0.4

data/_layouts/room.html

@@ -17,50 +17,54 @@
 
   {{ content }}
 
-  <h5 class="mt-4 mb-2">
-    {{ 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 %}
-      {% assign room_talks = false %}
-      {% if this_room.name == r.room %}
-        {% if r.talks.size > 0 %}
-          {% for t in r.talks %}
-            {% assign talk = site.talks | where: 'name', t.name | first %}
-            {% include partials/get_main_category.html %}
+  {% assign room_talks = false %}
+  {% for d in site.data.program.days %}
+    {% include partials/get_day_hash.html %}
+    {% for r in d.rooms %}
+      {% if this_room.name == r.name and r.talks.size > 0 %}
+        {% unless room_talks %}
+          <h5 class="mt-4 mb-2">
+            {{ site.data.lang[site.conference.lang].location.talks | default: "Talks in this room" }}:
+          </h5>
+          {% assign room_talks = true %}
+        {% endunless %}
 
-            <li class="d-flex flex-row">
-              <div class="flex-column">
-                {% include partials/get_talk_time.html %}
-                {% include partials/show_talk_time.html %}
+        <h6 class="mt-1 mb-0">
+          {{- day_name -}}
+        </h6>
 
-                {% assign live_button_styleclass = "mb-1" %}
-                {% include partials/live_button.html %}
-              </div>
-              <div class="flex-column ml-2 pl-2 mb-2 border-soft-{{ main_cat_color }}">
-                <p class="mb-0">
-                  {% include partials/show_talk.html %}
-                </p>
-                <p class="font-weight-light mb-0">
-                  {% include partials/list_speakers.html %}
-                </p>
-              </div>
-            </li>
+        <table class="list-program">
+        {%- for t in r.talks -%}
+          {%- assign talk = site.talks | where: 'name', t.name | first -%}
+          {%- include partials/get_main_category.html %}
 
-          {% endfor %}
-          {% assign room_talks = true %}
+          <tr>
+            <td class="pr-2">
+              {%- include partials/get_talk_time.html -%}
+              {%- assign talk_day_hide = true -%}
+              {%- assign talk_time_styleclass = "w-100" -%}
+              {% include partials/show_talk_time.html %}
+
+              {%- assign live_button_styleclass = "w-100" -%}
+              {% include partials/show_live_button.html %}
+            </td>
+            <td class="pl-2 border-soft-{{ main_cat_color }}">
+              <p class="mb-0">
+                {%- include partials/show_talk.html -%}
+              </p>
+              <p class="font-weight-light mb-0">
+                {%- include partials/list_speakers.html -%}
+              </p>
+            </td>
+          </tr>
+        {%- endfor -%}
+
+        </table>
+        {%- break -%}
 
-        {% endif %}
-        {% break %}
       {% endif %}
     {% endfor %}
-    {% unless room_talks %}
-      <li>
-        <em>{{ site.data.lang[site.conference.lang].location.no_talks | default: "no talks planned" }}</em>
-      </li>
-    {% endunless %}
-
-  </ul>
+  {% endfor %}
 
   {%- include partials/footer.html -%}
 {%- endunless -%}

data/_layouts/speaker.html

@@ -18,12 +18,16 @@
   {% if has_icon_links %}
     <ul class="list-unstyled">
       {% for link in speaker.links %}
+        {% assign link_styleclass = "text-reset" %}
         {% include partials/get_link.html %}
 
         {% if link_icon %}
-          <li class="mb-1 ml-2">
+          <li class="mb-1">
             {{ link_tag }}
-              <i class="fas fa-{{ link_icon }} pr-1"></i>&nbsp;{{ link.name }}
+              <span class="badge badge-light font-weight-normal mr-1">
+                <i class="fas fa-{{ link_icon }} fa-fw"></i>
+              </span>
+              {{- link.name }}
             </a>
           </li>
         {% endif %}
@@ -61,40 +65,40 @@
   {% endfor %}
 
   {% if active_speaker %}
-    <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 %}
-        {% if r.talks.size > 0 %}
-          {% for t in r.talks %}
-            {% assign talk = site.talks | where: 'name', t.name | first %}
-
-            {% for speaker_name in talk.speakers %}
-              {% if speaker_name == speaker.name %}
-
-                {% include partials/get_main_category.html %}
-
-                <li class="d-flex flex-row">
-                  <div class="flex-column">
-                    {% include partials/get_talk_time.html %}
-                    {% include partials/show_talk_time.html %}
-                  </div>
-                  <div class="flex-column ml-2 pl-2 mb-2 border-soft-{{ main_cat_color }}">
-                    <p class="mb-0">
-                      {% include partials/show_talk.html %}
-
-                      {% assign live_button_styleclass = "ml-2" %}
-                      {% include partials/live_button.html %}
-                    </p>
-                  </div>
-                </li>
-
-              {% endif %}
-            {% endfor %}
-          {% endfor %}
-        {% endif %}
-      {% endfor %}
-    </ul>
+    <h5 class="mt-4 mb-0">{{ site.data.lang[site.conference.lang].speaker.talks | default: "Talks at this conference" }}:</h5>
+
+    <table class="list-program">
+      {%- for d in site.data.program.days -%}
+        {%- include partials/get_day_hash.html -%}
+        {%- for r in d.rooms -%}
+          {%- for t in r.talks -%}
+            {%- assign talk = site.talks | where: 'name', t.name | first -%}
+
+            {%- for speaker_name in talk.speakers -%}
+              {%- if speaker_name == speaker.name -%}
+
+                {%- include partials/get_main_category.html -%}
+
+                <tr>
+                  <td class="pr-2 py-0">
+                    {%- include partials/get_talk_time.html -%}
+                    {%- assign talk_time_styleclass = "w-100" -%}
+                    {%- include partials/show_talk_time.html -%}
+                  </td>
+                  <td class="pl-2 py-0 align-baseline border-soft-{{ main_cat_color }}">
+                    <span class="mr-2">
+                      {%- include partials/show_talk.html -%}
+                    </span>
+                    {%- include partials/show_live_button.html -%}
+                  </td>
+                </tr>
+
+              {%- endif -%}
+            {%- endfor -%}
+          {%- endfor -%}
+        {%- endfor -%}
+      {%- endfor -%}
+    </table>
   {% endif %}
 
   <p class="d-print-none mt-5">

data/_layouts/talk-overview.html

@@ -1,11 +1,11 @@
 {% include partials/header.html %}
 
   <h1 class="display-5 mb-4">
-    {% if page.title %}
-      {{ page.title }}
-    {% else %}
-      {{ site.data.lang[site.conference.lang].talk.overview | default: "Talks" }}
-    {% endif %}
+    {%- if page.title -%}
+      {{- page.title -}}
+    {%- else -%}
+      {{- site.data.lang[site.conference.lang].talk.overview | default: "Talks" -}}
+    {%- endif -%}
   </h1>
 
   {{ content }}
@@ -17,66 +17,96 @@
       </span>
     </h3>
     <ul class="list-unstyled">
-      {% for talk in site.talks %}
-        {% for cat in talk.categories %}
-          {% if cat == main_category.name %}
-            {% assign main_cat = main_category.name %}
-            <li class="pl-3 mb-2 border-soft-{{ main_category.color }}">
+      {% for talk in site.talks -%}
+        {%- for cat in talk.categories -%}
+          {%- if cat == main_category.name -%}
+            {%- assign main_cat = main_category.name -%}
+            <li class="pl-2 mb-2 border-soft-{{ main_category.color }}">
               <p class="mb-0">
                 {% include partials/show_talk.html %}
               </p>
               <p class="font-weight-light mb-0">
                 {% include partials/list_speakers.html %}
               </p>
-              <p class="mb-0">
-                {% for r in site.data.program %}
-                  {% for t in r.talks %}
-                    {% if talk.name == t.name %}
-                      {% include partials/live_button.html %}
-                    {% endif %}
-                  {% endfor %}
-                {% endfor %}
-                {% 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 }} p-1"></i></a>
-                      {% endif %}
-                    {% endfor %}
-                  </span>
-                {% endif %}
-              </p>
+              {% if talk.hide -%}
+                {%- assign talk_scheduled = false -%}
+                {%- for d in site.data.program.days -%}
+                  {%- include partials/get_day_hash.html -%}
+                  {%- for r in d.rooms -%}
+                    {%- assign room = site.rooms | where: 'name', r.name | first -%}
+                    {%- for t in r.talks -%}
+                      {%- if talk.name == t.name -%}
+                        <p class="mb-0">
+
+                          {%- if site.conference.live -%}
+                            {%- include partials/get_talk_timestamp.html -%}
+                            <span class="live-hide" data-start="{{ timestamp_start }}" data-end="{{ timestamp_end }}">
+                          {%- endif -%}
+
+                          {%- include partials/get_time_pronoun.html -%}
+                          {%- include partials/get_talk_time.html -%}
+                          {{- time_pronoun }} {% include partials/show_talk_time.html %}
+
+                          {%- if site.conference.live -%}
+                            </span>
+                            {%- include partials/show_live_button.html -%}
+                          {%- endif %}
 
-              {% if talk.hide %}
-                <p class="mb-0">
-                  {% for r in site.data.program %}
-                    {% for t in r.talks %}
-                      {% if talk.name == t.name %}
-                        {% include partials/get_talk_time.html %}
-                        {% assign room = site.rooms | where: 'name', r.room | first %}
-                        {% break %}
-                      {% endif %}
-                    {% endfor %}
-                  {% endfor %}
+                          {{ site.data.lang[site.conference.lang].pronoun.in | default: "in" }} {% include partials/show_room.html -%}
+                        </p>
 
-                  {{ site.data.lang[site.conference.lang].pronoun.at | default: "at" }} {% include partials/show_talk_time.html %}
+                        {%- assign talk_scheduled = true -%}
+                        {%- break -%}
+                      {%- endif -%}
+                    {%- endfor -%}
 
-                  {{ site.data.lang[site.conference.lang].pronoun.in | default: "in"  }} {% include partials/show_room.html %}
-                </p>
-              {% endif %}
+                    {%- if talk_scheduled -%}
+                      {%- break -%}
+                    {%- endif -%}
+                  {%- endfor -%}
+
+                  {%- if talk_scheduled -%}
+                    {%- break -%}
+                  {%- endif -%}
+                {%- endfor -%}
+              {%- endif %}
+
+              <p class="mb-0">
+                {%- if site.conference.live and talk.hide != true -%}
+                  {% for d in site.data.program.days -%}
+                    {%- for r in d.rooms -%}
+                      {%- for t in r.talks -%}
+                        {%- if talk.name == t.name -%}
+                          {%- assign live_button_styleclass = "mr-1" -%}
+                          {%- include partials/show_live_button.html -%}
+                        {%- endif -%}
+                      {%- endfor -%}
+                    {%- endfor -%}
+                  {%- endfor -%}
+                {%- endif -%}
+                {%- include partials/list_sub_categories.html -%}
+
+                {%- include partials/get_link_types.html -%}
+                {%- if has_icon_links and site.conference.talks.hide_icons != true -%}
+                  {% for link in talk.links -%}
+                    {%- assign link_styleclass = "badge badge-light text-reset font-weight-normal mr-1" -%}
+                    {%- include partials/get_link.html -%}
+                    {%- if link_icon -%}
+                      {{- link_tag -}}
+                        <i class="fas fa-{{ link_icon }} text-secondary"></i>
+                      </a>
+                    {%- endif -%}
+                  {%- endfor %}
+                {%- endif %}
+              </p>
 
             </li>
-            {% break %}
-          {% endif %}
-        {% endfor %}
-      {% endfor %}
+            {%- break -%}
+          {%- endif -%}
+        {%- endfor -%}
+      {%- endfor %}
     </ul>
-  {% endfor %}
+  {%- endfor -%}
 
 {% include partials/footer.html %}

data/_layouts/talk.html

@@ -29,40 +29,39 @@
   </p>
 
   <div class="mb-3 p-0">
-    {% for r in site.data.program %}
-      {% for t in r.talks %}
-        {% if talk.name == t.name %}
-
-          {% if site.conference.live %}
-            {% assign time_start = t.time_start %}
-            {% assign time_end = t.time_end %}
-            {% include partials/get_timestamp.html %}
-            <span class="live-hide" data-start="{{ timestamp_start }}" data-end="{{ timestamp_end }}">
-          {% endif %}
-
-          {% include partials/get_talk_time.html %}
-          <span class="d-none d-sm-inline">
-            {{ site.data.lang[site.conference.lang].pronoun.at | default: "at" }}
-          </span>
-          {% include partials/show_talk_time.html %}
+    {% for d in site.data.program.days -%}
+      {%- include partials/get_day_hash.html -%}
+      {%- for r in d.rooms -%}
+        {%- for t in r.talks -%}
+          {%- if talk.name == t.name -%}
+
+            {%- if site.conference.live -%}
+              {%- include partials/get_talk_timestamp.html -%}
+              <span class="live-hide" data-start="{{ timestamp_start }}" data-end="{{ timestamp_end }}">
+            {%- endif -%}
+
+            {%- include partials/get_time_pronoun.html -%}
+            {%- include partials/get_talk_time.html -%}
+            <span class="d-none d-sm-inline">
+              {{- time_pronoun -}}
+            </span> {% include partials/show_talk_time.html -%}
+
+            {%- if site.conference.live -%}
+              </span>
+              {%- include partials/show_live_button.html -%}
+            {%- endif -%}
+
+            {%- assign room = site.rooms | where: 'name', r.name | first -%}
+            <span class="d-none d-sm-inline ml-1">
+              {{- 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 | default: "for" -}}
+            </span> {% include partials/show_talk_duration.html -%}
 
-          {% if site.conference.live %}
-            </span>
-            {% include partials/live_button.html %}
           {% endif %}
-
-          {% 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 | 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 | default: "for" }}
-          </span>
-          {% include partials/show_talk_duration.html %}
-
-        {% endif %}
+        {% endfor %}
       {% endfor %}
     {% endfor %}
   </div>
@@ -78,9 +77,12 @@
         {% include partials/get_link.html %}
 
         {% if link_icon %}
-          <li class="mb-1 ml-2">
+          <li class="mb-1">
             {{ link_tag }}
-              <i class="fas fa-{{ link_icon }} pr-1 text-{{ main_cat_color }}"></i>&nbsp;{{ link.name }}
+              <span class="badge bg-soft-{{ main_cat_color }} font-weight-normal mr-1">
+                <i class="fas fa-{{ link_icon }} fa-fw"></i>
+              </span>
+              {{- link.name }}
             </a>
           </li>
         {% endif %}

data/_sass/conference.scss

@@ -48,6 +48,18 @@ $fa-font-path: '/assets/webfonts' !default;
   }
 }
 
+//   Button group for lists
+ul.btn-group {
+  > li:not(:first-child) > .btn {
+    margin-left: -$btn-border-width;
+    @include border-left-radius(0);
+  }
+
+  > li:not(:last-child) > .btn {
+    @include border-right-radius(0);
+  }
+}
+
 // Extend Bootstrap Elements
 .display-5 {
   font-size:   3rem;
@@ -67,17 +79,24 @@ $fa-font-path: '/assets/webfonts' !default;
 
 // General
 
+//   Keep images in container
+main.container img {
+  max-width: 100%;
+  height: auto;
+}
+
 //   No bottom margin on info-bar
 .alert > p:last-of-type {
   margin-bottom: 0;
 }
 
-//   Live button icon
+//   Live icon
 .live-button > object {
   width: 0.85em;
   height: 0.85em;
-  color: white;
+  color: inherit;
 }
+
 //   Live button font size in navigation bar
 .nav-link .live-button {
   font-size: 1em;
@@ -117,22 +136,26 @@ $fa-font-path: '/assets/webfonts' !default;
   // First row defines width for all columns
   table-layout: fixed;
 
-  // Table width
-  min-width: 100%;
+  // Columns define table width
+  width: auto;
 
   // Column widths
-  tr {
+  th, td {
+    // Total available container width is 1110px
+
+    // Width of columns with content (default)
+    width: 245px;
+    min-width: 245px;
+
     // Spacing between columns
-    > :nth-child(even) {
-      width: 10px;
-    }
-    // Width of columns with content
-    > :nth-child(odd) {
-      width: 180px;
+    &.col-space {
+      width: 15px;
+      min-width: 15px;
     }
     // Width of first column containing timestamps
-    > :nth-child(1) {
-      width: 4rem;
+    &.col-title {
+      width: 70px;
+      min-width: 70px;
     }
   }
 }
@@ -149,11 +172,20 @@ $fa-font-path: '/assets/webfonts' !default;
 }
 
 //   Program per Room
-.list-program li > div.flex-column:first-of-type {
-  width: 4em;
+.list-program {
+  border: 0 none white;
+
+  border-collapse: separate;
+  border-spacing: 0 0.5em;
 
-  & > * {
-    width: 4.6em;
+  tr {
+    td:first-child {
+      vertical-align: top;
+    }
+
+    td:last-child {
+      width: 100%;
+    }
   }
 }