Commit ac904ca5 authored by tron's avatar tron
Browse files

bug fixes

parent e6839d0b
{
"beautify.ignore": ["assets/css/*.scss", "_layouts/*"]
}
\ No newline at end of file
......@@ -4,7 +4,7 @@
{% assign itemlist = '' | split: ',' %}
{% for d in taged %}
{% assign tag = d | remove: '"'| remove: ',,'| remove: "["| remove: "]"%}
{% assign temp = site.jobs | where: "active",true | where: "tags", tag %}
{% assign temp = site.jobs | where: "active","true" | where: "tags", tag %}
{% assign itemlist = itemlist | concat: temp | sort: 'date' | reverse %}
{% endfor %}
{% else %}
......
......@@ -4,7 +4,11 @@
{% assign itemlist = '' | split: ',' %}
{% for d in taged %}
{% assign tag = d | remove: '"'| remove: ',,'| remove: "["| remove: "]"%}
{% if include.status%}
{% assign temp = site.topics | where: "tags", tag | where: "status",include.status %}
{% else %}
{% assign temp = site.topics | where: "tags", tag %}
{% endif %}
{% assign itemlist = itemlist | concat: temp | sort: 'date' | reverse | sort:"put-on-top-of-the-list" | reverse%}
{% endfor %}
{% else %}
......@@ -72,9 +76,14 @@
{% if topic.put-on-top-of-the-list == true %}
{% assign title = title | append: " ★" %}
{% endif %}
{% if include.status%}
{% include detailed-topic class=typeClasses image=topic.image title=title teaser=topic.teaser url=topic.url assigned-to=topic.assigned-to type=typeDescription%}
{% endif %}
{% endfor %}
{% if include.status%}
{% include placeholderBlocks maxItems= include.maxItems itemListLength=itemlist.size hiddenItems=hiddenItems%}
{% endif %}
</div>
<!--{% unless include.noToggle %}
<div id="react-placeholder-toggleVisibility"></div>
......
......@@ -28,5 +28,5 @@ layout: text
{{ content }}
{% if page.tags %}
{% include projects tags=page.tags maxItems=6 %}
{% include projects tags=page.tags maxItems=6 noToggle="true" %}
{% endif %}
\ No newline at end of file
......@@ -6,12 +6,12 @@ layout: text
{{ content | markdownify }}
{% if page.tags %}
{% include news tags=page.tags maxItems=6 headline="<h2>News</h2>"%}
{% include news tags=page.tags maxItems=6 headline="<h2>News</h2>" noToggle=true %}
<h2>Theses and projects</h2>
{% include topics tags=page.tags maxItems=6 status = "open" headline="<h3>Open</h3>" %}
{% include topics tags=page.tags maxItems=6 status = "assigned" headline="<h3>Assigned</h3>"%}
{% include topics tags=page.tags maxItems=6 status = "closed" headline="<h3>Closed</h3>"%}
{% include topics tags=page.tags headline="<h2>Theses and projects</h2>" %}
{% include topics tags=page.tags status = "open" headline="<h3>Open</h3>" %}
{% include topics tags=page.tags status = "assigned" headline="<h3>Assigned</h3>" %}
{% include topics tags=page.tags status = "closed" headline="<h3>Closed</h3>" %}
{% include jobs tags=page.tags maxItems=6 headline="<h2>Open positions</h2>"%}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment