Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
HCI Theme
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HCI-Development
HCI Theme
Commits
c39eafec
Commit
c39eafec
authored
Feb 20, 2020
by
Marvin Thäns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
features for consistency
parent
de8a3159
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
155 additions
and
146 deletions
+155
-146
.gitlab-ci.yml
.gitlab-ci.yml
+2
-0
_includes/jobs
_includes/jobs
+8
-22
_includes/list-blocks
_includes/list-blocks
+55
-0
_includes/news
_includes/news
+8
-28
_includes/people
_includes/people
+20
-0
_includes/projects
_includes/projects
+21
-0
_includes/topics
_includes/topics
+2
-1
_layouts/person.html
_layouts/person.html
+3
-83
_layouts/post.html
_layouts/post.html
+4
-0
_layouts/project.html
_layouts/project.html
+32
-12
No files found.
.gitlab-ci.yml
View file @
c39eafec
...
...
@@ -7,3 +7,5 @@ build-container:
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 "
only
:
-
master
\ No newline at end of file
_includes/jobs
View file @
c39eafec
...
...
@@ -2,7 +2,8 @@
{% if include.tags %}
{% assign taged = include.tags | remove: " " | split: "," %}
{% assign itemlist = '' | split: ',' %}
{% for tag in taged %}
{% for d in taged %}
{% assign tag = d | remove: '"'| remove: ',,'| remove: "["| remove: "]"%}
{% assign temp = site.jobs | where: "active",true | where: "tags", tag %}
{% assign itemlist = itemlist | concat: temp | sort: 'date' | reverse %}
{% endfor %}
...
...
@@ -12,25 +13,10 @@
<!-- Display data -->
{% if itemlist.size > 0 %}
{% unless include.noHeadline %}
{% if include.headline %}
{{include.headline}}
{% else %}
## 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
{% endif %}
{% include list-blocks items=itemlist maxItems=include.maxItems noToggle=include.noToggle hardMax=include.hardMax%}
{% endif %}
_includes/list-blocks
0 → 100644
View file @
c39eafec
{% assign maxItems = include.maxItems %}
{% if include.hardMax %}
{% assign items = include.items | slice: 0, maxItems %}
{% else %}
{% assign items = include.items %}
{% endif %}
{% assign counter = 1 %}
{% assign hiddenItems = 0 %}
{% assign listSize = items.size %}
<div class="column-layout">
{% if include.logo %}
<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>
{% assign counter = counter | plus: 1 %}
{% assign listSize = listSize | plus: 1 %}
{% endif %}
{% for i in items %}
{% assign visibility = "" %}
{% if counter > maxItems %}
{% assign visibility = "toggle-visibility hide" %}
{% assign hiddenItems = hiddenItems | plus: 1 %}
{% endif %}
{% assign date = i.date | date_to_string %}
<!--- Person Block --->
{% if i.firstNames %}
{% if stuwo==yes%}
{% capture title %}{{i.titlePrefix}} {{i.firstNames}} {{i.lastName}}{{i.titleSuffix}}{% endcapture %}
{% include block image=i.image imagedimension="portrait" imageclass="u-width-50" title=title teaser=i.function url="none"%}
{% else %}
{% capture title %}{{i.titlePrefix}} {{i.firstNames}} {{i.lastName}}{{i.titleSuffix}}{% endcapture %}
{% include block image=i.image imagedimension="portrait" imageclass="u-width-50" title=title teaser=i.function url=i.url %}
{% endif %}
{% else %}
<!-- Change Meta -->
{% if i.enddate %}
{% capture meta %}{{ i.startdate | date:"%Y" }} – {{ i.enddate | date:"%Y" }}{% endcapture %}
{% else %}
{% capture meta %}Since {{ i.startdate | date:"%Y" }}{% endcapture %}
{% endif %}
<!--- Normal Block --->
{% include block class=visibility image=i.image title=i.title teaser=i.teaser external_url=i.external_url url=i.url meta=meta%}
{% endif %}
{% assign counter = counter | plus: 1 %}
{% endfor %}
{% include placeholderBlocks maxItems=maxItems itemListLength=listSize hiddenItems=hiddenItems %}
</div>
{% unless include.noToggle %}
<div id="react-placeholder-toggleVisibility"></div>
{% endunless %}
\ No newline at end of file
_includes/news
View file @
c39eafec
<!-- Filter active posts. Further filter tags when used. -->
{% if include.tags %}
{{include.tags}}
{% assign taged = include.tags | remove: " " | split: "," %}
{% assign itemlist = '' | split: ',' %}
{% for tag in taged %}
{% for d in taged %}
{% assign tag = d | remove: '"'| remove: ',,'| remove: "["| remove: "]"%}
{% 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 %}
{% if include.headline %}
{{include.headline}}
{% else %}
## 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 %}
{% include list-blocks items=itemlist maxItems=include.maxItems noToggle=include.noToggle hardMax=include.hardMax logo=include.logo%}
{% endif %}
\ No newline at end of file
_includes/people
0 → 100644
View file @
c39eafec
<!-- Filter people. Further filter tags when used. -->
{% if include.tags %}
{% assign taged = include.tags | remove: " " | split: "," %}
{% assign itemlist = '' | split: ',' %}
{% for tag in taged %}
{% assign temp = site.people | where: "tags", tag %}
{% assign itemlist = itemlist | concat: temp | sort: 'date' | reverse %}
{% endfor %}
{% else %}
{% assign itemlist = site.people %}
{% endif %}
<!-- Display data -->
{% if itemlist.size > 0 %}
{% if include.headline %}
{{include.headline}}
{% else %}
## Team
{% endif %}
{% include list-blocks items=itemlist maxItems=include.maxItems noToggle=include.noToggle hardMax=include.hardMax logo=include.logo%}
{% endif %}
\ No newline at end of file
_includes/projects
0 → 100644
View file @
c39eafec
<!-- Filter active projects. Further filter tags when used. -->
{% if include.tags %}
{% assign taged = include.tags | remove: " " | split: "," %}
{% assign itemlist = '' | split: ',' %}
{% for d in taged %}
{% assign tag = d | remove: '"'| remove: ',,'| remove: "["| remove: "]"%}
{% assign temp = site.projects | where: active,true | where: "tag", tag %}
{% assign itemlist = itemlist | concat: temp | sort: 'date' | reverse %}
{% endfor %}
{% else %}
{% assign itemlist = site.projects | where: active,true | sort: 'date' | reverse %}
{% endif %}
<!-- Display data -->
{% if itemlist.size > 0 %}
{% if include.headline %}
{{include.headline}}
{% else %}
## Projects
{% endif %}
{% include list-blocks items=itemlist maxItems=include.maxItems noToggle=include.noToggle hardMax=include.hardMax logo=include.logo%}
{% endif %}
\ No newline at end of file
_includes/topics
View file @
c39eafec
...
...
@@ -2,7 +2,8 @@
{% if include.tags %}
{% assign taged = include.tags | remove: " " | split: "," %}
{% assign itemlist = '' | split: ',' %}
{% for tag in taged %}
{% for d in taged %}
{% assign tag = d | remove: '"'| remove: ',,'| remove: "["| remove: "]"%}
{% 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 %}
...
...
_layouts/person.html
View file @
c39eafec
---
layout: text
regenerate: true
---
<script
src=
"http://www.x3dom.org/release/x3dom.js"
></script>
...
...
@@ -73,92 +74,11 @@ layout: text
</div>
{% endif %}
<br>
<br>
{% comment %} Refactor the if statement below to reduce code duplication {% endcomment %}
{% if page.projects %}
{% assign counter = 0 %}
{% assign maxVisibleCount = 5 %}
{% assign visibility = "" %}
{% for projectDescription in page.projects %}
{% for project in site.projects %}
{% if project.title == projectDescription.title %}
{% if counter > maxVisibleCount %}
{% assign visibility = "toggle-visibility hide" %}
{% endif %}
{% assign date = project.date | date_to_string %}
{% if counter == 0 %}
<h2>
Projects
</h2><div
class=
"column-layout"
>
{% endif %}
{% if project.enddate %}
{% capture meta %}{{ project.startdate | date:"%Y" }}
–
{{ project.enddate | date:"%Y" }}{% endcapture %}
{% else %}
{% capture meta %}Since {{ project.startdate | date:"%Y" }}{% endcapture %}
{% endif %}
{% include block class=visibility image=project.image title=project.title teaser=project.teaser external_url=project.external_url url=project.url meta=meta%}
{% assign counter = counter | plus: 1 %}
{% endif %}
{% endfor %}
{% endfor %}
{% assign mod = counter | modulo: 3 %}
{% if mod == 1 %}
{% include block url = "none" class=visibility%}
{% include block url = "none" class=visibility%}
{% endif %}
{% if mod == 2 %}
{% include block url = "none" class=visibility%}
{% endif %}
{% if counter > 0 %}
</div>
{% endif %}
{% if counter > maxVisibleCount %}
<div
id=
"react-placeholder-toggleVisibility"
></div>
{% endif %}
{% else %}
{% assign sortedProjects = site.projects | sort: 'startdate' | reverse %}
{% assign counter = 0 %}
{% assign maxVisibleCount = 5 %}
{% assign visibility = "" %}
{% for project in sortedProjects %}
{% assign fullname = page.lastName| append: ' ' | append: page.firstNames %}
{% if project.members contains fullname %}
{% if counter > maxVisibleCount %}
{% assign visibility = "toggle-visibility hide" %}
{% endif %}
{% assign date = project.date | date_to_string %}
{% if counter == 0 %}
<h2>
Projects
</h2><div
class=
"column-layout"
>
{% endif %}
{% if project.enddate %}
{% capture meta %}{{ project.startdate | date:"%Y" }}
–
{{ project.enddate | date:"%Y" }}{% endcapture %}
{% else %}
{% capture meta %}Since {{ project.startdate | date:"%Y" }}{% endcapture %}
{% endif %}
{% include block class=visibility image=project.image title=project.title teaser=project.teaser external_url=project.external_url url=project.url meta=meta%}
{% assign counter = counter | plus: 1 %}
{% endif %}
{% endfor %}
{% assign mod = counter | modulo: 3 %}
{% if mod == 1 %}
{% include block url = "none" class=visibility%}
{% include block url = "none" class=visibility%}
{% endif %}
{% if mod == 2 %}
{% include block url = "none" class=visibility%}
{% endif %}
{% if counter > 0 %}
</div>
{% endif %}
{% if counter > maxVisibleCount %}
<div
id=
"react-placeholder-toggleVisibility"
></div>
{% endif %}
{% if page.tags %}
{% include projects tags=page.tags maxItems=6 headline="
<h2>
Projects
</h2>
" %}
{% endif %}
...
...
_layouts/post.html
View file @
c39eafec
...
...
@@ -26,3 +26,7 @@ layout: text
{% unless page.blank == true %}{% include image src=page.image dimension="wide" %}{% endunless %}
{{ content }}
{% if page.tags %}
{% include projects tags=page.tags maxItems=6 %}
{% endif %}
\ No newline at end of file
_layouts/project.html
View file @
c39eafec
...
...
@@ -5,13 +5,39 @@ layout: text
{{ content | markdownify }}
{% if page.tags %}
{% include news tags=page.tags maxItems=6 headline="
<h2>
News
</h2>
"%}
<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 jobs tags=page.tags maxItems=6 headline="
<h2>
Open positions
</h2>
"%}
{% endif %}
{% if page.funding%}
<h2>
Funding and Collaboration
</h2>
{% assign cf = 0 %}
<div
class=
"column-layout"
>
{% for funder in page.funding %}
<div>
{% include block image=funder.logo title=funder.name external_url=funder.url teaser=funder.description%}
</div>
{% assign cf = cf | plus: 1 %}
{% endfor %}
{% include placeholderBlocks itemListLength=cf %}
</div>
{% endif %}
{% if page.hideteam %}
{% else %}
{% assign counter = 0 %}
<h2>
Team
</h2>
<h2>
Team
</h2>
<div
class=
"column-layout"
>
{% for member in page.team %}
{% assign name = member.title %}
...
...
@@ -21,8 +47,9 @@ layout: text
{% assign image = member.image %}
{% else %}
{% for staff in site.people %}
{% capture fullname %}{{staff.firstNames}} {{staff.lastName}}{% endcapture %}
{% if staff.firstNames == name or staff.lastName == name or fullname == name %}
{% capture fullname %}{{staff.firstNames}} {{staff.lastName}}{% endcapture %}
{% if staff.firstNames == name or staff.lastName == name or fullname == name %}
{% capture fullname %}{{staff.firstNames}} {{staff.lastName}}{% endcapture %}
{% capture name %}{{staff.titlePrefix}} {{staff.firstNames}} {{staff.lastName}}{{staff.titleSuffix}}{% endcapture %}
{% assign image = staff.image %}
{% assign url = staff.url %}
...
...
@@ -33,13 +60,6 @@ layout: text
{% assign counter = counter | plus: 1 %}
{% endfor %}
{% assign mod = counter | modulo: 3 %}
{% if mod == 1 %}
{% include block url = "none" %}
{% include block url = "none" %}
{% elsif mod == 2 %}
{% include block url = "none" %}
{% endif %}
{% include placeholderBlocks itemListLength=counter %}
</div>
{% endif %}
{% endif %}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment