mirror of
https://github.com/openvk/openvk
synced 2025-07-07 16:29:50 +03:00
Fix debilny oshibky
Убрал лишние ключи локализации, исправил панель поеска и исправил hometown
This commit is contained in:
parent
9933a55895
commit
4041fbc345
8 changed files with 9 additions and 45 deletions
|
@ -92,9 +92,9 @@
|
||||||
<div class="{if $atSearch}nodivider{else}link{/if}">
|
<div class="{if $atSearch}nodivider{else}link{/if}">
|
||||||
|
|
||||||
{if !$atSearch}
|
{if !$atSearch}
|
||||||
<form action="/search" method="get" id="searcher">
|
<form action="/search" method="get" id="searcher" style="position:relative;">
|
||||||
<input id="searchInput" onfocus="expandSearch()" onblur="decreaseSearch()" class="sr" type="search" name="query" placeholder="{_header_search}" style="height: 20px;background: url('/assets/packages/static/openvk/img/search_icon.png') no-repeat 3px 4px; background-color: #fff; padding-left: 18px;width: 120px;" title="{_header_search} [Alt+Shift+F]" accesskey="f" />
|
<input id="searchInput" onfocus="expandSearch()" onblur="decreaseSearch()" class="sr" type="search" name="query" placeholder="{_header_search}" style="height: 20px;background: url('/assets/packages/static/openvk/img/search_icon.png') no-repeat 3px 4px; background-color: #fff; padding-left: 18px;width: 120px;" title="{_header_search} [Alt+Shift+F]" accesskey="f" />
|
||||||
<select name="type" class="whatFind" style="display:none;">
|
<select name="type" class="whatFind" style="display:none;top: 0px;">
|
||||||
<option value="users">{_s_by_people}</option>
|
<option value="users">{_s_by_people}</option>
|
||||||
<option value="groups">{_s_by_groups}</option>
|
<option value="groups">{_s_by_groups}</option>
|
||||||
<option value="posts">{_s_by_posts}</option>
|
<option value="posts">{_s_by_posts}</option>
|
||||||
|
@ -104,7 +104,7 @@
|
||||||
</select>
|
</select>
|
||||||
</form>
|
</form>
|
||||||
{else}
|
{else}
|
||||||
<form action="/search" method="get" id="searcher">
|
<form action="/search" method="get" id="searcher" style="margin-top: -1px;position:relative;">
|
||||||
<input id="searchInput" value="{$_GET['query'] ?? ''}" type="search" class="sr" name="query" placeholder="{_header_search}" style="height: 20px;background: url('/assets/packages/static/openvk/img/search_icon.png') no-repeat 3px 4px; background-color: #fff; padding-left: 18px;width: 555px;" title="{_header_search} [Alt+Shift+F]" accesskey="f" />
|
<input id="searchInput" value="{$_GET['query'] ?? ''}" type="search" class="sr" name="query" placeholder="{_header_search}" style="height: 20px;background: url('/assets/packages/static/openvk/img/search_icon.png') no-repeat 3px 4px; background-color: #fff; padding-left: 18px;width: 555px;" title="{_header_search} [Alt+Shift+F]" accesskey="f" />
|
||||||
<select name="type" class="whatFind">
|
<select name="type" class="whatFind">
|
||||||
<option value="users" {if str_contains($_SERVER['REQUEST_URI'], "type=users")}selected{/if}>{_s_by_people}</option>
|
<option value="users" {if str_contains($_SERVER['REQUEST_URI'], "type=users")}selected{/if}>{_s_by_people}</option>
|
||||||
|
|
|
@ -293,7 +293,7 @@
|
||||||
<div class="searchOptionBlock" id="s_main">
|
<div class="searchOptionBlock" id="s_main">
|
||||||
<input type="text" value="{if !is_null($_GET['status'])}{$_GET['status']}{/if}" form="searcher" placeholder="{_status}" name="status">
|
<input type="text" value="{if !is_null($_GET['status'])}{$_GET['status']}{/if}" form="searcher" placeholder="{_status}" name="status">
|
||||||
<input type="text" value="{if !is_null($_GET['city'])}{$_GET['city']}{/if}" form="searcher" placeholder="{_city}" name="city">
|
<input type="text" value="{if !is_null($_GET['city'])}{$_GET['city']}{/if}" form="searcher" placeholder="{_city}" name="city">
|
||||||
<input type="text" value="{if !is_null($_GET['native_city'])}{$_GET['native_city']}{/if}" form="searcher" placeholder="{_s_native_city}" name="native_city">
|
<input type="text" value="{if !is_null($_GET['hometown'])}{$_GET['hometown']}{/if}" form="searcher" placeholder="{_hometown}" name="hometown">
|
||||||
<input name="is_online" type="checkbox" {if !is_null($_GET['is_online']) && $_GET['is_online'] == "1"}checked{/if} form="searcher" value="1">{_s_now_on_site}
|
<input name="is_online" type="checkbox" {if !is_null($_GET['is_online']) && $_GET['is_online'] == "1"}checked{/if} form="searcher" value="1">{_s_now_on_site}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -31,9 +31,9 @@
|
||||||
<div n:if="isset($thisUser) &&! ($compact ?? false)" class="post-menu">
|
<div n:if="isset($thisUser) &&! ($compact ?? false)" class="post-menu">
|
||||||
<a {if is_null($linkW)}href="#_comment{$comment->getId()}"{else}href="wall{!is_null($comment->getTarget()) ? $comment->getTarget()->getPrettyId() : $comment->getOwner()->getId()}#_comment{$comment->getId()}"{/if} class="date">{$comment->getPublicationTime()}</a> |
|
<a {if is_null($linkW)}href="#_comment{$comment->getId()}"{else}href="wall{!is_null($comment->getTarget()) ? $comment->getTarget()->getPrettyId() : $comment->getOwner()->getId()}#_comment{$comment->getId()}"{/if} class="date">{$comment->getPublicationTime()}</a> |
|
||||||
{if $comment->canBeDeletedBy($thisUser)}
|
{if $comment->canBeDeletedBy($thisUser)}
|
||||||
<a href="/comment{$comment->getId()}/delete">{_delete}</a>
|
<a href="/comment{$comment->getId()}/delete">{_delete}</a> |
|
||||||
{/if}
|
{/if}
|
||||||
{if is_null($linkW)} |
|
{if is_null($linkW)}
|
||||||
<a class="comment-reply">{_reply}</a>{/if}
|
<a class="comment-reply">{_reply}</a>{/if}
|
||||||
<div style="float: right; font-size: .7rem;">
|
<div style="float: right; font-size: .7rem;">
|
||||||
<a class="post-like-button" href="/comment{$comment->getId()}/like?hash={rawurlencode($csrfToken)}">
|
<a class="post-like-button" href="/comment{$comment->getId()}/like?hash={rawurlencode($csrfToken)}">
|
||||||
|
|
|
@ -2328,7 +2328,7 @@ a.poll-retract-vote {
|
||||||
border: solid 1px #575757;
|
border: solid 1px #575757;
|
||||||
background-color: #696969;
|
background-color: #696969;
|
||||||
color:white;
|
color:white;
|
||||||
margin-left: -3px;
|
margin-left: -11px;
|
||||||
padding-bottom:2px;
|
padding-bottom:2px;
|
||||||
width:80px;
|
width:80px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
@ -2416,8 +2416,8 @@ a.poll-retract-vote {
|
||||||
border:none;
|
border:none;
|
||||||
position:absolute;
|
position:absolute;
|
||||||
width:150px;
|
width:150px;
|
||||||
right:95px;
|
cursor:pointer;
|
||||||
top:12px;
|
right:80px;
|
||||||
text-align:right;
|
text-align:right;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1490,17 +1490,8 @@
|
||||||
"s_date_before" = "Before";
|
"s_date_before" = "Before";
|
||||||
"s_date_after" = "After";
|
"s_date_after" = "After";
|
||||||
|
|
||||||
"s_region" = "Region";
|
|
||||||
"s_city" = "City";
|
|
||||||
"s_native_city" = "Hometown";
|
|
||||||
|
|
||||||
"s_main" = "Main";
|
"s_main" = "Main";
|
||||||
"s_age" = "Age";
|
|
||||||
"s_sex" = "Sex";
|
|
||||||
"s_wemen" = "Woman";
|
|
||||||
"s_man" = "Man";
|
|
||||||
|
|
||||||
"s_relationship" = "Relationship";
|
|
||||||
"s_now_on_site" = "now on site";
|
"s_now_on_site" = "now on site";
|
||||||
"s_with_photo" = "with photo";
|
"s_with_photo" = "with photo";
|
||||||
"s_only_in_names" = "only in names";
|
"s_only_in_names" = "only in names";
|
||||||
|
|
|
@ -1384,17 +1384,8 @@
|
||||||
"s_date_before" = "До";
|
"s_date_before" = "До";
|
||||||
"s_date_after" = "После";
|
"s_date_after" = "После";
|
||||||
|
|
||||||
"s_region" = "Регион";
|
|
||||||
"s_city" = "Город";
|
|
||||||
"s_native_city" = "Родной город";
|
|
||||||
|
|
||||||
"s_main" = "Основное";
|
"s_main" = "Основное";
|
||||||
"s_age" = "Возраст";
|
|
||||||
"s_sex" = "Пол";
|
|
||||||
"s_wemen" = "Женский";
|
|
||||||
"s_man" = "Мужской";
|
|
||||||
|
|
||||||
"s_relationship" = "Семейное положение";
|
|
||||||
"s_now_on_site" = "cейчас на сайте";
|
"s_now_on_site" = "cейчас на сайте";
|
||||||
"s_with_photo" = "с фото";
|
"s_with_photo" = "с фото";
|
||||||
"s_only_in_names" = "только в именах";
|
"s_only_in_names" = "только в именах";
|
||||||
|
|
|
@ -760,17 +760,8 @@
|
||||||
"s_date_before" = "До";
|
"s_date_before" = "До";
|
||||||
"s_date_after" = "После";
|
"s_date_after" = "После";
|
||||||
|
|
||||||
"s_region" = "Губернiя";
|
|
||||||
"s_city" = "Городъ";
|
|
||||||
"s_native_city" = "Родной городъ";
|
|
||||||
|
|
||||||
"s_main" = "Основное";
|
"s_main" = "Основное";
|
||||||
"s_age" = "Возрастъ";
|
|
||||||
"s_sex" = "Полъ";
|
|
||||||
"s_wemen" = "Женскiй";
|
|
||||||
"s_man" = "Мужской";
|
|
||||||
|
|
||||||
"s_relationship" = "Семейное положенiе";
|
|
||||||
"s_now_on_site" = "cейчас тутъ";
|
"s_now_on_site" = "cейчас тутъ";
|
||||||
"s_with_photo" = "с фотокарточкой";
|
"s_with_photo" = "с фотокарточкой";
|
||||||
"s_only_in_names" = "только в имѣнахъ";
|
"s_only_in_names" = "только в имѣнахъ";
|
||||||
|
|
|
@ -965,17 +965,8 @@
|
||||||
"s_date_before" = "До";
|
"s_date_before" = "До";
|
||||||
"s_date_after" = "После";
|
"s_date_after" = "После";
|
||||||
|
|
||||||
"s_region" = "Область";
|
|
||||||
"s_city" = "Город";
|
|
||||||
"s_native_city" = "Место рождения";
|
|
||||||
|
|
||||||
"s_main" = "Паспорт";
|
"s_main" = "Паспорт";
|
||||||
"s_age" = "Возраст";
|
|
||||||
"s_sex" = "Пол";
|
|
||||||
"s_wemen" = "Женский";
|
|
||||||
"s_man" = "Мужской";
|
|
||||||
|
|
||||||
"s_relationship" = "Семейное положение";
|
|
||||||
"s_now_on_site" = "cейчас доступен";
|
"s_now_on_site" = "cейчас доступен";
|
||||||
"s_with_photo" = "с фотокарточкой";
|
"s_with_photo" = "с фотокарточкой";
|
||||||
"s_only_in_names" = "только в паспорте";
|
"s_only_in_names" = "только в паспорте";
|
||||||
|
|
Loading…
Reference in a new issue