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

Do not set portal background in CSS if no value is configured (#1643)

Browse Source
This commit is contained in:
Clément OUDOT 2019-02-05 18:39:43 +01:00
parent deac8a7f92
commit 8ca60a9238
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
View File

@ -793,13 +793,16 @@ sub sendHtml {
sub sendCss { sub sendCss {
my ( $self, $req ) = @_; my ( $self, $req ) = @_;
my $s = my $s = '/* LL::NG Portal CSS */';
'html,body{background:url("' if ( $self->conf->{portalSkinBackground} ) {
. $self->staticPrefix $s .=
. '/common/backgrounds/' 'html,body{background:url("'
. $self->conf->{portalSkinBackground} . $self->staticPrefix
. '") no-repeat center fixed;' . '/common/backgrounds/'
. 'background-size:cover;}'; . $self->conf->{portalSkinBackground}
. '") no-repeat center fixed;'
. 'background-size:cover;}';
}
return [ return [
200, 200,
[ [
@ -852,7 +855,7 @@ sub tplParams {
for my $session_key ( keys %{ $req->{sessionInfo} } ) { for my $session_key ( keys %{ $req->{sessionInfo} } ) {
$templateParams{ "session_" . $session_key } = $templateParams{ "session_" . $session_key } =
$req->{sessionInfo}->{$session_key}; $req->{sessionInfo}->{$session_key};
} }
for my $env_key ( keys %{ $req->env } ) { for my $env_key ( keys %{ $req->env } ) {
@ -860,7 +863,7 @@ sub tplParams {
} }
return ( return (
SKIN => $self->getSkin( $req ), SKIN => $self->getSkin($req),
PORTAL_URL => $self->conf->{portal}, PORTAL_URL => $self->conf->{portal},
SKIN_PATH => $portalPath . "skins", SKIN_PATH => $portalPath . "skins",
ANTIFRAME => $self->conf->{portalAntiFrame}, ANTIFRAME => $self->conf->{portalAntiFrame},