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

Minor GUI improvements (Highlight active menu)

Browse Source
This commit is contained in:
Christophe Maudoux 2020-02-14 23:23:16 +01:00
parent 9a8d668c61
commit 79bb7f4138
16 changed files with 94 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/StatusConstants.pm
View File

@ -108,7 +108,7 @@ sub portalConsts {
}
# EXPORTER PARAMETERS
our @EXPORT_OK = ('portalConsts');
our @EXPORT_OK = ('portalConsts');
our %EXPORT_TAGS = ( 'all' => [ @EXPORT_OK, 'import' ], );
1;

7
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
View File

@ -142,7 +142,7 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
eval {
do {
qr/$_[0]/;
}
}
};
return $@ ? ( 0, "__badRegexp__: $@" ) : 1;
}
@ -223,8 +223,7 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\
},
'select' => {
'test' => sub {
my $test =
grep( { $_ eq $_[0]; }
my $test = grep( { $_ eq $_[0]; }
map( { $_->{'k'}; } @{ $_[2]{'select'}; } ) );
return $test
? 1
@ -1695,7 +1694,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
eval {
do {
qr/$_[0]/;
}
}
};
return $@ ? 0 : 1;
},

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm
View File

@ -572,7 +572,7 @@ sub tree {
{
title => 'reloadParams',
help => 'configlocation.html#configuration_reload',
nodes => [ 'reloadUrls', 'reloadTimeout', 'compactConf' ]
nodes => [ 'reloadTimeout', 'compactConf', 'reloadUrls' ]
},
{
title => 'plugins',

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

@ -193,6 +193,14 @@ llapp.controller 'NotificationsExplorerCtrl', [ '$scope', '$translator', '$locat
, (resp) ->
$scope.waiting = false
# Highlight current selection
console.log "Selection", $scope.type
$scope.activesStyle = {color: '#777'}
$scope.doneStyle = {color: '#777'}
$scope.newStyle = {color: '#777'}
$scope.activesStyle = {color: '#333'} if $scope.type == 'actives'
$scope.doneStyle = {color: '#333'} if $scope.type == 'done'
$scope.displayNotification = (scope) ->
$scope.waiting = true
$scope.currentScope = scope
@ -304,6 +312,9 @@ llapp.controller 'NotificationsExplorerCtrl', [ '$scope', '$translator', '$locat
$scope.myStyle = {color: '#ffb84d'}
$scope.displayCreateForm = ->
$scope.activesStyle = {color: '#777'}
$scope.doneStyle = {color: '#777'}
$scope.newStyle = {color: '#333'}
$scope.waiting = true
$translator.init($scope.lang).then ->
$scope.currentNotification = null

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

@ -492,6 +492,15 @@ llapp.controller 'SessionsExplorerCtrl', ['$scope', '$translator', '$location',
, (resp) ->
$scope.waiting = false
# Highlight current selection
console.log "Selection", sessionType
$scope.navssoStyle = {color: '#777'}
$scope.offlineStyle = {color: '#777'}
$scope.persistentStyle = {color: '#777'}
$scope.navssoStyle = {color: '#333'} if sessionType == 'global'
$scope.offlineStyle = {color: '#333'} if sessionType == 'offline'
$scope.persistentStyle = {color: '#333'} if sessionType == 'persistent'
# Intialization function
# Simply set $scope.waiting to false during $translator and tree root
# initialization

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -195,7 +195,7 @@
over = 0;
}
if ($scope.type === 'done' || $scope.type === 'actives') {
return $http.get(scriptname + "notifications/" + $scope.type + "?" + query).then(function(response) {
$http.get(scriptname + "notifications/" + $scope.type + "?" + query).then(function(response) {
var data, i, len, n, ref;
data = response.data;
if (data.result) {
@ -221,6 +221,26 @@
return $scope.waiting = false;
});
}
console.log("Selection", $scope.type);
$scope.activesStyle = {
color: '#777'
};
$scope.doneStyle = {
color: '#777'
};
$scope.newStyle = {
color: '#777'
};
if ($scope.type === 'actives') {
$scope.activesStyle = {
color: '#333'
};
}
if ($scope.type === 'done') {
return $scope.doneStyle = {
color: '#333'
};
}
};
$scope.displayNotification = function(scope) {
var node, notificationId;
@ -358,6 +378,15 @@
};
};
$scope.displayCreateForm = function() {
$scope.activesStyle = {
color: '#777'
};
$scope.doneStyle = {
color: '#777'
};
$scope.newStyle = {
color: '#333'
};
$scope.waiting = true;
return $translator.init($scope.lang).then(function() {
$scope.currentNotification = null;

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

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

File diff suppressed because one or more lines are too long

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

@ -537,7 +537,7 @@
} else {
over = 0;
}
return $http.get(scriptname + "sessions/" + sessionType + "?" + query).then(function(response) {
$http.get(scriptname + "sessions/" + sessionType + "?" + query).then(function(response) {
var data, i, len, n, ref;
data = response.data;
if (data.result) {
@ -565,6 +565,31 @@
}, function(resp) {
return $scope.waiting = false;
});
console.log("Selection", sessionType);
$scope.navssoStyle = {
color: '#777'
};
$scope.offlineStyle = {
color: '#777'
};
$scope.persistentStyle = {
color: '#777'
};
if (sessionType === 'global') {
$scope.navssoStyle = {
color: '#333'
};
}
if (sessionType === 'offline') {
$scope.offlineStyle = {
color: '#333'
};
}
if (sessionType === 'persistent') {
return $scope.persistentStyle = {
color: '#333'
};
}
};
$scope.init = function() {
$scope.waiting = true;

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
lemonldap-ng-manager/site/htdocs/static/struct.json
View File

File diff suppressed because one or more lines are too long

6
lemonldap-ng-manager/site/templates/notifications.tpl
View File

@ -15,9 +15,9 @@
<div class="navbar navbar-default">
<div class="navbar-collapse">
<ul class="nav navbar-nav" role="grid">
<li><a id="a-actives" href="#" role="row"><i class="glyphicon glyphicon-eye-open"></i> {{translate('actives')}}</a></li>
<li><a id="a-done" href="#!/done" role="row"><i class="glyphicon glyphicon-check"></i> {{translate('dones')}}</a></li>
<li><a id="a-new" href="#!/new" role="row"><i class="glyphicon glyphicon-plus-sign"></i> {{translate('create')}}</a></li>
<li><a id="a-actives" href="#" role="row" ng-style="activesStyle"><i class="glyphicon glyphicon-eye-open"></i> {{translate('actives')}}</a></li>
<li><a id="a-done" href="#!/done" role="row" ng-style="doneStyle"><i class="glyphicon glyphicon-check"></i> {{translate('dones')}}</a></li>
<li><a id="a-new" href="#!/new" role="row" ng-style="newStyle"><i class="glyphicon glyphicon-plus-sign"></i> {{translate('create')}}</a></li>
</ul>
</div>
</div>

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

@ -16,7 +16,7 @@
<div class="navbar-collapse">
<ul class="nav navbar-nav" role="grid">
<li uib-dropdown>
<a id="navsso" name="menu" uib-dropdown-toggle data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="glyphicon glyphicon-user"></i> {{translate('ssoSessions')}} <span class="caret"></span></a>
<a id="navsso" name="menu" uib-dropdown-toggle data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" ng-style="navssoStyle"><i class="glyphicon glyphicon-user"></i> {{translate('ssoSessions')}} <span class="caret"></span></a>
<ul uib-dropdown-menu aria-labelled-by="navsso">
<li><a id="a-users" href="#" role="row"><i class="glyphicon glyphicon-user"></i> {{translate('users')}}</a></li>
<li><a id="a-ip" href="#!/ipAddr" role="row"><i class="glyphicon glyphicon-sort-by-order"></i> {{translate('ipAddresses')}}</a></li>
@ -25,8 +25,8 @@
<li><a id="a-updatetime" href="#!/_updateTime" role="row"><i class="glyphicon glyphicon-hourglass"></i> {{translate('_updateTime')}}</a></li>
</ul>
</li>
<li><a id="a-persistent" href="#!/persistent" role="row"><i class="glyphicon glyphicon-lock"></i> {{translate('persistentSessions')}}</a></li>
<li><a id="a-offline" href="#!/offline" role="row"><i class="glyphicon glyphicon-time"></i> {{translate('offlineSessions')}}</a></li>
<li><a id="a-persistent" href="#!/persistent" role="row" ng-style="persistentStyle"><i class="glyphicon glyphicon-lock"></i> {{translate('persistentSessions')}}</a></li>
<li><a id="a-offline" href="#!/offline" role="row" ng-style="offlineStyle"><i class="glyphicon glyphicon-time"></i> {{translate('offlineSessions')}}</a></li>
</ul>
</div>
</div>