Append manager option to enable langs display (#1539)

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm

@@ -249,6 +249,7 @@ sub defaultValues {
         'securedCookie'                           => 0,
         'sfEngine'                                => '::2F::Engines::Default',
         'sfRequired'                              => 0,
+        'showLanguages'                           => 1,
         'slaveAuthnLevel'                         => 2,
         'slaveExportedVars'                       => {},
         'SMTPServer'                              => '',

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

@@ -3103,6 +3103,10 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
             'default' => 0,
             'type'    => 'boolOrExpr'
         },
+        'showLanguages' => {
+            'default' => 1,
+            'type'    => 'bool'
+        },
         'singleIP' => {
             'default' => 0,
             'type'    => 'bool'

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm

@@ -379,6 +379,11 @@ sub attributes {
             default       => 'common/logos/logo_llng_400px.png',
             documentation => 'Portal main logo path',
         },
+        showLanguages => {
+            type          => 'bool',
+            default       => 1,
+            documentation => 'Display langs icons',
+        },
         staticPrefix => {
             type          => 'text',
             documentation => 'Prefix of static files for HTML templates',

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

@@ -51,6 +51,7 @@ sub tree {
                             help  => 'portalcustom.html',
                             nodes => [
                                 'portalMainLogo',
+                                'showLanguages',
                                 'portalSkin',
                                 'portalSkinBackground',
                                 'portalSkinRules',

lemonldap-ng-manager/site/htdocs/static/languages/ar.json

@@ -686,6 +686,7 @@
 "sfRequired":"Require 2FA",
 "show":"عرض",
 "showHelp":"عرض المساعدة",
+"showLanguages":"Show languages choice",
 "singleIP":"عنوان آي بي واحد لكل مستخدم",
 "singleSession":"جلسة واحدة فقط من قبل المستخدم",
 "singleUserByIP":"مستخدم واحد لكل عنوان آي بي",

lemonldap-ng-manager/site/htdocs/static/languages/en.json

@@ -686,6 +686,7 @@
 "sfRequired":"Require 2FA",
 "show":"Show",
 "showHelp":"Show help",
+"showLanguages":"Show languages choice",
 "singleIP":"One IP only by user",
 "singleSession":"One session only by user",
 "singleUserByIP":"One user by IP address",

lemonldap-ng-manager/site/htdocs/static/languages/fr.json

@@ -686,6 +686,7 @@
 "sfaTitle":"Seconds Facteurs d'Authentification",
 "show":"Montrer",
 "showHelp":"Montrer l'aide",
+"showLanguages":"Afficher le choix des langues",
 "singleIP":"Une seule session par couple utilisateur/IP",
 "singleSession":"Une seule session par utilisateur",
 "singleUserByIP":"Un seul utilisateur par IP",

lemonldap-ng-manager/site/htdocs/static/languages/it.json

@@ -686,6 +686,7 @@
 "sfRequired":"Require 2FA",
 "show":"Mostra",
 "showHelp":"Mostra aiuto",
+"showLanguages":"Show languages choice",
 "singleIP":"Solo un IP per utente",
 "singleSession":"Una sola sessione per utente",
 "singleUserByIP":"Un utente per indirizzo IP",

lemonldap-ng-manager/site/htdocs/static/languages/vi.json

@@ -685,6 +685,7 @@
 "sfaTitle":"Second Factors Authentication",
 "sfRequired":"Require 2FA",
 "show":"Hiển thị",
+"showLanguages":"Show languages choice",
 "showHelp":"Hiển thị trợ giúp",
 "singleIP":"Chỉ một địa chỉ IP bởi người dùng",
 "singleSession":"Một phiên chỉ bởi người dùng",

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm

@@ -69,6 +69,7 @@ sub display {
         $skinfile       = 'confirm';
         %templateParams = (
             MAIN_LOGO       => $self->conf->{portalMainLogo},
+            LANGS           => $self->conf->{showLanguages},
             AUTH_ERROR      => $req->error,
             AUTH_ERROR_TYPE => $req->error_type,
             AUTH_URL        => $req->{data}->{_url},
@@ -98,6 +99,7 @@ sub display {
         $skinfile       = 'idpchoice';
         %templateParams = (
             MAIN_LOGO       => $self->conf->{portalMainLogo},
+            LANGS           => $self->conf->{showLanguages},
             AUTH_ERROR      => $req->error,
             AUTH_ERROR_TYPE => $req->error_type,
             AUTH_URL        => $req->{data}->{_url},
@@ -128,6 +130,7 @@ sub display {
         $skinfile       = 'info';
         %templateParams = (
             MAIN_LOGO       => $self->conf->{portalMainLogo},
+            LANGS           => $self->conf->{showLanguages},
             AUTH_ERROR      => $self->error,
             AUTH_ERROR_TYPE => $req->error_type,
             MSG             => $info,
@@ -156,6 +159,7 @@ sub display {
           ->{ $self->conf->{openIdAttr} || $self->conf->{whatToTrace} };
         %templateParams = (
             MAIN_LOGO       => $self->conf->{portalMainLogo},
+            LANGS           => $self->conf->{showLanguages},
             AUTH_ERROR      => $self->error,
             AUTH_ERROR_TYPE => $req->error_type,
             PROVIDERURI     => $p,
@@ -193,6 +197,7 @@ sub display {
         #utf8::decode($auth_user);
         %templateParams = (
             MAIN_LOGO => $self->conf->{portalMainLogo},
+            LANGS     => $self->conf->{showLanguages},
             AUTH_USER => $req->{sessionInfo}->{ $self->conf->{portalUserAttr} },
             NEWWINDOW => $self->conf->{portalOpenLinkInNewWindow},
             LOGOUT_URL          => $self->conf->{portal} . "?logout=1",
@@ -213,6 +218,7 @@ sub display {
         $skinfile       = 'upgradesession';
         %templateParams = (
             MAIN_LOGO  => $self->conf->{portalMainLogo},
+            LANGS      => $self->conf->{showLanguages},
             MSG        => 'askToRenew',
             CONFIRMKEY => $self->stamp,
             PORTAL     => $self->conf->{portal},
@@ -229,6 +235,7 @@ sub display {
         $skinfile       = 'updatesession';
         %templateParams = (
             MAIN_LOGO  => $self->conf->{portalMainLogo},
+            LANGS      => $self->conf->{showLanguages},
             MSG        => 'PE87',
             CONFIRMKEY => $self->stamp,
             PORTAL     => $self->conf->{portal},
@@ -252,6 +259,7 @@ sub display {
         $skinfile       = 'error';
         %templateParams = (
             MAIN_LOGO       => $self->conf->{portalMainLogo},
+            LANGS           => $self->conf->{showLanguages},
             AUTH_ERROR      => $req->error,
             AUTH_ERROR_TYPE => $req->error_type,
             (
@@ -269,6 +277,7 @@ sub display {
         $login = '' if ( $login eq 'anonymous' );
         %templateParams = (
             MAIN_LOGO             => $self->conf->{portalMainLogo},
+            LANGS                 => $self->conf->{showLanguages},
             AUTH_ERROR            => $req->error,
             AUTH_ERROR_TYPE       => $req->error_type,
             AUTH_URL              => $req->{data}->{_url},

lemonldap-ng-portal/site/templates/bootstrap/footer.tpl

@@ -6,14 +6,16 @@
     <div class="col-md-8 col-10">
       <TMPL_INCLUDE NAME="customfooter.tpl">
     </div>
+    <TMPL_IF NAME="LANGS">
     <div class="col-md-2 col-2 text-right">
       <span id="languages"></span>
     </div>
+    </TMPL_IF>
     </div>
   </div>
 
 <!-- Constants -->
-<script type="text/JavaScript" src="<TMPL_VAR NAME="SCRIPTNAME">/psgi.js"></script>
+<script type="text/JavaScript" src="<TMPL_VAR NAME="SCRIPTNAME">psgi.js"></script>
 </body>
 </html>
 

lemonldap-ng-portal/site/templates/bootstrap/header.tpl

@@ -39,15 +39,15 @@
  <TMPL_INCLUDE NAME="../common/script.tpl">
 <!-- //if:usedebianlibs
   <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX"><TMPL_VAR NAME="SKIN">/js/skin.min.js"></script>
-  <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">/common/js/portal.min.js"></script>
+  <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">common/js/portal.min.js"></script>
   <script type="text/javascript" src="/javascript/bootstrap/js/bootstrap.min.js"></script>
  //elsif:jsminified
   <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX"><TMPL_VAR NAME="SKIN">/js/skin.min.js"></script>
-  <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">/common/js/portal.min.js"></script>
+  <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">common/js/portal.min.js"></script>
   <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/bootstrap/dist/js/bootstrap.min.js"></script>
  //else -->
   <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX"><TMPL_VAR NAME="SKIN">/js/skin.js"></script>
-  <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">/common/js/portal.js"></script>
+  <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">common/js/portal.js"></script>
   <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/bootstrap/dist/js/bootstrap.js"></script>
  <!-- //endif -->
  <TMPL_VAR NAME="CUSTOM_SCRIPT">