From f9f6270da022648a8dac114bfc07b3d687a4689a Mon Sep 17 00:00:00 2001 From: lalka2018 <99399973+lalka2016@users.noreply.github.com> Date: Sat, 10 Jun 2023 18:54:02 +0300 Subject: [PATCH] Search: Add search with parameters (#880) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Search with parameters * Small improvements * Small improvements no.2 Поиск теперь нормально выглядит на других темах При поиске по группам отображается количество участников там Костыль с пропуском постов возвращён но немного изменён Добавлен костыль к комментариям чтобы не показывались комменты с удалённых постов и не было бага как в вепуровке Добавлены ключи в советском и имперском языке для моих прошлых пуллов (ну и этого конечно) * Fix debilny oshibky Убрал лишние ключи локализации, исправил панель поеска и исправил hometown * fiksy bagiv * ok * ok 2 * ok * rrrrrrrrrrrrrrrr Добавил параметры в vkapi users.search(), пофиксил проверку коммерции, сузил параметры ещё больше и добавил анимацию выдвижения поиска чтобы красиво было --- VKAPI/Handlers/Users.php | 86 ++++- Web/Models/Repositories/Applications.php | 8 + Web/Models/Repositories/Clubs.php | 4 +- Web/Models/Repositories/Comments.php | 31 ++ Web/Models/Repositories/Posts.php | 34 +- Web/Models/Repositories/Users.php | 80 +++- Web/Models/Repositories/Videos.php | 32 ++ Web/Presenters/SearchPresenter.php | 71 +++- Web/Presenters/templates/@layout.xml | 52 ++- Web/Presenters/templates/Search/Index.xml | 347 +++++++++++++++--- Web/Presenters/templates/User/View.xml | 47 ++- .../templates/components/comment.xml | 5 +- Web/Presenters/templates/components/video.xml | 35 ++ Web/static/css/main.css | 170 +++++++++ Web/static/img/hide.png | Bin 0 -> 184 bytes Web/static/img/show.png | Bin 0 -> 169 bytes Web/static/js/openvk.cls.js | 74 ++++ locales/en.strings | 53 ++- locales/ru.strings | 55 ++- locales/ru_old.strings | 84 ++++- locales/ru_sov.strings | 91 ++++- themepacks/midnight/stylesheet.css | 104 ++++++ themepacks/openvk_modern/stylesheet.css | 92 +++++ 23 files changed, 1473 insertions(+), 82 deletions(-) create mode 100644 Web/Presenters/templates/components/video.xml create mode 100644 Web/static/img/hide.png create mode 100644 Web/static/img/show.png diff --git a/VKAPI/Handlers/Users.php b/VKAPI/Handlers/Users.php index acb29469..f48592b5 100644 --- a/VKAPI/Handlers/Users.php +++ b/VKAPI/Handlers/Users.php @@ -150,7 +150,10 @@ final class Users extends VKAPIRequestHandler break; case "interests": $response[$i]->interests = $usr->getInterests(); - break; + break; + case "rating": + $response[$i]->rating = $usr->getRating(); + break; } } @@ -188,19 +191,94 @@ final class Users extends VKAPIRequestHandler ]; } - function search(string $q, string $fields = "", int $offset = 0, int $count = 100) + function search(string $q, + string $fields = "", + int $offset = 0, + int $count = 100, + string $city = "", + string $hometown = "", + int $sex = 2, + int $status = 0, # это про marital status + bool $online = false, + # дальше идут параметры которых нету в vkapi но есть на сайте + string $profileStatus = "", # а это уже нормальный статус + int $sort = 0, + int $before = 0, + int $politViews = 0, + int $after = 0, + string $interests = "", + string $fav_music = "", + string $fav_films = "", + string $fav_shows = "", + string $fav_books = "", + string $fav_quotes = "" + ) { $users = new UsersRepo; + $sortg = "id ASC"; + + $nfilds = $fields; + + switch($sort) { + case 0: + $sortg = "id DESC"; + break; + case 1: + $sortg = "id ASC"; + break; + case 2: + $sortg = "first_name DESC"; + break; + case 3: + $sortg = "first_name ASC"; + break; + case 4: + $sortg = "rating DESC"; + + if(!str_contains($nfilds, "rating")) { + $nfilds .= "rating"; + } + + break; + case 5: + $sortg = "rating DESC"; + + if(!str_contains($nfilds, "rating")) { + $nfilds .= "rating"; + } + + break; + } + $array = []; - $find = $users->find($q); + + $parameters = [ + "city" => !empty($city) ? $city : NULL, + "hometown" => !empty($hometown) ? $hometown : NULL, + "gender" => $sex < 2 ? $sex : NULL, + "maritalstatus" => (bool)$status ? $status : NULL, + "politViews" => (bool)$politViews ? $politViews : NULL, + "is_online" => $online ? 1 : NULL, + "status" => !empty($profileStatus) ? $profileStatus : NULL, + "before" => $before != 0 ? $before : NULL, + "after" => $after != 0 ? $after : NULL, + "interests" => !empty($interests) ? $interests : NULL, + "fav_music" => !empty($fav_music) ? $fav_music : NULL, + "fav_films" => !empty($fav_films) ? $fav_films : NULL, + "fav_shows" => !empty($fav_shows) ? $fav_shows : NULL, + "fav_books" => !empty($fav_books) ? $fav_books : NULL, + "fav_quotes" => !empty($fav_quotes) ? $fav_quotes : NULL, + ]; + + $find = $users->find($q, $parameters, $sortg); foreach ($find as $user) $array[] = $user->getId(); return (object) [ "count" => $find->size(), - "items" => $this->get(implode(',', $array), $fields, $offset, $count) + "items" => $this->get(implode(',', $array), $nfilds, $offset, $count) ]; } } diff --git a/Web/Models/Repositories/Applications.php b/Web/Models/Repositories/Applications.php index 3aa6e5be..0687856e 100644 --- a/Web/Models/Repositories/Applications.php +++ b/Web/Models/Repositories/Applications.php @@ -66,4 +66,12 @@ class Applications { return sizeof($this->appRels->where("user", $user->getId())); } + + function find(string $query, array $pars = [], string $sort = "id"): Util\EntityStream + { + $query = "%$query%"; + $result = $this->apps->where("CONCAT_WS(' ', name, description) LIKE ?", $query)->where("enabled", 1); + + return new Util\EntityStream("Application", $result->order("$sort")); + } } \ No newline at end of file diff --git a/Web/Models/Repositories/Clubs.php b/Web/Models/Repositories/Clubs.php index 8e97f3eb..04bb30ab 100644 --- a/Web/Models/Repositories/Clubs.php +++ b/Web/Models/Repositories/Clubs.php @@ -43,12 +43,12 @@ class Clubs return $this->toClub($this->clubs->get($id)); } - function find(string $query, int $page = 1, ?int $perPage = NULL): \Traversable + function find(string $query, array $pars = [], string $sort = "id DESC", int $page = 1, ?int $perPage = NULL): \Traversable { $query = "%$query%"; $result = $this->clubs->where("name LIKE ? OR about LIKE ?", $query, $query); - return new Util\EntityStream("Club", $result); + return new Util\EntityStream("Club", $result->order($sort)); } function getCount(): int diff --git a/Web/Models/Repositories/Comments.php b/Web/Models/Repositories/Comments.php index 4774cf35..f4b8e5ac 100644 --- a/Web/Models/Repositories/Comments.php +++ b/Web/Models/Repositories/Comments.php @@ -59,4 +59,35 @@ class Comments "deleted" => false, ])); } + + function find(string $query = "", array $pars = [], string $sort = "id"): Util\EntityStream + { + $query = "%$query%"; + + $notNullParams = []; + + foreach($pars as $paramName => $paramValue) + if($paramName != "before" && $paramName != "after") + $paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL; + else + $paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL; + + $result = $this->comments->where("content LIKE ?", $query)->where("deleted", 0); + $nnparamsCount = sizeof($notNullParams); + + if($nnparamsCount > 0) { + foreach($notNullParams as $paramName => $paramValue) { + switch($paramName) { + case "before": + $result->where("created < ?", $paramValue); + break; + case "after": + $result->where("created > ?", $paramValue); + break; + } + } + } + + return new Util\EntityStream("Comment", $result->order("$sort")); + } } diff --git a/Web/Models/Repositories/Posts.php b/Web/Models/Repositories/Posts.php index 7aadc0bb..c354f152 100644 --- a/Web/Models/Repositories/Posts.php +++ b/Web/Models/Repositories/Posts.php @@ -99,7 +99,39 @@ class Posts return NULL; } - + + function find(string $query = "", array $pars = [], string $sort = "id"): Util\EntityStream + { + $query = "%$query%"; + + $notNullParams = []; + + foreach($pars as $paramName => $paramValue) + if($paramName != "before" && $paramName != "after") + $paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL; + else + $paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL; + + $result = $this->posts->where("content LIKE ?", $query)->where("deleted", 0); + $nnparamsCount = sizeof($notNullParams); + + if($nnparamsCount > 0) { + foreach($notNullParams as $paramName => $paramValue) { + switch($paramName) { + case "before": + $result->where("created < ?", $paramValue); + break; + case "after": + $result->where("created > ?", $paramValue); + break; + } + } + } + + + return new Util\EntityStream("Post", $result->order("$sort")); + } + function getPostCountOnUserWall(int $user): int { return sizeof($this->posts->where(["wall" => $user, "deleted" => 0])); diff --git a/Web/Models/Repositories/Users.php b/Web/Models/Repositories/Users.php index 63e77df0..0eec3306 100644 --- a/Web/Models/Repositories/Users.php +++ b/Web/Models/Repositories/Users.php @@ -49,12 +49,88 @@ class Users return $this->toUser($this->users->where("user", $user->getId())->fetch()); } - function find(string $query): Util\EntityStream + function find(string $query, array $pars = [], string $sort = "id DESC"): Util\EntityStream { $query = "%$query%"; $result = $this->users->where("CONCAT_WS(' ', first_name, last_name, pseudo, shortcode) LIKE ?", $query)->where("deleted", 0); - return new Util\EntityStream("User", $result); + $notNullParams = []; + $nnparamsCount = 0; + + foreach($pars as $paramName => $paramValue) + if($paramName != "before" && $paramName != "after" && $paramName != "gender" && $paramName != "maritalstatus" && $paramName != "politViews") + $paramValue != NULL ? $notNullParams += ["$paramName" => "%$paramValue%"] : NULL; + else + $paramValue != NULL ? $notNullParams += ["$paramName" => "$paramValue"] : NULL; + + $nnparamsCount = sizeof($notNullParams); + + if($nnparamsCount > 0) { + foreach($notNullParams as $paramName => $paramValue) { + switch($paramName) { + case "hometown": + $result->where("hometown LIKE ?", $paramValue); + break; + case "city": + $result->where("city LIKE ?", $paramValue); + break; + case "maritalstatus": + $result->where("marital_status ?", $paramValue); + break; + case "status": + $result->where("status LIKE ?", $paramValue); + break; + case "politViews": + $result->where("polit_views ?", $paramValue); + break; + case "email": + $result->where("email_contact LIKE ?", $paramValue); + break; + case "telegram": + $result->where("telegram LIKE ?", $paramValue); + break; + case "site": + $result->where("telegram LIKE ?", $paramValue); + break; + case "address": + $result->where("address LIKE ?", $paramValue); + break; + case "is_online": + $result->where("online >= ?", time() - 900); + break; + case "interests": + $result->where("interests LIKE ?", $paramValue); + break; + case "fav_mus": + $result->where("fav_music LIKE ?", $paramValue); + break; + case "fav_films": + $result->where("fav_films LIKE ?", $paramValue); + break; + case "fav_shows": + $result->where("fav_shows LIKE ?", $paramValue); + break; + case "fav_books": + $result->where("fav_books LIKE ?", $paramValue); + break; + case "fav_quote": + $result->where("fav_quote LIKE ?", $paramValue); + break; + case "before": + $result->where("UNIX_TIMESTAMP(since) < ?", $paramValue); + break; + case "after": + $result->where("UNIX_TIMESTAMP(since) > ?", $paramValue); + break; + case "gender": + $result->where("sex ?", $paramValue); + break; + } + } + } + + + return new Util\EntityStream("User", $result->order($sort)); } function getStatistics(): object diff --git a/Web/Models/Repositories/Videos.php b/Web/Models/Repositories/Videos.php index 5701b44e..30753371 100644 --- a/Web/Models/Repositories/Videos.php +++ b/Web/Models/Repositories/Videos.php @@ -45,4 +45,36 @@ class Videos { return sizeof($this->videos->where("owner", $user->getId())->where(["deleted" => 0, "unlisted" => 0])); } + + function find(string $query = "", array $pars = [], string $sort = "id"): Util\EntityStream + { + $query = "%$query%"; + + $notNullParams = []; + + foreach($pars as $paramName => $paramValue) + if($paramName != "before" && $paramName != "after") + $paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL; + else + $paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL; + + $result = $this->videos->where("name OR description LIKE ?", $query)->where("deleted", 0); + $nnparamsCount = sizeof($notNullParams); + + if($nnparamsCount > 0) { + foreach($notNullParams as $paramName => $paramValue) { + switch($paramName) { + case "before": + $result->where("created < ?", $paramValue); + break; + case "after": + $result->where("created > ?", $paramValue); + break; + } + } + } + + + return new Util\EntityStream("Video", $result->order("$sort")); + } } diff --git a/Web/Presenters/SearchPresenter.php b/Web/Presenters/SearchPresenter.php index 2171297c..fadf9954 100644 --- a/Web/Presenters/SearchPresenter.php +++ b/Web/Presenters/SearchPresenter.php @@ -1,18 +1,28 @@ users = $users; - $this->clubs = $clubs; + $this->users = $users; + $this->clubs = $clubs; + $this->posts = new Posts; + $this->comments = new Comments; + $this->videos = new Videos; + $this->apps = new Applications; + $this->notes = new Notes; parent::__construct(); } @@ -21,6 +31,8 @@ final class SearchPresenter extends OpenVKPresenter { $query = $this->queryParam("query") ?? ""; $type = $this->queryParam("type") ?? "users"; + $sorter = $this->queryParam("sort") ?? "id"; + $invert = $this->queryParam("invert") == 1 ? "ASC" : "DESC"; $page = (int) ($this->queryParam("p") ?? 1); $this->willExecuteWriteAction(); @@ -28,11 +40,58 @@ final class SearchPresenter extends OpenVKPresenter $this->assertUserLoggedIn(); # https://youtu.be/pSAWM5YuXx8 - - $repos = [ "groups" => "clubs", "users" => "users" ]; + + $repos = [ + "groups" => "clubs", + "users" => "users", + "posts" => "posts", + "comments" => "comments", + "videos" => "videos", + "audios" => "posts", + "apps" => "apps", + "notes" => "notes" + ]; + + switch($sorter) { + default: + case "id": + $sort = "id " . $invert; + break; + case "name": + $sort = "first_name " . $invert; + break; + case "rating": + $sort = "rating " . $invert; + break; + } + + $parameters = [ + "type" => $this->queryParam("type"), + "city" => $this->queryParam("city") != "" ? $this->queryParam("city") : NULL, + "maritalstatus" => $this->queryParam("maritalstatus") != 0 ? $this->queryParam("maritalstatus") : NULL, + "with_photo" => $this->queryParam("with_photo"), + "status" => $this->queryParam("status") != "" ? $this->queryParam("status") : NULL, + "politViews" => $this->queryParam("politViews") != 0 ? $this->queryParam("politViews") : NULL, + "email" => $this->queryParam("email"), + "telegram" => $this->queryParam("telegram"), + "site" => $this->queryParam("site") != "" ? "https://".$this->queryParam("site") : NULL, + "address" => $this->queryParam("address"), + "is_online" => $this->queryParam("is_online") == 1 ? 1 : NULL, + "interests" => $this->queryParam("interests") != "" ? $this->queryParam("interests") : NULL, + "fav_mus" => $this->queryParam("fav_mus") != "" ? $this->queryParam("fav_mus") : NULL, + "fav_films" => $this->queryParam("fav_films") != "" ? $this->queryParam("fav_films") : NULL, + "fav_shows" => $this->queryParam("fav_shows") != "" ? $this->queryParam("fav_shows") : NULL, + "fav_books" => $this->queryParam("fav_books") != "" ? $this->queryParam("fav_books") : NULL, + "fav_quote" => $this->queryParam("fav_quote") != "" ? $this->queryParam("fav_quote") : NULL, + "hometown" => $this->queryParam("hometown") != "" ? $this->queryParam("hometown") : NULL, + "before" => $this->queryParam("datebefore") != "" ? strtotime($this->queryParam("datebefore")) : NULL, + "after" => $this->queryParam("dateafter") != "" ? strtotime($this->queryParam("dateafter")) : NULL, + "gender" => $this->queryParam("gender") != "" && $this->queryParam("gender") != 2 ? $this->queryParam("gender") : NULL + ]; + $repo = $repos[$type] or $this->throwError(400, "Bad Request", "Invalid search entity $type."); - $results = $this->{$repo}->find($query); + $results = $this->{$repo}->find($query, $parameters, $sort); $iterator = $results->page($page); $count = $results->size(); diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index cd6e4891..7bb7e194 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -70,28 +70,60 @@ {_header_log_out} {else} -
+
{_header_home}
-
+
{_header_groups}
-
+
{_header_search}
-
+
{_header_invite}
-
+
{_header_help} ({$ticketAnsweredCount})
-
+
{_header_log_out}
-
-
- -
+ {var $atSearch = str_contains($_SERVER['REQUEST_URI'], "/search")} +
+ + {if !$atSearch} +
+ + +
+ {else} +
+ + + +
+ + {/if}
{/if} {else} diff --git a/Web/Presenters/templates/Search/Index.xml b/Web/Presenters/templates/Search/Index.xml index fe39b4e3..828ffe62 100644 --- a/Web/Presenters/templates/Search/Index.xml +++ b/Web/Presenters/templates/Search/Index.xml @@ -1,11 +1,7 @@ -{extends "../@listView.xml"} +{extends "../@layout.xml"} {block title} - {if $type === "users"} - {tr("search_for_people")} - {else} - {tr("search_for_groups")} - {/if} + {tr("search_for_$type")} {if $_GET['query']} - {$_GET['query']} {/if} @@ -13,41 +9,17 @@ {block header} {=OPENVK_ROOT_CONF["openvk"]["appearance"]["name"]} » - {if $type === "users"} - {tr("search_for_people")} - {else} - {tr("search_for_groups")} - {/if} + {tr("search_for_$type")} {/block} {* BEGIN ELEMENTS DESCRIPTION *} -{block tabs} -
- - {_users} - -
-
- - {_groups} - -
-
-
- - - -
- -

- {tr("results", $count)} -

-
-{/block} - {block link|strip|stripHtml} - {$x->getURL()} + {if $type != "apps"} + {$x->getURL()} + {else} + /app{$x->getId()} + {/if} {/block} {block preview} @@ -55,17 +27,72 @@ {/block} {block name} -  {$x->getCanonicalName()} - + {if $type != "apps"} +  {$x->getCanonicalName()} + {if $_GET['sort'] == "rating"}({$x->getRating()}%) + {elseif $_GET['sort'] == "id"}(id{$x->getId()}){/if} + + {else} + {$x->getName()} + {/if} {/block} {block description} {if $type === "users"} + {if !is_null($_GET['status']) && $_GET['status'] != ""} + + + + + {/if} + {if !is_null($_GET['city']) && $_GET['city'] != "" && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if !is_null($_GET['city']) && $_GET['hometown'] != "" && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if !is_null($_GET['politViews']) && $_GET['politViews'] != 0 && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if !is_null($_GET['email']) && $_GET['email'] != "" && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if !is_null($_GET['telegram']) && $_GET['telegram'] != "" && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if !is_null($_GET['site']) && $_GET['site'] != "" && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if !is_null($_GET['address']) && $_GET['address'] != "" && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if $x->getPrivacySetting("page.info.read") > 1} @@ -78,15 +105,253 @@ + {/if} {/if} + {if !empty($x->getDescription())} + {if $type != "apps"} + {/if} + {/if} + {if $type == "groups"} + + + {/if}
{_status}:{$x->getStatus()}
{_city}:{$x->getCity()}
{_hometown}:{$x->getHometown()}
{_politViews}:{tr("politViews_".$x->getPoliticalViews())}
{_email}:{$x->getContactEmail()}
{_telegram}:@{$x->getTelegram()}
{_personal_website}:{$x->getWebsite()}
{_address}:{$x->getPhysicalAddress()}
{_gender}: {$x->isFemale() ? tr("female") : tr("male")}{_registration_date}: {$x->getRegistrationTime()}
{_description}: {$x->getDescription() ?? '(' . tr("none") . ')'}
+ {_size}: + + {tr("participants", $x->getFollowersCount())} +
{/block} + +{block content} + +
+ {include "../components/paginator.xml", conf => (object) [ + "page" => $page, + "count" => $count, + "amount" => sizeof($data), + "perPage" => $perPage ?? OPENVK_DEFAULT_PER_PAGE, + "atBottom" => false, + ]} +
+

+ {tr("results", $count)} +

+
+ {include searchOptions} + + {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} +
+ {if sizeof($data) > 0} + {if $type == "users" || $type == "groups" || $type == "apps"} +
+ + + + + + + + +
+ + {include preview, x => $dat} + + + {ifset infotable} + {include infotable, x => $dat} + {else} + + + {include name, x => $dat} + + +
+ {include description, x => $dat} + {/ifset} + 		+ {include actions, x => $dat} +
+
+ {elseif $type == "posts"} +
+ {if !$dat || $dat->getTargetWall() < 0 && $dat->getWallOwner()->isHideFromGlobalFeedEnabled()} + {_closed_group_post}. + {else} + {include "../components/post.xml", post => $dat, commentSection => true, onWallOf => true} + {/if} +
+ {elseif $type == "comments"} +
+ {if !$dat->getTarget() || $dat->getTarget()->isDeleted()} + {_deleted_target_comment}. + {else} + {include "../components/comment.xml", comment => $dat, linkW => true} + {/if} +
+ {elseif $type == "videos"} + {foreach $data as $dat} + {if $dat->getOwner()->isDeleted()} + {php continue;} + {else} +
+ {include "../components/video.xml", video => $dat} +
+ {/if} + {/foreach} + {elseif $type == "audios"} + хуй + {/if} + {else} + {ifset customErrorMessage} + {include customErrorMessage} + {else} + {include "../components/nothing.xml"} + {/ifset} + {/if} +
+ +{/block} + +{block searchOptions} +
+ + +
+
{_s_order_by}
+
+ +
+ {_s_order_invert} +
+
+
+ + {if $type !== "groups" && $type !== "apps"} {* В OpenVK не сохраняется дата создания группы *} +
+
{_s_by_date}
+
+

{_s_date_before}:
+

+

{_s_date_after}:
+

+
+
+ {/if} + + {if $type === "users"} +
+
{_main}
+
+ + + + {_s_now_on_site} +
+
+ +
+
{_gender}
+
+

{_male}

+

{_female}

+

{_s_any}

+
+
+ +
+
{ovk_proc_strtr(tr("relationship"), 14)}
+
+ +
+
+ +
+
{_politViews}
+
+ +
+
+ +
+
{_contacts}
+
+ +
+
+ +
+
+ +
+
{_interests}
+
+ + + + + + +
+
+ + {/if} + +
+ +{/block} \ No newline at end of file diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml index d3fb9aec..1fa71026 100644 --- a/Web/Presenters/templates/User/View.xml +++ b/Web/Presenters/templates/User/View.xml @@ -420,11 +420,11 @@ {_hometown}: - {$user->getHometown()} + {$user->getHometown()} {_politViews}: - {var $pviews = $user->getPoliticalViews()}{_"politViews_$pviews"} + getPoliticalViews() != 0}href="/search?type=users&query=&politViews={$user->getPoliticalViews()}"{/if}>{var $pviews = $user->getPoliticalViews()}{_"politViews_$pviews"} {_birth_date}: @@ -470,7 +470,7 @@ {_city}: - {$user->getCity()} + {$user->getCity()} {_address}: @@ -484,23 +484,54 @@ {_interests}: - {$user->getInterests()} + + {var $interests = explode(", ", $user->getInterests())} + + {foreach $interests as $interest} + {$interest}{if $interest != end($interests)},{/if} + {/foreach} + + {_favorite_music}: - {$user->getFavoriteMusic()} + + {var $musics = explode(", ", $user->getFavoriteMusic())} + + {foreach $musics as $music} + {$music}{if $music != end($musics)},{/if} + {/foreach} + {_favorite_films}: - {$user->getFavoriteFilms()} + + {var $films = explode(", ", $user->getFavoriteFilms())} + + {foreach $films as $film} + {$film}{if $film != end($films)},{/if} + {/foreach} + {_favorite_shows}: - {$user->getFavoriteShows()} + + {var $shows = explode(", ", $user->getFavoriteShows())} + + {foreach $shows as $show} + {$show}{if $show != end($shows)},{/if} + {/foreach} + {_favorite_books}: - {$user->getFavoriteBooks()} + + {var $books = explode(", ", $user->getFavoriteBooks())} + + {foreach $books as $book} + {$book}{if $book != end($books)},{/if} + {/foreach} + {_favorite_quotes}: diff --git a/Web/Presenters/templates/components/comment.xml b/Web/Presenters/templates/components/comment.xml index 125c1cef..0c725714 100644 --- a/Web/Presenters/templates/components/comment.xml +++ b/Web/Presenters/templates/components/comment.xml @@ -29,11 +29,12 @@
- {$comment->getPublicationTime()} | + {$comment->getPublicationTime()} | {if $comment->canBeDeletedBy($thisUser)} {_delete} | {/if} - {_reply} + {if is_null($linkW)} + {_reply}{/if}
diff --git a/Web/Presenters/templates/components/video.xml b/Web/Presenters/templates/components/video.xml new file mode 100644 index 00000000..752191a1 --- /dev/null +++ b/Web/Presenters/templates/components/video.xml @@ -0,0 +1,35 @@ + + + + + + + +
+
+ + + +
+ 		+ {ifset infotable} + {include infotable, x => $dat} + {else} + + + {$video->getName()} + + +
+

+ {$video->getDescription() ?? ""} +

+ {_video_uploaded} {$video->getPublicationTime()}
+ +

+ {_view_video} + {if $video->getCommentsCount() > 0}| {_comments} ({$video->getCommentsCount()}){/if} +

+ {/ifset} +
\ No newline at end of file diff --git a/Web/static/css/main.css b/Web/static/css/main.css index 1a07e4c6..8c5ae37a 100644 --- a/Web/static/css/main.css +++ b/Web/static/css/main.css @@ -97,6 +97,14 @@ h1 { background-size: 1.5px 41px; } +.header_navigation .nodivider { + display: inline-block; + height: 29px; + padding: 11px 4px 0 7px; + background: none; + background-size: 1.5px 41px; +} + .header_navigation .link a { color: #D7D7D7; text-decoration: none; @@ -670,6 +678,7 @@ select { font-family: tahoma, verdana, arial, sans-serif; width: 100%; box-sizing: border-box; + outline:none; } .header2 { @@ -2301,6 +2310,167 @@ a.poll-retract-vote { display: none; } +.searchOptions +{ + overflow: hidden; + width:25.5%; + border-top:1px solid #E5E7E6; + float:right; + scrollbar-width: none; + font-size:12px; + background-color:#f7f7f7; + margin-right: -7px; +} + +.searchBtn +{ + border: solid 1px #575757; + background-color: #696969; + color:white; + margin-left: -11px; + padding-bottom:2px; + width:80px; + cursor: pointer; + box-shadow: 0px 2px 0px 0px rgba(255, 255, 255, 0.18) inset; + margin-top: 1px; +} + +.searchBtn:active +{ + border: solid 1px #666666; + background-color: #696969; + color:white; + box-shadow: 0px -2px 0px 0px rgba(255, 255, 255, 0.18) inset; +} + +.searchList +{ + list-style: none; + user-select: none; + padding-left:0px; +} + +.searchList #used +{ + margin-left:0px; + color: white; + padding:2px; + padding-top:5px; + padding-bottom:5px; + border: solid 0.125rem #696969; + background:linear-gradient(#888888,#858585); + margin-bottom:2px; + padding-left:9px; + width:87%; +} + +.searchList #used a +{ + color: white; +} + +.sr:focus +{ + outline:none; +} + +.searchHide +{ + padding-right: 5px; +} + +.searchList li +{ + margin-left:0px; + color: #2B587A !important; + cursor:pointer; + padding:2px; + padding-top:5px; + padding-bottom:5px; + margin-bottom:2px; + padding-left:9px; +} + +.searchList li a +{ + min-width:100%; +} + +.searchList li:hover +{ + margin-left:0px; + color: #2B587A !important; + background:#ebebeb; + padding:2px; + padding-top:5px; + padding-bottom:5px; + margin-bottom:2px; + padding-left:9px; + width:91%; +} + +.whatFind +{ + color:rgb(128, 128, 128); + background:none; + border:none; + position:absolute; + width:150px; + cursor:pointer; + right:80px; + text-align:right; + margin-top: 0.5px; +} + +.searchOptionName +{ + cursor:pointer; + background-color: #EAEAEA; + padding-left:5px; + padding-top:5px; + padding-bottom:5px; + width: 90%; + font-weight: 600; + color: #585858; + border-bottom: 2px solid #E4E4E4; +} + +.searchOption +{ + user-select: none; +} + +.searchOptionBlock +{ + margin-top: -5px; + padding-top:10px; + max-width:92%; + padding-bottom:6px; +} + +.searchOptionBlock select +{ + padding-left:7px; + padding-top:3px; + padding-bottom:3px; + cursor:pointer; +} + +.searchOptionBlock input[type=text], input[type=date] +{ + margin-bottom:5px; +} + +.borderup +{ + border-top:1px solid #E5E7E6; +} + +#searchInput +{ + transition: .3s linear; +} + #standaloneCommentBox { position: sticky; top: 0; diff --git a/Web/static/img/hide.png b/Web/static/img/hide.png new file mode 100644 index 0000000000000000000000000000000000000000..afada122b2ddcba52feba5a8f183b393634d48f3 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRM!3HF?&tBaMq!^2X+?^QKos)S9a~60+7BevL9RguSQ4OyKprEg(i(`mJaI%l5=g;#%(7^rY-{0AdndjzM z_5|348Dw5kaof@K=+UG90ctW|zI|(YI`e=H6T?xhl* literal 0 HcmV?d00001 diff --git a/Web/static/img/show.png b/Web/static/img/show.png new file mode 100644 index 0000000000000000000000000000000000000000..5c3763c896e0a2751fb55a7f8735fdb3ec130920 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK|4 setTimeout(r, 4000)); + // console.log("search decreased") + if(document.activeElement !== searchInput) + { + document.getElementById("searchInput").style.background = "url('/assets/packages/static/openvk/img/search_icon.png') no-repeat 3px 4px"; + document.getElementById("searchInput").style.backgroundColor = "#fff"; + document.getElementById("searchInput").style.paddingLeft = "18px"; + document.getElementById("searchInput").style.width = "120px"; + document.querySelector(".whatFind").style.display = "none"; + + await new Promise(r => setTimeout(r, 300)); + srch.classList.remove("nodivider") + + let els = document.querySelectorAll("div.dec") + for(const element of els) + { + element.style.display = "inline-block" + } + } +} + +function hideParams(name) +{ + $("#s_"+name).slideToggle(250, "swing"); + + if($(`#n_${name} img`).attr("src") == "/assets/packages/static/openvk/img/hide.png") + { + $("#n_"+name+" img").attr("src", "/assets/packages/static/openvk/img/show.png"); + } else { + $("#n_"+name+" img").attr("src", "/assets/packages/static/openvk/img/hide.png"); + } +} + +function resetSearch() +{ + let inputs = document.querySelectorAll("input") + let selects = document.querySelectorAll("select") + + for(const input of inputs) + { + if(input != dnt) { + input.value = "" + } + } + + for(const select of selects) + { + if(select != sortyor && select != document.querySelector(".whatFind")) { + select.value = 0 + } + } +} + $(document).on("scroll", () => { if($(document).scrollTop() > $(".sidebar").height() + 50) { $(".floating_sidebar")[0].classList.add("show"); diff --git a/locales/en.strings b/locales/en.strings index c70bc259..b36ec078 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -91,6 +91,7 @@ "no_information_provided" = "No information provided."; "deceased_person" = "Deceased person"; "none" = "none"; +"desc_none" = "no description"; "send" = "Send"; "years_zero" = "0 year old"; @@ -478,7 +479,12 @@ "apply_style_for_this_device" = "Apply style only for this device"; "search_for_groups" = "Search for groups"; -"search_for_people" = "Search for people"; +"search_for_users" = "Search for people"; +"search_for_posts" = "Search for posts"; +"search_for_comments" = "Search for comments"; +"search_for_videos" = "Search for videos"; +"search_for_apps" = "Search for apps"; +"search_for_notes" = "Search for notes"; "search_button" = "Find"; "search_placeholder" = "Start typing any name, title or word"; "results_zero" = "No results"; @@ -1450,3 +1456,48 @@ "tour_section_14_bottom_text_1" = "Screenshots"; "tour_section_14_bottom_text_2" = "This concludes the tour of the site. If you want to try our mobile app, create your own group here, invite your friends or find new ones, or just have some fun in general, you can do it right now with a small registration"; "tour_section_14_bottom_text_3" = "This concludes the tour of the site"; + +/* Search */ + +"s_people" = "People"; +"s_groups" = "Clubs"; +"s_events" = "Events"; +"s_apps" = "Applications"; +"s_questions" = "Questions"; +"s_notes" = "Notes"; +"s_themes" = "Themes"; +"s_posts" = "Posts"; +"s_comments" = "Comments"; +"s_videos" = "Videos"; +"s_audios" = "Music"; +"s_by_people" = "for people"; +"s_by_groups" = "for groups"; +"s_by_posts" = "for posts"; +"s_by_comments" = "for comments"; +"s_by_videos" = "for videos"; +"s_by_apps" = "for apps"; +"s_by_audios" = "for musics"; + +"s_order_by" = "Order by..."; + +"s_order_by_id" = "By id"; +"s_order_by_name" = "By name"; +"s_order_by_random" = "By random"; +"s_order_by_rating" = "By rating"; +"s_order_invert" = "Invert"; + +"s_by_date" = "By date"; +"s_date_before" = "Before"; +"s_date_after" = "After"; + +"s_main" = "Main"; + +"s_now_on_site" = "now on site"; +"s_with_photo" = "with photo"; +"s_only_in_names" = "only in names"; + +"s_any" = "any"; +"reset" = "Reset"; + +"closed_group_post" = "This is a post from private group"; +"deleted_target_comment" = "This comment belongs to deleted post"; \ No newline at end of file diff --git a/locales/ru.strings b/locales/ru.strings index 6c62de66..dd3157e2 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -80,6 +80,7 @@ "no_information_provided" = "Информация отсутствует."; "deceased_person" = "Страница покойного человека"; "none" = "отсутствует"; +"desc_none" = "описание отсутствует"; "send" = "Отправить"; "years_zero" = "0 лет"; "years_one" = "1 год"; @@ -452,7 +453,12 @@ "round_avatars" = "Круглые"; "apply_style_for_this_device" = "Применить стиль только для этого устройства"; "search_for_groups" = "Поиск групп"; -"search_for_people" = "Поиск людей"; +"search_for_users" = "Поиск людей"; +"search_for_posts" = "Поиск записей"; +"search_for_comments" = "Поиск комментариев"; +"search_for_videos" = "Поиск видео"; +"search_for_apps" = "Поиск приложений"; +"search_for_notes" = "Поиск записок"; "search_button" = "Найти"; "search_placeholder" = "Начните вводить любое имя, название или слово"; "results_zero" = "Ни одного результата"; @@ -1343,4 +1349,49 @@ "tour_section_14_bottom_text_1" = "Скриншоты приложения"; "tour_section_14_bottom_text_2" = "На этом экскурсия по сайту завершена. Если вы хотите попробовать наше мобильное приложение, создать здесь свою группу, позвать своих друзей или найти новых, или вообще просто как-нибудь поразвлекаться, то это можно сделать прямо сейчас, пройдя небольшую регистрацию"; -"tour_section_14_bottom_text_3" = "На этом экскурсия по сайту завершена." +"tour_section_14_bottom_text_3" = "На этом экскурсия по сайту завершена."; + +/* Search */ + +"s_people" = "Люди"; +"s_groups" = "Группы"; +"s_events" = "События"; +"s_apps" = "Приложения"; +"s_questions" = "Вопросы"; +"s_notes" = "Заметки"; +"s_themes" = "Темы"; +"s_posts" = "Записи"; +"s_comments" = "Комментарии"; +"s_videos" = "Видео"; +"s_audios" = "Аудио"; +"s_by_people" = "по людям"; +"s_by_groups" = "по группам"; +"s_by_posts" = "по записям"; +"s_by_comments" = "по комментариям"; +"s_by_videos" = "по видео"; +"s_by_apps" = "по приложениям"; +"s_by_audios" = "по музыке"; + +"s_order_by" = "Порядок"; + +"s_order_by_id" = "По id"; +"s_order_by_name" = "По имени"; +"s_order_by_random" = "По случайности"; +"s_order_by_rating" = "По рейтингу"; +"s_order_invert" = "Инвертировать"; + +"s_by_date" = "По дате"; +"s_date_before" = "До"; +"s_date_after" = "После"; + +"s_main" = "Основное"; + +"s_now_on_site" = "cейчас на сайте"; +"s_with_photo" = "с фото"; +"s_only_in_names" = "только в именах"; + +"s_any" = "любой"; +"reset" = "Сброс"; + +"closed_group_post" = "Эта запись из закрытой группы"; +"deleted_target_comment" = "Этот комментарий принадлежит к удалённой записи"; \ No newline at end of file diff --git a/locales/ru_old.strings b/locales/ru_old.strings index e82986ee..c75889db 100644 --- a/locales/ru_old.strings +++ b/locales/ru_old.strings @@ -151,6 +151,9 @@ "pinned" = "высказыванiе наверху"; "comments_tip" = "Будьте первымъ, кто оставитъ замѣчанiе."; "your_comment" = "Вашъ комментарій"; +"auditory" = "Смотритѣли"; +"in_wall" = "на странiцу"; +"in_group" = "в общѣство"; "shown" = "Показано"; "x_out_of" = "$1 изъ"; "wall_zero" = "Нѣтъ извѣстій"; @@ -236,6 +239,7 @@ "only_administrators" = "Только администраторы"; "website" = "Сайтъ"; "managed" = "Управляемые"; +"size" = "Размеръ"; "administrators_one" = "$1 администраторъ"; "administrators_few" = "$1 администратора"; @@ -294,6 +298,35 @@ "albums_few" = "$1 альбома"; "albums_many" = "$1 альбомовъ"; "albums_other" = "$1 альбомовъ"; +"albums_list_zero" = "У Васъ нетъ нi одного альбома с картiнками"; +"albums_list_one" = "У Васъ одiн альбом с картiнками"; +"albums_list_few" = "У Васъ $1 альбома с картiнками"; +"albums_list_many" = "У Васъ $1 альбомовъ с картiнками"; +"albums_list_other" = "У Васъ $1 альбомовъ с картiнками"; + +"add_image" = "Вклѣить фото"; +"add_image_group" = "Вклѣйка фото"; +"upload_new_picture" = "Вклеiть новую фото"; +"uploading_new_image" = "Вклѣйка нового фото"; +"friends_avatar" = "Знакомымъ будетъ проще узнать Васъ, если вы вклѣите своё настоящое фото."; +"groups_avatar" = "Хорошое фото сделает Вашу группу более узнаваѣмой."; +"formats_avatar" = "Вы можете вклѣить фото в формате JPG, GIF или PNG."; +"troubles_avatar" = "Ежѣли вознiкают проблѣмы с прикрѣплѣнiем, попробуйтѣ вклѣить фото меньшего размера."; +"webcam_avatar" = "Ежѣли Вашъ компьютер имѣет фотоаппаратъ, Вы можѣте сделать быстрое фото »"; + +"update_avatar_notification" = "Фото странiцы обновлено"; +"update_avatar_description" = "Нажмiте сюда, чтобы пѣрейти к просмотру"; + +"deleting_avatar" = "Вырѣзка фото"; +"deleting_avatar_sure" = "Вы дѣйствительно хотите отклѣить фото?"; + +"deleted_avatar_notification" = "Фото успешно отклѣено"; + +"save_changes" = "Сохранiть измѣненiя"; + +"upd_m" = "обновил фото своѣй странiцы"; +"upd_f" = "обновила фото своѣй странiцы"; +"upd_g" = "обновило фото общѣства"; /* Notes */ @@ -375,7 +408,12 @@ "round_avatars" = "Круглые"; "search_for_groups" = "Поискъ обществъ"; -"search_for_people" = "Поискъ людей"; +"search_for_users" = "Поискъ граждан"; +"search_for_posts" = "Поискъ высказыванiй"; +"search_for_comments" = "Поискъ очерковъ"; +"search_for_videos" = "Поискъ синематографовъ"; +"search_for_apps" = "Поискъ забав"; +"search_for_notes" = "Поискъ запiсокъ"; "search_button" = "Найти"; "results_zero" = "Ни одного результата"; "results_one" = "Одинъ результатъ"; @@ -689,3 +727,47 @@ "warning" = "Вниманіе"; "question_confirm" = "Это дѣйствіе нельзя отмѣнить. Вы дѣйствительно увѣрены въ томъ что хотите сдѣлать?"; +/* Search */ + +"s_people" = "Гражданѣ"; +"s_groups" = "Общѣства"; +"s_events" = "События"; +"s_apps" = "Забавы"; +"s_questions" = "Вопросы"; +"s_notes" = "Заметки"; +"s_themes" = "Тѣмы"; +"s_posts" = "Высказыванiя"; +"s_comments" = "Очерки"; +"s_videos" = "Сiнѣматографы"; +"s_audios" = "Аудио"; +"s_by_people" = "по гражданам"; +"s_by_groups" = "по общѣствам"; +"s_by_posts" = "по запiсям"; +"s_by_comments" = "по очеркамъ"; +"s_by_videos" = "по сiнѣматографамъ"; +"s_by_apps" = "по забавам"; +"s_by_audios" = "по музыке"; + +"s_order_by" = "Расположѣнiе"; + +"s_order_by_id" = "По порядковому номеру"; +"s_order_by_name" = "По паспорту"; +"s_order_by_random" = "По случайности"; +"s_order_by_rating" = "По рейтингу"; +"s_order_invert" = "Отразiть"; + +"s_by_date" = "По датѣ"; +"s_date_before" = "До"; +"s_date_after" = "После"; + +"s_main" = "Основное"; + +"s_now_on_site" = "cейчас тутъ"; +"s_with_photo" = "с фотокарточкой"; +"s_only_in_names" = "только в имѣнахъ"; + +"s_any" = "любой"; +"reset" = "Сбросъ"; + +"closed_group_post" = "Это высказыванiе изъ закрытого общѣства"; +"deleted_target_comment" = "Этотъ отзыв принадлѣжит к удалѣнному высказыванiю"; \ No newline at end of file diff --git a/locales/ru_sov.strings b/locales/ru_sov.strings index 7fe1de3e..56b3cffe 100644 --- a/locales/ru_sov.strings +++ b/locales/ru_sov.strings @@ -1,3 +1,5 @@ +#include + "__locale" = "su_SU.utf8;su_SU.UTF-8;Rus"; "__WinEncoding" = "Windows-1251"; @@ -154,6 +156,9 @@ "pinned" = "закреплено"; "comments_tip" = "Гражданин, будьте первым, кто напишет отзыв!"; "your_comment" = "Ваш отзыв"; +"auditory" = "Зрители"; +"in_wall" = "в досье"; +"in_group" = "в собрание"; "shown" = "Показано"; "x_out_of" = "$1 из"; "wall_zero" = "нет записей"; @@ -244,6 +249,7 @@ "only_administrators" = "Только администраторы"; "website" = "Сайт"; "managed" = "Управляемые"; +"size" = "Размер"; "administrators_one" = "$1 администратор"; "administrators_few" = "$1 администратора"; @@ -308,6 +314,36 @@ "albums_few" = "$1 альбома с картинками"; "albums_many" = "$1 альбомов с картинками"; "albums_other" = "$1 альбомов с картинками"; +"albums_list_zero" = "У Вас нет ни одного альбома с картинками"; +"albums_list_one" = "У Вас один альбом с картинками"; +"albums_list_few" = "У Вас $1 альбома с картинками"; +"albums_list_many" = "У Вас $1 альбомов с картинками"; +"albums_list_other" = "У Вас $1 альбомов с картинками"; + +"add_image" = "Поставить фотокарточку"; +"add_image_group" = "Загрузка фотокарточки"; +"upload_new_picture" = "Загрузить новую фотокарточку"; +"uploading_new_image" = "Загрузка новой фотокарточки"; +"friends_avatar" = "Знакомым будет проще узнать Вас, если вы загрузите свою настоящую фотокарточку."; +"groups_avatar" = "Хорошая фотокарточка сделает Ваше собрание более узнаваемым."; +"formats_avatar" = "Вы можете загрузить плёнку в формате JPG, GIF или PNG."; +"troubles_avatar" = "Если возникают проблемы с прикреплением, попробуйте выбрать фотокарточку меньшего размера."; +"webcam_avatar" = "Если ваш компьютер оснащён фотокамерой, Вы можете сделать быструю фотокарточку »"; + +"update_avatar_notification" = "Фотокарточка досье обновлена"; +"update_avatar_description" = "Нажмите сюда, чтобы перейти к рассмотрению"; + +"deleting_avatar" = "Удаление фотокарточки"; +"deleting_avatar_sure" = "Вы действительно хотите удалить фотокарточку?"; + +"deleted_avatar_notification" = "Фотокарточка успешно откреплена"; + +"save_changes" = "Сохранить изменения"; + +"upd_m" = "обновил фотокарточку на своём досье"; +"upd_f" = "обновила фотокарточку на своём досье"; +"upd_g" = "обновило фотокарточку собрания"; + /* Notes */ @@ -390,8 +426,14 @@ "cut" = "Обрезка"; "round_avatars" = "Круглая картинка"; -"search_for_groups" = "Розыск клубов"; -"search_for_people" = "Розыск граждан"; +"search_for_groups" = "Розыск собраний"; +"search_for_users" = "Розыск граждан"; +"search_for_posts" = "Розыск записей"; +"search_for_comments" = "Розыск отзывов"; +"search_for_videos" = "Розыск кинолент"; +"search_for_apps" = "Розыск приложений"; +"search_for_notes" = "Розыск записок"; + "search_button" = "Найти"; "search_placeholder" = "Начните вводить любое имя, название или слово"; "results_zero" = "Ни одного результата"; @@ -889,3 +931,48 @@ "instance_links" = "Ссылки страны:"; "my_apps" = "Досуг и отдых"; + +/* Search */ + +"s_people" = "Граждане"; +"s_groups" = "Собрания"; +"s_events" = "События"; +"s_apps" = "Приложения"; +"s_questions" = "Вопросы"; +"s_notes" = "Заметки"; +"s_themes" = "Темы"; +"s_posts" = "Записи"; +"s_comments" = "Отзывы"; +"s_videos" = "Киноленты"; +"s_audios" = "Аудио"; +"s_by_people" = "по гражданам"; +"s_by_groups" = "по собраниям"; +"s_by_posts" = "по записям"; +"s_by_comments" = "по отзывам"; +"s_by_videos" = "по кинолентам"; +"s_by_apps" = "по приложениям"; +"s_by_audios" = "по музыке"; + +"s_order_by" = "Расположение"; + +"s_order_by_id" = "По номерам"; +"s_order_by_name" = "По имени"; +"s_order_by_random" = "Наобум"; +"s_order_by_rating" = "По соц. рейтингу"; +"s_order_invert" = "Отразить"; + +"s_by_date" = "По дате"; +"s_date_before" = "До"; +"s_date_after" = "После"; + +"s_main" = "Паспорт"; + +"s_now_on_site" = "cейчас доступен"; +"s_with_photo" = "с фотокарточкой"; +"s_only_in_names" = "только в паспорте"; + +"s_any" = "любой"; +"reset" = "Сброс"; + +"closed_group_post" = "Эта запись из закрытого собрания"; +"deleted_target_comment" = "Этот отзыв надлежит к удалённой записи"; \ No newline at end of file diff --git a/themepacks/midnight/stylesheet.css b/themepacks/midnight/stylesheet.css index 8d80916e..ca6b9ed8 100644 --- a/themepacks/midnight/stylesheet.css +++ b/themepacks/midnight/stylesheet.css @@ -226,6 +226,110 @@ input[type="radio"] { border-color: #514534; } +.searchOptions +{ + overflow-y: hidden; + overflow-x:hidden; + width:28.8%; + border-top:1px solid #2B2B2B; + float:right; + scrollbar-width: none; + font-size:12px; + background-color:#1e1a2b; + margin-right: -7px; +} + +.searchBtn +{ + border: solid 1px #484848; + background-color: #333; + color:#c6d2e8; + margin-left: -3px; + padding-bottom:2px; + width:80px; + cursor: pointer; + box-shadow: 0px 2px 0px 0px rgba(111, 111, 111, 0.18) inset; +} + +.searchBtn:active +{ + border: solid 1px #414141; + background-color: rgb(77, 77, 77); + color:white; + box-shadow: 0px -2px 0px 0px rgba(255, 255, 255, 0.18) inset; +} + +.searchList #used +{ + margin-left:0px; + color: white; + padding:2px; + padding-top:5px; + padding-bottom:5px; + border: solid 0.125rem #2f2f2f; + background: linear-gradient(#3c3c3c,#393939); + margin-bottom:2px; + padding-left:5px; + width:90%; +} + +.searchList #used a +{ + color: white; +} + +.searchHide +{ + padding-right: 5px; +} + +.searchList li +{ + margin-left:0px; + color: #2B587A !important; + cursor:pointer; + padding:2px; + padding-top:5px; + padding-bottom:5px; + margin-bottom:2px; + padding-left:5px; +} + +.searchList li a +{ + min-width:100%; +} + +.searchList li:hover +{ + margin-left:0px; + color: #2B587A !important; + background:#181522; + padding:2px; + padding-top:5px; + padding-bottom:5px; + margin-bottom:2px; + padding-left:5px; + width:91%; +} + +.searchOptionName +{ + cursor:pointer; + background-color: #120e1f; + padding-left:5px; + padding-top:5px; + padding-bottom:5px; + width: 90%; + font-weight: 600; + color: #c6d2e8; +} + +.borderup +{ + border-top:1px solid #2f2f2f; +} + #backdropEditor { background-image: url("/themepack/midnight/0.0.2.7/resource/backdrop-editor.gif") !important; border-color: #473e66 !important; diff --git a/themepacks/openvk_modern/stylesheet.css b/themepacks/openvk_modern/stylesheet.css index 6881a10e..320c263b 100644 --- a/themepacks/openvk_modern/stylesheet.css +++ b/themepacks/openvk_modern/stylesheet.css @@ -245,3 +245,95 @@ input[type=checkbox] { width:100%; background-color:#3c3c3c } + +.searchOptions +{ + overflow-y: hidden; + overflow-x:hidden; + width:28.8%; + border-top:1px solid #2B2B2B; + float:right; + scrollbar-width: none; + font-size:12px; + background-color:#F6F6F6; + margin-right: -7px; +} + +.searchBtn +{ + border: none; + background-color: #555555; + color:#ffffff; + margin-left: -3px; + padding-bottom:2px; + width:80px; + cursor: pointer; + box-shadow: none; +} + +.searchBtn:active +{ + border: none; + background-color: rgb(77, 77, 77); + color:white; + box-shadow: none; +} + +.searchList #used +{ + margin-left:0px; + color: white; + padding:2px; + padding-top:5px; + padding-bottom:5px; + border: none; + background: #a4a4a4; + margin-bottom:2px; + padding-left:5px; + width:90%; +} + +.searchList #used a +{ + color: white; +} + +.searchHide +{ + padding-right: 5px; +} + +.searchList li:hover +{ + margin-left:0px; + color: #2B587A !important; + background:#eeeeee; + padding:2px; + padding-top:5px; + padding-bottom:5px; + margin-bottom:2px; + padding-left:5px; + width:91%; +} + +.searchOptionName +{ + cursor:pointer; + background-color: #a4a4a4; + padding-left:5px; + padding-top:5px; + padding-bottom:5px; + width: 90%; + font-weight: 600; + color: #fff; +} + +.searchOptionName img +{ + display:none; +} + +.borderup +{ + border-top:1px solid #2f2f2f; +} \ No newline at end of file