diff --git a/COPYING b/COPYING index 4ef6eaefa..77b3935e5 100644 --- a/COPYING +++ b/COPYING @@ -91,10 +91,12 @@ Copyright: Bautsch License: CC0-1.0 Comment: Downloaded from http://commons.wikimedia.org -Files: lemonldap-ng-portal/site/htdocs/static/common/icons/2FManagment.png -Copyright: Freepik -License: Flaticon Basic -Comment: Downloaded from https://www.flaticon.com +Files: lemonldap-ng-portal/site/htdocs/static/common/icons/sfa_manager.png +Copyright: The Open Source Initiative +License: CC-BY-2.5, https://creativecommons.org/licenses/by/2.5/ +Comment: This work, "sfa_manager.png", is a derivative of +"Open Source Initiative keyhole.svg" by The Open Source Initiative, +used under CC-BY-2.5. "sfa_manager" is licensed under CC-BY-2.5 by MAUDOUX Christophe. Files: lemonldap-ng-portal/site/htdocs/static/common/backgrounds/* Copyright: Various artists diff --git a/lemonldap-ng-portal/MANIFEST b/lemonldap-ng-portal/MANIFEST index 5a19f30c3..e60ceb180 100644 --- a/lemonldap-ng-portal/MANIFEST +++ b/lemonldap-ng-portal/MANIFEST @@ -222,7 +222,7 @@ site/htdocs/static/common/backgrounds/Aletschgletscher_mit_Pinus_cembra1.jpg site/htdocs/static/common/en.png site/htdocs/static/common/favicon.ico site/htdocs/static/common/fr.png -site/htdocs/static/common/icons/2FManagment.png +site/htdocs/static/common/icons/sfa_manager.png site/htdocs/static/common/icons/application_cascade.png site/htdocs/static/common/icons/arrow_refresh.png site/htdocs/static/common/icons/calendar.png diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm index b7421c916..faab032d1 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm @@ -100,9 +100,9 @@ sub params { $req->error_type( $res{AUTH_ERROR} = $req->menuError ); # Display menu 2fRegisters link only if at least a 2F device is registered - $res{SFAManagment} = + $res{sfaManager} = $self->p->_sfEngine->display2fRegisters( $req, $req->userData ); - $self->logger->debug( "Display 2fRegisters link ? " . $res{SFAManagment} ); + $self->logger->debug("Display 2fRegisters link") if $res{sfaManager}; return %res; } diff --git a/lemonldap-ng-portal/site/htdocs/static/common/icons/2FManagment.png b/lemonldap-ng-portal/site/htdocs/static/common/icons/2FManagment.png deleted file mode 100644 index d9e5d2c6d..000000000 Binary files a/lemonldap-ng-portal/site/htdocs/static/common/icons/2FManagment.png and /dev/null differ diff --git a/lemonldap-ng-portal/site/htdocs/static/common/icons/sfa_manager.png b/lemonldap-ng-portal/site/htdocs/static/common/icons/sfa_manager.png new file mode 100644 index 000000000..b4c51b95c Binary files /dev/null and b/lemonldap-ng-portal/site/htdocs/static/common/icons/sfa_manager.png differ diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/ar.json b/lemonldap-ng-portal/site/htdocs/static/languages/ar.json index 392e3d255..5a389fdf0 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/ar.json @@ -85,7 +85,6 @@ "PE83":"فشل التحقق من U2F", "PE84":"أنت غير مخول بالدخول إلى هذا الخادم", "PE85":" الموقع البعيد يطلب جلسة جديدة (ولم يتم تحميل برنامج ترقية الجلسة).\nسجل الخروج و أعد المحاولة", -"2FManagment":"2ndFA Management", "2fRegRequired":"This service requires a double factor authentication. Register a device now, then go back to the portal.", "accept":"قبول", "accessDenied":"ليس لديك إذن بالدخول لهذا التطبيق", @@ -201,6 +200,7 @@ "serverError":"يحدث خطأ في الخادم", "serviceProvidedBy":"الخدمة المقدمة من قبل", "sessionsDeleted":"الجلسات التالية تم غلقها", +"sfaManager":"2ndFA Manager", "SSOSessionInactive":"جلسة الدخول الموحد غير نشطة", "stayConnected": "ابق على اتصال على هذا الجهاز", "submit":"قدم", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/de.json b/lemonldap-ng-portal/site/htdocs/static/languages/de.json index c3cc1fd33..3b40c9c7f 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/de.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/de.json @@ -85,7 +85,6 @@ "PE83":"U2F verification failed", "PE84":"You're not authorized to access to this host", "PE85":"The remote site ask for a newer session (and UpgradeSession plugin isn't loaded). Logout and retry", -"2FManagment":"2ndFA Management", "2fRegRequired":"This service requires a double factor authentication. Register a device now, then go back to the portal.", "accept":"Accept", "accessDenied":"You have no access authorization for this application", @@ -201,6 +200,7 @@ "serverError":"Error occurs on the server", "serviceProvidedBy":"Service provided by", "sessionsDeleted":"The following sessions have been closed", +"sfaManager":"2ndFA Manager", "SSOSessionInactive":"SSO session inactive", "stayConnected": "Stay connected on this device", "submit":"Submit", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/en.json b/lemonldap-ng-portal/site/htdocs/static/languages/en.json index 4e57b9e74..0c4d6c600 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/en.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/en.json @@ -85,7 +85,6 @@ "PE83":"U2F verification failed. Retry or contact your administrator", "PE84":"You're not authorized to access to this host", "PE85":"The remote site ask for a newer session (and UpgradeSession plugin isn't loaded). Logout and retry", -"2FManagment":"2ndFA Management", "2fRegRequired":"This service requires a double factor authentication. Register a device now, then go back to the portal.", "accept":"Accept", "accessDenied":"You have no access authorization for this application", @@ -201,6 +200,7 @@ "serverError":"Error occurs on the server", "serviceProvidedBy":"Service provided by", "sessionsDeleted":"The following sessions have been closed", +"sfaManager":"2ndFA Manager", "SSOSessionInactive":"SSO session inactive", "stayConnected": "Stay connected on this device", "submit":"Submit", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/es.json b/lemonldap-ng-portal/site/htdocs/static/languages/es.json index 6edb05fd7..a04d831c9 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/es.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/es.json @@ -85,7 +85,6 @@ "PE83":"U2F verification failed. Retry or contact your administrator", "PE84":"You're not authorized to access to this host", "PE85":"The remote site ask for a newer session (and UpgradeSession plugin isn't loaded). Logout and retry", -"2FManagment":"2ndFA Management", "2fRegRequired":"This service requires a double factor authentication. Register a device now, then go back to the portal.", "accept":"Accept", "accessDenied":"You have no access authorization for this application", @@ -202,6 +201,7 @@ "serverError":"Error occurs on the server", "serviceProvidedBy":"Service provided by", "sessionsDeleted":"The following sessions have been closed", +"sfaManager":"2ndFA Manager", "SSOSessionInactive":"SSO session inactive", "stayConnected": "Stay connected on this device", "submit":"Submit", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/fr.json b/lemonldap-ng-portal/site/htdocs/static/languages/fr.json index aebffa719..d9d062689 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/fr.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/fr.json @@ -85,7 +85,6 @@ "PE83":"La vérification U2F a échoué. Réessayez ou contactez votre administrateur", "PE84":"Vous n'êtes pas autorisé à accéder à ce site", "PE85":"Le site souhaite une authentification plus récente (et le plugin UpgradeSession n'est pas chargé). Déconnectez-vous et réessayez", -"2FManagment":"Gestionnaire 2ndFA", "2fRegRequired":"Ce service requiert une authentification à deux facteurs. Enregistrez un équipement ici et retournez au portail.", "accept":"Accepter", "accessDenied":"Vous n'avez pas les droits d'accès à cette application", @@ -201,6 +200,7 @@ "serverError":"Une erreur est survenue sur le serveur", "serviceProvidedBy":"Ce service est fourni par", "sessionsDeleted":"Les sessions suivantes ont été fermées", +"sfaManager":"Gestionnaire 2ndFA", "SSOSessionInactive":"Session SSO inactive", "stayConnected": "Rester connecté sur cet appareil", "submit":"Envoyer", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/it.json b/lemonldap-ng-portal/site/htdocs/static/languages/it.json index 1f8a1113e..e5ff69b05 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/it.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/it.json @@ -85,7 +85,6 @@ "PE83":"Verifica U2F fallita", "PE84":"Non sei autorizzato ad accedere a questo host", "PE85":"Il sito remoto richiede una sessione più recente (e il plug-in di UpgradeSession non viene caricato). Disconnetti e riprova", -"2FManagment":"2ndFA Management", "2fRegRequired":"This service requires a double factor authentication. Register a device now, then go back to the portal.", "accept":"Accetta", "accessDenied":"Non hai un'autorizzazione di accesso per questa applicazione", @@ -201,6 +200,7 @@ "serverError":"Un, errore si verifica sul server", "serviceProvidedBy":"Servizio offerto da", "sessionsDeleted":"Le sessioni seguenti sono state chiuse", +"sfaManager":"2ndFA Manager", "SSOSessionInactive":"Sessione SSO inattiva", "stayConnected": "Resta connesso su questo dispositivo", "submit":"Invia", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/nl.json b/lemonldap-ng-portal/site/htdocs/static/languages/nl.json index c80ef3227..92726c6dc 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/nl.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/nl.json @@ -85,7 +85,6 @@ "PE83":"U2F verification failed. Retry or contact your administrator", "PE84":"You're not authorized to access to this host", "PE85":"The remote site ask for a newer session (and UpgradeSession plugin isn't loaded). Logout and retry", -"2FManagment":"2ndFA Management", "2fRegRequired":"This service requires a double factor authentication. Register a device now, then go back to the portal.", "accept":"Accept", "accessDenied":"You have no access authorization for this application", @@ -201,6 +200,7 @@ "serverError":"Error occurs on the server", "serviceProvidedBy":"Service provided by", "sessionsDeleted":"The following sessions have been closed", +"sfaManager":"2ndFA Manager", "SSOSessionInactive":"SSO session inactive", "stayConnected": "Stay connected on this device", "submit":"Submit", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/pt.json b/lemonldap-ng-portal/site/htdocs/static/languages/pt.json index 951e947ff..d9db8e5de 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/pt.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/pt.json @@ -85,7 +85,6 @@ "PE83":"U2F verification failed. Retry or contact your administrator", "PE84":"You're not authorized to access to this host", "PE85":"The remote site ask for a newer session (and UpgradeSession plugin isn't loaded). Logout and retry", -"2FManagment":"2ndFA Management", "2fRegRequired":"This service requires a double factor authentication. Register a device now, then go back to the portal.", "accept":"Accept", "accessDenied":"You have no access authorization for this application", @@ -201,6 +200,7 @@ "serverError":"Error occurs on the server", "serviceProvidedBy":"Service provided by", "sessionsDeleted":"The following sessions have been closed", +"sfaManager":"2ndFA Manager", "SSOSessionInactive":"SSO session inactive", "stayConnected": "Stay connected on this device", "submit":"Submit", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/ro.json b/lemonldap-ng-portal/site/htdocs/static/languages/ro.json index 64658e7e9..b34e853cd 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/ro.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/ro.json @@ -85,7 +85,6 @@ "PE83":"U2F verification failed. Retry or contact your administrator", "PE84":"You're not authorized to access to this host", "PE85":"The remote site ask for a newer session (and UpgradeSession plugin isn't loaded). Logout and retry", -"2FManagment":"2ndFA Management", "2fRegRequired":"This service requires a double factor authentication. Register a device now, then go back to the portal.", "accept":"Accept", "accessDenied":"You have no access authorization for this application", @@ -201,6 +200,7 @@ "serverError":"Error occurs on the server", "serviceProvidedBy":"Service provided by", "sessionsDeleted":"The following sessions have been closed", +"sfaManager":"2ndFA Manager", "SSOSessionInactive":"SSO session inactive", "stayConnected": "Stay connected on this device", "submit":"Submit", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/vi.json b/lemonldap-ng-portal/site/htdocs/static/languages/vi.json index fe433604f..9bf08aac7 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/vi.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/vi.json @@ -85,7 +85,6 @@ "PE83":"Xác minh U2F không thành công", "PE84":"Bạn không được phép truy cập vào máy chủ lưu trữ này", "PE85":"Trang web từ xa yêu cầu một phiên mới (và plugin UpgradeSession không được tải). Đăng xuất và thử lại ", -"2FManagment":"2ndFA Management", "2fRegRequired":"This service requires a double factor authentication. Register a device now, then go back to the portal.", "accept":"Chấp nhận", "accessDenied":"Bạn không có quyền truy cập vào ứng dụng này", @@ -201,6 +200,7 @@ "serverError":"Lỗi xảy ra trên máy chủ", "serviceProvidedBy":"Dịch vụ được cung cấp bởi", "sessionsDeleted":"Các phiên làm việc sau đã được đóng lại", +"sfaManager":"2ndFA Manager", "SSOSessionInactive":"Phiên SSO không hoạt động", "stayConnected": "Giữ kết nối trên thiết bị này", "submit":"Gửi", diff --git a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl index a99dfc8e0..be2005800 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl @@ -73,10 +73,10 @@