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

Commit

Permalink
Merge pull request #11 from geometalab/kort-patch2
Browse files Browse the repository at this point in the history
Kort design patch
  • Loading branch information
and01 authored Nov 16, 2016
2 parents ddc363b + baa237e commit 84e7438
Show file tree
Hide file tree
Showing 10 changed files with 245 additions and 421 deletions.
2 changes: 1 addition & 1 deletion .htaccess
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DirectoryIndex index.html index.php
DirectoryIndex index_en.html index.php

RewriteEngine on
RewriteCond %{HTTP_HOST} !^www\..* [NC]
Expand Down
42 changes: 34 additions & 8 deletions developers.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,23 @@
<head>
<title>Kort - An OpenStreetMap Game</title>
<meta charset="utf-8">

<!-- Facebook -->
<meta property="og:title" content="Kort" />
<meta property="og:type" content="summary_large_image" />
<meta property="og:description" content="Kort - An OpenStreetMap Game" />
<meta property="og:image" content="./resources/images/twitterCard.png" />

<!-- Twitter -->
<meta name="twitter:title" content="Kort">
<meta name="twitter:creator" content="@KortGame">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:description" content="Kort - An OpenStreetMap Game">
<meta name="twitter:image" content="./resources/images/twitterCard.png">

<link rel="icon" href="./resources/images/kort-favicon.ico" type="image/png" />
<link href="./lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" type="text/css" href="./resources/styles/styles.css">
<link rel="stylesheet" type="text/css" href="./resources/styles/styles.scss">
<script src="http://code.jquery.com/jquery-latest.js"></script>
<script src="./lib/bootstrap/js/bootstrap.min.js"></script>
</head>
Expand All @@ -16,19 +30,18 @@
<a class="brand" href="index.html">Kort</a>
<ul class="nav">
<li><a href="index.html"><i class="nav-icon icon-home"></i> Home</a></li>
<li><a href="screenshots.html"><i class="nav-icon icon-picture"></i> Screenshots</a></li>
<li class="active"><a href="developers.html"><i class="nav-icon icon-user icon-white"></i> Entwickler</a></li>
<li><a href="statistics.php"><i class="nav-icon icon-tasks"></i> Statistiken</a></li>
<li><a href="proposals.php"><i class="nav-icon icon-ok-sign"></i> Lösungen</a></li>
<li><a href="developers_en.html"><i class="nav-icon icon-home icon-white"></i> English</a></li>
<!-- <li><a href="screenshots.html"><i class="nav-icon icon-picture"></i> Screenshots</a></li> -->
<li><a href="statistics.php"><i class="nav-icon icon-tasks"></i> Dokumentation</a></li>
<li class="active"><a href="developers.html"><i class="nav-icon icon-user icon-white"></i> Über uns</a></li>
<!-- <li><a href="proposals.php"><i class="nav-icon icon-ok-sign"></i> Lösungen</a></li> -->
<li><a href="developers_en.html"><i class="nav-icon icon-home icon-white"></i> Englisch</a></li>
</ul>
<p><a href="http://play.kort.ch" target="_blank" class="btn btn-success" type="button">Jetzt spielen! <i class="icon-play-circle icon-white"></i></a></p>
</div>
</div>
</div>
<header class="jumbotron subhead">
<div class="container">
<h1>Entwickler</h1>
<h1>Über uns</h1>
<p>Le Team</p>
</div>
</header>
Expand Down Expand Up @@ -138,5 +151,18 @@ <h2>Danke!</h2>
})();

</script>
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//log.hsr.ch/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '90']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
</body>
</html>
45 changes: 37 additions & 8 deletions developers_en.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,23 @@
<head>
<title>Kort - An OpenStreetMap Game</title>
<meta charset="utf-8">

<!-- Facebook -->
<meta property="og:title" content="Kort" />
<meta property="og:type" content="summary_large_image" />
<meta property="og:description" content="Kort - An OpenStreetMap Game" />
<meta property="og:image" content="./resources/images/twitterCard.png" />

<!-- Twitter -->
<meta name="twitter:title" content="Kort">
<meta name="twitter:creator" content="@KortGame">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:description" content="Kort - An OpenStreetMap Game">
<meta name="twitter:image" content="./resources/images/twitterCard.png">

<link rel="icon" href="./resources/images/kort-favicon.ico" type="image/png" />
<link href="./lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" type="text/css" href="./resources/styles/styles.css">
<link rel="stylesheet" type="text/css" href="./resources/styles/styles.scss">
<script src="http://code.jquery.com/jquery-latest.js"></script>
<script src="./lib/bootstrap/js/bootstrap.min.js"></script>
</head>
Expand All @@ -16,19 +30,18 @@
<a class="brand" href="index_en.html">Kort</a>
<ul class="nav">
<li><a href="index_en.html"><i class="nav-icon icon-home"></i> Home</a></li>
<li><a href="screenshots_en.html"><i class="nav-icon icon-picture"></i> Screenshots</a></li>
<li class="active"><a href="developers_en.html"><i class="nav-icon icon-user icon-white"></i> Developers</a></li>
<li><a href="statistics_en.php"><i class="nav-icon icon-tasks"></i> Statistics</a></li>
<li><a href="proposals_en.php"><i class="nav-icon icon-ok-sign"></i> Solutions</a></li>
<li><a href="developers.html"><i class="nav-icon icon-home icon-white"></i> Deutsch</a></li>
<!-- <li><a href="screenshots_en.html"><i class="nav-icon icon-picture"></i> Screenshots</a></li> -->
<li><a href="statistics_en.php"><i class="nav-icon icon-tasks"></i> Documentation</a></li>
<li class="active"><a href="developers_en.html"><i class="nav-icon icon-user icon-white"></i> About</a></li>
<!-- <li><a href="proposals_en.php"><i class="nav-icon icon-ok-sign"></i> Solutions</a></li> -->
<li><a href="developers.html"><i class="nav-icon icon-home icon-white"></i> German</a></li>
</ul>
<p><a href="http://play.kort.ch" target="_blank" class="btn btn-success" type="button">Play now! <i class="icon-play-circle icon-white"></i></a></p>
</div>
</div>
</div>
<header class="jumbotron subhead">
<div class="container">
<h1>Developers</h1>
<h1>About</h1>
<p>Le Team</p>
</div>
</header>
Expand Down Expand Up @@ -137,5 +150,21 @@ <h2>Acknowledgements</h2>
})();

</script>
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//log.hsr.ch/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '90']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="//log.hsr.ch/piwik.php?idsite=90" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->

</body>
</html>
124 changes: 54 additions & 70 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,23 @@
<head>
<title>Kort - An OpenStreetMap Game</title>
<meta charset="utf-8">

<!-- Facebook -->
<meta property="og:title" content="Kort" />
<meta property="og:type" content="summary_large_image" />
<meta property="og:description" content="Kort - An OpenStreetMap Game" />
<meta property="og:image" content="./resources/images/twitterCard.png" />

<!-- Twitter -->
<meta name="twitter:title" content="Kort">
<meta name="twitter:creator" content="@KortGame">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:description" content="Kort - An OpenStreetMap Game">
<meta name="twitter:image" content="./resources/images/twitterCard.png">

<link rel="icon" href="./resources/images/kort-favicon.ico" type="image/png" />
<link href="./lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" type="text/css" href="./resources/styles/styles.css">
<link rel="stylesheet" type="text/css" href="./resources/styles/styles.scss">
<script src="http://code.jquery.com/jquery-latest.js"></script>
<script src="./lib/bootstrap/js/bootstrap.min.js"></script>
</head>
Expand All @@ -15,14 +29,13 @@
<div class="container">
<a class="brand" href="index.html">Kort</a>
<ul class="nav">
<li class="active"><a href="index.html"><i class="nav-icon icon-home icon-white"></i> Home</a></li>
<li><a href="screenshots.html"><i class="nav-icon icon-picture"></i> Screenshots</a></li>
<li><a href="developers.html"><i class="nav-icon icon-user"></i> Entwickler</a></li>
<li><a href="statistics.php"><i class="nav-icon icon-tasks"></i> Statistiken</a></li>
<li><a href="proposals.php"><i class="nav-icon icon-ok-sign"></i> Lösungen</a></li>
<li><a href="index_en.html"><i class="nav-icon icon-home icon-white"></i> English</a></li>
<li class="active"><a href="index_en.html"><i class="nav-icon icon-home icon-white"></i> Home</a></li>
<!-- <li><a href="screenshots.html"><i class="nav-icon icon-picture"></i> Screenshots</a></li> -->
<li><a href="statistics.php"><i class="nav-icon icon-tasks"></i> Dokumentation </a></li>
<li><a href="developers.html"><i class="nav-icon icon-user"></i> Über uns</a></li>
<!-- <li><a href="proposals.php"><i class="nav-icon icon-ok-sign"></i> Lösungen</a></li> -->
<li><a href="index_en.html"><i class="nav-icon icon-home icon-white"></i> Englisch</a></li>
</ul>
<p><a href="http://play.kort.ch" target="_blank" class="btn btn-success" type="button">Jetzt spielen! <i class="icon-play-circle icon-white"></i></a></p>
</div>
</div>
</div>
Expand Down Expand Up @@ -51,88 +64,43 @@ <h1>Kort</h1>
<img src="./resources/images/home/openstreetmap.png" class="introduction-image" />
<h2>OpenStreetMap</h2>
<p>
<strong>Kort</strong> trägt dazu bei, die <em>OpenStreetMap</em>-Daten zu verbessern.
Auf einer Karte werden <em>Aufträge</em> angezeigt, die zu erledigen sind.
</p>
<p>
Spieler können bereits erledigte Aufträge auf ihre Korrektheit überprüfen.
Sobald genügend positive Überprüfungen eingegangen sind, kann die Lösung eines Auftrags auf OpenStreetMap eingetragen werden.
<strong>Kort</strong> trägt dazu bei, die <em>OpenStreetMap</em>-Daten zu verbessern. Auf einer Karte werden Aufträge angezeigt, die zu erledigen sind.
Sobald genügend übereinstimmende <em>Aufträge</em> gelöst wurden, wird die Lösung eines Auftrags automatisch auf OpenStreetMap eingetragen.
</p>
</div>
<div class="span4">
<img src="./resources/images/home/gamification.png" class="introduction-image" />
<h2>Gamification</h2>
<p>
<strong>Kort</strong> nutzt <em>Gamification</em>, um Benutzer zu motivieren, die App zu verwenden.
So können durch das Lösen von Aufträgen oder das Überpüfen von Lösungsvorschlägen Punkte (sogenannte <em>Koins</em>) gesammelt werden.
Ziel ist es, durch das Sammeln von Koins immer höher in der Highscore aufzusteigen.
Zusätzlich wird ein Spieler für seinen Einsatz auch mit Auszeichnungen belohnt.
<strong>Kort</strong> nutzt <em>Gamification</em>, um Benutzer zu motivieren, die App zu verwenden. So können durch das Lösen von Aufträgen Punkte (sogenannte <em>Koins</em>) gesammelt werden.
Ziel ist es, durch das Sammeln von Koins immer höher in der Rangliste aufzusteigen.
Zusätzlich wird ein Spieler für seinen Einsatz auch mit Auszeichnungen belohnt.
</p>
</div>
<div class="span4">
<img src="./resources/images/home/crossplatform.png" class="introduction-image" />
<h2>WebApp</h2>
<h2>App</h2>
<p>
<strong>Kort</strong> ist eine <em>WebApp</em>, die in HTML5 und JavaScript geschrieben ist.
So können verschiedene mobile Betriebssysteme unterstützt werden.
Dazu gehören iOS, Android und BlackBerry.
<strong>Kort</strong> ist eine native <em>App</em>, die in React Native geschrieben und somit für die meist verbreiteten mobilen Plattformen Android und iOS verfügbar ist.
</p>
<p>
Die App wird im Browser des Smartphones gestartet und gespielt.
Kort ist momentan in der Entwicklungsphase und wird im Q2 2017 verfügbar sein. Bleibe mittels <a href="https://github.com/kort/kort" target="_blank">GitHub</a> auf dem Laufenden.
</p>
</div>
</div>
</div>
</div>
<div class="container with-margin">
<div class="row-fluid">
<div class="span12">
<h2>Unterstützte Browser</h2>
<p>
Kort wurde für den Betrieb auf mobilen Geräten (Smartphones, Tablets) entwickelt.
Durch den Einsatz des <a href="http://www.sencha.com/products/touch/" target="_blank">Sencha Touch 2 Frameworks</a> werden aber alle <strong>WebKit-Browser</strong> unterstützt.
</p>
</div>
</div>
<div class="row-fluid">
<div class="span6">
<img src="resources/images/home/supported-browsers.png" alt="Unterstützte Browser" />
</div>
<div class="span3">
<h4>Mobile Browser</h4>
<ul>
<li>iOS
<ul>
<li>Safari mobile</li>
<li>Google Chrome</li>
</ul>
</li>
<li>Android
<ul>
<li>Native Browser</li>
<li>Google Chrome</li>
<li>Dolphin</li>
</ul>
</li>
<li>BlackBerry
<ul>
<li>Native Browser</li>
</ul>
</li>
</ul>
</div>
<div class="span3">
<h4>Desktop Browser</h4>
<ul>
<li>Google Chrome</li>
<li>Safari</li>
</ul>
</div>
<div class="container">
<div class="pagination-centered">
<div class="span12">
<!-- Embedded video -->
<iframe width="560" height="315" src="https://www.youtube.com/embed/ixWWiSsw324" frameborder="0" allowfullscreen></iframe>
</div>
</div>
</div>

<div class="container centered">
<p><a href="http://play.kort.ch" target="_blank" class="btn btn-large btn-info"><img class="image-koin" src="resources/images/home/koin_no_value.png" /> Jetzt Koins sammeln! <i class="icon-play-circle icon-white"></i></a></p>
</div>
</div>

Expand All @@ -142,7 +110,7 @@ <h4>Desktop Browser</h4>
<p class="pull-right"><a href="http://www.hsr.ch/informatik" target="_blank"><img class="image-hsr-logo" src="resources/images/hsr_logo.png" /></a></p>
<p class="pull-right"><a href="http://www.hsr.ch/informatik" target="_blank">Informatik-Studium an der HSR</a></p>
</div>
</footer>
</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>
<!-- UserVoice widget -->
Expand All @@ -167,5 +135,21 @@ <h4>Desktop Browser</h4>
})();

</script>
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//log.hsr.ch/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '90']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="//log.hsr.ch/piwik.php?idsite=90" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->

</body>
</html>
</html>
Loading

0 comments on commit 84e7438

Please sign in to comment.