ISTWCMS-4184: fixing yml and twig for timeline

source/_patterns/04-components/timeline/timeline.twig

@@ -2,44 +2,59 @@
     uw-timeline vertical-timeline vertical-{{ style }}  {{ modifier_classes }}
 {%- endset %}
 
-{%  set display_year = timeline_items[0].year %}
+{#{% for year, timeline_item in timeline_items %}#}
+{#    {{ year }}#}
+{#    {% for month, entries in timeline_item %}#}
+{#        {{ month }}#}
+{#        {% for entry in entries %}#}
+{#            {{ entry.headline }}#}
+{#        {% endfor %}#}
+{#    {% endfor %}#}
+{#{% endfor %}#}
 
 <ol class="{{ modifier_classes }}">
-    {% for years in timeline_items %}
-
-        {%  if loop.index == 1 or  loop.index == 2 or loop.index == 3 or  years.year != display_year %}
-            <li>
-                <span class="timeline-year">{{ years.year }}</span>
-                <ol>
-        {% endif %}
-            {%  for months in years.month %}
-                {% if style == 'month' %}
-                    <li>
-                        <span class="timeline-month">{{ months.name}}</span>
-                        <ol>
-                {% endif %}
-
-                {%  for item in months.entries %}
-                    <li class="timeline-info">
-                        {% if  item.image %}
-                            <img src="{{ item.image }}" alt=""  class="timeline-photo"/>
-                        {%  endif %}
-                        <div class="timeline-headline"><strong>{{ item.headline }}</strong></div>
-                        <p>{{ item.content }}</p>
-                    </li>
-                {% endfor %}
+    {% for year, timeline_item in timeline_items %}
+
+        <li>
+            <span class="timeline-year">{{ year }}</span>
+            <ol>
+
+                {% for month, entries in timeline_item %}
+
+                    {% if style == 'month' %}
+                        <li>
+                            <span class="timeline-month">{{ month }}</span>
+                            <ol>
+                    {% endif %}
+
+                    {% for entry in entries %}
 
-                {% if style == 'month' %}
-                    </ol>
-                </li>
-                {% endif %}
+                        <li class="timeline-info">
+                            {% if entry.image %}
+                                <img src="{{ entry.image }}" alt=""  class="timeline-photo"/>
+                            {%  endif %}
+                            <div class="timeline-headline"><strong>{{ entry.headline }}</strong></div>
+                            <p>{{ entry.content }}</p>
+                        </li>
+
+                    {% endfor %}
+
+                    {% if style == 'month' %}
+                            </ol>
+                        </li>
+                    {% endif %}
+
+                {% endfor %}
+            </ol>
+        </li>
 
-            {% endfor %}
+{#        {% if timeline_items[loop.index0 + 1].year and timeline_items[loop.index0 + 1].year != display_year %}#}
+{#                </ol>#}
+{#            </li>#}
+{#        {% elseif not timeline_items[loop.index0 + 1].year %}#}
+{#                </ol>#}
+{#            </li>#}
+{#        {% endif %}#}
 
-            {%  if loop.index == 1 or  loop.index == 2 or loop.index == 3 or years.year != display_year %}
-                </ol>
-            </li>
-            {% set display_year = years.year %}
-        {% endif %}
     {% endfor %}
 </ol>
\ No newline at end of file