Lanmikeman/openvk
Lanmikeman/openvk
1
1
Fork 0
mirror of https://github.com/openvk/openvk synced 2024-12-23 00:51:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use correct image sizes in various templates

Browse source
This commit is contained in:
Celestora 2022-04-05 14:39:13 +03:00
parent 608c34815e
commit ed9dac2ac1
25 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Web/Models/Entities/Club.php
View file

@ -38,12 +38,12 @@ class Club extends RowModel
return iterator_to_array($avPhotos)[0] ?? NULL; return iterator_to_array($avPhotos)[0] ?? NULL;
} }
function getAvatarUrl(): string function getAvatarUrl(string $size = "miniscule"): string
{ {
$serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"]; $serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"];
$avPhoto = $this->getAvatarPhoto(); $avPhoto = $this->getAvatarPhoto();
return is_null($avPhoto) ? "$serverUrl/assets/packages/static/openvk/img/camera_200.png" : $avPhoto->getURL(); return is_null($avPhoto) ? "$serverUrl/assets/packages/static/openvk/img/camera_200.png" : $avPhoto->getURLBySizeId($size);
} }
function getAvatarLink(): string function getAvatarLink(): string

1
Web/Models/Entities/Photo.php
View file

@ -26,6 +26,7 @@ class Photo extends Media
if(($image->getWidth() / $image->getHeight()) > ($px / $py)) { if(($image->getWidth() / $image->getHeight()) > ($px / $py)) {
# For some weird reason using resize with EXACT flag causes system to consume an unholy amount of RAM # For some weird reason using resize with EXACT flag causes system to consume an unholy amount of RAM
$image->crop(0, 0, "100%", (int) ceil(($px * $image->getWidth()) / $py)); $image->crop(0, 0, "100%", (int) ceil(($px * $image->getWidth()) / $py));
$res[0] = true;
} }
} }

4
Web/Models/Entities/User.php
View file

@ -102,7 +102,7 @@ class User extends RowModel
return "/id" . $this->getId(); return "/id" . $this->getId();
} }
function getAvatarUrl(): string function getAvatarUrl(string $size = "miniscule"): string
{ {
$serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"]; $serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"];
@ -115,7 +115,7 @@ class User extends RowModel
if(is_null($avPhoto)) if(is_null($avPhoto))
return "$serverUrl/assets/packages/static/openvk/img/camera_200.png"; return "$serverUrl/assets/packages/static/openvk/img/camera_200.png";
else else
return $avPhoto->getURL(); return $avPhoto->getURLBySizeId($size);
} }
function getAvatarLink(): string function getAvatarLink(): string

4
Web/Presenters/templates/Admin/Club.xml
View file

@ -38,7 +38,7 @@
</label> </label>
<span id="avatar" class="aui-avatar aui-avatar-project aui-avatar-xlarge"> <span id="avatar" class="aui-avatar aui-avatar-project aui-avatar-xlarge">
<span class="aui-avatar-inner"> <span class="aui-avatar-inner">
<img src="{$club->getAvatarUrl()}" style="object-fit: cover;"></img> <img src="{$club->getAvatarUrl('tiny')}" style="object-fit: cover;"></img>
</span> </span>
</span> </span>
</div> </div>
@ -155,7 +155,7 @@
<td> <td>
<span class="aui-avatar aui-avatar-xsmall"> <span class="aui-avatar aui-avatar-xsmall">
<span class="aui-avatar-inner"> <span class="aui-avatar-inner">
<img src="{$follower->getAvatarUrl()}" alt="{$follower->getCanonicalName()}" role="presentation" /> <img src="{$follower->getAvatarUrl('miniscule')}" alt="{$follower->getCanonicalName()}" role="presentation" />
</span> </span>
</span> </span>

4
Web/Presenters/templates/Admin/Clubs.xml
View file

@ -32,7 +32,7 @@
<td> <td>
<span class="aui-avatar aui-avatar-xsmall"> <span class="aui-avatar aui-avatar-xsmall">
<span class="aui-avatar-inner"> <span class="aui-avatar-inner">
<img src="{$club->getAvatarUrl()}" alt="{$club->getCanonicalName()}" style="object-fit: cover;" role="presentation" /> <img src="{$club->getAvatarUrl('miniscule')}" alt="{$club->getCanonicalName()}" style="object-fit: cover;" role="presentation" />
</span> </span>
</span> </span>
@ -43,7 +43,7 @@
<span class="aui-avatar aui-avatar-xsmall"> <span class="aui-avatar aui-avatar-xsmall">
<span class="aui-avatar-inner"> <span class="aui-avatar-inner">
<img src="{$user->getAvatarUrl()}" alt="{$user->getCanonicalName()}" role="presentation" /> <img src="{$user->getAvatarUrl('miniscule')}" alt="{$user->getCanonicalName()}" role="presentation" />
</span> </span>
</span> </span>

2
Web/Presenters/templates/Admin/User.xml
View file

@ -17,7 +17,7 @@
</label> </label>
<span id="avatar" class="aui-avatar aui-avatar-project aui-avatar-xlarge"> <span id="avatar" class="aui-avatar aui-avatar-project aui-avatar-xlarge">
<span class="aui-avatar-inner"> <span class="aui-avatar-inner">
<img src="{$user->getAvatarUrl()}" style="object-fit: cover;"></img> <img src="{$user->getAvatarUrl('tiny')}" style="object-fit: cover;"></img>
</span> </span>
</span> </span>
</div> </div>

2
Web/Presenters/templates/Admin/Users.xml
View file

@ -32,7 +32,7 @@
<td> <td>
<span class="aui-avatar aui-avatar-xsmall"> <span class="aui-avatar aui-avatar-xsmall">
<span class="aui-avatar-inner"> <span class="aui-avatar-inner">
<img src="{$user->getAvatarUrl()}" alt="{$user->getCanonicalName()}" style="object-fit: cover;" role="presentation" /> <img src="{$user->getAvatarUrl('miniscule')}" alt="{$user->getCanonicalName()}" style="object-fit: cover;" role="presentation" />
</span> </span>
</span> </span>

2
Web/Presenters/templates/Admin/Voucher.xml
View file

@ -74,7 +74,7 @@
<td> <td>
<span class="aui-avatar aui-avatar-xsmall"> <span class="aui-avatar aui-avatar-xsmall">
<span class="aui-avatar-inner"> <span class="aui-avatar-inner">
<img src="{$user->getAvatarUrl()}" alt="{$user->getCanonicalName()}" role="presentation" /> <img src="{$user->getAvatarUrl('miniscule')}" alt="{$user->getCanonicalName()}" role="presentation" />
</span> </span>
</span> </span>

2
Web/Presenters/templates/Group/Followers.xml
View file

@ -41,7 +41,7 @@
{/block} {/block}
{block preview} {block preview}
<img src="{$x instanceof $Manager ? $x->getUser()->getAvatarURL() : $x->getAvatarURL()}" alt="{$x instanceof $Manager ? $x->getUser()->getCanonicalName() : $x->getCanonicalName()}" width=75 /> <img src="{$x instanceof $Manager ? $x->getUser()->getAvatarURL() : $x->getAvatarURL('miniscule')}" alt="{$x instanceof $Manager ? $x->getUser()->getCanonicalName() : $x->getCanonicalName()}" width=75 />
{/block} {/block}
{block name} {block name}

4
Web/Presenters/templates/Group/View.xml
View file

@ -57,7 +57,7 @@
<div class="cl_element" n:foreach="$club->getFollowers(1) as $follower"> <div class="cl_element" n:foreach="$club->getFollowers(1) as $follower">
<div class="cl_avatar"> <div class="cl_avatar">
<a href="{$follower->getURL()}"> <a href="{$follower->getURL()}">
<img class="ava" src="{$follower->getAvatarUrl()}" /> <img class="ava" src="{$follower->getAvatarUrl('miniscule')}" />
</a> </a>
</div> </div>
<a href="{$follower->getURL()}" class="cl_name"> <a href="{$follower->getURL()}" class="cl_name">
@ -94,7 +94,7 @@
{var avatarPhoto = $club->getAvatarPhoto()} {var avatarPhoto = $club->getAvatarPhoto()}
{var avatarLink = ((is_null($avatarPhoto) ? FALSE : $avatarPhoto->isAnonymous()) ? "/photo" . ("s/" . base_convert((string) $avatarPhoto->getId(), 10, 32)) : $club->getAvatarLink())} {var avatarLink = ((is_null($avatarPhoto) ? FALSE : $avatarPhoto->isAnonymous()) ? "/photo" . ("s/" . base_convert((string) $avatarPhoto->getId(), 10, 32)) : $club->getAvatarLink())}
<a href="{$avatarLink|nocheck}"> <a href="{$avatarLink|nocheck}">
<img src="{$club->getAvatarUrl()}" style="width: 100%; image-rendering: -webkit-optimize-contrast;" /> <img src="{$club->getAvatarUrl('normal')}" style="width: 100%; image-rendering: -webkit-optimize-contrast;" />
</a> </a>
<div n:ifset="$thisUser" id="profile_links"> <div n:ifset="$thisUser" id="profile_links">
{if $club->canBeModifiedBy($thisUser)} {if $club->canBeModifiedBy($thisUser)}

4
Web/Presenters/templates/Messenger/App.xml
View file

@ -44,7 +44,7 @@
</div> </div>
<div class="messenger-app--input"> <div class="messenger-app--input">
{if $correspondent->getId() === $thisUser->getId() || $correspondent->getPrivacyPermission('messages.write', $thisUser)} {if $correspondent->getId() === $thisUser->getId() || $correspondent->getPrivacyPermission('messages.write', $thisUser)}
<img class="ava" src="{$thisUser->getAvatarUrl()}" alt="{$thisUser->getCanonicalName()}" /> <img class="ava" src="{$thisUser->getAvatarUrl('miniscule')}" alt="{$thisUser->getCanonicalName()}" />
<div class="messenger-app--input---messagebox"> <div class="messenger-app--input---messagebox">
<textarea <textarea
data-bind="value: messageContent, event: { keydown: onTextareaKeyPress }" data-bind="value: messageContent, event: { keydown: onTextareaKeyPress }"
@ -52,7 +52,7 @@
placeholder="Введите сообщение"></textarea> placeholder="Введите сообщение"></textarea>
<button class="button" data-bind="click: sendMessage">Отправить</button> <button class="button" data-bind="click: sendMessage">Отправить</button>
</div> </div>
<img class="ava" src="{$correspondent->getAvatarUrl()}" alt="{$correspondent->getCanonicalName()}" /> <img class="ava" src="{$correspondent->getAvatarUrl('miniscule')}" alt="{$correspondent->getCanonicalName()}" />
{else} {else}
<div class="blocked" data-localized-text="Вы не можете писать сообщения {$correspondent->getCanonicalName()} из-за его настроек приватности."></div> <div class="blocked" data-localized-text="Вы не можете писать сообщения {$correspondent->getCanonicalName()} из-за его настроек приватности."></div>
{/if} {/if}

4
Web/Presenters/templates/Messenger/Index.xml
View file

@ -25,7 +25,7 @@
{var lastMsg = $coresp->getPreviewMessage()} {var lastMsg = $coresp->getPreviewMessage()}
<div class="crp-entry--image"> <div class="crp-entry--image">
<img src="{$recipient->getAvatarURL()}" <img src="{$recipient->getAvatarURL('miniscule')}"
alt="Фотография пользователя" /> alt="Фотография пользователя" />
</div> </div>
<div class="crp-entry--info"> <div class="crp-entry--info">
@ -36,7 +36,7 @@
{var _author = $lastMsg->getSender()} {var _author = $lastMsg->getSender()}
<div class="crp-entry--message---av" n:if="$_author->getId() === $thisUser->getId()"> <div class="crp-entry--message---av" n:if="$_author->getId() === $thisUser->getId()">
<img src="{$_author->getAvatarURL()}" <img src="{$_author->getAvatarURL('miniscule')}"
alt="Фотография пользователя" /> alt="Фотография пользователя" />
</div> </div>
<div class="crp-entry--message---text"> <div class="crp-entry--message---text">

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

@ -68,7 +68,7 @@
<div n:foreach="$data as $dat"> <div n:foreach="$data as $dat">
<div class="profile_thumb"> <div class="profile_thumb">
<a href="{$owner->getURL()}"> <a href="{$owner->getURL()}">
<img src="{$owner->getAvatarUrl()}" style="width: 50px;"> <img src="{$owner->getAvatarUrl('miniscule')}" style="width: 50px;">
</a> </a>
</div> </div>
<article class="note_body" id="userContent" style="width: 540px; display: inline-block; margin-bottom: 35px;"> <article class="note_body" id="userContent" style="width: 540px; display: inline-block; margin-bottom: 35px;">

2
Web/Presenters/templates/Notification/Feed.xml
View file

@ -26,7 +26,7 @@
{/block} {/block}
{block preview} {block preview}
<img src="{$x->getModel(1)->getAvatarUrl()}" width=64 /> <img src="{$x->getModel(1)->getAvatarUrl('miniscule')}" width=64 />
{/block} {/block}
{block name} {block name}

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

@ -43,7 +43,7 @@
{block preview} {block preview}
{var cover = $x->getCoverPhoto()} {var cover = $x->getCoverPhoto()}
{var preview = is_null($cover) ? "/assets/packages/static/openvk/img/camera_200.png" : $cover->getURL()} {var preview = is_null($cover) ? "/assets/packages/static/openvk/img/camera_200.png" : $cover->getURLBySizeId("normal")}
<a href="/album{$x->getPrettyId()}"> <a href="/album{$x->getPrettyId()}">
<img src="{$preview}" alt="{$x->getName()}" style="height: 130px; width: 170px; object-fit: cover" /> <img src="{$preview}" alt="{$x->getName()}" style="height: 130px; width: 170px; object-fit: cover" />

2
Web/Presenters/templates/Photos/Photo.xml
View file

@ -21,7 +21,7 @@
{block content} {block content}
<center style="margin-bottom: 8pt;"> <center style="margin-bottom: 8pt;">
<img src="{$photo->getURL()}" style="max-width: 80%; max-height: 60vh;" /> <img src="{$photo->getURLBySizeId('large')}" style="max-width: 80%; max-height: 60vh;" />
</center> </center>
<hr/> <hr/>

2
Web/Presenters/templates/Search/Index.xml
View file

@ -50,7 +50,7 @@
{/block} {/block}
{block preview} {block preview}
<img src="{$x->getAvatarUrl()}" width="75" alt="{_"photo"}" /> <img src="{$x->getAvatarUrl('miniscule')}" width="75" alt="{_"photo"}" />
{/block} {/block}
{block name} {block name}

2
Web/Presenters/templates/Support/AnswerTicket.xml
View file

@ -47,7 +47,7 @@
<tr> <tr>
{if $comment->getUType() === 0} {if $comment->getUType() === 0}
<td width="54" valign="top"> <td width="54" valign="top">
<img src="{$comment->getUser()->getAvatarUrl()}" width="50" /> <img src="{$comment->getUser()->getAvatarUrl('miniscule')}" width="50" />
</td> </td>
{else} {else}
<td width="54" valign="top"> <td width="54" valign="top">

2
Web/Presenters/templates/Support/View.xml
View file

@ -60,7 +60,7 @@
<tr> <tr>
{if $comment->getUType() === 0} {if $comment->getUType() === 0}
<td width="54" valign="top"> <td width="54" valign="top">
<img src="{$comment->getUser()->getAvatarUrl()}" width="50" /> <img src="{$comment->getUser()->getAvatarUrl('miniscule')}" width="50" />
</td> </td>
{else} {else}
<td width="54" valign="top"> <td width="54" valign="top">

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

@ -85,7 +85,7 @@
{/block} {/block}
{block preview} {block preview}
<img src="{$x->getAvatarUrl()}" width="75" alt="Фотография группы" /> <img src="{$x->getAvatarUrl('miniscule')}" width="75" alt="Фотография пользователя" />
{/block} {/block}
{block name} {block name}

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

@ -48,7 +48,7 @@
{/block} {/block}
{block preview} {block preview}
<img src="{$x->getAvatarUrl()}" width="75" alt="Фотография группы" /> <img src="{$x->getAvatarUrl('miniscule')}" width="75" alt="Фотография группы" />
{/block} {/block}
{block name}{/block} {block name}{/block}

8
Web/Presenters/templates/User/View.xml
View file

@ -7,7 +7,7 @@
<!-- openGraph --> <!-- openGraph -->
<meta property="og:title" content="{$user->getCanonicalName()}" /> <meta property="og:title" content="{$user->getCanonicalName()}" />
<meta property="og:url" content="http://{$_SERVER['HTTP_HOST']}{$user->getURL()}" /> <meta property="og:url" content="http://{$_SERVER['HTTP_HOST']}{$user->getURL()}" />
<meta property="og:image" content="{$user->getAvatarUrl()}" /> <meta property="og:image" content="{$user->getAvatarUrl('normal')}" />
<meta property="og:type" content="profile" /> <meta property="og:type" content="profile" />
<meta property="og:first_name" content="{$user->getFirstName()}" /> <meta property="og:first_name" content="{$user->getFirstName()}" />
<meta property="og:last_name" content="{$user->getLastName()}" /> <meta property="og:last_name" content="{$user->getLastName()}" />
@ -62,7 +62,7 @@
<div class="left_small_block"> <div class="left_small_block">
<div> <div>
<a href="{$user->getAvatarLink()|nocheck}"> <a href="{$user->getAvatarLink()|nocheck}">
<img src="{$user->getAvatarUrl()}" <img src="{$user->getAvatarUrl('normal')}"
alt="{$user->getCanonicalName()}" alt="{$user->getCanonicalName()}"
style="width: 100%; image-rendering: -webkit-optimize-contrast;" /> style="width: 100%; image-rendering: -webkit-optimize-contrast;" />
</a> </a>
@ -190,7 +190,7 @@
<div class="cl_element" n:foreach="$user->getFriends(1) as $friend"> <div class="cl_element" n:foreach="$user->getFriends(1) as $friend">
<div class="cl_avatar"> <div class="cl_avatar">
<a href="{$friend->getURL()}"> <a href="{$friend->getURL()}">
<img class="ava" src="{$friend->getAvatarUrl()}" /> <img class="ava" src="{$friend->getAvatarUrl('miniscule')}" />
</a> </a>
</div> </div>
<a href="{$friend->getURL()}" class="cl_name"> <a href="{$friend->getURL()}" class="cl_name">
@ -218,7 +218,7 @@
{var cover = $album->getCoverPhoto()} {var cover = $album->getCoverPhoto()}
<img <img
src="{is_null($cover)?'/assets/packages/static/openvk/img/camera_200.png':$cover->getURL()}" src="{is_null($cover)?'/assets/packages/static/openvk/img/camera_200.png':$cover->getURLBySizeId('small')}"
style="max-width: 80px; max-height: 54pt;" /> style="max-width: 80px; max-height: 54pt;" />
</div> </div>
<div style="overflow: hidden; overflow-wrap: break-word;"> <div style="overflow: hidden; overflow-wrap: break-word;">

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

@ -8,7 +8,7 @@
<tr> <tr>
<td width="30" valign="top"> <td width="30" valign="top">
<a href="{$author->getURL()}"> <a href="{$author->getURL()}">
<img src="{$author->getAvatarURL()}" width="30" class="cCompactAvatars" /> <img src="{$author->getAvatarURL('miniscule')}" width="30" class="cCompactAvatars" />
</a> </a>
</td> </td>
<td width="100%" valign="top"> <td width="100%" valign="top">

2
Web/Presenters/templates/components/post/microblogpost.xml
View file

@ -9,7 +9,7 @@
<tr> <tr>
<td width="54" valign="top"> <td width="54" valign="top">
<a href="{$author->getURL()}"> <a href="{$author->getURL()}">
<img src="{$author->getAvatarURL()}" width="{ifset $compact}25{else}50{/ifset}" {ifset $compact}class="cCompactAvatars"{/ifset} /> <img src="{$author->getAvatarURL('miniscule')}" width="{ifset $compact}25{else}50{/ifset}" {ifset $compact}class="cCompactAvatars"{/ifset} />
<span n:if="!$post->isPostedOnBehalfOfGroup() && !$compact && $author->isOnline()" class="post-online">{_online}</span> <span n:if="!$post->isPostedOnBehalfOfGroup() && !$compact && $author->isOnline()" class="post-online">{_online}</span>
</a> </a>
</td> </td>

2
Web/Presenters/templates/components/post/oldpost.xml
View file

@ -5,7 +5,7 @@
<tr> <tr>
<td width="54" valign="top"> <td width="54" valign="top">
<a href="{$author->getURL()}"> <a href="{$author->getURL()}">
<img src="{$author->getAvatarURL()}" width="50" /> <img src="{$author->getAvatarURL('miniscule')}" width="50" />
<span n:if="!$post->isPostedOnBehalfOfGroup() && !($compact ?? false) && $author->isOnline()" class="post-online">{_online}</span> <span n:if="!$post->isPostedOnBehalfOfGroup() && !($compact ?? false) && $author->isOnline()" class="post-online">{_online}</span>
</a> </a>
</td> </td>