Merge remote-tracking branch 'origin/master'

.gitlab-ci.yml

@@ -2,8 +2,8 @@ build-container:
   tags:
     - docker
   image: 
-    name: gcr.io/kaniko-project/executor:debug
+    name: gcr.io/kaniko-project/executor:debug-v0.15.0
     entrypoint: [""]
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:build 2>&1 | grep -v "Adding "
\ No newline at end of file
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:build 2>&1 | grep -v "Adding "

Readme.md

@@ -41,6 +41,39 @@ menu:
       - title: "Other"
         href: "/other"
 ```
+### Lists
+
+1. News
+   ```
+   {% include news tags = "yourTag" maxItems = 6 %}
+   ```
+   Accepted arguments:
+   - `tags`: list of comma-separate tags. Used to filter all news. 
+   - `maxItems`: `int` number of items to display
+   - `logo`:Path to image relative to `./images`
+   - `noHeadline`: disables default headline
+   - `noToggle`: disables `show more` button
+2. Jobs  
+   ```
+   {% include jobs tags = "yourTag" maxItems = 6 %}
+   ```
+   Accepted arguments:
+     - `tags`: list of comma-separate tags. Used to filter all news. 
+     - `maxItems`: `int` number of items to display
+     - `logo`:Path to image relative to `./images`
+     - `noHeadline`: disables default headline
+     - `noToggle`: disables `show more` button
+3. Topics
+   ```
+   ## Theses and projects
+   {% include topics tags="yourTag" status = "open" %}
+   {% include topics tags="yourTag" status = "assigned" %}
+   {% include topics tags="yourTag" status = "closed" %}
+   ```
+   Accepted arguments:
+   - `tags`: list of comma-separate tags. Used to filter all news. 
+   - `status`: accepts `open`, `closed` and `assigned`
+   - `headline`: overrides default headline
 
 ### Image Carousel
 The teaser images at the top can be selected for each page individually with a default in the `_config.yml` as:
@@ -60,4 +93,4 @@ widths:
   - 844
   - 640
   - 320
-```
\ No newline at end of file
+```

_includes/detailed-topic

+{% if include.external_url %}
+    {% assign url = include.external_url %}
+{% elsif include.url %}
+    {% assign url = include.url | prepend: site.baseurl %}
+{% endif %}
+
+<div class="block {{ include.class }}">
+    {%  if include.image %}
+        {% if include.imagedimension %}
+            {% assign dimension = include.imagedimension %}
+        {% else %}
+            {% assign dimension = "wide" %}
+        {% endif %}
+        {% if url %}
+            <a href="{{ url }}">
+                {% include image src=include.image dimension=dimension sizes="(min-width: 1180px) 500px, (min-width: 980px) 410px, (min-width: 740px) 50vw, 100vw" class=include.imageclass %}
+            </a>
+        {% else %}
+            {% include image src=include.image dimension=dimension sizes="(min-width: 1180px) 320px, (min-width: 980px) 260px, (min-width: 740px) 50vw, 100vw" class=include.imageclass %}
+        {% endif %}
+    {% endif %}
+    {% if include.assigned-to %}
+        <div class="author">
+        	<p style="text-align:left;"> {{ include.assigned-to }} <span style="float:right;"><i>{{ include.type }}</i></span></p>
+        </div>
+    {% endif %}
+    {% if include.title %}
+        {% if url %}
+            <a href="{{ url }}" class="title">
+                {{ include.title }}
+            </a>
+        {% else %}
+            <div class="title">
+                {{ include.title }}
+            </div>
+        {% endif %}
+    {% endif %}
+    {% if include.teaser %}
+        <div class="text">
+            {{ include.teaser }}
+        </div>
+    {% endif %}
+    <div class="footer">
+        <div class="text">{{ include.meta }}</div>
+        {% if include.external_url %}
+            <a class="link" href="{{ include.external_url }}">
+                <i class="icon-right-open"></i>Go to website
+            </a>
+            {% elsif url %}
+            <a class="link" href="{{ url }}">
+                <i class="icon-right-open"></i>More
+            </a>
+        {% endif %}
+    </div>
+</div>

_includes/jobs

+<!-- Filter active jobs. Further filter tags when used.  -->
+{% if include.tags %}
+{% assign taged = include.tags | remove: " " | split: "," %}
+    {% assign itemlist = '' | split: ',' %}
+    {% for tag in taged %}
+        {% assign temp = site.jobs | where: "active",true | where: "tags", tag  %}
+        {% assign itemlist = itemlist | concat: temp | sort: 'date' | reverse %}
+    {% endfor %}
+{% else %}
+{% assign itemlist = site.jobs | where: "active",true | sort: 'date' | reverse %}
+{% endif %}
+
+<!-- Display data -->
+{% if itemlist.size > 0 %}
+{% unless include.noHeadline %}
+## Open Positions
+{% endunless %}
+{% assign counter = 1 %}
+{% assign hiddenItems = 0 %}
+<div class="column-layout">
+    {% for i in itemlist %}
+            {% assign visibility = "" %}
+            {% if counter > include.maxItems %}
+                {% assign visibility = "toggle-visibility hide" %}
+                {% assign hiddenItems = hiddenItems | plus: 1 %}
+            {% endif %}
+            {% assign date = i.date | date_to_string %}
+            {% include block class=visibility image=i.image title=i.title teaser=i.teaser external_url=i.external_url url=i.url meta=date%}
+            {% assign counter = counter | plus: 1 %}
+    {% endfor %}
+    {% include placeholderBlocks maxItems= include.maxItems itemListLength=itemlist.size hiddenItems=hiddenItems%}
+</div>
+<!--{% unless include.noToggle %}
+<div id="react-placeholder-toggleVisibility"></div>
+{% endunless %}-->
+{% endif %}
\ No newline at end of file

_includes/news

+<!-- Filter active posts. Further filter tags when used.  -->
+{% if include.tags %}
+{% assign taged = include.tags | remove: " " | split: "," %}
+    {% assign itemlist = '' | split: ',' %}
+    {% for tag in taged %}
+        {% assign temp = site.posts | where: active,true | where: "tags", tag  %}
+        {% assign itemlist = itemlist | concat: temp | sort: 'date' | reverse %}
+    {% endfor %}
+{% else %}
+{% assign itemlist = site.posts | where: active,true | sort: 'date' | reverse %}
+{% endif %}
+
+<!-- Display data -->
+{% if itemlist.size > 0 %}
+{% unless include.noHeadline %}
+## News
+{% endunless %}
+{% assign counter = 1 %}
+{% assign hiddenItems = 0 %}
+<div class="column-layout">
+    {% if include.logo %}
+    {% assign counter = counter | plus: 1 %}
+        <div class="block">
+            {% include image src=include.logo sizes="(min-width: 1180px) 320px, (min-width: 980px) 260px, (min-width: 740px) 50vw, 100vw" class=include.imageclass style="width: 75%; margin: auto" %}
+        </div>
+    {% endif %}
+    {% for i in itemlist %}
+            {% assign visibility = "" %}
+            {% if counter > include.maxItems %}
+                {% assign visibility = "toggle-visibility hide" %}
+                {% assign hiddenItems = hiddenItems | plus: 1 %}
+            {% endif %}
+            {% assign date = i.date | date_to_string %}
+            {% include block class=visibility image=i.image title=i.title teaser=i.teaser external_url=i.external_url url=i.url meta=date%}
+            {% assign counter = counter | plus: 1 %}
+    {% endfor %}
+    {% include placeholderBlocks maxItems= include.maxItems itemListLength=itemlist.size hiddenItems=hiddenItems%}
+</div>
+{% unless include.noToggle %}
+<div id="react-placeholder-toggleVisibility"></div>
+{% endunless %}
+{% endif %}

_includes/placeholderBlocks

+<!--Dummy Visible -->
+{% assign dummyblocksMod =  0 %}
+{% if include.maxItems%}
+  {% if include.itemListLength < include.maxItems%}
+  {% assign dummyblocksMod =  include.itemListLength | modulo: 3 %}
+  {% else %}
+  {% assign dummyblocksMod =  include.maxItems | modulo: 3 %}
+  {% endif %}
+{% else %}
+ {% assign dummyblocksMod =  include.itemListLength | modulo: 3 %}
+{% endif %}
+{% if dummyblocksMod == 1%}
+  <div class="block placeholder"></div>
+  <div class="block placeholder"></div>
+{% elsif dummyblocksMod == 2 %}
+  <div class="block placeholder"></div>
+{% else %}
+{% endif %}
+<!--Dummy Hidden -->
+{% assign invisMod =  include.hiddenItems | modulo: 3 %}
+{% if invisMod == 1%}
+  <div class="block placeholder toggle-visibility hide"></div>
+  <div class="block placeholder toggle-visibility hide"></div>
+{% elsif invisMod == 2 %}
+  <div class="block placeholder toggle-visibility hide"></div>
+{% else %}
+{% endif %}
+

_includes/topics

+<!-- Filter active topics. Further filter tags when used.  -->
+{% if include.tags %}
+{% assign taged = include.tags | remove: " " | split: "," %}
+    {% assign itemlist = '' | split: ',' %}
+    {% for tag in taged %}
+        {% assign temp = site.topics  | where: "tags", tag | where: "status",include.status %}
+        {% assign itemlist = itemlist | concat: temp | sort: 'date' | reverse | sort:"put-on-top-of-the-list" | reverse%}
+    {% endfor %}
+{% else %}
+{% assign itemlist = site.topics  | where: "status",include.status | sort: 'date' | reverse | sort:"put-on-top-of-the-list" | reverse%}
+{% endif %}
+
+<!-- Display data -->
+{% if itemlist.size > 0 %}
+{% if include.headline %}
+    {{include.headline}}
+{% else %}
+### {{ include.status | capitalize }}
+{% endif %}
+
+
+{% assign counter = 1 %}
+{% assign hiddenItems = 0 %}
+<div class="column-layout">
+    {% for topic in itemlist %}
+      {% assign typeClasses = "topic " %}
+                   {% assign typeDescription = "unknown format" %}
+                   {% if topic.type-mcs-bachelor-project == true %}
+                       {% assign typeClasses = typeClasses | append: " " | append: "type-mcsp" %}
+                       {% assign typeDescription = "Bachelor Project" %}
+                   {% endif %}
+                   {% if topic.type-mcs-bachelor-thesis == true %}
+                       {% assign typeClasses = typeClasses | append: " " | append: "type-mcst" %}
+                       {% assign typeDescription = "Bachelor Thesis" %}
+                   {% endif %}
+                   {% if topic.type-hci-master-project == true %}
+                       {% assign typeClasses = typeClasses | append: " " | append: "type-hcip" %}
+                       {% assign typeDescription = "Master Project" %}
+                   {% endif %}
+                   {% if topic.type-hci-master-thesis == true %}
+                       {% assign typeClasses = typeClasses | append: " " | append: "type-hcit" %}
+                       {% assign typeDescription = "Master Thesis" %}
+                   {% endif %}
+                   {% if topic.type-cs-bachelor-thesis == true %}
+                       {% assign typeClasses = typeClasses | append: " " | append: "type-csbt" %}
+                       {% assign typeDescription = "Bachelor Thesis" %}
+                   {% endif %}
+                   {% if topic.type-cs-master-project == true %}
+                       {% assign typeClasses = typeClasses | append: " " | append: "type-csmp" %}
+                       {% assign typeDescription = "Master Project" %}
+                   {% endif %}
+                   {% if topic.type-cs-master-thesis == true %}
+                       {% assign typeClasses = typeClasses | append: " " | append: "type-csmt" %}
+                       {% assign typeDescription = "Master Thesis" %}
+                   {% endif %}
+                   {% if topic.type-ge-bachelor-thesis == true %}
+                       {% assign typeClasses = typeClasses | append: " " | append: "type-gebt" %}
+                       {% assign typeDescription = "Bachelor Thesis" %}
+                   {% endif %}
+                   {% if topic.type-phd-project == true %}
+                       {% assign typeClasses = typeClasses | append: " " | append: "type-phd" %}
+                       {% assign typeDescription = "Phd Project" %}
+                   {% endif %}
+                   {% if topic.type-industry == true %}
+                       {% assign typeClasses = typeClasses | append: " " | append: "type-ind" %}
+                   {% endif %}
+                   {% if topic.type-industry-coop == true %}
+                       {% assign typeClasses = typeClasses | append: " " | append: "type-indcoop" %}
+                   {% endif %}
+                   {% assign title = topic.title %}
+                   {% if topic.put-on-top-of-the-list == true %}
+                       {% assign title = title | append: " &#9733;" %}
+                   {% endif %}
+                   {% include detailed-topic class=typeClasses image=topic.image title=title teaser=topic.teaser url=topic.url assigned-to=topic.assigned-to type=typeDescription%}
+    {% endfor %}
+    {% include placeholderBlocks maxItems= include.maxItems itemListLength=itemlist.size hiddenItems=hiddenItems%}
+</div>
+<!--{% unless include.noToggle %}
+<div id="react-placeholder-toggleVisibility"></div>
+{% endunless %}-->
+{% endif %}

bibsonomy.js

@@ -50,13 +50,13 @@ var parents = new Array()
 
 var bibtexSpecs = new Object()
 bibtexSpecs.allKeys         = new Array("address", "annote", "author", "booktitle", "chapter", "crossref", "edition", "editor", "eprint", "howpublished", "institution", "journal", "key", "month", "note", "number", "organization", "pages", "publisher", "school", "series", "title", "type", "url", "volume", "year" )
-bibtexSpecs.article         = new Array("author", "title", "journal", "year", "volume", "number", "pages", "month", "note", "key")
+bibtexSpecs.article         = new Array("author", "title", "journal", "year", "volume", "number", "pages", "month", "note", "key", "url")
 bibtexSpecs.book            = new Array("author", "editor", "title", "publisher", "year", "volume", "number", "series", "address", "edition", "month", "note", "key")
 bibtexSpecs.booklet         = new Array("title", "author", "howpublished", "address", "month", "year", "note", "key")
 bibtexSpecs.conference      = new Array("author", "title", "booktitle", "year", "editor", "volume", "number", "series", "pages", "address", "month", "organization", "publisher", "note", "key")
 bibtexSpecs.inbook          = new Array("author", "editor", "title", "chapter", "pages", "publisher", "year", "volume", "number", "series", "type", "address", "edition", "month", "note", "key")
 bibtexSpecs.incollection    = new Array("author", "title", "booktitle", "publisher", "year", "editor", "volume", "number", "series", "type", "chapter", "pages", "address", "edition", "month", "note", "key")
-bibtexSpecs.inproceedings   = new Array("author", "title", "booktitle", "year", "editor", "volume", "number", "series", "pages", "address", "month", "organization", "publisher", "note", "key")
+bibtexSpecs.inproceedings   = new Array("author", "title", "booktitle", "year", "editor", "volume", "number", "series", "pages", "address", "month", "organization", "publisher", "note", "key", "url")
 bibtexSpecs.manual          = new Array("title", "author", "organization", "address", "edition", "month", "year", "note", "key")
 bibtexSpecs.masterthesis    = new Array("author", "title", "school", "year", "type", "address", "month", "note", "key")
 bibtexSpecs.misc            = new Array("author", "title", "howpublished", "month", "year", "note", "key")