Skip to content
This repository was archived by the owner on Jan 11, 2022. It is now read-only.

Commit

Permalink
Merge pull request #13 from geometalab/kort-about-page-update
Browse files Browse the repository at this point in the history 
Changed about page slightly
  • Loading branch information
@and01
and01 authored Dec 23, 2016
2 parents b3ba65a + ecb9728 commit 3b37c85
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 19 deletions.
20 changes: 9 additions & 11 deletions about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ <h3>Andreas Egloff</h3>
<div class="span6">
<img src="./resources/images/developers/stefankeller.png" class="img-polaroid portrait">
<h3>Stefan Keller</h3>
<dt>Kontakt:</dt>
<dd>Prof. Stefan Keller, <a href="http://www.hsr.ch/geometalab" target="blank">Geometa Lab HSR</a>, <a href="mailto:[email protected]" target="_blank">[email protected]</a></dd><br>
<p><a href="https://twitter.com/sfkeller" class="twitter-follow-button" data-show-count="false" data-lang="de" data-size="large">@sfkeller folgen</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script></p>
Expand All @@ -81,23 +80,22 @@ <h3>Stefan Keller</h3>
<div class="container with-margin">
<div class="row">
<div class="span12">
<h2>Zur Arbeit</h2>
<p>Kort wurde im Rahmen der Bachelorarbeit von Jürg Hunziker und Stefan Oderbolz im Studiengang Informatik an der <a href="http://www.hsr.ch/informatik">HSR Hochschule für Technik Rapperswil</a> ent- und im Rahmen einer Semesterarbeit von Annrita Egli und Carmelo Schumacher weiterentwickelt. </p>
<h2>Über das Projekt</h2>
<p>Das Kort-Game wurde im Rahmen von mehreren Studentenarbeiten im Studiengang Informatik an der <a href="http://www.hsr.ch/informatik">HSR Hochschule für Technik Rapperswil</a> entwickelt.</p>
<div><a href="http://www.hsr.ch/informatik"><img src="resources/images/hsr_logo.png" /></a> <a href="http://www.sourcepole.ch"><img src="resources/images/logo_sourcepole.gif" /></a></div>
<dl>
<dt>Betreuer:</dt>
<dd>Prof Stefan Keller, <a href="http://www.ifs.hsr.ch/" target="_blank">Institut für Software (IFS)</a></dd>
<dt>Weiterer Dank an:</dt>
<dd>Reto Senn, <a href="http://bitforge.ch/" target="_blank">bitforge AG</a></dd>
<dd>René Bauer, <a href="http://gamedesign.zhdk.ch/de/content/forschung/game-lab" target="_blank">gamelab ZHdK</a></dd>
<dd>Harald Kleiner, <a href="http://www.keepright.at" target="_blank">KeepRight</a></dd>
<dd>Pirmin Kalberer, <a href ="http://www.sourcepole.ch/" target="_blank">Sourcepole</a> (Datenbank-Dienst)</dd>
<dd>Reto Senn, <a href="http://bitforge.ch/" target="_blank">bitforge AG</a> (Konzept und Design)</dd>
<dd>René Bauer, <a href="http://gamedesign.zhdk.ch/de/content/forschung/game-lab" target="_blank">gamelab ZHdK</a> (Design)</dd>
<dd>Harald Kleiner, <a href="http://www.keepright.at" target="_blank">KeepRight</a> (Daten)</dd>
<dd>Emil Sivro und Severin Fritschi (Webseite)</dd>
<dt>Ermöglicht durch:</dt>
<dd><a href="http://www.openstreetmap.org" target="_blank">OpenStreetMap</a></dd>
<dd><a href="http://www.sourcepole.ch" target="_blank">sourcepole</a></dd>
<dd><a href="http://www.heroku.com" target="_blank">Heroku</a></dd>
<dd><a href="http://travisci.org" target="_blank">Travis CI</a></dd>
<dd><a href="http://www.sencha.com/products/touch" target="_blank">Sencha Touch</a></dd>
<dd><a href="http://leafletjs.com/" target="_blank">Leaflet</a></dd>
<dd><a href="http://www.heroku.com" target="_blank">Heroku</a></dd>
<dd><a href="http://travisci.org" target="_blank">Travis CI</a></dd>
</dl>
</div>
<div class="span12">
Expand Down
8 changes: 3 additions & 5 deletions about_en.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ <h3>Andreas Egloff</h3>
<div class="span6">
<img src="./resources/images/developers/stefankeller.png" class="img-polaroid portrait">
<h3>Stefan Keller</h3>
<dt>Contact:</dt>
<dd>Prof. Stefan Keller, <a href="http://www.hsr.ch/geometalab" target="blank">Geometa Lab HSR</a>, <a href="mailto:[email protected]" target="_blank">[email protected]</a></dd><br>
<p><a href="https://twitter.com/sfkeller" class="twitter-follow-button" data-show-count="false" data-lang="en" data-size="large">follow @sfkeller</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script></p>
Expand All @@ -89,15 +88,14 @@ <h2>Regarding the paper</h2>
<dd>Prof Stefan Keller, <a href="http://www.ifs.hsr.ch/" target="_blank">Institute for Software (IFS)</a></dd>
<dt>Additional thanks go to: </dt>
<dd>Pirmin Kalberer, <a href ="http://www.sourcepole.ch/" target="_blank">Sourcepole</a> (database service)</dd>
<dd><a href="http://www.heroku.com" target="_blank">Heroku</a> and <a href="http://travisci.org" target="_blank">Travis CI</a> (free software delevopment services)</dd>
<dd>Reto Senn, <a href="http://bitforge.ch/" target="_blank">bitforge AG</a> (concept and design)</dd>
<dd>René Bauer, <a href="http://gamedesign.zhdk.ch/de/content/forschung/game-lab" target="_blank">gamelab ZHdK</a> (design)</dd>
<dd>Harald Kleiner, <a href="http://www.keepright.at" target="_blank">KeepRight</a> (data)</dd>
<dd>Emil Sivro and Severin Fritschi (website)</dd>
<dt>Made possible by:</dt>
<dd><a href="http://www.openstreetmap.org" target="_blank">OpenStreetMap</a></dd>
<dd><a href="http://www.sencha.com/products/touch" target="_blank">Sencha Touch</a></dd>
<dd><a href="http://leafletjs.com/" target="_blank">Leaflet</a></dd>
<dd><a href="http://www.heroku.com" target="_blank">Heroku</a></dd>
<dd><a href="http://travisci.org" target="_blank">Travis CI</a></dd>
</dl>
</div>
<div class="span12">
Expand All @@ -118,7 +116,7 @@ <h2>Acknowledgements</h2>

<footer>
<div class="container">
<p class="pull-left">&copy; <a href="https://creativecommons.org/licenses/by-nc/4.0/" target="blank">CC BY-NC</a> - <a href="http://www.hsr.ch/geometalab" target="blank">Geometa Lab HSR</a> - HSR University of applied sciences Rapperswil</p>
<p class="pull-left">&copy; <a href="https://creativecommons.org/licenses/by-nc/4.0/" target="blank">CC BY-NC</a> - <a href="http://www.hsr.ch/geometalab" target="blank">Geometa Lab HSR</a> - HSR University of Applied Sciences Rapperswil</p>
</div>
</footer>

Expand Down
2 changes: 1 addition & 1 deletion documentation_en.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
</div>
<footer>
<div class="container">
<p class="pull-left">&copy; <a href="https://creativecommons.org/licenses/by-nc/4.0/" target="blank">CC BY-NC</a> - <a href="http://www.hsr.ch/geometalab" target="blank">Geometa Lab HSR</a> - HSR University of applied sciences Rapperswil</p>
<p class="pull-left">&copy; <a href="https://creativecommons.org/licenses/by-nc/4.0/" target="blank">CC BY-NC</a> - <a href="http://www.hsr.ch/geometalab" target="blank">Geometa Lab HSR</a> - HSR University of Applied Sciences Rapperswil</p>
</div>
</footer>
<a href="https://github.com/kort/kort" target="_blank"><img style="position: absolute; top: 0; right: 0; border: 0; z-index: 1500;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"></a>
Expand Down
4 changes: 2 additions & 2 deletions index_en.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ <h2>OpenStreetMap</h2>
<h2>Gamification</h2>
<p>
<strong>Kort</strong> uses <em>Gamification</em> to motivate users to play with the app. By solving missions, points (so called <em>Koins</em>) can be earned.
The goal is to continually rise in ranking. Additionally, the player is awarded medals for his efforts.
The goal is to progressively rise in rank. Additionally, the player is awarded medals for his efforts.
</p>
</div>
<div class="span4">
Expand Down Expand Up @@ -99,7 +99,7 @@ <h2>App</h2>

<footer>
<div class="container">
<p class="pull-left">&copy; <a href="https://creativecommons.org/licenses/by-nc/4.0/" target="blank">CC BY-NC</a> - <a href="http://www.hsr.ch/geometalab" target="blank">Geometa Lab HSR</a> - HSR University of applied sciences Rapperswil</p>
<p class="pull-left">&copy; <a href="https://creativecommons.org/licenses/by-nc/4.0/" target="blank">CC BY-NC</a> - <a href="http://www.hsr.ch/geometalab" target="blank">Geometa Lab HSR</a> - HSR University of Applied Sciences Rapperswil</p>
</div>
</footer>

Expand Down
Binary file modified resources/images/developers/andreas.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3b37c85

Please sign in to comment.