dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'manager-2ndFA-module' into 'master'

Browse Source 
Manager 2nfa module

See merge request lemonldap-ng/lemonldap-ng!27
This commit is contained in:
Xavier Guimard 2018-04-29 07:55:54 +02:00
commit 83b716dba2
15 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lemonldap-ng-manager/site/coffee/2ndfa.coffee
View File

@ -375,12 +375,14 @@ llapp.controller 'SessionsExplorerCtrl', ['$scope', '$translator', '$location',
$scope.waiting = false
, (resp) ->
$scope.waiting = false
$scope.activeModule = "2ndFA"
$scope.myStyle = {color: '#ffb84d'}
# Query scheme initialization
# Default to '_whatToTrace'
c = $location.path().match /^\/(\w+)/
$scope.type = if c then c[1] else '_whatToTrace'
#$scope.myStyle = "{color: '#ffb84d'}"
]

3
lemonldap-ng-manager/site/coffee/manager.coffee
View File

@ -751,6 +751,9 @@ llapp.controller 'TreeCtrl', [
$scope.form = 'home'
$scope.waiting = false
, readError
$scope.activeModule = "conf"
$scope.myStyle = {color: '#ffb84d'}
c = $location.path().match(new RegExp('^/confs/(latest|[0-9]+)'))
unless c
console.log "Redirecting to /confs/latest"

4
lemonldap-ng-manager/site/coffee/notifications.coffee
View File

@ -241,7 +241,9 @@ llapp.controller 'NotificationsExplorerCtrl', [ '$scope', '$translator', '$locat
$scope.waiting = false
, (resp) ->
$scope.waiting = false
$scope.activeModule = "notifications"
$scope.myStyle = {color: '#ffb84d'}
$scope.displayCreateForm = ->
$scope.waiting = true
$translator.init($scope.lang).then ->

2
lemonldap-ng-manager/site/coffee/sessions.coffee
View File

@ -395,6 +395,8 @@ llapp.controller 'SessionsExplorerCtrl', ['$scope', '$translator', '$location',
$scope.waiting = false
, (resp) ->
$scope.waiting = false
$scope.activeModule = "sessions"
$scope.myStyle = {color: '#ffb84d'}
# Query scheme initialization
# Default to '_whatToTrace'

6
lemonldap-ng-manager/site/htdocs/static/js/2ndfa.js
View File

@ -369,11 +369,15 @@
$scope.init = function() {
$scope.waiting = true;
$scope.data = [];
return $q.all([$translator.init($scope.lang), $scope.updateTree('', $scope.data, 0, 0)]).then(function() {
$q.all([$translator.init($scope.lang), $scope.updateTree('', $scope.data, 0, 0)]).then(function() {
return $scope.waiting = false;
}, function(resp) {
return $scope.waiting = false;
});
$scope.activeModule = "2ndFA";
return $scope.myStyle = {
color: '#ffb84d'
};
};
c = $location.path().match(/^\/(\w+)/);
return $scope.type = c ? c[1] : '_whatToTrace';

2
lemonldap-ng-manager/site/htdocs/static/js/2ndfa.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
lemonldap-ng-manager/site/htdocs/static/js/manager.js
View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.7
// Generated by CoffeeScript 1.9.3
/*
LemonLDAP::NG Manager client
@ -868,7 +868,7 @@ This file contains:
$scope.data = [];
$scope.confirmNeeded = false;
$scope.forceSave = false;
return $q.all([
$q.all([
$translator.init($scope.lang), $http.get(window.staticPrefix + "struct.json").then(function(response) {
tmp = response.data;
return console.log("Structure loaded");
@ -889,6 +889,10 @@ This file contains:
$scope.form = 'home';
return $scope.waiting = false;
}, readError);
$scope.activeModule = "conf";
return $scope.myStyle = {
color: '#ffb84d'
};
};
c = $location.path().match(new RegExp('^/confs/(latest|[0-9]+)'));
if (!c) {

2
lemonldap-ng-manager/site/htdocs/static/js/manager.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
lemonldap-ng-manager/site/htdocs/static/js/notifications.js
View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.10.0
// Generated by CoffeeScript 1.9.3
/*
* LemonLDAP::NG Notifications Explorer client
@ -291,11 +291,15 @@
$scope.init = function() {
$scope.waiting = true;
$scope.data = [];
return $q.all([$translator.init($scope.lang), $scope.updateTree('', $scope.data, 0)]).then(function() {
$q.all([$translator.init($scope.lang), $scope.updateTree('', $scope.data, 0)]).then(function() {
return $scope.waiting = false;
}, function(resp) {
return $scope.waiting = false;
});
$scope.activeModule = "notifications";
return $scope.myStyle = {
color: '#ffb84d'
};
};
$scope.displayCreateForm = function() {
$scope.waiting = true;

2
lemonldap-ng-manager/site/htdocs/static/js/notifications.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
lemonldap-ng-manager/site/htdocs/static/js/sessions.js
View File

@ -430,11 +430,15 @@
$scope.init = function() {
$scope.waiting = true;
$scope.data = [];
return $q.all([$translator.init($scope.lang), $scope.updateTree('', $scope.data, 0, 0)]).then(function() {
$q.all([$translator.init($scope.lang), $scope.updateTree('', $scope.data, 0, 0)]).then(function() {
return $scope.waiting = false;
}, function(resp) {
return $scope.waiting = false;
});
$scope.activeModule = "sessions";
return $scope.myStyle = {
color: '#ffb84d'
};
};
c = $location.path().match(/^\/(\w+)/);
return $scope.type = c ? c[1] : '_whatToTrace';

2
lemonldap-ng-manager/site/htdocs/static/js/sessions.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
lemonldap-ng-manager/site/templates/2ndfa.tpl
View File

@ -87,12 +87,12 @@
</div>
<div ng-if="!node.nodes" >
<th ng-if="node.title!='UBK' && node.title!='TOTP' && node.title!='U2F'">{{translate(node.title)}}</th>
<td class="data-{{node.epoch}}" ng-if="node.title=='TOTP' || node.title=='UBK' || node.title=='U2F'" >{{node.title}}</td>
<td ng-if="node.title=='TOTP' || node.title=='UBK' || node.title=='U2F'" >{{node.title}}</td>
<th ng-if="node.title=='type'">{{translate(node.value)}}</th>
<td class="data-{{node.epoch}}" ng-if="node.title!='type'" >{{node.value}}</td>
<td class="col-md-3" ng-if="node.title!='type'" >{{node.value}}</td>
<th ng-if="node.title=='type'">{{translate(node.epoch)}}</th>
<td class="data-{{node.epoch}}" ng-if="node.title=='TOTP' || node.title=='UBK' || node.title=='U2F'">{{localeDate(node.epoch)}}</td>
<td class="data-{{node.epoch}}">
<td class="col-md-3" ng-if="node.title=='TOTP' || node.title=='UBK' || node.title=='U2F'">{{localeDate(node.epoch)}}</td>
<td >
<span ng-if="node.title=='TOTP' || node.title=='UBK' || node.title=='U2F'" class="link text-danger glyphicon glyphicon-minus-sign" ng-click="delete2FA(node.title, node.epoch)"></span>
<!--
<span ng-if="$last && ( node.title=='TOTP' || node.title=='UBK' || node.title=='U2F' )" class="link text-success glyphicon glyphicon-plus-sign" ng-click="menuClick({title:'newRule'})"></span>

2
lemonldap-ng-manager/site/templates/menubar.tpl
View File

@ -21,7 +21,7 @@
<!-- Last buttons, available languages -->
</div>
<ul class="hidden-xs nav navbar-nav" role="grid">
<li ng-repeat="l in links" id="l in links"><a href="{{l.target}}" role="row" ng-mousedown="myStyle={color: '#ffb84d'}"><strong><i ng-if="l.icon" class="glyphicon glyphicon-{{l.icon}}" ng-style="myStyle"></i> <span ng-style="myStyle" ng-bind="translate(l.title)"></span></strong></a></li>
<li ng-repeat="l in links" id="l in links"><a href="{{l.target}}" role="row" ng-mousedown="clickStyle={color: '#ffb84d'}"><strong><i ng-if="activeModule == l.title" ng-style="myStyle" class="glyphicon glyphicon-{{l.icon}}"></i><i ng-if="activeModule != l.title" class="glyphicon glyphicon-{{l.icon}}" ng-style="clickStyle"></i> <span ng-if="activeModule == l.title" ng-style="myStyle" ng-bind="translate(l.title)"></span><span ng-if="activeModule != l.title" ng-bind="translate(l.title)" ng-style="clickStyle"></span></strong></a></li>
</ul>
<ul class="hidden-xs nav navbar-nav navbar-right">
<li uib-dropdown>

11
lemonldap-ng-manager/site/templates/sessions.tpl
View File

@ -91,21 +91,14 @@
</table>
</div>
<div ng-if="!node.nodes">
<th ng-if="node.title!='UBK' && node.title!='TOTP' && node.title!='U2F'">{{translate(node.title)}}</th>
<td ng-if="node.title!='type' && node.title!='UBK' && node.title!='TOTP' && node.title!='U2F' " >${{node.title}}</td>
<td ng-if="node.title=='TOTP' || node.title=='UBK' || node.title=='U2F'">{{node.title}}</td>
<th ng-if="node.title=='type'">{{translate(node.value)}}</th>
<td ng-if="node.title!='type'" >{{node.value}}</td>
<td class="col-md-3" ng-if="node.title!='type'" >{{node.value}}</td>
<th ng-if="node.title=='type'">{{translate(node.epoch)}}</th>
<td ng-if="node.title=='TOTP' || node.title=='UBK' || node.title=='U2F'">{{localeDate(node.epoch)}}</td>
<td class="col-md-3" ng-if="node.title=='TOTP' || node.title=='UBK' || node.title=='U2F'">{{localeDate(node.epoch)}}</td>
<td></td>
</div>
</script>