From 57b1b03acdd7edd43c92c76c8e232818d05ea728 Mon Sep 17 00:00:00 2001 From: thom Date: Tue, 15 Sep 2020 15:00:41 +0200 Subject: [PATCH] Use styled button for password generation --- interface/web/admin/lib/lang/ar_users.lng | 2 +- interface/web/admin/lib/lang/bg_users.lng | 2 +- interface/web/admin/lib/lang/br_users.lng | 2 +- interface/web/admin/lib/lang/ca_users.lng | 2 +- interface/web/admin/lib/lang/cz_users.lng | 2 +- interface/web/admin/lib/lang/de_users.lng | 2 +- interface/web/admin/lib/lang/dk_users.lng | 2 +- interface/web/admin/lib/lang/el_users.lng | 2 +- interface/web/admin/lib/lang/en_users.lng | 2 +- interface/web/admin/lib/lang/es_users.lng | 2 +- interface/web/admin/lib/lang/fi_users.lng | 2 +- interface/web/admin/lib/lang/fr_users.lng | 2 +- interface/web/admin/lib/lang/hr_users.lng | 2 +- interface/web/admin/lib/lang/hu_users.lng | 2 +- interface/web/admin/lib/lang/id_users.lng | 2 +- interface/web/admin/lib/lang/it_users.lng | 2 +- interface/web/admin/lib/lang/ja_users.lng | 2 +- interface/web/admin/lib/lang/nl_users.lng | 2 +- interface/web/admin/lib/lang/pl_users.lng | 2 +- interface/web/admin/lib/lang/pt_users.lng | 2 +- interface/web/admin/lib/lang/ro_users.lng | 2 +- interface/web/admin/lib/lang/ru_users.lng | 2 +- interface/web/admin/lib/lang/se_users.lng | 2 +- interface/web/admin/lib/lang/sk_users.lng | 2 +- interface/web/admin/lib/lang/tr_users.lng | 2 +- .../web/admin/templates/users_user_edit.htm | 21 ++++++++++++------- 26 files changed, 39 insertions(+), 32 deletions(-) diff --git a/interface/web/admin/lib/lang/ar_users.lng b/interface/web/admin/lib/lang/ar_users.lng index dd4ef0143..369d56559 100644 --- a/interface/web/admin/lib/lang/ar_users.lng +++ b/interface/web/admin/lib/lang/ar_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Username'; $wb['username_err'] = 'The username is too long or contains invalid characters.'; $wb['username_empty'] = 'The username is empty.'; $wb['username_unique'] = 'There is already a user with this username.'; -$wb['passwort_txt'] = 'Password'; +$wb['password_txt'] = 'Password'; $wb['password_strength_txt'] = 'Password strength'; $wb['modules_txt'] = 'Module'; $wb['startmodule_txt'] = 'Startmodule'; diff --git a/interface/web/admin/lib/lang/bg_users.lng b/interface/web/admin/lib/lang/bg_users.lng index 801d9e70a..a7d669bd2 100644 --- a/interface/web/admin/lib/lang/bg_users.lng +++ b/interface/web/admin/lib/lang/bg_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Потребителско име'; $wb['username_err'] = 'Потребителското име е твърде дълго или съдържа непозволени символи.'; $wb['username_empty'] = 'Полето с потребителското име е празно.'; $wb['username_unique'] = 'Вече съществува потребител с това потребителско име.'; -$wb['passwort_txt'] = 'Парола'; +$wb['password_txt'] = 'Парола'; $wb['password_strength_txt'] = 'Сила на паролата'; $wb['modules_txt'] = 'Модул'; $wb['startmodule_txt'] = 'Старт модул'; diff --git a/interface/web/admin/lib/lang/br_users.lng b/interface/web/admin/lib/lang/br_users.lng index 18e6085b8..de664c674 100644 --- a/interface/web/admin/lib/lang/br_users.lng +++ b/interface/web/admin/lib/lang/br_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Usuário'; $wb['username_err'] = 'O nome do usuário é muito longo ou contém caracteres inválidos.'; $wb['username_empty'] = 'O nome do usuário está em branco.'; $wb['username_unique'] = 'Já existe um usuário com este nome.'; -$wb['passwort_txt'] = 'Senha'; +$wb['password_txt'] = 'Senha'; $wb['password_strength_txt'] = 'Dificuldade da senha'; $wb['modules_txt'] = 'Módulo'; $wb['startmodule_txt'] = 'Módulo inicial'; diff --git a/interface/web/admin/lib/lang/ca_users.lng b/interface/web/admin/lib/lang/ca_users.lng index dd4ef0143..369d56559 100644 --- a/interface/web/admin/lib/lang/ca_users.lng +++ b/interface/web/admin/lib/lang/ca_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Username'; $wb['username_err'] = 'The username is too long or contains invalid characters.'; $wb['username_empty'] = 'The username is empty.'; $wb['username_unique'] = 'There is already a user with this username.'; -$wb['passwort_txt'] = 'Password'; +$wb['password_txt'] = 'Password'; $wb['password_strength_txt'] = 'Password strength'; $wb['modules_txt'] = 'Module'; $wb['startmodule_txt'] = 'Startmodule'; diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng index 9aa92402f..00eefa1d5 100644 --- a/interface/web/admin/lib/lang/cz_users.lng +++ b/interface/web/admin/lib/lang/cz_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Uživatelské jméno'; $wb['username_err'] = 'Uživatelské jméno je příliš dlouhé nebo obsahuje neplatné znaky.'; $wb['username_empty'] = 'Uživatelské jméno je prázdné.'; $wb['username_unique'] = 'Toto uživatelské jméno již existuje.'; -$wb['passwort_txt'] = 'Heslo'; +$wb['password_txt'] = 'Heslo'; $wb['password_strength_txt'] = 'Bezpečnost hesla'; $wb['modules_txt'] = 'Modul'; $wb['startmodule_txt'] = 'Výchozí modul'; diff --git a/interface/web/admin/lib/lang/de_users.lng b/interface/web/admin/lib/lang/de_users.lng index 9bc13061c..e52090dce 100644 --- a/interface/web/admin/lib/lang/de_users.lng +++ b/interface/web/admin/lib/lang/de_users.lng @@ -2,7 +2,7 @@ $wb['users_txt'] = 'Users'; $wb['username_txt'] = 'Benutzername'; $wb['username_err'] = 'Der Benutzername enthält ungültige Zeichen.'; -$wb['passwort_txt'] = 'Passwort'; +$wb['password_txt'] = 'Passwort'; $wb['modules_txt'] = 'Module'; $wb['startmodule_txt'] = 'Startmodul'; $wb['app_theme_txt'] = 'Design'; diff --git a/interface/web/admin/lib/lang/dk_users.lng b/interface/web/admin/lib/lang/dk_users.lng index f5811d771..fa595ed18 100644 --- a/interface/web/admin/lib/lang/dk_users.lng +++ b/interface/web/admin/lib/lang/dk_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Brugernavn'; $wb['username_err'] = 'Brugernavnet er for langt eller indeholder ugyldige karaktere.'; $wb['username_empty'] = 'Brugernavnet er tomt.'; $wb['username_unique'] = 'Der findes allerede en bruger med dette brugernavn.'; -$wb['passwort_txt'] = 'Adgangskode'; +$wb['password_txt'] = 'Adgangskode'; $wb['password_strength_txt'] = 'Adgangskode styrke'; $wb['modules_txt'] = 'Modul'; $wb['startmodule_txt'] = 'Startmodul'; diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng index e25fbe17f..6d07d6632 100644 --- a/interface/web/admin/lib/lang/el_users.lng +++ b/interface/web/admin/lib/lang/el_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Όνομα Χρήστη'; $wb['username_err'] = 'Το όνομα χρήστη είναι πολύ μεγάλο ή περιέχει μη επιτρεπόμενους χαρακτήρες'; $wb['username_empty'] = 'Το όνομα χρήστη δεν έχει οριστεί.'; $wb['username_unique'] = 'Υπάρχει ήδη ένας χρήστης με αυτό το όνομα χρήστη.'; -$wb['passwort_txt'] = 'Συνθηματικό'; +$wb['password_txt'] = 'Συνθηματικό'; $wb['password_strength_txt'] = 'Δύναμη Συνθηματικού'; $wb['modules_txt'] = 'Άρθρωμα'; $wb['startmodule_txt'] = 'Άρθρωμα Εκκίνησης'; diff --git a/interface/web/admin/lib/lang/en_users.lng b/interface/web/admin/lib/lang/en_users.lng index 72d93eb4d..dd5942bdf 100644 --- a/interface/web/admin/lib/lang/en_users.lng +++ b/interface/web/admin/lib/lang/en_users.lng @@ -4,7 +4,7 @@ $wb["username_txt"] = 'Username'; $wb["username_err"] = 'The username is too long or contains invalid characters.'; $wb["username_empty"] = 'The username is empty.'; $wb["username_unique"] = 'There is already a user with this username.'; -$wb["passwort_txt"] = 'Password'; +$wb["password_txt"] = 'Password'; $wb["password_strength_txt"] = 'Password strength'; $wb["modules_txt"] = 'Module'; $wb["startmodule_txt"] = 'Startmodule'; diff --git a/interface/web/admin/lib/lang/es_users.lng b/interface/web/admin/lib/lang/es_users.lng index 127d5431e..5a06c7ed3 100644 --- a/interface/web/admin/lib/lang/es_users.lng +++ b/interface/web/admin/lib/lang/es_users.lng @@ -17,7 +17,7 @@ $wb['ort_txt'] = 'Ciudad'; $wb['password_match_txt'] = 'Las contraseñas coinciden.'; $wb['password_mismatch_txt'] = 'Las contraseñas no coinciden.'; $wb['password_strength_txt'] = 'Fortaleza de la contraseña'; -$wb['passwort_txt'] = 'Contraseña'; +$wb['password_txt'] = 'Contraseña'; $wb['plz_txt'] = 'Zona postal'; $wb['repeat_password_txt'] = 'Repetir contraseña'; $wb['startmodule_err'] = 'El módulo de inicio no se encuentra entre los módulos.'; diff --git a/interface/web/admin/lib/lang/fi_users.lng b/interface/web/admin/lib/lang/fi_users.lng index 3e44e5667..1e5bb5885 100644 --- a/interface/web/admin/lib/lang/fi_users.lng +++ b/interface/web/admin/lib/lang/fi_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Käyttäjätunnus'; $wb['username_err'] = 'Käyttäjätunnus on liian pitkä tai sisältää kiellettyjä merkkejä.'; $wb['username_empty'] = 'Käyttäjätunnus on tyhjä.'; $wb['username_unique'] = 'Tämä käyttäjätunnus on jo olemassa.'; -$wb['passwort_txt'] = 'Salasana'; +$wb['password_txt'] = 'Salasana'; $wb['modules_txt'] = 'Ohjelmaosiot'; $wb['startmodule_txt'] = 'Aloitusosio'; $wb['app_theme_txt'] = 'Teema'; diff --git a/interface/web/admin/lib/lang/fr_users.lng b/interface/web/admin/lib/lang/fr_users.lng index 2f91cab83..0f50d10d6 100644 --- a/interface/web/admin/lib/lang/fr_users.lng +++ b/interface/web/admin/lib/lang/fr_users.lng @@ -2,7 +2,7 @@ $wb['users_txt'] = 'Users'; $wb['username_txt'] = 'Nom d’utilisateur'; $wb['username_err'] = 'Le nom d’utilisateur est trop long ou contient des caractères invalides.'; -$wb['passwort_txt'] = 'Mot de passe'; +$wb['password_txt'] = 'Mot de passe'; $wb['modules_txt'] = 'Module'; $wb['startmodule_txt'] = 'Module de démarrage'; $wb['app_theme_txt'] = 'Thème'; diff --git a/interface/web/admin/lib/lang/hr_users.lng b/interface/web/admin/lib/lang/hr_users.lng index c274a9498..3a7da2a42 100644 --- a/interface/web/admin/lib/lang/hr_users.lng +++ b/interface/web/admin/lib/lang/hr_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Korisničko ime'; $wb['username_err'] = 'Korisničko ime je predugačko ili sadrži nedozvoljene znakove.'; $wb['username_empty'] = 'Korisničko ime je prazno.'; $wb['username_unique'] = 'Već postoji korisnik sa ovim korisničkim imenom.'; -$wb['passwort_txt'] = 'Šifra'; +$wb['password_txt'] = 'Šifra'; $wb['password_strength_txt'] = 'Jačina šifre'; $wb['modules_txt'] = 'Modul'; $wb['startmodule_txt'] = 'Početni modul'; diff --git a/interface/web/admin/lib/lang/hu_users.lng b/interface/web/admin/lib/lang/hu_users.lng index 5cb86c850..6f1ded0b7 100644 --- a/interface/web/admin/lib/lang/hu_users.lng +++ b/interface/web/admin/lib/lang/hu_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Felhasználónév'; $wb['username_err'] = 'A Felhasználónév túl hosszú vagy érvénytelen karaktereket tartalmaz'; $wb['username_empty'] = 'A Felhasználónév üres.'; $wb['username_unique'] = 'Ez a Felhasználónév már foglalt.'; -$wb['passwort_txt'] = 'Jelszó'; +$wb['password_txt'] = 'Jelszó'; $wb['modules_txt'] = 'Modul'; $wb['startmodule_txt'] = 'Kezdőmodul'; $wb['app_theme_txt'] = 'Kinézet'; diff --git a/interface/web/admin/lib/lang/id_users.lng b/interface/web/admin/lib/lang/id_users.lng index e6ed3d5be..bc546d4df 100644 --- a/interface/web/admin/lib/lang/id_users.lng +++ b/interface/web/admin/lib/lang/id_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Nama Pengguna'; $wb['username_err'] = 'Nama pengguna terlalu panjang atau mengandung karakter yang tidak valid.'; $wb['username_empty'] = 'Nama pengguna kosong.'; $wb['username_unique'] = 'Sudah ada pengguna yang memakai nama ini.'; -$wb['passwort_txt'] = 'Kata Sandi'; +$wb['password_txt'] = 'Kata Sandi'; $wb['password_strength_txt'] = 'Kekuatan sandi'; $wb['modules_txt'] = 'Modul'; $wb['startmodule_txt'] = 'Modul awal'; diff --git a/interface/web/admin/lib/lang/it_users.lng b/interface/web/admin/lib/lang/it_users.lng index 60c80063f..e657d2ae9 100644 --- a/interface/web/admin/lib/lang/it_users.lng +++ b/interface/web/admin/lib/lang/it_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Nome utente'; $wb['username_err'] = 'Nome utente troppo lungo o avente caratteri non validi.'; $wb['username_empty'] = 'Nome utente mancante.'; $wb['username_unique'] = 'Nome utente già utilizzato.'; -$wb['passwort_txt'] = 'Password'; +$wb['password_txt'] = 'Password'; $wb['password_strength_txt'] = 'Solidità password'; $wb['modules_txt'] = 'Modulo'; $wb['startmodule_txt'] = 'Startmodule'; diff --git a/interface/web/admin/lib/lang/ja_users.lng b/interface/web/admin/lib/lang/ja_users.lng index 7d77bb8ac..45b1faec6 100644 --- a/interface/web/admin/lib/lang/ja_users.lng +++ b/interface/web/admin/lib/lang/ja_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'ユーザー名'; $wb['username_err'] = 'ユーザー名が長すぎるか、または不正な文字を含んでいます。'; $wb['username_empty'] = 'ユーザー名を入力してください。'; $wb['username_unique'] = '既に登録済みのユーザー名です。別の名前を選んでください。'; -$wb['passwort_txt'] = 'パスワード'; +$wb['password_txt'] = 'パスワード'; $wb['password_strength_txt'] = 'パスワードの強度'; $wb['modules_txt'] = 'モジュール'; $wb['startmodule_txt'] = 'ログイン直後のモジュール'; diff --git a/interface/web/admin/lib/lang/nl_users.lng b/interface/web/admin/lib/lang/nl_users.lng index 53611ff56..e1e6609c2 100644 --- a/interface/web/admin/lib/lang/nl_users.lng +++ b/interface/web/admin/lib/lang/nl_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Gebruikersnaam'; $wb['username_err'] = 'De gebruikersnaam is te lang of bevat ongeldige karakters.'; $wb['username_empty'] = 'De gebruikersnaam is niet ingvuld.'; $wb['username_unique'] = 'Er is al een een gebruiker met deze gebruikersnaam.'; -$wb['passwort_txt'] = 'Wachtwoord'; +$wb['password_txt'] = 'Wachtwoord'; $wb['password_strength_txt'] = 'Wachtwoord sterkte'; $wb['modules_txt'] = 'Module'; $wb['startmodule_txt'] = 'Startmodule'; diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng index c303b1ab1..f5439f4f5 100644 --- a/interface/web/admin/lib/lang/pl_users.lng +++ b/interface/web/admin/lib/lang/pl_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Nazwa użytkownika'; $wb['username_err'] = 'Nazwa użytkownika jest za długa lub zawiera niedozwolone znaki.'; $wb['username_empty'] = 'Nazwa użytkownika jest pusta.'; $wb['username_unique'] = 'Istnieje już użytkownik o takiej nazwie.'; -$wb['passwort_txt'] = 'Hasło'; +$wb['password_txt'] = 'Hasło'; $wb['password_strength_txt'] = 'Siła hasła'; $wb['modules_txt'] = 'Moduł'; $wb['startmodule_txt'] = 'Moduł startowy'; diff --git a/interface/web/admin/lib/lang/pt_users.lng b/interface/web/admin/lib/lang/pt_users.lng index 3e620e02c..7522fb027 100644 --- a/interface/web/admin/lib/lang/pt_users.lng +++ b/interface/web/admin/lib/lang/pt_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Utilizador '; $wb['username_err'] = 'O Nome do utilizador é muito longo ou contém caracteres inválidos!'; $wb['username_empty'] = 'Por favor, entre com um nome de utilizador .'; $wb['username_unique'] = 'Já existe um utilizador com este nome!'; -$wb['passwort_txt'] = 'Senha'; +$wb['password_txt'] = 'Senha'; $wb['password_strength_txt'] = 'Segurança da Senha'; $wb['modules_txt'] = 'Módulos'; $wb['startmodule_txt'] = 'Módulo Inicial'; diff --git a/interface/web/admin/lib/lang/ro_users.lng b/interface/web/admin/lib/lang/ro_users.lng index dd4ef0143..369d56559 100644 --- a/interface/web/admin/lib/lang/ro_users.lng +++ b/interface/web/admin/lib/lang/ro_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Username'; $wb['username_err'] = 'The username is too long or contains invalid characters.'; $wb['username_empty'] = 'The username is empty.'; $wb['username_unique'] = 'There is already a user with this username.'; -$wb['passwort_txt'] = 'Password'; +$wb['password_txt'] = 'Password'; $wb['password_strength_txt'] = 'Password strength'; $wb['modules_txt'] = 'Module'; $wb['startmodule_txt'] = 'Startmodule'; diff --git a/interface/web/admin/lib/lang/ru_users.lng b/interface/web/admin/lib/lang/ru_users.lng index 9ed98ca02..d805b9391 100644 --- a/interface/web/admin/lib/lang/ru_users.lng +++ b/interface/web/admin/lib/lang/ru_users.lng @@ -2,7 +2,7 @@ $wb['users_txt'] = 'Users'; $wb['username_txt'] = 'Логин'; $wb['username_err'] = 'Ошибка в логине'; -$wb['passwort_txt'] = 'Пароль'; +$wb['password_txt'] = 'Пароль'; $wb['modules_txt'] = 'Модуль'; $wb['startmodule_txt'] = 'Стартовый модуль'; $wb['app_theme_txt'] = 'Тема'; diff --git a/interface/web/admin/lib/lang/se_users.lng b/interface/web/admin/lib/lang/se_users.lng index 4f8814842..60f3829ad 100644 --- a/interface/web/admin/lib/lang/se_users.lng +++ b/interface/web/admin/lib/lang/se_users.lng @@ -2,7 +2,7 @@ $wb['users_txt'] = 'Users'; $wb['username_txt'] = 'Användarnamn'; $wb['username_err'] = 'användarnamn_fel'; -$wb['passwort_txt'] = 'Lösenord'; +$wb['password_txt'] = 'Lösenord'; $wb['modules_txt'] = 'Modul'; $wb['startmodule_txt'] = 'Startmodul'; $wb['app_theme_txt'] = 'Design'; diff --git a/interface/web/admin/lib/lang/sk_users.lng b/interface/web/admin/lib/lang/sk_users.lng index b037e307c..9cc7f87e0 100644 --- a/interface/web/admin/lib/lang/sk_users.lng +++ b/interface/web/admin/lib/lang/sk_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Užívateľské meno'; $wb['username_err'] = 'Užívateľské meno je príliš dlhá alebo obsahuje neplatné znaky.'; $wb['username_empty'] = 'Užívateľské meno je prázdne.'; $wb['username_unique'] = 'V súčasnosti už existuje užívateľ s týmto užívateľským menom.'; -$wb['passwort_txt'] = 'Heslo'; +$wb['password_txt'] = 'Heslo'; $wb['password_strength_txt'] = 'Pevnosť hesla'; $wb['modules_txt'] = 'Modul'; $wb['startmodule_txt'] = 'Startmodul'; diff --git a/interface/web/admin/lib/lang/tr_users.lng b/interface/web/admin/lib/lang/tr_users.lng index 307cdd37b..84826357b 100644 --- a/interface/web/admin/lib/lang/tr_users.lng +++ b/interface/web/admin/lib/lang/tr_users.lng @@ -4,7 +4,7 @@ $wb['username_txt'] = 'Kullanıcı Adı'; $wb['username_err'] = 'Kullanıcı adı çok uzun ya da geçersiz karakterler içeriyor.'; $wb['username_empty'] = 'Kullanıcı adı boş olamaz.'; $wb['username_unique'] = 'Bu adla bir kullanıcı zaten var.'; -$wb['passwort_txt'] = 'Parola'; +$wb['password_txt'] = 'Parola'; $wb['password_strength_txt'] = 'Parola Zorluğu'; $wb['modules_txt'] = 'Modül'; $wb['startmodule_txt'] = 'Başlangıç modülü'; diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm index baf5f5855..b8c9d9640 100644 --- a/interface/web/admin/templates/users_user_edit.htm +++ b/interface/web/admin/templates/users_user_edit.htm @@ -1,10 +1,17 @@
-
- -
 
{tmpl_var name='generate_password_txt'} -
+
+ +
+
+ + + + +
+
+
@@ -63,10 +70,10 @@ {tmpl_var name='lost_password_function'}
- - + + - +
-- GitLab