mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2026-03-12 12:08:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Error notifications

Browse source
This commit is contained in:
Martin Schröder 2015-05-13 17:08:04 +02:00 • committed by Martin Schröder
parent 9fd3c694a9
commit 55efc52eda
14 changed files with 76 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
luciexpress/htdocs/config.json
View file

@ -11,7 +11,8 @@
"settings",
"status",
"internet",
"wifi",
"juci-mod-dropbear"
"wifi"
//"juci-mod-dropbear",
//"testrunner"
]
}

5
luciexpress/htdocs/index.html
View file

@ -12,6 +12,7 @@
<link href="lib/css/select.min.css" rel="stylesheet" type="text/css" />
<link href="lib/css/angular-ui-switch.min.css" rel="stylesheet" type="text/css" />
<link href="lib/css/awesome-bootstrap-checkbox.css" rel="stylesheet" type="text/css" />
<!--<link href="lib/js/jasmine-core/jasmine.css" rel="stylesheet" type="text/css" />-->
<!--<link href="/lib/css/awesome-bootstrap-checkbox.css" rel="stylesheet" type="text/css" />-->
<link href="css/nga.min.css" rel="stylesheet" type="text/css" />
<link href="css/app.css" rel="stylesheet" type="text/css" />
@ -39,6 +40,10 @@
<script src="lib/js/angular-modal-service.min.js"></script>
<script src="lib/js/angular-checklist-model.js"></script>
<!--<script src="lib/js/jasmine-core/jasmine.js"></script>
<script src="lib/js/jasmine-core/jasmine-html.js"></script>
<script src="lib/js/jasmine-core/boot.js"></script>-->
<!-- ###---### -->
<script src="js/rpc.js"></script>
<script src="js/uci.js"></script>

11
luciexpress/htdocs/js/app.js
View file

@ -68,6 +68,12 @@ JUCI.app.config(function ($stateProvider, $locationProvider, $compileProvider, $
.run(function($rootScope, $state, $session, gettextCatalog, $tr, gettext, $rpc, $config, $location, $navigation){
console.log("RUN");
// TODO: maybe use some other way to gather errors than root scope?
$rootScope.errors = [];
$rootScope.$on("error", function(ev, data){
$rootScope.errors.push({message: data});
console.log("ERROR: "+ev.name+": "+JSON.stringify(Object.keys(ev.currentScope)));
});
// set current language
gettextCatalog.currentLanguage = "se";
gettextCatalog.debug = true;
@ -81,7 +87,7 @@ JUCI.app.config(function ($stateProvider, $locationProvider, $compileProvider, $
// Generate states for all loaded pages
Object.keys($juci.plugins).map(function(pname){
var plugin = $juci.plugins[pname];
Object.keys(plugin.pages).map(function(k){
Object.keys(plugin.pages||{}).map(function(k){
var page = plugin.pages[k];
if(page.view){
//scripts.push(plugin_root + "/" + page.view);
@ -109,7 +115,8 @@ JUCI.app.config(function ($stateProvider, $locationProvider, $compileProvider, $
return deferred.promise;
}
},*/
onEnter: function($window){
onEnter: function($window, $rootScope){
$rootScope.errors.splice(0, $rootScope.errors.length);
document.title = $tr(k+".title")+" - "+$tr(gettext("application.name"));
},
});

17
luciexpress/htdocs/js/uci.js
View file

@ -262,14 +262,15 @@
}
},
"network": {
"interface": { dvalue: "", type: String },
"is_lan": { dvalue: 1, type: Number },
"ifname": { dvalue: "", type: String },
"proto": { dvalue: "dhcp", type: String },
"ipaddr": { dvalue: "", type: String },
"netmask": { dvalue: "", type: String },
"peerdns": { dvalue: false, type: String },
"dns": { dvalue: [], type: Array }
"ineterface": {
"is_lan": { dvalue: 1, type: Number },
"ifname": { dvalue: "", type: String },
"proto": { dvalue: "dhcp", type: String },
"ipaddr": { dvalue: "", type: String },
"netmask": { dvalue: "", type: String },
"peerdns": { dvalue: false, type: String },
"dns": { dvalue: [], type: Array }
}
},
"unknown": {
"host": {

4
luciexpress/htdocs/lib/js/jquery-jsonrpc.js vendored
View file

@ -263,7 +263,7 @@
_response: function(json) {
if (json === undefined) {
return {
error: 'Internal server error',
error: 'JSONRPC: server returned empty string',
version: '2.0'
};
}
@ -282,7 +282,7 @@
}
catch (e) {
return {
error: 'Internal server error: ' + e,
error: 'JSONRPC error: ' + e,
version: '2.0'
}
}

1
luciexpress/htdocs/plugins/core/plugin.json
View file

@ -13,6 +13,7 @@
"widgets/luci.nav",
"widgets/luci.navbar",
"widgets/luci.top_bar",
"widgets/luci.errors",
"widgets/core.modal",
"widgets/luci.input.port",
"widgets/luci.input.port.range",

5
luciexpress/htdocs/plugins/core/widgets/luci.errors.html Normal file
View file

@ -0,0 +1,5 @@
<div class="alert alert-danger" ng-show="errors.length">
<ul>
<li ng-repeat="err in errors"><button class="btn btn-default pull-right">Hide</button>{{err.message}}<div style="clear: both;"></div></li>
</ul>
</div>

16
luciexpress/htdocs/plugins/core/widgets/luci.errors.js Normal file
View file

@ -0,0 +1,16 @@
JUCI.app
.directive("luciErrors", function(){
var plugin_root = $juci.module("core").plugin_root;
return {
// accepted parameters for this tag
scope: {
},
templateUrl: plugin_root+"/widgets/luci.errors.html",
replace: true,
controller: "luciErrors"
};
})
.controller("luciErrors", function($scope, $rootScope, $localStorage){
$scope.errors = $rootScope.errors;
});

6
luciexpress/htdocs/plugins/core/widgets/luci.login.js
View file

@ -20,8 +20,8 @@
* 02110-1301 USA
*/
$juci.module("core")
.directive("luciLogin", function(){
JUCI.app
.directive("luciLogin", function(){
var plugin_root = $juci.module("core").plugin_root;
return {
// accepted parameters for this tag
@ -94,4 +94,6 @@ $juci.module("core")
alert("Error logging out!");
});
}
});

2
luciexpress/htdocs/plugins/phone/pages/phone.call_log.js
View file

@ -1,7 +1,7 @@
//! Author: Martin K. Schröder <mkschreder.uk@gmail.com>
$juci.module("phone")
.controller("PhoneCallLogPageCtrl", function($scope, $uci, gettext, $tr){
.controller("PhoneCallLogPageCtrl", function($scope, $uci, gettext, $tr, $rpc){
$scope.phoneFilter = "";
$scope.phoneFilterSelected = {};
$scope.phoneList = [];

2
luciexpress/htdocs/plugins/status/pages/status.diagnostics.js
View file

@ -1,5 +1,5 @@
$juci.module("status")
.controller("StatusDiagnostics", function($scope){
.controller("StatusDiagnostics", function($scope, $rpc){
$scope.data = {};
$rpc.router.networks().done(function(result){
if(result){

7
luciexpress/htdocs/plugins/wifi/pages/wifi.wps.js
View file

@ -1,9 +1,12 @@
$juci.module("wifi")
.controller("WifiWPSPageCtrl", function($scope, $uci){
.controller("WifiWPSPageCtrl", function($scope, $uci, $rpc){
console.log("WIFI PAGE CONTROLLER");
$scope.data = {
userPIN: ""
}
$uci.sync(["wireless"]).done(function(){
$uci.sync(["wireless", "easybox"]).done(function(){
if($uci.easybox == undefined) $scope.$emit("error", "Easybox config is not present on this system!");
else $scope.easybox = $uci.easybox;
$scope.wireless = $uci.wireless;
$scope.$apply();
}).fail(function(err){

1
luciexpress/htdocs/themes/vodafone/widgets/luci.layout.with_sidebar.html
View file

@ -16,6 +16,7 @@
<luci-nav></luci-nav>
</div>
<div class="col-md-9">
<luci-errors></luci-errors>
<ng-transclude></ng-transclude>
</div>
</div>

23
luciexpress/package.json
View file

@ -2,17 +2,22 @@
"name": "LuCi",
"version": "0.0.1",
"dependencies": {
"JSON": "*",
"express": "*",
"body-parser": "*",
"grunt": "*",
"grunt-angular-gettext": "*",
"request": "*",
"glob": "*",
"async": "*"
},
"JSON": "*",
"express": "*",
"body-parser": "*",
"grunt": "*",
"grunt-angular-gettext": "*",
"request": "*",
"glob": "*",
"async": "*"
},
"engines": {
"node": "0.10.x",
"npm": "1.2.x"
},
"devDependencies": {
"jasmine-core": "~2.3.3",
"karma-jasmine": "~0.3.5",
"karma-firefox-launcher": "~0.1.6"
}
}