From d29b33532d3fd6e2a8f077a70a65b77a7df9d322 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 21 Jan 2021 17:13:27 +0100 Subject: [PATCH] added UIkit markup for login winix function --- winixd/html/fun_login.html | 107 ++++++++++++++++++++++++++----------- winixd/locale/en | 13 +++-- winixd/locale/pl | 12 ++++- 3 files changed, 96 insertions(+), 36 deletions(-) diff --git a/winixd/html/fun_login.html b/winixd/html/fun_login.html index 7408735..6bfe1dc 100644 --- a/winixd/html/fun_login.html +++ b/winixd/html/fun_login.html @@ -1,47 +1,92 @@
-

{login_header}

- [if user_logged] -

{logged_as_long}: [user_name]
- {logout}

+
+

{login_header}

+ +

+ {login_currently_logged_as} [user_name] +

+ +
+ {login_logout_button} +
+
[else] [if not ipban_is_login_allowed_from_this_ip] -

{login_cannot_login_from_this_ip}
- {login_cannot_login_available} [ipban_current_ip_expires_time]

+
+

{login_cannot_login_from_this_ip}
+ {login_cannot_login_available} [ipban_current_ip_expires_time]

+
[else] -
-
- -
+
+ + +
+
+
+ + +
+
+
+
+ + +
+
-
- -
+ [if login_should_use_captcha] +
+
+ + +
+
+ [end] -
- - -
+
+ +
+
+ +
- [if login_should_use_captcha] -
- - + [if winix_function_param_is "postredirect"] + + [end] + +
+ + + + + + + + + +
+
+ {login_forgot_password_question} + +
- [end] - - - - [if winix_function_param_is "postredirect"] - - [end] - - - + +
[end] diff --git a/winixd/locale/en b/winixd/locale/en index 22007de..20a6d30 100644 --- a/winixd/locale/en +++ b/winixd/locale/en @@ -5,7 +5,6 @@ language = en charset = UTF-8 logged_as = logged as -logged_as_long = You are logged as display_guest_name = guest unknown = unknown @@ -40,7 +39,6 @@ email_sent_to = An email has been sent to: logout = logout -remember_me = Remember me home_page = Home page @@ -340,7 +338,16 @@ login_cannot_login_from_this_ip = We are sorry but you cannot login from this IP #We are sorry but there were too many incorrect login attempts from your IP address. login_cannot_login_available = The login process will be available since: - +login_currently_logged_as = You are logged as: +login_username = Username +login_password = Password +login_remember_me = Remember me +login_button = Log in +login_forgot_password_question = Forgot your password? +login_back_to_login_form = Back to Login +login_forgot_password_email = E-mail +login_forgot_password_button = Change password +login_logout_button = Logout uptime_header = Uptime uptime_current_time = current time diff --git a/winixd/locale/pl b/winixd/locale/pl index 72a46fd..f4c291e 100644 --- a/winixd/locale/pl +++ b/winixd/locale/pl @@ -6,7 +6,6 @@ language = pl charset = UTF-8 logged_as = zalogowany jako -logged_as_long = Aktualnie jesteś zalogowany jako display_guest_name = gość unknown = nie znany @@ -45,7 +44,6 @@ email_sent_to = Wiadomość została wysłana do: logout = wyloguj -remember_me = Zapamiętaj mnie home_page = Strona główna @@ -361,6 +359,16 @@ login_cannot_login_from_this_ip = Przepraszamy ale nie możesz się zalogować z #Przepraszamy ale z twojego adresu IP było zbyt wiele prób nieprawidłowego logowania. login_cannot_login_available = Ponowne logowanie będzie możliwe dopiero od: +login_currently_logged_as = Aktualnie jesteś zalogowany jako: +login_username = Użytkownik +login_password = Hasło +login_remember_me = Zapamiętaj mnie +login_button = Zaloguj +login_forgot_password_question = Zapomniałeś hasła? +login_back_to_login_form = Powrót do logowania +login_forgot_password_email = E-mail +login_forgot_password_button = Zmień hasło +login_logout_button = Wyloguj uptime_header = Czas pracy systemu uptime_current_time = aktualna godzina