From 79e9a7673d41a813bd975186794bf5ee8155f3e9 Mon Sep 17 00:00:00 2001
From: lalka2018 <99399973+lalka2016@users.noreply.github.com>
Date: Sun, 23 Apr 2023 20:55:24 +0300
Subject: [PATCH 1/5] some changes for upload picture text

---
 Web/static/css/avataredit.css | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Web/static/css/avataredit.css b/Web/static/css/avataredit.css
index 9f9c6a52..189d0938 100644
--- a/Web/static/css/avataredit.css
+++ b/Web/static/css/avataredit.css
@@ -41,8 +41,13 @@
 .newpict
 {
     position:absolute;
-    margin-left:0;
-    margin-right:0;
+    text-align:center;
+    left:20%;
+    top:75%;
+}
+.newpict:hover
+{
+    color:#5680a0;
 }
 #groupAvatarChange
 {
@@ -60,4 +65,4 @@
     position:absolute;
     left:0;
     margin-left:20px;
-}
\ No newline at end of file
+}

From d6089afabdea4e89ebc8eb488c6c194701f62277 Mon Sep 17 00:00:00 2001
From: lalka2018 <99399973+lalka2016@users.noreply.github.com>
Date: Mon, 24 Apr 2023 21:51:05 +0300
Subject: [PATCH 2/5] now these things have animation

I stole css from vepurovk and now these things have animation
---
 Web/static/css/avataredit.css | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/Web/static/css/avataredit.css b/Web/static/css/avataredit.css
index 189d0938..fb7397cd 100644
--- a/Web/static/css/avataredit.css
+++ b/Web/static/css/avataredit.css
@@ -3,6 +3,25 @@
 {
     position: relative;
 }
+#avatarAll {
+    overflow: hidden;
+    position: relative;
+}
+#avatarChange, #_avatarDelete, #groupAvatarChange {
+    -webkit-transition: all 200ms ease-in-out;
+    -moz-transition: all 200ms ease-in-out;
+    -o-transition: all 200ms ease-in-out;
+    transition: all 200ms ease-in-out;
+}
+#avatarChange {
+    bottom: -32px !important;
+    visibility: hidden;
+}
+div#avatarAll:hover #avatarChange {
+    opacity: 1 !important;
+    bottom: -8px !important;
+    visibility: visible;
+}
 #_avatarDelete 
 {
     position:absolute;
@@ -26,18 +45,23 @@
     font-size:11px;
     padding-top:10px;
     padding-bottom:10px;
+	padding-right: 10px;
     opacity:0%;
 }
 #uploadIcon
 {
     position:absolute;
     left:0;
-    margin-left:20px;
+    margin-left:13px;
 }
 #_newPicture
 {
     color:#B2B2B2;
 }
+#_newPicture:hover
+{
+    color: #D9D9D9;
+}
 .newpict
 {
     position:absolute;
@@ -58,11 +82,16 @@
     font-size:11px;
     padding-top:10px;
     padding-bottom:10px;
+	padding-right: 10px;
     opacity:0%;
 }
 #_newAvatarPicture2
 {
     position:absolute;
     left:0;
-    margin-left:20px;
+    margin-left:13px;
+}
+#_newAvatarPicture:hover
+{
+    color:#D9D9D9;
 }

From 24e5dc2be5b08c3000e23ab69bf217ad027ad1a5 Mon Sep 17 00:00:00 2001
From: lalka2018 <99399973+lalka2016@users.noreply.github.com>
Date: Tue, 25 Apr 2023 08:47:31 +0300
Subject: [PATCH 3/5] =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8C=D1=88=D0=B5=20=D0=B0=D0=BD=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/static/css/avataredit.css | 37 ++++++++++++-----------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/Web/static/css/avataredit.css b/Web/static/css/avataredit.css
index fb7397cd..df10bebc 100644
--- a/Web/static/css/avataredit.css
+++ b/Web/static/css/avataredit.css
@@ -1,27 +1,8 @@
-/*avatar controls idk*/
+/*avatar controls*/
 #avatarEdit
 {
     position: relative;
 }
-#avatarAll {
-    overflow: hidden;
-    position: relative;
-}
-#avatarChange, #_avatarDelete, #groupAvatarChange {
-    -webkit-transition: all 200ms ease-in-out;
-    -moz-transition: all 200ms ease-in-out;
-    -o-transition: all 200ms ease-in-out;
-    transition: all 200ms ease-in-out;
-}
-#avatarChange {
-    bottom: -32px !important;
-    visibility: hidden;
-}
-div#avatarAll:hover #avatarChange {
-    opacity: 1 !important;
-    bottom: -8px !important;
-    visibility: visible;
-}
 #_avatarDelete 
 {
     position:absolute;
@@ -36,6 +17,12 @@ div#avatarAll:hover #avatarChange {
 {
     opacity:0;
 }
+#avatarChange, #_avatarDelete, #groupAvatarChange {
+    -webkit-transition: all 200ms ease-in-out;
+    -moz-transition: all 200ms ease-in-out;
+    -o-transition: all 200ms ease-in-out;
+    transition: all 200ms ease-in-out;
+}
 #avatarChange
 {
     position:absolute;
@@ -45,14 +32,17 @@ div#avatarAll:hover #avatarChange {
     font-size:11px;
     padding-top:10px;
     padding-bottom:10px;
-	padding-right: 10px;
     opacity:0%;
 }
+div#avatarAll:hover #avatarChange {
+    opacity: 1 !important;
+    visibility: visible;
+}
 #uploadIcon
 {
     position:absolute;
     left:0;
-    margin-left:13px;
+    margin-left:20px;
 }
 #_newPicture
 {
@@ -82,14 +72,13 @@ div#avatarAll:hover #avatarChange {
     font-size:11px;
     padding-top:10px;
     padding-bottom:10px;
-	padding-right: 10px;
     opacity:0%;
 }
 #_newAvatarPicture2
 {
     position:absolute;
     left:0;
-    margin-left:13px;
+    margin-left:20px;
 }
 #_newAvatarPicture:hover
 {

From 23c6e121c384ff35c82f393c77fde61e0946cee8 Mon Sep 17 00:00:00 2001
From: Dmitry Tretyakov <76806170+tretdm@users.noreply.github.com>
Date: Tue, 25 Apr 2023 13:12:31 +0700
Subject: [PATCH 4/5] Update openvk.cls.js

---
 Web/static/js/openvk.cls.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Web/static/js/openvk.cls.js b/Web/static/js/openvk.cls.js
index 571223a0..ea3e797f 100644
--- a/Web/static/js/openvk.cls.js
+++ b/Web/static/js/openvk.cls.js
@@ -108,9 +108,13 @@ document.addEventListener("DOMContentLoaded", function() { //BEGIN
         return e.preventDefault();
     });
     u("#_newPicture").on("click", function(e) {
-        MessageBox(tr('new_photo'), 
+        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>"+
+        "<div id='tmpdd' style='text-align:center'>"+tr('formats')+"<br><br>"+
+        "<label class=\"button\" style=\"\">"+tr('browse')+
+        "<input type=\"file\" id=\"blob\" name=\"blob\" style=\"display: none;\" onchange=\"filename.innerHTML=blob.files[0].name\" /></label>"+
+        "<div id=\"filename\" style=\"margin-top: 10px;\"></div>"+
+        "<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>", [

From df3bc9f90daae9550d235c7959046c77ca643572 Mon Sep 17 00:00:00 2001
From: makar0nny <99399973+lalka2016@users.noreply.github.com>
Date: Tue, 25 Apr 2023 09:23:38 +0300
Subject: [PATCH 5/5] some updates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Теперь нету редиректа в настройки группы при смене аватарки
---
 Web/Presenters/GroupPresenter.php       |  35 +++++++++++++++++++++++-
 Web/Presenters/templates/Group/View.xml |   4 +--
 Web/routes.yml                          |   2 ++
 Web/static/css/avataredit.css           |  31 ++++++++++++++++++---
 Web/static/img/upload.png               | Bin 211 -> 257 bytes
 5 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/Web/Presenters/GroupPresenter.php b/Web/Presenters/GroupPresenter.php
index a0b83a59..2933ecda 100644
--- a/Web/Presenters/GroupPresenter.php
+++ b/Web/Presenters/GroupPresenter.php
@@ -250,7 +250,40 @@ final class GroupPresenter extends OpenVKPresenter
             $this->flash("succ", "Изменения сохранены", "Новые данные появятся в вашей группе.");
         }
     }
-    
+    function renderEditAvatar(int $id)
+    {
+        $this->assertUserLoggedIn();
+        $this->willExecuteWriteAction();
+        $club = $this->clubs->get($id);
+        if(!$club ||!$club->canBeModifiedBy($this->user->identity))
+        {
+            $this->flashFail("err", "Неизвестная ошибка", "Не удалось сохранить фотографию.");
+        }
+        if($_FILES["ava"]["error"] === UPLOAD_ERR_OK) {
+            $photo = new Photo;
+            try {
+                $anon = OPENVK_ROOT_CONF["openvk"]["preferences"]["wall"]["anonymousPosting"]["enable"];
+                if($anon && $this->user->id === $club->getOwner()->getId())
+                    $anon = $club->isOwnerHidden();  
+                else if($anon)
+                    $anon = $club->getManager($this->user->identity)->isHidden();
+
+                $photo->setOwner($this->user->id);
+                $photo->setDescription("Group image");
+                $photo->setFile($_FILES["ava"]);
+                $photo->setCreated(time());
+                $photo->setAnonymous($anon);
+                $photo->save();
+                
+                (new Albums)->getClubAvatarAlbum($club)->addPhoto($photo);
+            } catch(ISE $ex) {
+                $name = $album->getName();
+                $this->flashFail("err", "Неизвестная ошибка", "Не удалось сохранить фотографию.");
+            }
+        }
+        $this->flash("succ", "Фотография сохранена", "Новые данные появятся в вашей группе.");
+        $this->redirect("/club$id");
+    }
     function renderEditBackdrop(int $id): void
     {
         $this->assertUserLoggedIn();
diff --git a/Web/Presenters/templates/Group/View.xml b/Web/Presenters/templates/Group/View.xml
index bc10caba..219b751e 100644
--- a/Web/Presenters/templates/Group/View.xml
+++ b/Web/Presenters/templates/Group/View.xml
@@ -118,8 +118,8 @@
             <a id="_avatarDelete" href="/photo{$club->getAvatarPhoto()->getPrettyId()}/delete">
                 <img id="deleteButton" src="/assets/packages/static/openvk/img/delete.png" style="opacity:0;"></a>
                 <ul id="groupAvatarChange">
-                        <li id="ff">
-                            <img src="/assets/packages/static/openvk/img/upload.png" id="_newAvatarPicture2"><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>
+                            <img src="/assets/packages/static/openvk/img/upload.png" id="_newAvatarPicture2"><a href="/club{$club->getId()}/al_avatars" 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>
diff --git a/Web/routes.yml b/Web/routes.yml
index 0dffb7bf..5a8c4f27 100644
--- a/Web/routes.yml
+++ b/Web/routes.yml
@@ -199,6 +199,8 @@ routes:
       handler: "Group->admin"
     - url: "/club{num}/setAdmin"
       handler: "Group->modifyAdmin"
+    - url: "/club{num}/al_avatars"
+      handler: "Group->editAvatar"
     - url: "/groups{num}"
       handler: "User->groups"
     - url: "/groups_pin"
diff --git a/Web/static/css/avataredit.css b/Web/static/css/avataredit.css
index 9f9c6a52..df10bebc 100644
--- a/Web/static/css/avataredit.css
+++ b/Web/static/css/avataredit.css
@@ -1,4 +1,4 @@
-/*avatar controls idk*/
+/*avatar controls*/
 #avatarEdit
 {
     position: relative;
@@ -17,6 +17,12 @@
 {
     opacity:0;
 }
+#avatarChange, #_avatarDelete, #groupAvatarChange {
+    -webkit-transition: all 200ms ease-in-out;
+    -moz-transition: all 200ms ease-in-out;
+    -o-transition: all 200ms ease-in-out;
+    transition: all 200ms ease-in-out;
+}
 #avatarChange
 {
     position:absolute;
@@ -28,6 +34,10 @@
     padding-bottom:10px;
     opacity:0%;
 }
+div#avatarAll:hover #avatarChange {
+    opacity: 1 !important;
+    visibility: visible;
+}
 #uploadIcon
 {
     position:absolute;
@@ -38,11 +48,20 @@
 {
     color:#B2B2B2;
 }
+#_newPicture:hover
+{
+    color: #D9D9D9;
+}
 .newpict
 {
     position:absolute;
-    margin-left:0;
-    margin-right:0;
+    text-align:center;
+    left:20%;
+    top:75%;
+}
+.newpict:hover
+{
+    color:#5680a0;
 }
 #groupAvatarChange
 {
@@ -60,4 +79,8 @@
     position:absolute;
     left:0;
     margin-left:20px;
-}
\ No newline at end of file
+}
+#_newAvatarPicture:hover
+{
+    color:#D9D9D9;
+}
diff --git a/Web/static/img/upload.png b/Web/static/img/upload.png
index e6280bc409ed82f60e09ba741372d77cfbe9ab7c..033009d2ae19ea404c6c1ecf3349f82919392f2c 100644
GIT binary patch
delta 192
zcmV;x06+iJ0f7RLNq-Ok01FTSts}j40001%Nkl<ZC{tr(Km%L1Zsi413xPP^+uQpy
zSP%-Bpfnf&6@oO+2jV~w4dufDieexr1>#@`6HJ5nZ~)f{G{qT6?F3?GumA-71!8xg
zbM}HbV8uX%azN?~5Q~ENXy7#vn*cRDVgxGW0CEliu_;If2RS$m#C9MzPX=Oq3PAuQ
uKN;E0|Dj9_0CWOa9eQZs1%pB{0|Nl}?jkA&l8|!%0000<MNUMnLSTaNZ$V`M

delta 146
zcmV;D0B!$)0@DGINq-Rl01FWTe`H^g0001JNkl<ZC{xvpyA6Oa3`A{|CRJKy&JxT(
zNy!FmWbTZS_(VX<lTOZk6uDw%Jv8w~)CPkBEfC=?QJq1Np_!`#^f@LQ2of~1ZNNP3
zLxl#W53pB`tJ`;~`uBh?o;MWmcJ4m%zp=;)QA)02Rg7k901E&B07*qoM6N<$g3Dt%
ACjbBd