fic/server
2
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

admin: msgbox can contains lists

Browse Source
This commit is contained in:
nemunaire 2017-12-17 15:39:51 +01:00
parent 33bf5a0f34
commit 31b80a5b2a
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/index.go
View File

@ -47,6 +47,9 @@ const indextpl = `<!DOCTYPE html>
<div ng-repeat="box in boxes" class="alert alert-dismissible alert-{{"{{ box.kind }}"}}" ng-cloak>
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<strong ng-if="box.title">{{"{{ box.title }}"}}</strong> {{"{{ box.msg }}"}}
<ul ng-if="box.list">
<li ng-repeat="i in box.list">{{"{{ i }}"}}</li>
</ul>
<button class="btn btn-sm btn-success" ng-if="box.yes || box.no" ng-click="box.yes()">Yes</button>
<button class="btn btn-sm btn-danger" ng-if="box.yes || box.no" ng-click="box.no()">No</button>
</div>

3
admin/static/index.html
View File

@ -45,6 +45,9 @@
<div ng-repeat="box in boxes" class="alert alert-dismissible alert-{{ box.kind }}" ng-cloak>
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<strong ng-if="box.title">{{ box.title }}</strong> {{ box.msg }}
<ul ng-if="box.list">
<li ng-repeat="i in box.list">{{ i }}</li>
</ul>
<button class="btn btn-sm btn-success" ng-if="box.yes || box.no" ng-click="box.yes()">Yes</button>
<button class="btn btn-sm btn-danger" ng-if="box.yes || box.no" ng-click="box.no()">No</button>
</div>

9
admin/static/js/app.js
View File

@ -275,7 +275,8 @@ angular.module("FICApp")
b.cancel = function() {
$scope.boxes.pop($scope.boxes.indexOf(b));
}
$timeout(function() { b.cancel(); }, b.timeout);
if (b.timeout >= 0)
$timeout(function() { b.cancel(); }, b.timeout);
}
}
@ -288,10 +289,14 @@ angular.module("FICApp")
var mybox = {
'kind': kind,
'title': title,
'msg': msg,
'timeout': tmout,
};
if (Array.isArray(msg))
mybox['list'] = msg;
else
mybox['msg'] = msg;
$rootScope._newBoxes.push(mybox);
};
$rootScope.newYesNoBox = function(kind, title, msg, yesFunc, noFunc, tmout) {