diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php index dbdfdde06..f2158343d 100644 --- a/Web/Presenters/WallPresenter.php +++ b/Web/Presenters/WallPresenter.php @@ -200,6 +200,7 @@ public function renderFeed(): void foreach ($posts->page((int) ($_GET["p"] ?? 1), $perPage) as $post) { $this->template->posts[] = $this->posts->get($post->id); } + $this->template->feedIgnoreButton = true; } public function renderGlobalFeed(): void @@ -240,6 +241,7 @@ public function renderGlobalFeed(): void foreach ($posts as $post) { $this->template->posts[] = $this->posts->get($post->id); } + $this->template->feedIgnoreButton = true; } public function renderHashtagFeed(string $hashtag): void diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml index a0bfeff99..a0e41ba41 100644 --- a/Web/Presenters/templates/components/post/microblogpost.xml +++ b/Web/Presenters/templates/components/post/microblogpost.xml @@ -58,7 +58,10 @@ {_pinned} + + + {if $canBePinned && !($forceNoPinLink ?? false) && $compact == false} {if $post->isPinned()} diff --git a/Web/static/css/main.css b/Web/static/css/main.css index 7aa433d28..ec9cb206d 100644 --- a/Web/static/css/main.css +++ b/Web/static/css/main.css @@ -918,6 +918,15 @@ h4 { } } +.post-hidden { + display: none; +} + +.ignore-message { + padding: 5px 0; +} + + .small-textarea { height: 24px; } diff --git a/Web/static/css/microblog.css b/Web/static/css/microblog.css index 46a1bb048..9ddbf12a8 100644 --- a/Web/static/css/microblog.css +++ b/Web/static/css/microblog.css @@ -86,6 +86,16 @@ background-color: rgb(240, 240, 240); } +.ignore { + float: right; + height: 16px; + width: 16px; + overflow: auto; + background: url("/assets/packages/static/openvk/img/ignore.png") no-repeat 0 0; + opacity: 0.1; + transition-duration: 0.3s; +} + .report { float: right; height: 16px; @@ -96,6 +106,19 @@ transition-duration: 0.3s; } +.ignore:hover { + opacity: 0.4; +} + +.post-hidden { + display: none; +} + +.ignore-message { + padding: 5px 0; + border-bottom: 1px #ddd solid; +} + .report:hover { opacity: 0.4; } diff --git a/locales/en.strings b/locales/en.strings index 1632b165b..0dba15b1f 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -359,6 +359,11 @@ "subscriptions_one" = "$1 subscription"; "subscriptions_other" = "$1 subscriptions"; +"feed_user_ignored" = "User will no longer appear in the feed."; +"feed_club_ignored" = "Club will no longer appear in the feed."; +"feed_unignore" = "Restore."; +"feed_ignore" = "Not interested"; + /* Group */ "group" = "Group"; diff --git a/locales/ru.strings b/locales/ru.strings index 6366b747f..63dada9a8 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -290,6 +290,11 @@ "change_geo_name" = "Изменить название точки"; "change_geo_name_new" = "Новое название"; +"feed_user_ignored" = "Пользователь больше не будет появляться в ленте."; +"feed_club_ignored" = "Группа больше не будет появляться в ленте."; +"feed_unignore" = "Вернуть."; +"feed_ignore" = "Не интересно"; + /* Friends */ "friends" = "Друзья"; diff --git a/locales/uk.strings b/locales/uk.strings index a98780658..a4e48ed9d 100644 --- a/locales/uk.strings +++ b/locales/uk.strings @@ -280,6 +280,11 @@ "change_geo_name" = "Змінити назву розташування"; "change_geo_name_new" = "Нова назва"; +"feed_user_ignored" = "Користувач більше не з'являтиметься у стрічці."; +"feed_club_ignored" = "Спiльнота більше не з'являтиметься у стрічці."; +"feed_unignore" = "Повернути."; +"feed_ignore" = "Не цікаво"; + /* Friends */ "friends" = "Друзі";