Lanmikeman/openvk
Lanmikeman/openvk
1
1
Fork 0
mirror of https://github.com/openvk/openvk synced 2024-11-11 01:19:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #482 from openvk/similartovk

Browse source 
Layout: Update friends, groups, videos and albums lists. And some style fixes
This commit is contained in:
KosFurler 2022-02-19 01:34:04 +03:00 committed by GitHub
commit 35a9c040fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 2050 additions and 1932 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Web/Presenters/templates/@listView.xml
View file

@ -1,8 +1,10 @@
{extends "@layout.xml"}
{block wrap}
<div class="page_wrap">
<div n:ifset="tabs" n:ifcontent class="tabs">
<div class="wrap2">
<div class="wrap1">
<div class="page_wrap padding_top">
<div n:ifset="tabs" class="tabs">
{include tabs}
</div>
@ -27,8 +29,8 @@
</a>
</td>
<td valign="top" style="width: 100%">
{ifset infoTable}
{include infoTable, x => $dat}
{ifset infotable}
{include infotable, x => $dat}
{else}
<a href="{include link, x => $dat}">
<b>
@ -67,4 +69,6 @@
{include bottom}
{/ifset}
</div>
</div>
</div>
{/block}

27
Web/Presenters/templates/Photos/AlbumList.xml
View file

@ -5,12 +5,29 @@
{block title}{_"albums"} {$owner->getCanonicalName()}{/block}
{block header}
<a href="{$owner->getURL()}">{$owner->getCanonicalName()}</a>
» {_"albums"}
{if isset($thisUser) && $thisUser->getId() == $owner->getId()}
{_my_photos}
{else}
<a href="{$owner->getURL()}">
{$owner->getCanonicalName()}</a>
»
{_albums}
{/if}
{/block}
<div n:if="$canEdit" style="float: right;">
{var isClub = ($owner instanceof openvk\Web\Models\Entities\Club)}
<a href="/albums/create{$isClub ? '?gpid=' . $owner->getId() : ''}">{_"create_album"}</a>
{block size}
<div style="padding-bottom: 0px; padding-top: 0;" class="summaryBar">
<div class="summary">
{if !is_null($thisUser) && $owner->getId() === $thisUser->getId()}
{tr("albums_list", $count)}
{else}
{tr("albums", $count)}
{/if}
<span n:if="isset($thisUser) && $thisUser->getId() == $owner->getId()">
&nbsp;|&nbsp;
<a href="/albums/create">{_create_album}</a>
</span>
</div>
</div>
{/block}

39
Web/Presenters/templates/User/Friends.xml
View file

@ -25,6 +25,9 @@
{/block}
{block header}
{if isset($thisUser) && $thisUser->getId() == $user->getId()}
{_my_friends}
{else}
<a href="{$user->getURL()}">{$user->getCanonicalName()}</a> »
{if $act == "incoming"}
{_"incoming_req"}
@ -33,17 +36,45 @@
{else}
{_"friends"}
{/if}
{/if}
{/block}
{block tabs}
<div n:attr="id => ($act === 'friends' ? 'activetabs' : 'ki')" class="tab">
<a n:attr="id => ($act === 'friends' ? 'act_tab_a' : 'ki')" href="?">{_friends}</a>
</div>
<div n:attr="id => ($act === 'incoming' ? 'activetabs' : 'ki')" class="tab">
<a n:attr="id => ($act === 'incoming' ? 'act_tab_a' : 'ki')" href="?act=incoming">{_incoming_req}</a>
<div n:attr="id => ($act === 'incoming' || $act === 'outcoming' ? 'activetabs' : 'ki')" class="tab">
<a n:attr="id => ($act === 'incoming' || $act === 'outcoming' ? 'act_tab_a' : 'ki')" href="?act=incoming">{_req}</a>
</div>
{/block}
{block size}
<div n:if="$act === 'incoming' || $act === 'outcoming'" class="mb_tabs">
<div n:attr="id => ($act === 'incoming' ? 'active' : 'ki')" class="mb_tab">
<div>
<a href="?act=incoming">Входящие</a>
</div>
</div>
<div n:attr="id => ($act === 'outcoming' ? 'active' : 'ki')" class="mb_tab">
<div>
<a href="?act=outcoming">Исходящие</a>
</div>
</div>
</div>
<div style="padding-bottom: 0px;" class="summaryBar">
<div class="summary">
{if !is_null($thisUser) && $user->getId() === $thisUser->getId()}
{if $act == "incoming"}
{tr("req", $count)}
{elseif $act == "outcoming"}
{tr("req", $count)}
{else}
{tr("friends_list", $count)}
{/if}
{else}
{tr("friends", $count)}
{/if}
</div>
<div n:attr="id => ($act === 'outcoming' ? 'activetabs' : 'ki')" class="tab">
<a n:attr="id => ($act === 'outcoming' ? 'act_tab_a' : 'ki')" href="?act=outcoming">{_outcoming_req}</a>
</div>
{/block}

10
Web/Presenters/templates/User/Groups.xml
View file

@ -32,7 +32,7 @@
{/block}
{block size}
<div n:if="!is_null($thisUser) && $user->getId() === $thisUser->getId()" style="padding-bottom: 0px; border-bottom: 0;" class="summaryBar">
<div style="padding-bottom: 0px;" class="summaryBar">
<div class="summary">
{if !is_null($thisUser) && $user->getId() === $thisUser->getId()}
{tr("groups_list", $thisUser->getClubCount())}
@ -75,11 +75,12 @@
{block actions}
{var clubPinned = $thisUser->isClubPinned($x)}
{if $x->canBeModifiedBy($thisUser ?? NULL)}
<a style="width: 140px;" class="profile_link" href="{$x->getURL()}">
<div class="navigation" style="width: 140px;">
<a class="link" href="{$x->getURL()}">
{_check_community}
</a>
{if ($clubPinned || $thisUser->getPinnedClubCount() <= 10)}
<a style="width: 140px;" class="profile_link" href="/groups_pin?club={$x->getId()}&hash={rawurlencode($csrfToken)}" id="_pinGroup" data-group-name="{$x->getName()}" data-group-url="{$x->getUrl()}">
<a class="link" href="/groups_pin?club={$x->getId()}&hash={rawurlencode($csrfToken)}" data-group-name="{$x->getName()}" data-group-url="{$x->getUrl()}">
{if $clubPinned}
{_remove_from_left_menu}
{else}
@ -91,8 +92,9 @@
<input type="hidden" name="act" value="rem" />
<input type="hidden" name="id" value="{$x->getId()}" />
<input type="hidden" name="hash" value="{$csrfToken}" />
<input style="width: 140px; text-transform: lowercase;" type="submit" id="profile_link" value="{_leave_community}" />
<input style="text-transform: lowercase; width: 100%;" class="link" type="submit" value="{_"leave_community"}" />
</form>
</div>
{/if}
{/block}

2
Web/Presenters/templates/Videos/List.xml
View file

@ -11,7 +11,7 @@
{/block}
{block size}
<div style="padding-bottom: 0px;border-bottom: 0; padding-top: 0;" class="summaryBar">
<div style="padding-bottom: 0px; padding-top: 0;" class="summaryBar">
<div class="summary">
{tr("videos", $count)}
<span n:if="isset($thisUser) && $thisUser->getId() == $user->getId()">

2
Web/Presenters/templates/components/error.xml
View file

@ -1,6 +1,6 @@
<center style="background: white;border: #DEDEDE solid 1px;">
<span style="color: #707070;margin: 60px 0;display: block;">
<b>{$title}</b><br><br>
<b n:if="!empty($title)">{$title}<br><br></b>
{$description}
</span>
</center>

2
Web/Presenters/templates/components/nothing.xml
View file

@ -1 +1 @@
{include "error.xml", title => tr("no_data"), description => tr("no_data_description")}
{include "error.xml", description => tr("no_data_description")}

1326
Web/static/css/style.css
View file

File diff suppressed because it is too large Load diff

26
locales/ru.strings
View file

@ -202,16 +202,28 @@
"friends_reject" = "Отменить заявку";
"friends_accept" = "Принять заявку";
"send_message" = "Отправить сообщение";
"incoming_req" = "Подписчики";
"outcoming_req" = "Заявки";
"incoming_req" = "Входящие";
"outcoming_req" = "Исходящие";
"req" = "Заявки";
"firends_zero" = "Ни одного друга";
"req_zero" = "Не найдено ни одной заявки...";
"req_one" = "Найдена $1 заявка";
"req_few" = "Найлено $1 заявки";
"req_many" = "Найдено $1 заявки";
"req_other" = "Найдено $1 заявок";
"friends_zero" = "Ни одного друга";
"friends_one" = "$1 друг";
"friends_few" = "$1 друга";
"friends_many" = "$1 друзей";
"friends_other" = "$1 друзей";
"friends_list_zero" = "У Вас пока нет друзей";
"friends_list_one" = "У Вас $1 друг";
"friends_list_few" = "У Вас $1 друга";
"friends_list_many" = "У Вас $1 друзей";
"friends_list_other" = "У Вас $1 друзей";
"followers_zero" = "Ни одного подписчика";
"followers_one" = "$1 подписчик";
"followers_few" = "$1 подписчика";
@ -326,6 +338,12 @@
"albums_many" = "$1 альбомов";
"albums_other" = "$1 альбомов";
"albums_list_zero" = "У Вас нет ни одного альбома";
"albums_list_one" = "У Вас один альбом";
"albums_list_few" = "У Вас $1 альбома";
"albums_list_many" = "У Вас $1 альбомов";
"albums_list_other" = "У Вас $1 альбомов";
/* Notes */
"notes" = "Заметки";
@ -784,7 +802,7 @@
"information_-2" = "Вход выполнен успешно";
"no_data" = "Нет данных";
"no_data_description" = "В этом представлении отсутствуют данные.";
"no_data_description" = "Тут ничего нет... Пока...";
"error" = "Ошибка";
"error_shorturl" = "Данный короткий адрес уже занят.";