mirror
/
stratux
kopia lustrzana https://github.com/cyoung/stratux
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #257 from cyoung/webui_cleanup 

some web ui cleanup
pull/259/head
cyoung 2016-02-17 18:19:13 -05:00
rodzic 2e64c9ba37 3da5c9becc
commit cca7d15683
6 zmienionych plików z 90 dodań i 45 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
web/css/main.css
Wyświetl plik

@ -199,6 +199,24 @@
padding: 1px 2px 1px 3px;
}
.fake-btn {
background-color:#ccc;
margin-bottom:0;
font-weight:400;
text-align:center;
vertical-align:middle;
cursor:pointer;
border:1px solid transparent;
white-space:nowrap;
padding: 6px 12px;
line-height: 1.43;
border-radius:4px;
}
.fake-btn-block {
display:inline-block;
width: 100%;
}
/* ***************************************************************************
everything below this comment represents tweeks to the mobile-angular-uis CSS

9
web/plates/js/logs.js
Wyświetl plik

@ -1,8 +1,11 @@
angular.module('appControllers').controller('LogsCtrl', LogsCtrl); // get the main module contollers set
LogsCtrl.$inject = ['$scope', '$http']; // Inject my dependencies
LogsCtrl.$inject = ['$scope', '$state', '$http']; // Inject my dependencies
// create our controller function with all necessary logic
function LogsCtrl($scope, $http) {
$scope.userAgent = navigator.userAgent;
function LogsCtrl($scope, $state, $http) {
$scope.$parent.helppage = 'plates/logs-help.html';
// just a couple environment variables that may bve useful for dev/debugging but otherwise not significant
$scope.userAgent = navigator.userAgent;
$scope.deviceViewport = 'screen = ' + window.screen.width + ' x ' + window.screen.height;
}

38
web/plates/js/settings.js
Wyświetl plik

@ -11,7 +11,8 @@ function SettingsCtrl($rootScope, $scope, $state, $http) {
for (i = 0; i < toggles.length; i++) {
settings[toggles[i]] = undefined;
}
$scope.update_files = '';
function loadSettings(data) {
settings = angular.fromJson(data);
// consider using angular.extend()
@ -39,7 +40,6 @@ function SettingsCtrl($rootScope, $scope, $state, $http) {
for (i = 0; i < toggles.length; i++) {
settings[toggles[i]] = false;
}
});
};
@ -88,7 +88,7 @@ function SettingsCtrl($rootScope, $scope, $state, $http) {
setSettings(angular.toJson(newsettings));
}
};
$scope.updatewatchlist = function () {
if ($scope.WatchList !== settings["WatchList"]) {
settings["WatchList"] = $scope.WatchList.toUpperCase();
@ -118,14 +118,38 @@ function SettingsCtrl($rootScope, $scope, $state, $http) {
$http.post('/reboot');
};
$scope.uploadFile = function(files) {
$scope.setUploadFile = function (files) {
$scope.update_files = files;
$scope.$apply();
}
$scope.resetUploadFile = function () {
$scope.update_files = '';
$scope.$apply();
}
$scope.uploadFile = function () {
var fd = new FormData();
//Take the first selected file
fd.append("update_file", files[0]);
var file = $scope.update_files[0];
// check for empty string
if (file === undefined || file === null) {
alert ("update file not selected")
return;
}
var filename = file.name;
// check for expected file naming convention
var re = /^update.*\.sh$/;
if (!re.exec(filename)) {
alert ("file does not appear to be an update")
return;
}
fd.append("update_file", file);
$http.post("/updateUpload", fd, {
withCredentials: true,
headers: {'Content-Type': undefined },
headers: {
'Content-Type': undefined
},
transformRequest: angular.identity
}).success(function (data) {
alert("success. wait 60 seconds and refresh home page to verify new version.");
@ -135,4 +159,4 @@ function SettingsCtrl($rootScope, $scope, $state, $http) {
});
};
};
};

5
web/plates/logs-help.html 100644
Wyświetl plik

@ -0,0 +1,5 @@
<div class="section text-left help-page">
<p>The <strong>Logs</strong> page provides basic access to teh replay logs and system logs generated on the Stratux device.</p>
<p></p>
<p class="text-warning">NOTE: It is the intent that minimal log processing be done to enalbve users to see recent activity from the logs. However, this is a lower value to the current project and has been prioritized accordingly.</p>
</div>

6
web/plates/logs.html
Wyświetl plik

@ -7,14 +7,14 @@
<i class="fa fa-cloud feature-icon text-primary"></i>
</div>
<div>
<a href="../logs/stratux.log">stratux.log</a>
<a target="_blank" href="../logs/stratux.log">stratux.log</a>
</div>
<div>
<a href="../logs/stratux/">SDR, AHRS, and GPS logs</a>
<a target="_blank" href="../logs/stratux/">SDR, AHRS, and GPS logs</a>
</div>
<div>
(Enable device logging on "Settings" page)
</dib>
</div>
</div>
</div>
<div class="col-sm-6">

59
web/plates/settings.html
Wyświetl plik

@ -50,8 +50,11 @@
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-12">
<div class="panel-group col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Configuration</div>
<div class="panel-body">
@ -80,44 +83,36 @@
</div>
</div>
</div>
<div class="panel-group col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Shutdown</div>
<div class="panel-heading">Commands</div>
<div class="panel-body">
<div class="form-group">
<div class="col-xs-5">
<button ui-turn-on="modalShutdown">Shutdown</button>
<!-- Upload. Temporary. -->
<div class="col-xs-12">
<span ng-show="update_files == ''">
<span style="position:relative; overflow: hidden;">
<span class="fake-btn fake-btn-block">Click to select System Update file</span>
<input style="opacity:0.0; position: absolute; top: 0; right: 0;" class="col-xs-12" type="file" name="update_file" onchange="angular.element(this).scope().setUploadFile(this.files)"/>
</span>
</span>
<span ng-hide="update_files == ''">
<button class="btn btn-block" onclick="angular.element(this).scope().uploadFile()">Install {{update_files[0].name}}</button>
</span>
</div>
<div class="form-group reset-flow">
<div class="col-xs-12">
<button class="btn btn-primary btn-block" ui-turn-on="modalReboot">Reboot</button>
</div>
</div>
<div class="form-group reset-flow">
<div class="col-xs-12">
<button class="btn btn-primary btn-block"ui-turn-on="modalShutdown">Shutdown</button>
</div>
</div>
</div>
</div>
</div>
<div class="panel-group col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Reboot</div>
<div class="panel-body">
<div class="form-group">
<div class="col-xs-5">
<button ui-turn-on="modalReboot">Reboot</button>
</div>
</div>
</div>
</div>
</div>
<!-- Upload. Temporary. -->
<div class="panel-group col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Update</div>
<div class="panel-body">
<div class="form-group">
<div class="col-xs-5">
<input class="col-xs-7" type="file" name="update_file" onChange="angular.element(this).scope().uploadFile(this.files)"/>
</div>
</div>
</div>
</div>
</div>
</div>