From c67607c3f90d1f54cb97c8b0926f3cd64739a9e3 Mon Sep 17 00:00:00 2001 From: ZAZiOs <85897688+ZAZiOs@users.noreply.github.com> Date: Sat, 7 Jan 2023 22:52:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?= =?UTF-8?q?=D0=B0=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=B8=D0=B7=202007=D0=B3=20(#788)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update @layout.xml * Update @layout.xml * Update Register.xml * Update Login.xml * Update style.css * Update en.strings * Update ru.strings * Update ru_old.strings * Update ru_sov.strings * h2 -> .header2 * h2 + header2 styling * Update Register.xml * Update Register.xml * Update Login.xml * Welcome message addiction * трахать * +reg-welcome * +reg-welcome * +reg-welcome * +reg-welcome (mixed up that with old rus one) * +reg-welcome * Adding UK localization * Delete settings.json * На всякий и тут обновлю на id в layout Нужно для изменения иконок при создании тем. * Update @layout.xml * Minor changes * minor changes * Fixes requested by celestora * пепяо с табами * пепяо с табами --- Web/Presenters/templates/@layout.xml | 10 +- .../Auth/FinishRestoringPassword.xml | 56 +++++-- Web/Presenters/templates/Auth/Login.xml | 33 ++-- .../templates/Auth/LoginSecondFactor.xml | 29 ++-- Web/Presenters/templates/Auth/Register.xml | 149 +++++++++++------- Web/Presenters/templates/Auth/Restore.xml | 41 +++-- Web/static/css/style.css | 18 +++ locales/en.strings | 3 + locales/ru.strings | 3 + locales/ru_old.strings | 3 + locales/ru_sov.strings | 3 + locales/uk.strings | 3 + 12 files changed, 233 insertions(+), 118 deletions(-) diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index 8cff0bb8..490225b6 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -169,7 +169,7 @@
- +
+{$thisUser->getFollowersCount()} @@ -177,10 +177,10 @@
- + - +
+{$thisUser->getUnreadMessagesCount()} @@ -188,10 +188,10 @@
- + - +
+{$thisUser->getNotificationsCount()} diff --git a/Web/Presenters/templates/Auth/FinishRestoringPassword.xml b/Web/Presenters/templates/Auth/FinishRestoringPassword.xml index 7752c3d0..dbc061c8 100644 --- a/Web/Presenters/templates/Auth/FinishRestoringPassword.xml +++ b/Web/Presenters/templates/Auth/FinishRestoringPassword.xml @@ -9,21 +9,47 @@ {/block} {block content} -

- {_access_recovery_info_2} -

- +

{_access_recovery}

+ + + + + + +
+ {_access_recovery_info_2} +
+
- - -

- {if $is2faEnabled} - - -

- {/if} - - - + + + + + + + {if $is2faEnabled} + + + + + {/if} + + + + +
+ {_new_password}: + + +
+ {_"2fa_code_2"}: + + +
+
+
+ + +
{/block} diff --git a/Web/Presenters/templates/Auth/Login.xml b/Web/Presenters/templates/Auth/Login.xml index 0b534ca1..82d73588 100644 --- a/Web/Presenters/templates/Auth/Login.xml +++ b/Web/Presenters/templates/Auth/Login.xml @@ -7,35 +7,36 @@ {block content}
- +

{_log_in}

+
- + - - + - - - -
- {_email}: + {_email}: +
- {_password}: + {_password}:
- - - - - {_registration} -
+
+ + + + {_registration}

+ {_forgot_password} +
{/block} diff --git a/Web/Presenters/templates/Auth/LoginSecondFactor.xml b/Web/Presenters/templates/Auth/LoginSecondFactor.xml index 33b68fac..a1ba1ede 100644 --- a/Web/Presenters/templates/Auth/LoginSecondFactor.xml +++ b/Web/Presenters/templates/Auth/LoginSecondFactor.xml @@ -6,16 +6,23 @@ {/block} {block content} -

- {_two_factor_authentication_login} -

+

{_two_factor_authentication}

+ + + + + + +
+ {_two_factor_authentication_login} +
- + -
- {_code}: + {_code}: @@ -25,14 +32,14 @@ - - - - -
+
+ + + + +
{/block} diff --git a/Web/Presenters/templates/Auth/Register.xml b/Web/Presenters/templates/Auth/Register.xml index 16532cb1..ac2743dc 100644 --- a/Web/Presenters/templates/Auth/Register.xml +++ b/Web/Presenters/templates/Auth/Register.xml @@ -22,31 +22,78 @@

{tr("invites_you_to", $referer->getFullName(), OPENVK_ROOT_CONF['openvk']['appearance']['name'])|noescape}

- +
+

{_registration}

+ + + + + + + +
+ + + {php echo OPENVK_ROOT_CONF['openvk']['appearance']['name']} {_registration_welcome_1}
+ {_registration_welcome_2} +
- + + - - - + - - + + + + + +
- {_name}: +

{_main}

+
+ {_name}: +
- {_surname}: + + {_surname}: +
- {_gender}: + + {_email}: + + +
+ {_password}: + + +
+ + +

{_other_fields}

+ + + + + + + + - - - - - - - - - - - - - - - - - - - - +
+ {_birth_date}: + + +
+ {_gender}: + {var $femalePreferred = OPENVK_ROOT_CONF["openvk"]["preferences"]["femaleGenderPriority"]}
- {_birth_date}: + + CAPTCHA: - -
- {_email}: - - -
- {_password}: - - -
- CAPTCHA: - + {captcha_template()|noescape}
- - - - {_checkbox_in_registration|noescape} -

- - {_log_in} -
+
+ + {_checkbox_in_registration|noescape} +

+

+
-
+
{else} -
- {_registration_closed} -

- {_registration_disabled_info} - {if OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']} -

{php echo OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']} - {/if} -

-
+

{_registration_closed}

+ + + + + + + +
+ {_registration_closed} + + {_registration_disabled_info} + {if OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']} +
+
+ {_admin_banned_link_reason}: +
+ {php echo OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']} + {/if} +
{/if} {/block} diff --git a/Web/Presenters/templates/Auth/Restore.xml b/Web/Presenters/templates/Auth/Restore.xml index 81d9cf41..ac3a9730 100644 --- a/Web/Presenters/templates/Auth/Restore.xml +++ b/Web/Presenters/templates/Auth/Restore.xml @@ -9,16 +9,37 @@ {/block} {block content} -

- {_access_recovery_info} -

- +

{_access_recovery}

+ + + + + + +
+ {_access_recovery_info} +
+
- - -

- - - + + + + + + + + + + +
+ {_email}: + + +
+
+
+ + +
{/block} diff --git a/Web/static/css/style.css b/Web/static/css/style.css index 42783603..52a14ccf 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -661,6 +661,15 @@ select { box-sizing: border-box; } +.header2 { + border-bottom: 1px solid #E8EBEE; + color: #45688E; + font-size: 14px; + font-weight: bold; + margin: 0; + font-family: verdana, arial, sans-serif; +} + h4 { border-bottom: 1px solid #E8EBEE; color: #45688E; @@ -2236,3 +2245,12 @@ a.poll-retract-vote { opacity: 1; } } + +.regform-left{ + text-align: right; + min-width: 110px; +} + +.regform-right{ + min-width: 200px; +} \ No newline at end of file diff --git a/locales/en.strings b/locales/en.strings index 79db26c6..ec923ba8 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -53,8 +53,11 @@ "register_meta_desc" = "Register in $1 now!"; "register_referer_meta_title" = "$1 invites you to $2!"; "register_referer_meta_desc" = "Join $1 and many other users at $2!"; +"registration_welcome_1" = "is a universal colleague search tool based on the VKontakte structure."; +"registration_welcome_2" = "We want friends, classmates, neighbors and colleagues to always be in touch."; "users" = "Users"; +"other_fields" = "Other fields"; /* Profile information */ diff --git a/locales/ru.strings b/locales/ru.strings index f2d09ecc..8f884574 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -44,7 +44,10 @@ "register_meta_desc" = "Зарегистрируйтесь в $1 прямо сейчас!"; "register_referer_meta_title" = "$1 приглашает вас в $2!"; "register_referer_meta_desc" = "Присоединяйтесь к $1 и множеству других пользователей в $2!"; +"registration_welcome_1" = "- универсальное средство поиска коллег основанное на структуре ВКонтакте."; +"registration_welcome_2" = "Мы хотим, чтобы друзья, однокурсники, одноклассники, соседи и коллеги всегда могли быть в контакте."; "users" = "Пользователи"; +"other_fields" = "Остальное"; /* Profile information */ diff --git a/locales/ru_old.strings b/locales/ru_old.strings index c86967e4..a4f664cf 100644 --- a/locales/ru_old.strings +++ b/locales/ru_old.strings @@ -44,6 +44,9 @@ "register_meta_desc" = "Зарегистрируйтесь въ $1 прямо сейчасъ!"; "register_referer_meta_title" = "$1 приглашаетъ васъ въ $2!"; "register_referer_meta_desc" = "Присоединяйтесь къ $1 и множеству другихъ пользователей въ $2!"; +"registration_welcome_1" = "- универсальное средство поиска собратовъ основанное на структурѣ ВКонтакте."; +"registration_welcome_2" = "Мы желаемъ, чтобы друзья, однокурсники, одноклассники, сосѣди и собратья всегда могли быть въ контактѣ."; +"other_fields" = "Остальное"; /* Profile information */ diff --git a/locales/ru_sov.strings b/locales/ru_sov.strings index 6ba885ea..c14ce67b 100644 --- a/locales/ru_sov.strings +++ b/locales/ru_sov.strings @@ -42,8 +42,11 @@ "register_meta_desc" = "Зарегистрируйтесь в $1 прямо сейчас!"; "register_referer_meta_title" = "$1 приглашает вас в $2!"; "register_referer_meta_desc" = "Присоединяйтесь к $1 и множеству других граждан в $2!"; +"registration_welcome_1" = "- универсальное средство поиска товарищей основанное на структуре ВКонтакте."; +"registration_welcome_2" = "Мы желаем, чтобы друзья, однокурсники, одноклассники, соседи и товарищи всегда могли быть в контакте."; "users" = "Граждане"; +"other_fields" = "Остальное"; /* Profile information */ diff --git a/locales/uk.strings b/locales/uk.strings index 8de26167..53e6aad2 100644 --- a/locales/uk.strings +++ b/locales/uk.strings @@ -46,7 +46,10 @@ "register_meta_desc" = "Зареєструйтесь у $1 прямо зараз!"; "register_referer_meta_title" = "$1 запрошує вас у $2!"; "register_referer_meta_desc" = "Приєднуйтесь до $1 та багатьох інших користувачів у $2!"; +"registration_welcome_1" = "- універсальний засіб пошуку колег, засноване на структурі ВКонтакте."; +"registration_welcome_2" = "Ми бажаємо, щоб друзі, однокурсники, однокласники, сусіди і колеги завжди могли бути в контакті."; "users" = "Користувачі"; +"other_fields" = "Інше"; /* Profile information */