TerranQuest/App
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Emprettify settings and license, place actions now sends coordinates

Browse Source
This commit is contained in:
Skylar Ittner 2016-10-03 20:08:25 -06:00
parent 9ea0f050df
commit 454fe53d0b
5 changed files with 193 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
www/assets/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 68 KiB

168
www/assets/netsyms-logo.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

19
www/screens/licenses.html
View File

@ -20,9 +20,26 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title">Open Source Licenses</h4>
<h4 class="modal-title">About</h4>
</div>
<div class="modal-body">
<img src="assets/netsyms-logo.svg" class="img-responsive" alt="Netsyms Technologies"/>
<p style="text-align: center; font-size: 110%;"> - presents - </p>
<img src="assets/logonobg.svg" class="img-responsive" alt="TerranQuest"/>
<h3>Credits</h3>
<h4>Weather:</h4>
<p>Powered by Dark Sky (darksky.net/poweredby).</p>
<h4>Place Data:</h4>
<p>Places from OpenStreetMap and contributers, licensed under the ODbL (opendatacommons.org/licenses/odbl).</p>
<h4>Map Tiles:</h4>
<p>Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.</p>
<h4>Map Engine:</h4>
<p>Powered by Leaflet (leafletjs.com), copyright (c) 2010-2016, Vladimir Agafonkin and copyright (c) 2010-2011, CloudMade. BSD 2-clause license.</p>
<h4>Barcode Scanner:</h4>
<p>Barcode scanner code copyright (c) 2010 Matt Kane (MIT License).</p>
<h4>Application Framework:</h4>
<p>Application developed using Apache Cordova (Apache License 2.0).</p>
<h3>Licenses</h3>
<h4>TerranQuest, Apache Cordova</h4>
<p>Apache License<br>Version 2.0, January 2004<br>
http://www.apache.org/licenses/</p>

8
www/screens/place.html
View File

@ -126,7 +126,9 @@
$('#capturebtn').prop('disabled', true);
$('#capturebtn').addClass('disabled');
$.getJSON(mkApiUrl('attackplace', 'gs'), {
locationid: thisplace.properties.gameinfo.locationid
locationid: thisplace.properties.gameinfo.locationid,
lat: latitude,
long: longitude
}, function (data) {
if (data.status === 'OK') {
$('#capturebtn').text(data.message);
@ -162,7 +164,9 @@
$('#capturebtn').prop('disabled', true);
$('#capturebtn').addClass('disabled');
$.getJSON(mkApiUrl('claimplace', 'gs'), {
locationid: thisplace.properties.gameinfo.locationid
locationid: thisplace.properties.gameinfo.locationid,
lat: latitude,
long: longitude
}, function (data) {
if (data.status === 'OK') {
$('#capturebtn').text(data.message);

21
www/screens/settings.html
View File

@ -31,27 +31,8 @@
<div class='list-group-item' onclick='askLogout()'>
Logout from app
</div>
<div class='list-group-item'>
<p>
<span style='font-weight: bold;'>Data and Libraries Used</span>
<br />
Map tiles by Stamen Design (stamen.com), under CC BY 3.0 (creativecommons.org/licenses/by/3.0).
<br />
Map tile data by OpenStreetMap (openstreetmap.org), under CC BY-SA (creativecommons.org/licenses/by-sa/3.0).
<br />
Places from OpenStreetMap and contributers, licensed under the ODbL (opendatacommons.org/licenses/odbl).
<br />
Map display is powered by Leaflet (leafletjs.com), copyright (c) 2010-2016, Vladimir Agafonkin and copyright (c) 2010-2011, CloudMade. BSD 2-clause license.
<br />
Weather data Powered by Dark Sky (darksky.net/poweredby).
<br />
Application developed using Apache Cordova (Apache License 2.0).
<br />
Barcode scanner code copyright (c) 2010 Matt Kane (MIT License).
</p>
</div>
<div class='list-group-item' onclick="openmodal('licenses', '#license-modal');">
Open Source Licenses
Credits and Licenses
</div>
<div class="list-group-item">
Version: <span id="settings-version-code"></span>