Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • dirk-norbert.baker/hifis.net
  • hifis/overall/hifis.net
  • jucke/hifis.net
  • stephan.thober/hifis.net
  • nicolas.boltz/hifis.net
  • axel.loewe/hifis.net
  • matthias.ruester/hifis.net
  • Franz.Steinmetz/hifis.net
  • bilke/hifis.net
  • guido.bloecher/hifis.net
  • mauro.cacace/hifis.net
  • sebastian.mueller/hifis.net
  • daniel.scheffler/hifis.net
  • manideep.jayavarapu/hifis.net
  • d.wortmann/hifis.net
  • j.mitchell/hifis.net
  • demme/hifis.net
  • s.dinkelacker/hifis.net
  • marcus/hifis.net
  • j.schmoelder/hifis.net
  • tempest.glodowski/hifis.net
  • norman.mueller/hifis.net
22 results
Show changes
Showing
with 343 additions and 50 deletions
......@@ -31,7 +31,7 @@ Introduce scientists and PhD students to the use of version control in research
## Content
The workshop covers introductory topics on the use of version control in research, as well as hands on sessions on different functionalities of Git with GitLab. You will find more information on [the workshop page]().
The workshop covers introductory topics on the use of version control in research, as well as hands on sessions on different functionalities of Git with GitLab. You will find more information on the workshop page.
## Requirements
......
_favicons/android-chrome-192x192.png

6.54 KiB | W: 0px | H: 0px

_favicons/android-chrome-192x192.png

14.3 KiB | W: 0px | H: 0px

_favicons/android-chrome-192x192.png
_favicons/android-chrome-192x192.png
_favicons/android-chrome-192x192.png
_favicons/android-chrome-192x192.png
  • 2-up
  • Swipe
  • Onion skin
_favicons/android-chrome-512x512.png

20.3 KiB | W: 0px | H: 0px

_favicons/android-chrome-512x512.png

51.4 KiB | W: 0px | H: 0px

_favicons/android-chrome-512x512.png
_favicons/android-chrome-512x512.png
_favicons/android-chrome-512x512.png
_favicons/android-chrome-512x512.png
  • 2-up
  • Swipe
  • Onion skin
_favicons/apple-touch-icon.png

5.69 KiB | W: 0px | H: 0px

_favicons/apple-touch-icon.png

5.82 KiB | W: 0px | H: 0px

_favicons/apple-touch-icon.png
_favicons/apple-touch-icon.png
_favicons/apple-touch-icon.png
_favicons/apple-touch-icon.png
  • 2-up
  • Swipe
  • Onion skin
_favicons/favicon-16x16.png

819 B | W: 0px | H: 0px

_favicons/favicon-16x16.png

1011 B | W: 0px | H: 0px

_favicons/favicon-16x16.png
_favicons/favicon-16x16.png
_favicons/favicon-16x16.png
_favicons/favicon-16x16.png
  • 2-up
  • Swipe
  • Onion skin
_favicons/favicon-32x32.png

1.41 KiB | W: 0px | H: 0px

_favicons/favicon-32x32.png

2.21 KiB | W: 0px | H: 0px

_favicons/favicon-32x32.png
_favicons/favicon-32x32.png
_favicons/favicon-32x32.png
_favicons/favicon-32x32.png
  • 2-up
  • Swipe
  • Onion skin
_favicons/favicon.ico

14.7 KiB | W: 48px | H: 48px

_favicons/favicon.ico

14.7 KiB | W: 48px | H: 48px

_favicons/favicon.ico
_favicons/favicon.ico
_favicons/favicon.ico
_favicons/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
_favicons/mstile-144x144.png

3.12 KiB

_favicons/mstile-150x150.png

2.82 KiB | W: 0px | H: 0px

_favicons/mstile-150x150.png

5.62 KiB | W: 0px | H: 0px

_favicons/mstile-150x150.png
_favicons/mstile-150x150.png
_favicons/mstile-150x150.png
_favicons/mstile-150x150.png
  • 2-up
  • Swipe
  • Onion skin
_favicons/mstile-310x150.png

2.85 KiB

_favicons/mstile-310x310.png

5.49 KiB

_favicons/mstile-70x70.png

2.37 KiB

This diff is collapsed.
......@@ -20,7 +20,16 @@
{% if include.date %}
<h3><i class="fas fa-calendar-day"></i> Posted on:</h3>
<span class="date"> {{ include.date | date: "%a, %d.%b.%Y" }} </span>
<span class="date">
{{ include.date | date: "%a., %d " }}
{% assign m = include.date | date: "%B" %}
{% case m %}
{% when 'May' or 'June' or 'July' %}{{ m }}
{% when 'September' %}Sept.
{% else %}{{ include.date | date: "%b." }}
{% endcase %}
{{ include.date | date: " %Y" }}
</span>
{% endif %}
</div>
......@@ -29,7 +38,7 @@
<h3><i class="fas fa-list"></i> Categories:</h3>
{% for category in include.categories %}
{%- unless site.languages contains category -%}
<span class="badge badge-pill badge-secondary">{{ category | capitalize }}</span>
<span class="badge badge-pill badge-secondary">{{ category }}</span>
{%- endunless -%}
{% endfor %}
{% endif %}
......@@ -37,7 +46,7 @@
{% if include.tags.size > 0 %}
<h3><i class="fas fa-tags"></i> Tags:</h3>
{% for tag in include.tags %}
<span class="badge badge-pill badge-secondary"><i class="fas fa-tag"></i> {{ tag | capitalize }}</span>
<span class="badge badge-pill badge-secondary"><i class="fas fa-tag"></i> {{ tag }}</span>
{% endfor %}
{% endif %}
</div>
......
{% if site.baseurl != '/' %}
{% assign base_url = site.baseurl | append: '/' %}
{% else %}
{% assign base_url = site.baseurl %}
{% endif %}
<div id="breadcrumbs">
{% assign crumbs = page.url | split: '/' %}
<a href="{{ base_url }}">Home</a>
{% for crumb in crumbs offset: 1 %}
{% if crumb != 'de' %}
{% if forloop.last == false %}
{% assign crumb_limit = forloop.index | plus: 1 %}
{% assign crumb_link = '' %}
{% for crumb in crumbs limit: crumb_limit %}
{% assign crumb_link = crumb_link | append: crumb | append: '/' %}
{% endfor %}
| <a href="{{ crumb_link | relative_url }}">
{{ crumb | replace:'-',' ' | replace:'_',' ' | capitalize }}</a>
{% endif %}
{% endif %}
{% endfor %}
</div>
......@@ -10,7 +10,7 @@ event: The event which sould be displayed on the card
<div class="card-title">
<span class="badge badge-secondary">
<i class="fas fa-calendar-day" aria-hidden="true"></i>
{{ include.event.date | date: "%d.&thinsp;%b.&thinsp;%y" }}
{{ include.event.date | date: "%d %b %y" }}
</span>
<span class="badge badge-secondary">
<i class="fas fa-tag" aria-hidden="true"></i>
......
......@@ -28,7 +28,14 @@ exclude_date: Do not show the date on the image card.
<div class="card-title">
<span class="badge badge-secondary">
<i class="fas fa-calendar-day" aria-hidden="true"></i>
{{ include.post.date | date: "%d.&thinsp;%b.&thinsp;%y" }}
{{ include.post.date | date: "%d " }}
{% assign m = include.post.date | date: "%B" %}
{% case m %}
{% when 'May' or 'June' or 'July' %}{{ m }}
{% when 'September' %}Sept.
{% else %}{{ include.post.date | date: "%b." }}
{% endcase %}
{{ include.post.date | date: " %y" }}
</span>
</div>
{%- endunless -%}
......
<span class="team-card-mini">
<a href="https://survey.pt-dlr.de/index.php?r=survey/index&sid=958212&lang=en&newtest=Y"
class="btn btn-outline-primary"><i class="fas fa-envelope-open-text"></i> Request a Consultation</a>
class="btn btn-outline-primary"><i class="fas fa-envelope-open-text"></i> Submit your Request</a>
</span>
......@@ -16,11 +16,26 @@
{% include events/event_registration_badges.html event=include.event %}
<h3>Time:</h3>
{{ include.event.start.date | date: "%a, %d. %b. %Y" }}&#8203;
{{ include.event.start.date | date: "%a., %d " }}
{% assign m = include.event.start.date | date: "%B" %}
{% case m %}
{% when 'May' or 'June' or 'July' %}{{ m }}
{% when 'September' %}Sept.
{% else %}{{ include.event.start.date | date: "%b." }}
{% endcase %}
{{ include.event.start.date | date: " %Y" }}&#8203;
{{ include.event.start.time | date: ", %H:%M" }}&nbsp;
{% if include.event.end.date %}
<br>{{ include.event.end.date | date: "%a, %d. %b. %Y" }}&#8203;
<br>
{{ include.event.end.date | date: "%a., %d " }}
{% assign m = include.event.end.date | date: "%B" %}
{% case m %}
{% when 'May' or 'June' or 'July' %}{{ m }}
{% when 'September' %}Sept.
{% else %}{{ include.event.end.date | date: "%b." }}
{% endcase %}
{{ include.event.end.date | date: " %Y" }}&#8203;
{{ include.event.end.time | date: ", %H:%M" }}
{% else %}
{{ include.event.end.time | date: "%H:%M" }}
......
<div class="events-list">
<div class="flex-content-wrapper">
{% assign sorted_events = include.events | sort: "start.date" %}
{% assign countdown = include.limit | default: 3 %}
{% assign today = "now" | date: "%Y-%m-%d" %}
{% assign has_upcoming_events = false %}
{% for event in sorted_events %}
{% if event.start.date < today or
event.registration_period.to < today %}
{% continue %}
{% else %}
{% assign has_upcoming_events = true %}
{% endif %}
{% include events/wide_card.html
title = event.excerpt %}
{% assign countdown = countdown | minus: 1 %}
{% if countdown == 0 %}{% break %}{% endif %}
{% endfor %}
{% if has_upcoming_events == false %}
<article class="list-entry">
<h4>
Check out the <strong>
<a href="https://events.hifis.net/category/4/">
<i class="fas fa-external-link-alt"></i> HIFIS Events page</a></strong>
or the <strong>
<a href="https://www.helmholtz-hida.de/course-catalog/?search%5Bfilter%5D%5B0%5D=tags%3AHIFIS&search%5Bfilter%5D%5B1%5D=">
<i class="fas fa-external-link-alt"></i> HIDA course catalog</a></strong>
for upcoming HIFIS courses and events.
</h4>
</article>
{% else %}
<div class="see-more-link">
<strong><a href="{% link events.md %}">See More Events</a></strong>
</div>
{% endif %}
</div>
</div>