Merge branch 'master' into avatarxd2

This commit is contained in:
Dmitry Tretyakov 2023-04-25 13:45:27 +07:00 committed by GitHub
commit 71dcd2930b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -70,7 +70,7 @@
<div class="left_small_block"> <div class="left_small_block">
<div style="margin-left: auto;margin-right: auto;display: table;"> <div style="margin-left: auto;margin-right: auto;display: table;">
<div <div id="avatarAll"
{if !is_null($thisUser) && $user->getId() == $thisUser->getId()} onmouseover=" {if !is_null($thisUser) && $user->getId() == $thisUser->getId()} onmouseover="
{if is_null($user->getAvatarPhoto()) == false && $user->getAvatarPhoto()->getURL() != "$serverUrl/assets/packages/static/openvk/img/camera_200.png"} {if is_null($user->getAvatarPhoto()) == false && $user->getAvatarPhoto()->getURL() != "$serverUrl/assets/packages/static/openvk/img/camera_200.png"}
_avatarDelete.style.backgroundColor='rgba(0, 0, 0, 0.7)'; _avatarDelete.style.backgroundColor='rgba(0, 0, 0, 0.7)';
@ -97,7 +97,7 @@
</div> </div>
<ul id="avatarChange"> <ul id="avatarChange">
<li><img src="/assets/packages/static/openvk/img/upload.png" id="uploadIcon"> <li><img src="/assets/packages/static/openvk/img/upload.png" id="uploadIcon">
<a href="/al_avatars" id="_newPicture" onmouseover="_newPicture.style.color = '#D9D9D9';" onmouseleave="_newPicture.style.color = '#B2B2B2';"> {tr("new_photo")}</a> <a href="/al_avatars" id="_newPicture"> {tr("new_photo")}</a>
</li> </li>
<!--<li><img src="/assets/packages/static/openvk/img/miniature.png"><a href="javascript:alert('')" id="_changeMiniature" style="color:#B2B2B2;" onmouseover="_changeMiniature.style.color = '#D9D9D9';" onmouseleave="_changeMiniature.style.color = '#B2B2B2';">{tr("change_miniature")}</a></li>--> <!--<li><img src="/assets/packages/static/openvk/img/miniature.png"><a href="javascript:alert('')" id="_changeMiniature" style="color:#B2B2B2;" onmouseover="_changeMiniature.style.color = '#D9D9D9';" onmouseleave="_changeMiniature.style.color = '#B2B2B2';">{tr("change_miniature")}</a></li>-->
<!--в опенвк не предвидится смена минатюры--> <!--в опенвк не предвидится смена минатюры-->