Skip to content
Snippets Groups Projects
Commit e1dc1488 authored by Michael Kohlhase's avatar Michael Kohlhase
Browse files

Merge branch 'master' of gl.kwarc.info:kwarc/website

parents 4e96291e 5008fb65
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 185 additions and 66 deletions
_includes/people_chip.html 0 → 100644
+ 19
− 0
View file @ e1dc1488
{% capture purl %}/people/{{person}}/{% endcapture %}
{% assign pname = person %}
{% assign pimg = "" %}
{% for pp in site.pages %}
{% if pp.url == purl %}
{% assign pname = pp.fullname %}
{% assign pimg = pp.pic %}
{% endif %}
{% endfor %}
<a href="{{ site.baseurl }}{{purl}}">
<div class="chip">
{% if pimg != "" %}
<img src="{{ site.baseurl }}/{{pimg}}">
{% endif %}
{{pname}}
</div>
</a>
\ No newline at end of file
_layouts/course.html
+ 3
− 2
View file @ e1dc1488
......@@ -3,11 +3,12 @@ layout: default
---
<div class="row">
<div class="col s12 m5 right">
<div class="col s12 m5 left">
<div class="card">
<div class="card-content">
<span class="card-title">{{page.title}} ({{page.taught}})</span>
<p>{{page.instructor}}</p>
{% assign person = page.instructor %}
Instructor: {% include people_chip.html person=person %}
</div>
</div>
</div>
......
_layouts/project.html
+ 68
− 32
View file @ e1dc1488
......@@ -2,37 +2,73 @@
layout: default
---
<div class="page">
<h1 class="page-title">
{{page.title}}
{% if page.start %}
{{page.start}} - {% if page.end %} {{page.end}}{% endif %}
{% endif %}
</h1>
{% if page.subtitle %}<h2>{{page.subtitle}}</h2>{% endif %}
{% if page.funding %}
<p>funded by {{page.funding}}
{% if page.program or page.grantid %}({% endif %}
{% if page.program %}{{page.program}}{% endif %}
{% if page.grantid %} - {{page.grantid}}{% endif %}
{% if page.program or page.grantid %}){% endif %}
</p>
{% endif %}
{{ content }}
{% if page.people %}
<h3>People</h3>
{{page.people}}
{% endif %}
{% if page.collaborators %}
<h3>Collaborators</h3>
{{page.collaborators}}
{% endif %}
{% if page.homepage %}
<h3>Project Home Page</h3>
<a href="{{page.url}}">{{page.homepage}}</a>
{% endif %}
<div class="row">
<div class="col s12 m5 left">
<div class="card">
<div class="card-content">
<span class="card-title">{{page.title}}</span>
{% if page.subtitle %}<h6>{{page.subtitle}}</h6>{% endif %}
{% if page.homepage %}
<p>
<a href="{{page.url}}">{{page.homepage}}</a>
</p>
{% endif %}
{% if page.start %}
<p>
<b>From:</b> {{page.start}} {% if page.end %} <b>To:</b> {{page.end}} {% endif %}
</p>
{% endif %}
</div>
<div class="card-tabs">
<ul class="tabs tabs-fixed-width">
{% if page.funding %}
<li class="tab"><a href="#funding">Funding</a></li>
{% endif %}
{% if page.people %}
<li class="tab"><a href="#people">People</a></li>
{% endif %}
{% if page.collaborators %}
<li class="tab"><a href="#collaborators">Collaborators</a></li>
{% endif %}
</ul>
</div>
<div class="card-content grey lighten-4">
{% if page.funding %}
<div id="funding">
funded by {{page.funding}}
{% if page.program or page.grantid %}({% endif %}
{% if page.program %}{{page.program}}{% endif %}
{% if page.grantid %} - {{page.grantid}}{% endif %}
{% if page.program or page.grantid %}){% endif %}
</div>
{% endif %}
{% if page.people %}
<div id="people">
{% assign people = page.people | split: ',' %}
{% for person in people %}
{% include people_chip.html person=person %}
{% endfor %}
</div>
{% endif %}
{% if page.collaborators %}
<div id="collaborators">
{{page.collaborators}}
</div>
{% endif %}
</div>
</div>
</div>
<p>
{{content}}
</p>
</div>
_layouts/system.html
+ 57
− 26
View file @ e1dc1488
......@@ -2,29 +2,60 @@
layout: default
---
<div class="page">
<h1 class="page-title">
{{page.title}}
{% if page.start %}
{{page.start}} - {% if page.end %} {{page.end}}{% endif %}
{% endif %}
</h1>
{% if page.subtitle %}<h2>{{page.subtitle}}</h2>{% endif %}
{{ content }}
{% if page.people %}
<h3>People</h3>
{{page.people}}
{% endif %}
{% if page.collaborators %}
<h3>Collaborators</h3>
{{page.collaborators}}
{% endif %}
{% if page.homepage %}
<h3>Project Home Page</h3>
<a href="{{page.url}}">{{page.homepage}}</a>
{% endif %}
</div>
<div class="row">
<div class="col s12 m5 left">
<div class="card">
<div class="card-content">
<span class="card-title">{{page.title}}</span>
{% if page.subtitle %}<h6>{{page.subtitle}}</h6>{% endif %}
{% if page.homepage %}
<p>
<a href="{{page.url}}">{{page.homepage}}</a>
</p>
{% endif %}
{% if page.start %}
<p>
<b>From:</b> {{page.start}} {% if page.end %} <b>To:</b> {{page.end}} {% endif %}
</p>
{% endif %}
</div>
<div class="card-tabs">
<ul class="tabs tabs-fixed-width">
{% if page.people %}
<li class="tab"><a href="#people">People</a></li>
{% endif %}
{% if page.collaborators %}
<li class="tab"><a href="#collaborators">Collaborators</a></li>
{% endif %}
</ul>
</div>
<div class="card-content grey lighten-4">
{% if page.people %}
<div id="people">
{% assign people = page.people | split: ',' %}
{% for person in people %}
{% include people_chip.html person=person %}
{% endfor %}
</div>
{% endif %}
{% if page.collaborators %}
<div id="collaborators">
{{page.collaborators}}
</div>
{% endif %}
</div>
</div>
</div>
<p>
{{content}}
</p>
</div>
\ No newline at end of file
people/mkohlhase.md
+ 1
− 1
View file @ e1dc1488
......@@ -8,7 +8,7 @@ fulltitle: Professur für Wissensrepräsentation und -verarbeitung
affiliation: Computer Science, FAU Erlangen-Nürnberg
account: mkohlhase
cv: people/mkohlhase-cv
pic: public/images/miko-quer.jpg
pic: public/images/mkohlhase.jpg
---
### Contact Details:
**Office**: Martensstraße 3, 91058 Erlangen, Room11.139, tel/fax: (49) 9131-85-64052/55, <michael.kohlhase@fau.de>
......
people/twiesing.md 0 → 100644
+ 17
− 0
View file @ e1dc1488
---
layout: person
menu_title: Tom Wiesing
title: Tom Wiesing
menu_order: 1
fullname: B.Sc. Tom Wiesing
affiliation: Data Engineering, Jacobs University
account: twiesing
pic: public/images/twiesing.jpg
---
### Description:
Hi, my name is Tom Wiesing and I am a German guy who is currently a _Data Engineering_ master student at _Jacobs University Bremen_ in my 4th and final semester.
I am working for _KWARC_ mostly on _localmh_, a cross-repository administration tool for the local authoring of MathHub.info content.
In my free time I like to code and make random tweets.
\ No newline at end of file
public/css/main.css
+ 15
− 0
View file @ e1dc1488
......@@ -36,6 +36,21 @@ h1, h2, h3, h4, h5, h6 {
background-color: #5B78FD;
}
/* tabs color */
.tabs .tab a{
color:#5B78FD;
}
.tabs .tab a:hover,.tabs .tab a.active {
background-color:transparent;
color:#5B78FD;
}
.tabs .tab.disabled a,.tabs .tab.disabled a:hover {
color:rgba(102,147,153,0.7);
}
.tabs .indicator {
background-color: #5B78FD;
}
/** sizing for navigation */
nav.top-nav {
height: 122px;
......
public/images/miko-quer.jpg → public/images/mkohlhase.jpg
+ 0
− 0
View file @ e1dc1488
File moved
public/images/twiesing.jpg 0 → 100755
+ 0
− 0
View file @ e1dc1488
public/images/twiesing.jpg

172 KiB

teaching/AIProj.md
+ 1
− 1
View file @ e1dc1488
---
layout: course
instructor: Prof. Dr. Michael Kohlhase
instructor: mkohlhase
title: Projekt zur Künstlichen Intelligenz
menu_title: KI-Projekt
taught: WS16/17, SS16
......
teaching/KRMT.md
+ 1
− 1
View file @ e1dc1488
---
layout: course
instructor: Prof. Dr. Michael Kohlhase
instructor: mkohlhase
title: Vorlesung *Logik-Basierte Wissensrepräsentation für Mathematisch/Technisches Wissen*
menu_title: Vorlesung KRMT
taught: SS16/17
......
teaching/ai1.md
+ 1
− 1
View file @ e1dc1488
---
layout: course
instructor: Prof. Dr. Michael Kohlhase
instructor: mkohlhase
title: Künstliche Intelligenz I
menu_title: Künstliche Intelligenz I
taught: WS16
......
teaching/ai2.md
+ 1
− 1
View file @ e1dc1488
---
layout: course
instructor: Prof. Dr. Michael Kohlhase
instructor: mkohlhase
title: Künstliche Intelligenz II
menu_title: Künstliche Intelligenz II
taught: SS16/17
......
teaching/wuv.md
+ 1
− 1
View file @ e1dc1488
---
layout: course
instructor: Prof. Dr. Michael Kohlhase
instructor: mkohlhase
title: Seminar Wissensrepräsentation und -verarbeitung
menu_title: Seminar WuV
---
......
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