From f67fd3f76eef98ceadb978c7e3bda874bed377cc Mon Sep 17 00:00:00 2001
From: makar0nny <99399973+makar0ny@users.noreply.github.com>
Date: Sun, 23 Apr 2023 19:09:15 +0300
Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=A1=D0=BC=D0=B5=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B0=D1=82=D0=B0=D1=80=D0=BA=D0=B8=20=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BA=20=D0=B2=20=D1=81=D1=82=D0=B0=D1=80=D0=BE=D0=BC=20=D0=B2?=
 =?UTF-8?q?=D0=BA"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4d9ba74de889e3fb5b8b2a04a5886bcaa4da3164.
---
 Web/Presenters/templates/Group/View.xml |  45 ++---------------
 Web/Presenters/templates/User/View.xml  |  49 ++-----------------
 Web/static/img/delete.png               | Bin 238 -> 0 bytes
 Web/static/img/miniature.png            | Bin 178 -> 0 bytes
 Web/static/img/upload.png               | Bin 211 -> 0 bytes
 Web/static/js/openvk.cls.js             |  62 +-----------------------
 6 files changed, 9 insertions(+), 147 deletions(-)
 delete mode 100644 Web/static/img/delete.png
 delete mode 100644 Web/static/img/miniature.png
 delete mode 100644 Web/static/img/upload.png

diff --git a/Web/Presenters/templates/Group/View.xml b/Web/Presenters/templates/Group/View.xml
index c027ec08..e09e3f5f 100644
--- a/Web/Presenters/templates/Group/View.xml
+++ b/Web/Presenters/templates/Group/View.xml
@@ -96,48 +96,9 @@
 <div class="right_small_block">
     {var $avatarPhoto = $club->getAvatarPhoto()}
     {var $avatarLink = ((is_null($avatarPhoto) ? FALSE : $avatarPhoto->isAnonymous()) ? "/photo" . ("s/" . base_convert((string) $avatarPhoto->getId(), 10, 32)) : $club->getAvatarLink())}
-    <div id="avatark" style="position:relative;width:100%;"
-        onmouseover="
-            avatarChange.style.backgroundColor = 'rgba(0, 0, 0, 0.7)';
-            avatarChange.style.opacity = '1';
-            _avatarDelete.style.backgroundColor = 'rgba(0, 0, 0, 0.7)';
-            _avatarDelete.style.opacity = '1';
-            deleteButton.style.opacity = '1';
-            "
-        onmouseleave="
-            avatarChange.style.backgroundColor = 'rgba(0, 0, 0, 0)';
-            avatarChange.style.opacity = '0';
-            _avatarDelete.style.backgroundColor = 'rgba(0, 0, 0, 0)';
-            _avatarDelete.style.opacity = '0';
-            deleteButton.style.opacity = '0';
-        ">
-        {if !is_null($thisUser) && $club->canBeModifiedBy($thisUser)}
-            {if is_null($avatarPhoto) == true}
-            <a href="/club{$club->getId()}/edit" id="_newAvatarPicture" class="newpict" style="position:absolute;margin-left:0;margin-right:0;">{_add_photo}</a>
-            {else}
-            <a id="_avatarDelete" href="/photo{$club->getAvatarPhoto()->getPrettyId()}/delete"
-                        style="position:absolute;right:0;top:0;background-color:rgba(51, 51, 51, 0); border-radius: 0px 0px 3px 3px;padding:2px;padding-left:3px;"><img id="deleteButton" src="/assets/packages/static/openvk/img/delete.png" style="opacity:0;"></a>
-                <ul id="avatarChange" style="position:absolute;width:100px;background-color:rgba(51, 51, 51, 0);list-style-type: none;font-size:11px;padding-top:10px;padding-bottom:10px;opacity:0%;">
-                        <li id="ff">
-                            <img src="/assets/packages/static/openvk/img/upload.png" style="position:absolute;left:0;margin-left:20px;"><a href="/club{$club->getId()}/edit" id="_newAvatarPicture" style="color:#B2B2B2;" onmouseover="_newAvatarPicture.style.color = '#D9D9D9';" onmouseleave="_newAvatarPicture.style.color = '#B2B2B2';"> {tr("new_photo")}</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>-->
-                </ul>
-            {/if}
-        {/if}
-        {if is_null($avatarPhoto) == false}<a href="/photo{$club->getAvatarPhoto()->getPrettyId()}"
-        {else}<a href="javascript:void(0)"
-        {/if}>
-        <img id="clubAvatar" src="{$club->getAvatarUrl('normal')}" style="width: 100%; image-rendering: -webkit-optimize-contrast;"></a>
-        <script>
-            //_newAvatarPicture.style.marginTop = clubAvatar.height-30+"px";
-            window.addEventListener("load", event => {
-                    let image = clubAvatar;
-                    avatarChange.style.marginTop = image.height-33+"px";
-                    avatarChange.style.width = image.width/1.25+"px"
-            });
-        </script>
-    </div>
+    <a href="{$avatarLink|nocheck}">
+        <img src="{$club->getAvatarUrl('normal')}" style="width: 100%; image-rendering: -webkit-optimize-contrast;" />
+    </a>
     <div n:ifset="$thisUser" id="profile_links">
         {if $club->canBeModifiedBy($thisUser)}
             <a href="/club{$club->getId()}/edit" id="profile_link">{_edit_group}</a>
diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml
index c0a78ec6..d184a54a 100644
--- a/Web/Presenters/templates/User/View.xml
+++ b/Web/Presenters/templates/User/View.xml
@@ -70,51 +70,10 @@
     
     <div class="left_small_block">
         <div style="margin-left: auto;margin-right: auto;display: table;">
-            <div
-            {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"}
-                _avatarDelete.style.backgroundColor='rgba(0, 0, 0, 0.7)';
-                deleteButton.style.opacity='100%';
-                {/if}
-                avatarChange.style.backgroundColor='rgba(0, 0, 0, 0.7)';
-                avatarChange.style.opacity='100%';
-                "
-                onmouseleave="
-                {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)';
-                deleteButton.style.opacity='0%';
-                {/if}
-                avatarChange.style.backgroundColor='rgba(0, 0, 0, 0)';
-                avatarChange.style.opacity='0%';
-                //pizdec
-                "{/if}>
-            <div n:if="!is_null($thisUser) && $user->getId() == $thisUser->getId()">
-                <div id="avatarEdit" style="position:relative;">
-                    <div n:if="is_null($user->getAvatarPhoto()) == false && $user->getAvatarPhoto()->getURL() != '$serverUrl/assets/packages/static/openvk/img/camera_200.png'">
-                        <a id="_avatarDelete" href="/photo{$user->getAvatarPhoto()->getPrettyId()}/delete"
-                            style="position:absolute;right:0;top:0;background-color:rgba(51, 51, 51, 0); border-radius: 0px 0px 3px 3px;padding:2px;padding-left:3px;">
-                    <img id="deleteButton" src="/assets/packages/static/openvk/img/delete.png" style="opacity:0;"></a>
-                    </div>
-                </div>
-                <ul id="avatarChange" style="position:absolute;width:100px;background-color:rgba(51, 51, 51, 0);list-style-type: none;font-size:11px;padding-top:10px;padding-bottom:10px;opacity:0%;">
-                        <li><img src="/assets/packages/static/openvk/img/upload.png" style="position:absolute;left:0;margin-left:20px;"><a href="/al_avatars" id="_newPicture" style="color:#B2B2B2;" onmouseover="_newPicture.style.color = '#D9D9D9';" onmouseleave="_newPicture.style.color = '#B2B2B2';"> {tr("new_photo")}</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>-->
-                </ul>
-                 
-            </div>
-                <a href="{$user->getAvatarLink()|nocheck}">
-                    <img src="{$user->getAvatarUrl('normal')}"
-                        id="avatarImage"
-                        alt="{$user->getCanonicalName()}"
-                        style="max-width:100%; image-rendering: -webkit-optimize-contrast;" />
-                <script>
-                    window.addEventListener("load", event => {
-                        let image = avatarImage;
-                        avatarChange.style.marginTop = image.height-32+"px";
-                        avatarChange.style.width = image.width/1.25+"px"
-                    });
-                 </script>
-            </div>
+            <a href="{$user->getAvatarLink()|nocheck}">
+                <img src="{$user->getAvatarUrl('normal')}"
+                     alt="{$user->getCanonicalName()}"
+                     style="width: 100%; image-rendering: -webkit-optimize-contrast;" />
             </a>
         </div>
         <div n:ifset="$thisUser" id="profile_links">
diff --git a/Web/static/img/delete.png b/Web/static/img/delete.png
deleted file mode 100644
index 352df253d247c19d4a3c0711c514e41df4b3e400..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 238
zcmeAS@N?(olHy`uVBq!ia0vp^!ayv-!3HGrL)l7z6k~CayA#8@b22Z19F}xPUq=Rp
zjs4tz5?O(K&H|6fVg?3ope}A<Muu5)B!Gg=o-U3d7XEK1U*tTXz~dr&FwtsK@U9T|
z4V495N=@4?>C3k$8<tPKwCk{Wkk>t}s8}gegX=r5XY`0Y+?K`k(zJcWM~UcFys84B
z{CAt%HfS&}aOC>zD9K}VZ4G<snG?NPO?}r49?zSdI6?42`THJM$psRDUk$`FyrcJT
huB|`tFn>-p!y#+aCr^$u{|7pU!PC{xWt~$(696uAQGfsd

diff --git a/Web/static/img/miniature.png b/Web/static/img/miniature.png
deleted file mode 100644
index 6eeb62772fda698c128cbc6c547d3bd4d27b7c0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4aTa()7Bet#3xP1>rMq>1fPyKW
zE{-7*mwP8%<ZLhyaE|w8FJy6l;pL|=_rO${h01r-UbeS~9K3ZvP{_$bNTpM~>+`+Y
z2b-k>?ixQoTFKh?WD(Qz)i<jIXS#fupEJR5fsgqj?noi|>8hE#3`>O#W<0<5vHSy@
Yn}+$XK%MJTfc7zXy85}Sb4q9e03bj;j{pDw

diff --git a/Web/static/img/upload.png b/Web/static/img/upload.png
deleted file mode 100644
index e6280bc409ed82f60e09ba741372d77cfbe9ab7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^+(693!3HF^taP6Tq!^2X+?^QKos)S9<glbW`Z_W&
zZ0zU$lgJ9>a~60+76Ua2f-qx!O8i8iV1}oQV~9rZ)t=qF4F)_exl`0aqtea^opJCy
z$(EDyu4m#87l+f6{m#{j>`Y3tHTmdvg{_%MSKy&;;9SRv3umro{$i;n%^_s6DffWQ
zTjy4`W&9h$`&QpBU-j#IgWf!Ikq>3>>^|+^c!Dd?Yh6-kPg*w6P6kg`KbLh*2~7ao
CAVvTH

diff --git a/Web/static/js/openvk.cls.js b/Web/static/js/openvk.cls.js
index 571223a0..0ecc385e 100644
--- a/Web/static/js/openvk.cls.js
+++ b/Web/static/js/openvk.cls.js
@@ -65,6 +65,7 @@ function toggleMenu(id) {
         });
     }
 }
+
 document.addEventListener("DOMContentLoaded", function() { //BEGIN
 
     u("#_photoDelete").on("click", function(e) {
@@ -87,66 +88,7 @@ document.addEventListener("DOMContentLoaded", function() { //BEGIN
         
         return e.preventDefault();
     });
-    u("#_avatarDelete").on("click", function(e) {
-        var formHtml = "<form id='tmpPhDelF' action='" + u(this).attr("href") + "' >";
-        formHtml    += "<input type='hidden' name='hash' value='" + u("meta[name=csrf]").attr("value") + "' />";
-        formHtml    += "</form>";
-        u("body").append(formHtml);
-        
-        MessageBox(tr('prevention'), tr('delete_photo'), [
-            tr('delete'),
-            tr('close')
-        ], [
-            (function() {
-                u("#tmpPhDelF").nodes[0].submit();
-            }),
-            (function() {
-                u("#tmpPhDelF").remove();
-            }),
-        ]);
-        
-        return e.preventDefault();
-    });
-    u("#_newPicture").on("click", function(e) {
-        MessageBox(tr('new_photo'), 
-        "<form id='tmpPhDelF' action='" + u(this).attr("href") + "' method='POST' enctype='multipart/form-data'>"+
-        "<div id='tmpdd' style='text-align:center'>"+tr('real_photo')+"<br><br>"+tr('formats')+"<br><br>"+"<input type='file' accept='image/*' name='blob' value='"+tr('select_file')+"'><br><br>"+tr('upload_problems')+"<br></div>"+
-        //"<p><input type='checkbox' name='makeAvatarPost'>"+tr('leave_photo')+"</p>"+
-        "<input type='hidden' name='hash' value='" + u("meta[name=csrf]").attr("value") + "' />"+
-        "</form>", [
-            tr('upload_button'),
-            tr('close')
-        ], [
-            (function() {
-                u("#tmpPhDelF").nodes[0].submit();
-            }),
-            (function() {
-                u("#tmpPhDelF").remove();
-            }),
-        ]);
-        
-        return e.preventDefault();
-    });
-    u("#_newAvatarPicture").on("click", function(e) {
-        MessageBox(tr('new_photo'), 
-        "<form id='tmpPhDelF' action='" + u(this).attr("href") + "' method='POST' enctype='multipart/form-data'>"+
-        "<div id='tmpdd' style='text-align:center'>"+tr('good_photo')+"<br><br>"+tr('formats')+"<br><br>"+"<input type='file' accept='image/*' name='ava' value='"+tr('select_file')+"'><br><br>"+tr('upload_problems')+"<br></div>"+
-        //"<p><input type='checkbox' name='makeAvatarPost' value='1'>"+tr('leave_photo')+"</p>"+
-        "<input type='hidden' name='hash' value='" + u("meta[name=csrf]").attr("value") + "' />"+
-        "</form>", [
-            tr('upload_button'),
-            tr('close')
-        ], [
-            (function() {
-                u("#tmpPhDelF").nodes[0].submit();
-            }),
-            (function() {
-                u("#tmpPhDelF").remove();
-            }),
-        ]);
-        
-        return e.preventDefault();
-    });
+
     /* @rem-pai why this func wasn't named as "#_deleteDialog"? It looks universal IMO */
 
     u("#_noteDelete").on("click", function(e) {