From 4235883af3b20b9c759085a4e11e0d7cecf348d0 Mon Sep 17 00:00:00 2001 From: ayato <58212796+ayaaop@users.noreply.github.com> Date: Sun, 1 Jun 2025 17:31:12 +0500 Subject: [PATCH 1/2] feat(user>groups): make the search bar and create group button more accessible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Повторяет вид отсюда: https://archive.is/hZ59B --- Web/Presenters/templates/User/Groups.xml | 41 ++++++++---------------- Web/static/css/main.css | 13 +++----- locales/en.strings | 4 --- locales/hy.strings | 4 --- locales/id.strings | 6 +--- locales/kk.strings | 4 --- locales/ru.strings | 4 --- locales/ru_lat.strings | 4 --- locales/uk.strings | 4 --- 9 files changed, 19 insertions(+), 65 deletions(-) diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index d3528268..79c13d95 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -8,9 +8,7 @@ {/block} {block header} - {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} - {_my_groups} - {else} + {if is_null($thisUser) || $user->getId() !== $thisUser->getId()} {$user->getCanonicalName()} » {_groups} {/if} {/block} @@ -21,7 +19,7 @@ {if !is_null($thisUser) && $user->getId() === $thisUser->getId()}
- {_groups} + {_my_groups}
@@ -33,6 +31,18 @@ {/block} {block size} + {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} +
+ +
+ +
+
+ {/if} +
{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} @@ -106,27 +116,4 @@ {/if} -{/block} - -{block bottom} - {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} -
-
-

{_open_new_group}

- {_open_group_desc} -
- -
-
-
-

{_search_group}

- {_search_group_desc} -
- - - -
-
-
- {/if} {/block} \ No newline at end of file diff --git a/Web/static/css/main.css b/Web/static/css/main.css index 0332d278..d770a814 100644 --- a/Web/static/css/main.css +++ b/Web/static/css/main.css @@ -2201,17 +2201,12 @@ body.scrolled .toTop:hover, .toTop.has_down:hover { border-top: #DEDEDE solid 1px; } -#gp_container { +#groups_graybar form { display: inline-block; } -#gp_container span { - display: block; - margin: 10px 0 15px; -} - -#gp_container h4 { - font-size: 11px; +#groups_graybar #create_group { + float: right; } .container_gray .content:last-child { @@ -2843,7 +2838,7 @@ a.poll-retract-vote { padding: 11px 4px 0 7px; } -.header_navigation #search_box input[type='search'] { +#search_box input[type='search'] { height: 20px; background: url('/assets/packages/static/openvk/img/search_icon.png') no-repeat 3px 4px; background-color: #fff; diff --git a/locales/en.strings b/locales/en.strings index bca784ef..7da501ef 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -480,11 +480,7 @@ "meetings_one" = "$1 meeting"; "meetings_other" = "$1 meetings"; -"open_new_group" = "Start a New Group"; -"open_group_desc" = "Unable to find the perfect group? Start your own..."; -"search_group" = "Search for a Group"; "search_by_groups" = "Explore Groups"; -"search_group_desc" = "Browse through existing groups and find the one that suits your needs..."; "error_suggestions" = "Error accessing to suggestions"; "error_suggestions_closed" = "This group has closed wall."; diff --git a/locales/hy.strings b/locales/hy.strings index dd4901cc..53718625 100755 --- a/locales/hy.strings +++ b/locales/hy.strings @@ -329,11 +329,7 @@ "meetings_one" = "Մեկ հանդիպում"; "meetings_other" = "$1 հանդիպում"; -"open_new_group" = "Նոր խումբ բացել"; -"open_group_desc" = "Չե՞ք կարողանում գտնել ճիշտ խումբը, բացե՛ք ձերը․․․"; -"search_group" = "Խմբի որոնում"; "search_by_groups" = "Որոնում ըստ խմբերի"; -"search_group_desc" = "Այստեղ դուք կարող եք փնտրել խմբեր և ընտրել ձեզ ամենահարմարը․․․"; /* Albums */ diff --git a/locales/id.strings b/locales/id.strings index d0a43d19..6c7e14e1 100755 --- a/locales/id.strings +++ b/locales/id.strings @@ -290,11 +290,7 @@ "meetings_one" = "$1 rapat/pertemuan"; "meetings_other" = "$1 rapat/pertemuan"; -"open_new_group" = "Open a new group"; -"open_group_desc" = "Can't find the right group? Open your own..."; -"search_group" = "Cari grup"; -"search_by_groups" = "Search by groups"; -"search_group_desc" = "Here you can browse through the existing groups and choose a group to suit your needs..."; +"search_by_groups" = "Cari grup"; /* Albums */ diff --git a/locales/kk.strings b/locales/kk.strings index 9195a17b..db60afc3 100755 --- a/locales/kk.strings +++ b/locales/kk.strings @@ -289,11 +289,7 @@ "meetings_zero" = "Кездесулер жоқ"; "meetings_one" = "$1 кездесу"; "meetings_other" = "$1 кездесу"; -"open_new_group" = "Жаңа топ ашу"; -"open_group_desc" = "Өзіңізге сай топ таба алмай жүрсіз бе? Өзіңіз ашып алыңыз!"; -"search_group" = "Топ іздеу"; "search_by_groups" = "Топтардан іздеу"; -"search_group_desc" = "Мұнда сіз бар топтарға шолу жасай аласыз және қажеттіліктеріңізге сай топты таңдай аласыз."; /* Albums */ diff --git a/locales/ru.strings b/locales/ru.strings index f933d724..1b2f47a8 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -465,11 +465,7 @@ "meetings_few" = "$1 встречи"; "meetings_many" = "$1 встреч"; "meetings_other" = "$1 встреч"; -"open_new_group" = "Открыть новую группу"; -"open_group_desc" = "Не можете найти нужную группу? Откройте свою..."; -"search_group" = "Поиск группы"; "search_by_groups" = "Поиск по группам"; -"search_group_desc" = "Здесь Вы можете просмотреть существующие группы и выбрать группу себе по вкусу..."; "group_banned" = "К сожалению, нам пришлось заблокировать сообщество $1."; "error_suggestions" = "Ошибка доступа к предложенным"; diff --git a/locales/ru_lat.strings b/locales/ru_lat.strings index 2c2845a6..13c3d319 100644 --- a/locales/ru_lat.strings +++ b/locales/ru_lat.strings @@ -319,11 +319,7 @@ "meetings_few" = "$1 vstreči"; "meetings_many" = "$1 vstreč"; "meetings_other" = "$1 vstreč"; -"open_new_group" = "Otkrytí novuju gruppu"; -"open_group_desc" = "Ne možete najti nužnuju gruppu? Otkrojte svoju..."; -"search_group" = "Poisk gruppy"; "search_by_groups" = "Poisk po gruppam"; -"search_group_desc" = "Zdesí Vy možete prosmotretí susčestvujusčie gruppy i vybratí gruppu sebe po vkusu..."; "group_banned" = "K sožaleniju, nam prišlosí zablokirovatí soobsčestvo $1."; /* Albums */ diff --git a/locales/uk.strings b/locales/uk.strings index c54b4769..70c25701 100644 --- a/locales/uk.strings +++ b/locales/uk.strings @@ -442,11 +442,7 @@ "meetings_few" = "$1 зустрічі"; "meetings_many" = "$1 зустрічей"; "meetings_other" = "$1 зустрічей"; -"open_new_group" = "Створити нову спільноту"; -"open_group_desc" = "Не можете знайти потрібну спільноту? Відкрийте свою!"; -"search_group" = "Пошук спільнот"; "search_by_groups" = "Пошук за спільнотами"; -"search_group_desc" = "Тут Ви можете переглянути існуючі спільноти та обрати спільноту до вподоби."; "group_banned" = "Спільнота $1 заблокована."; "error_suggestions" = "Помилка доступу до пропозиційної"; "error_suggestions_closed" = "Ця спільнота має закриту стіну."; From b77103627f35f220b96acce9b4181d95fd688121 Mon Sep 17 00:00:00 2001 From: ayato <58212796+ayaaop@users.noreply.github.com> Date: Sun, 1 Jun 2025 18:35:06 +0500 Subject: [PATCH 2/2] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20?= =?UTF-8?q?=D0=B6=D0=B5=D0=BB=D1=82=D1=83=D1=8E=20=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Web/Presenters/templates/User/Groups.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 79c13d95..83d39e0b 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -8,7 +8,9 @@ {/block} {block header} - {if is_null($thisUser) || $user->getId() !== $thisUser->getId()} + {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} + {_my_groups} + {else} {$user->getCanonicalName()} » {_groups} {/if} {/block} @@ -19,7 +21,7 @@ {if !is_null($thisUser) && $user->getId() === $thisUser->getId()}
- {_my_groups} + {_groups}
@@ -116,4 +118,4 @@ {/if} -{/block} \ No newline at end of file +{/block}