Append Portal main logo option in Manager (#1515)
This commit is contained in:
parent
6ae0035fbb
commit
7a1117d4c4
|
@ -179,17 +179,18 @@ sub defaultValues {
|
||||||
'portalDisplayRegister' => 1,
|
'portalDisplayRegister' => 1,
|
||||||
'portalErrorOnExpiredSession' => 1,
|
'portalErrorOnExpiredSession' => 1,
|
||||||
'portalForceAuthnInterval' => 5,
|
'portalForceAuthnInterval' => 5,
|
||||||
'portalPingInterval' => 60000,
|
'portalMainLogo' => 'common/logos/logo_llng_400px.png',
|
||||||
'portalRequireOldPassword' => 1,
|
'portalPingInterval' => 60000,
|
||||||
'portalSkin' => 'bootstrap',
|
'portalRequireOldPassword' => 1,
|
||||||
'portalUserAttr' => '_user',
|
'portalSkin' => 'bootstrap',
|
||||||
'proxyAuthnLevel' => 2,
|
'portalUserAttr' => '_user',
|
||||||
'radiusAuthnLevel' => 3,
|
'proxyAuthnLevel' => 2,
|
||||||
'randomPasswordRegexp' => '[A-Z]{3}[a-z]{5}.\\d{2}',
|
'radiusAuthnLevel' => 3,
|
||||||
'redirectFormMethod' => 'get',
|
'randomPasswordRegexp' => '[A-Z]{3}[a-z]{5}.\\d{2}',
|
||||||
'registerDB' => 'Null',
|
'redirectFormMethod' => 'get',
|
||||||
'registerTimeout' => 0,
|
'registerDB' => 'Null',
|
||||||
'registerUrl' => 'http://auth.example.com/register',
|
'registerTimeout' => 0,
|
||||||
|
'registerUrl' => 'http://auth.example.com/register',
|
||||||
'remoteGlobalStorage' => 'Lemonldap::NG::Common::Apache::Session::SOAP',
|
'remoteGlobalStorage' => 'Lemonldap::NG::Common::Apache::Session::SOAP',
|
||||||
'remoteGlobalStorageOptions' => {
|
'remoteGlobalStorageOptions' => {
|
||||||
'ns' =>
|
'ns' =>
|
||||||
|
|
|
@ -2173,6 +2173,10 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
|
||||||
'default' => 5,
|
'default' => 5,
|
||||||
'type' => 'int'
|
'type' => 'int'
|
||||||
},
|
},
|
||||||
|
'portalMainLogo' => {
|
||||||
|
'default' => 'common/logos/logo_llng_400px.png',
|
||||||
|
'type' => 'text'
|
||||||
|
},
|
||||||
'portalOpenLinkInNewWindow' => {
|
'portalOpenLinkInNewWindow' => {
|
||||||
'default' => 0,
|
'default' => 0,
|
||||||
'type' => 'bool'
|
'type' => 'bool'
|
||||||
|
|
|
@ -375,6 +375,11 @@ sub attributes {
|
||||||
msgFail => '__badUrl__',
|
msgFail => '__badUrl__',
|
||||||
documentation => 'URL to call on reload',
|
documentation => 'URL to call on reload',
|
||||||
},
|
},
|
||||||
|
portalMainLogo => {
|
||||||
|
type => 'text',
|
||||||
|
default => 'common/logos/logo_llng_400px.png',
|
||||||
|
documentation => 'Portal main logo path',
|
||||||
|
},
|
||||||
staticPrefix => {
|
staticPrefix => {
|
||||||
type => 'text',
|
type => 'text',
|
||||||
documentation => 'Prefix of static files for HTML templates',
|
documentation => 'Prefix of static files for HTML templates',
|
||||||
|
|
|
@ -57,6 +57,7 @@ sub tree {
|
||||||
nodes => [
|
nodes => [
|
||||||
'portalSkin',
|
'portalSkin',
|
||||||
'portalSkinBackground',
|
'portalSkinBackground',
|
||||||
|
'portalMainLogo',
|
||||||
'portalSkinRules',
|
'portalSkinRules',
|
||||||
{
|
{
|
||||||
title => 'portalButtons',
|
title => 'portalButtons',
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -186,6 +186,7 @@ sub display {
|
||||||
|
|
||||||
#utf8::decode($auth_user);
|
#utf8::decode($auth_user);
|
||||||
%templateParams = (
|
%templateParams = (
|
||||||
|
MAIN_LOGO => $self->conf->{portalMainLogo},
|
||||||
AUTH_USER => $req->{sessionInfo}->{ $self->conf->{portalUserAttr} },
|
AUTH_USER => $req->{sessionInfo}->{ $self->conf->{portalUserAttr} },
|
||||||
NEWWINDOW => $self->conf->{portalOpenLinkInNewWindow},
|
NEWWINDOW => $self->conf->{portalOpenLinkInNewWindow},
|
||||||
LOGOUT_URL => $self->conf->{portal} . "?logout=1",
|
LOGOUT_URL => $self->conf->{portal} . "?logout=1",
|
||||||
|
@ -258,6 +259,7 @@ sub display {
|
||||||
my $login = $self->userId($req);
|
my $login = $self->userId($req);
|
||||||
$login = '' if ( $login eq 'anonymous' );
|
$login = '' if ( $login eq 'anonymous' );
|
||||||
%templateParams = (
|
%templateParams = (
|
||||||
|
MAIN_LOGO => $self->conf->{portalMainLogo},
|
||||||
AUTH_ERROR => $req->error,
|
AUTH_ERROR => $req->error,
|
||||||
AUTH_ERROR_TYPE => $req->error_type,
|
AUTH_ERROR_TYPE => $req->error_type,
|
||||||
AUTH_URL => $req->{data}->{_url},
|
AUTH_URL => $req->{data}->{_url},
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
<!-- Custom HTML header -->
|
<!-- Custom HTML header -->
|
||||||
<img src="<TMPL_VAR NAME="STATIC_PREFIX">common/logos/logo_llng_400px.png" class="img-fluid rounded mx-auto d-block" />
|
<img src="<TMPL_VAR NAME="STATIC_PREFIX"><TMPL_VAR NAME="MAIN_LOGO">" class="img-fluid rounded mx-auto d-block" />
|
||||||
|
|
Loading…
Reference in New Issue
Block a user