diff --git a/_includes/people_chip.html b/_includes/people_chip.html new file mode 100644 index 0000000000000000000000000000000000000000..e949b2bb800cf44ec7b055f48af542c9862414ad --- /dev/null +++ b/_includes/people_chip.html @@ -0,0 +1,19 @@ +{% 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 diff --git a/_layouts/course.html b/_layouts/course.html index 53c70c703e97c9471794eb271d75b1f7679f7aa9..68009790126b77a1ae49515973c43a05f3e87703 100644 --- a/_layouts/course.html +++ b/_layouts/course.html @@ -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> diff --git a/_layouts/project.html b/_layouts/project.html index e3d431f26cc7f2e59acb857357f04cbd70a892b4..5c836140fa6b79324bf53afba420ec8453b81c46 100644 --- a/_layouts/project.html +++ b/_layouts/project.html @@ -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> diff --git a/_layouts/system.html b/_layouts/system.html index 73cd7e84a8210eb0b74fffc0268b456f1c2fd5cc..4ade3d656a26b370d05e99b65a3a1b055bcd880e 100644 --- a/_layouts/system.html +++ b/_layouts/system.html @@ -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 diff --git a/people/mkohlhase.md b/people/mkohlhase.md index 9d593ae294bf4e67d68c57445ae117913f298a32..6e8804af3f0dad5a6fb3a46d8da80d70fae44755 100644 --- a/people/mkohlhase.md +++ b/people/mkohlhase.md @@ -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> diff --git a/people/twiesing.md b/people/twiesing.md new file mode 100644 index 0000000000000000000000000000000000000000..32ad4405883ef787c63d74348ad908f6840d9994 --- /dev/null +++ b/people/twiesing.md @@ -0,0 +1,17 @@ +--- +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 diff --git a/public/css/main.css b/public/css/main.css index 75a34236e7eee443e0bdde3c40fbeddef6267bb1..e7de137782272499d5f4c548c7388ca173b44887 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -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; diff --git a/public/images/miko-quer.jpg b/public/images/mkohlhase.jpg similarity index 100% rename from public/images/miko-quer.jpg rename to public/images/mkohlhase.jpg diff --git a/public/images/twiesing.jpg b/public/images/twiesing.jpg new file mode 100755 index 0000000000000000000000000000000000000000..c8a62eb55d5ba91214717adfa164c3088f250b0c Binary files /dev/null and b/public/images/twiesing.jpg differ diff --git a/teaching/AIProj.md b/teaching/AIProj.md index d5c858af142d9772796ce4c0e62e000eebec92a2..ddaf9fd8dd59db1efa4b277eddf74037d4a87711 100644 --- a/teaching/AIProj.md +++ b/teaching/AIProj.md @@ -1,6 +1,6 @@ --- layout: course -instructor: Prof. Dr. Michael Kohlhase +instructor: mkohlhase title: Projekt zur Künstlichen Intelligenz menu_title: KI-Projekt taught: WS16/17, SS16 diff --git a/teaching/KRMT.md b/teaching/KRMT.md index 7c617c72d0fee1655ec8036b2a3848e965035724..e4502ee8e436dc939df1866c34701120e7199013 100644 --- a/teaching/KRMT.md +++ b/teaching/KRMT.md @@ -1,6 +1,6 @@ --- 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 diff --git a/teaching/ai1.md b/teaching/ai1.md index 99a6978b165369df467ad67150a160fe41e8fcad..df57c14db5224fdae3df21f28a38120ae5f8482b 100644 --- a/teaching/ai1.md +++ b/teaching/ai1.md @@ -1,6 +1,6 @@ --- layout: course -instructor: Prof. Dr. Michael Kohlhase +instructor: mkohlhase title: Künstliche Intelligenz I menu_title: Künstliche Intelligenz I taught: WS16 diff --git a/teaching/ai2.md b/teaching/ai2.md index fbc61abc6cc8c77483d03048e4a02ca810cb166c..174c4e9ed2e9f773dd207821a08a66449868fb41 100644 --- a/teaching/ai2.md +++ b/teaching/ai2.md @@ -1,6 +1,6 @@ --- layout: course -instructor: Prof. Dr. Michael Kohlhase +instructor: mkohlhase title: Künstliche Intelligenz II menu_title: Künstliche Intelligenz II taught: SS16/17 diff --git a/teaching/wuv.md b/teaching/wuv.md index dc2967711d928c1e62308a3486d45740034d8b1b..4d3dce0ba72873b5e6357e0749df6bc7ab4e1c25 100644 --- a/teaching/wuv.md +++ b/teaching/wuv.md @@ -1,6 +1,6 @@ --- layout: course -instructor: Prof. Dr. Michael Kohlhase +instructor: mkohlhase title: Seminar Wissensrepräsentation und -verarbeitung menu_title: Seminar WuV ---