make creating avatar ✨better✨

Web/Presenters/templates/Group/View.xml

@@ -129,11 +129,13 @@
     {var $avatarLink = ((is_null($avatarPhoto) ? FALSE : $avatarPhoto->isAnonymous()) ? "/photo" . ("s/" . base_convert((string) $avatarPhoto->getId(), 10, 32)) : $club->getAvatarLink())}
     <div class="avatar_block" style="position:relative;" data-club="{$club->getId()}">
         {if $thisUser && $club->canBeModifiedBy($thisUser)}
-            <a {if $avatarPhoto}style="display:none"{/if} class="add_image_text" id="add_image">{_add_image}</a>
+			<div class="avatar_controls">
-            <div {if !$avatarPhoto}style="display:none"{/if} class="avatar_controls">
+				<div {if !$hasAvatar}style="display:none"{/if} class="avatarDelete hoverable"></div>
-                <div class="avatarDelete hoverable"></div>
 				<div class="avatar_variants">
-                    <a class="_add_image hoverable" id="add_image"><span>{_upload_new_picture}</span></a>
+					<a {if $hasAvatar}style="display:none"{/if} class="_add_image hoverable upload_image" id="add_image">
+					<span>{_add_image}</span></a>
+					<a {if !$hasAvatar}style="display:none"{/if} class="_add_image hoverable set_image" id="add_image">
+					<span>{_upload_new_picture}</span></a>
 				</div>
 			</div>
         {/if}

Web/Presenters/templates/User/View.xml

@@ -73,11 +73,13 @@
             {var $hasAvatar = !str_contains($user->getAvatarUrl('miniscule'), "/assets/packages/static/openvk/img/camera_200.png")}
             
             {if $thisUser && $user->getId() == $thisUser->getId()}
-                <a {if $hasAvatar}style="display:none"{/if} class="add_image_text" id="add_image">{_add_image}</a>
+                <div class="avatar_controls">
-                <div {if !$hasAvatar}style="display:none"{/if} class="avatar_controls">
+                    <div {if !$hasAvatar}style="display:none"{/if} class="avatarDelete hoverable"></div>
-                    <div class="avatarDelete hoverable"></div>
                     <div class="avatar_variants">
-                        <a class="_add_image hoverable" id="add_image"><span>{_upload_new_picture}</span></a>
+                        <a {if $hasAvatar}style="display:none"{/if} class="_add_image hoverable upload_image" id="add_image">
+						<span>{_add_image}</span></a>
+                        <a {if !$hasAvatar}style="display:none"{/if} class="_add_image hoverable set_image" id="add_image">
+						<span>{_upload_new_picture}</span></a>
                     </div>
                 </div>
             {/if}

Web/static/js/al_wall.js

@@ -2180,8 +2180,10 @@ $(document).on("click", "#add_image", (e) => {
                         document.querySelector("#bigAvatar").src = response.url
                         document.querySelector("#bigAvatar").parentNode.href = "/photo" + response.new_photo
 						
-                        document.querySelector(".add_image_text").style.display = "none"
                         document.querySelector(".avatar_controls").style.display = "block"
+                        document.querySelector(".avatar_controls .set_image").style.display = "block"
+						document.querySelector(".avatar_controls .avatarDelete").style.display = "block"
+                        document.querySelector(".avatar_controls .upload_image").style.display = "none"
                     }
                 })
             })
@@ -2314,8 +2316,9 @@ $(document).on("click", ".avatarDelete", (e) => {
                     document.querySelector("#bigAvatar").parentNode.href = response.new_photo ? ("/photo" + response.new_photo) : "javascript:void(0)"
                     
                     if(!response.has_new_photo) {
-                        document.querySelector(".avatar_controls").style.display = "none"
+                        document.querySelector(".avatar_controls .set_image").style.display = "none"
-                        document.querySelector(".add_image_text").style.display = "block"
+						document.querySelector(".avatar_controls .avatarDelete").style.display = "none"
+                        document.querySelector(".avatar_controls .upload_image").style.display = "block"
                     }
                 }
             })

locales/kk.strings

@@ -45,8 +45,8 @@
 "register_meta_desc" = "$1 желісіне тіркеліңіз!";
 "register_referer_meta_title" = "$1 сізді $2 желіне шақырады!";
 "register_referer_meta_desc" = "$1 және одан көп пайдаланушылармен $2 желісінде қосылыңыз!";
-"registration_welcome_1" = "is a universal colleague search tool based on the VKontakte structure. дегеніміз — VK құрылымына негізделген әмбебап әріптестерді іздеу құралы";
+"registration_welcome_1" = "дегеніміз — VK құрылымына негізделген әмбебап әріптестерді іздеу құралы";
-"registration_welcome_2" = "Достар, сыныптастар, көршілер мен әріптестер үнемі байланыста болғанын қалаймыз.";
+"registration_welcome_2" = "Біз достар, сыныптастар, көршілер мен әріптестер үнемі байланыста болғанын қалаймыз.";
 "users" = "Пайдаланушылар";
 "other_fields" = "Қалғаны";