Add version info on loading and settings screens

This commit is contained in:
Skylar Ittner 2016-09-06 22:07:03 -06:00
parent 1d80b50063
commit 8bb500efe2
8 changed files with 115 additions and 83 deletions

View File

@ -49,4 +49,5 @@
<plugin name="cordova-plugin-geolocation" spec="https://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation.git" />
<plugin name="com.phonegap.plugins.barcodescanner" spec="https://github.com/Telerik-Verified-Plugins/BarcodeScanner" />
<plugin name="cordova-plugin-inapppurchase" spec="~1.0.0" />
<plugin name="cordova_app_version_plugin" spec="~0.2.6" />
</widget>

View File

@ -21,3 +21,4 @@ cordova-plugin-console=https://git-wip-us.apache.org/repos/asf/cordova-plugin-co
cordova-plugin-device=https://git-wip-us.apache.org/repos/asf/cordova-plugin-device.git
com.phonegap.plugins.barcodescanner=https://github.com/Telerik-Verified-Plugins/BarcodeScanner3
cordova-plugin-inapppurchase=https://github.com/AlexDisler/cordova-plugin-inapppurchase
cordova_app_version_plugin=https://github.com/Binarypark/cordova_app_version_plugin

View File

@ -437,3 +437,11 @@ body {
#menutabcontent {
padding-top: 85px;
}
.splash-version {
position: fixed;
bottom: 0px;
right: 10px;
color: white;
z-index: 90000;
}

View File

@ -23,6 +23,7 @@
<br /><i class="fa fa-spinner fa-pulse fa-fw"></i>
<br />
<span id="loading-error"></span></p>
<p class="splash-version"></p>
<div style="background: url(assets/mountains-simple.svg) repeat-x; background-size: auto 100%; height: 20%; position: absolute; bottom: 0; width: 100%;"></div>
</div>
</div>
@ -95,6 +96,7 @@
</div>
<div id="map"></div>
<script>
$('.splash-version').text("v" + window.cordova.plugins.version.getAppVersion());
$('#namedisp').text(username);
navigator.splashscreen.hide();

View File

@ -214,6 +214,13 @@ limitations under the License.
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
<h4>cordova_app_version_plugin</h4>
<p>The MIT License</p>
<p>Copyright (c) 2016 Binarypark</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
</div>
<div class="modal-footer">
<button type="button" data-dismiss="modal" class="btn btn-default"><i class="fa fa-times"></i> Close</button>

View File

@ -23,6 +23,7 @@
<br /><i class="fa fa-spinner fa-pulse fa-fw"></i>
<br />
<span id="loading-error"></span></p>
<p class="splash-version"></p>
<div style="background: url(assets/mountains-simple.svg) repeat-x; background-size: auto 100%; height: 20%; position: absolute; bottom: 0; width: 100%;"></div>
</div>
</div>
@ -58,6 +59,8 @@
$("[data-localize]").localize("login-screen", i18n_options);
$('.splash-version').text("v" + window.cordova.plugins.version.getAppVersion());
userset = false;
passset = false;
if (localStorage.getItem("username") !== null && localStorage.getItem("username") !== '') {

View File

@ -53,5 +53,11 @@
<div class='list-group-item' onclick="openmodal('licenses', '#license-modal');">
Open Source Licenses
</div>
<div class="list-group-item">
Version: <span id="settings-version-code"></span>
</div>
</div>
</div>
<script>
$('#settings-version-code').text(window.cordova.plugins.version.getAppVersion());
</script>

View File

@ -22,5 +22,9 @@
<br /><i class="fa fa-spinner fa-pulse fa-fw"></i>
<br />
<span id="loading-error"></span></p>
<p class="splash-version"></p>
<div style="background: url(assets/mountains-simple.svg) repeat-x; background-size: auto 100%; height: 20%; position: absolute; bottom: 0; width: 100%;"></div>
</div>
<script>
$('.splash-version').text("v" + window.cordova.plugins.version.getAppVersion());
</script>