From 48ccd7ef4328e6250fb52a10b873b24076de6770 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sun, 8 Dec 2024 16:45:35 +0300
Subject: [PATCH] fix(ajax): maybe last fixes

---
 Web/Presenters/templates/Audio/List.xml      |  2 +-
 Web/Presenters/templates/Audio/Playlist.xml  |  6 +++---
 Web/Presenters/templates/Messenger/Index.xml |  2 +-
 Web/Presenters/templates/User/Friends.xml    |  2 +-
 Web/static/css/audios.css                    | 18 +++++++++++++++---
 Web/static/css/main.css                      |  2 +-
 Web/static/js/al_wall.js                     |  2 +-
 Web/static/js/router.js                      |  2 +-
 8 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/Web/Presenters/templates/Audio/List.xml b/Web/Presenters/templates/Audio/List.xml
index 8cc0a436..1483ce95 100644
--- a/Web/Presenters/templates/Audio/List.xml
+++ b/Web/Presenters/templates/Audio/List.xml
@@ -99,7 +99,7 @@
             </div>
         </div>
         
-        <div class="audiosPaddingContainer audiosSideContainer audiosPaddingContainer" n:if="$mode == 'playlists'">
+        <div class="audiosPaddingContainer audiosSideContainer audiosPaddingContainer" style="width: 72.2%;" n:if="$mode == 'playlists'">
             <div n:if="$playlistsCount <= 0" style='height: 100%;'>
                 {include "../components/content_error.xml", description => $ownerId > 0 ? ($ownerId == $thisUser->getId() ? tr("no_playlists_thisuser") : tr("no_playlists_user")) : tr("no_playlists_club")}
             </div>
diff --git a/Web/Presenters/templates/Audio/Playlist.xml b/Web/Presenters/templates/Audio/Playlist.xml
index 5a96ad6c..218a47f4 100644
--- a/Web/Presenters/templates/Audio/Playlist.xml
+++ b/Web/Presenters/templates/Audio/Playlist.xml
@@ -41,7 +41,7 @@
     </script>
     
     <div class="playlistBlock">
-        <div class="playlistCover" style="float: left;">
+        <div class="playlistCover">
             {if $cover}
             <a href="{$cover_url}" target="_blank">
                     <img onclick="OpenMiniature(event, {$cover_url}, null, {$cover->getPrettyId()}, null)" src="{$cover_url}" alt="{_playlist_cover}">
@@ -62,7 +62,7 @@
 
         <div class='playlistWrapper'>
             <div class="playlistInfo">
-                <h4 style="border-bottom:unset;">{$playlist->getName()}</h4>
+                <h4>{$playlist->getName()}</h4>
 
                 <div class="moreInfo">
                     {$playlist->getMetaDescription()|noescape}
@@ -70,7 +70,7 @@
                     <div style="margin-top: 11px;">
                         <span>{nl2br($playlist->getDescriptionHTML())|noescape}</span>
                     </div>
-                    <hr style="color: #f7f7f7;">
+                    <hr>
                 </div>
             </div>
             <div class="audiosContainer scroll_container infContainer" style="margin-top: 14px;">
diff --git a/Web/Presenters/templates/Messenger/Index.xml b/Web/Presenters/templates/Messenger/Index.xml
index b045c06f..3c4cedcc 100644
--- a/Web/Presenters/templates/Messenger/Index.xml
+++ b/Web/Presenters/templates/Messenger/Index.xml
@@ -20,7 +20,7 @@
         <div class="crp-list scroll_container">
             <div n:foreach="$corresps as $coresp"
                  class="scroll_node crp-entry"
-                 onmousedown="window.location.href = {$coresp->getURL()};" >
+                 onmousedown="window.location.assign({$coresp->getURL()});" >
                 {var $recipient = $coresp->getCorrespondents()[1]}
                 {var $lastMsg   = $coresp->getPreviewMessage()}
 
diff --git a/Web/Presenters/templates/User/Friends.xml b/Web/Presenters/templates/User/Friends.xml
index b84228c5..7c52ad90 100644
--- a/Web/Presenters/templates/User/Friends.xml
+++ b/Web/Presenters/templates/User/Friends.xml
@@ -174,7 +174,7 @@
                 <input type="submit" class="profile_link" value="{_friends_reject}" />
             </form>
         {elseif $subStatus === 3}
-            <a href="/im?sel={$x->getId()}" class="profile_link">{_send_message}</a>
+            <a href="/im?sel={$x->getId()}" class="profile_link" rel="nofollow">{_send_message}</a>
             <form action="/setSub/user" method="post" class="profile_link_form" id="_submitUserSubscriptionAction">
                 <input type="hidden" name="act" value="rem" />
                 <input type="hidden" name="id"  value="{$x->getId()}" />
diff --git a/Web/static/css/audios.css b/Web/static/css/audios.css
index 316522b2..cd49b006 100644
--- a/Web/static/css/audios.css
+++ b/Web/static/css/audios.css
@@ -593,13 +593,25 @@
 }
 
 .playlistBlock {
+    display: flex;
+    gap: 13px;
     margin-top: 14px;
 }
 
+.playlistBlock .playlistCover {
+    max-width: 135px;
+}
+
 .playlistBlock .playlistWrapper {
-    float: left;
-    padding-left: 13px;
-    width:75%
+    width: 75%
+}
+
+.playlistBlock .playlistInfo h4 {
+    border-bottom: unset;
+}
+
+.playlistBlock .playlistInfo hr {
+    color: #f7f7f7;
 }
 
 .playlistCover .profile_links .profile_link {
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 574fd8ef..8f465432 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -2617,7 +2617,7 @@ a.poll-retract-vote {
     gap: 2px;
 }
 
-.vertical-attachment .vertical-attachment-content { 
+.post-buttons .vertical-attachment .vertical-attachment-content { 
     max-height: 27px;
 }
 
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 132c8e98..95aeebeb 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -2018,7 +2018,7 @@ async function repost(id, repost_type = 'post') {
                         }
                     }
     
-                    NewNotification(tr('information_-1'), tr('shared_succ'), null, () => {window.location.assign(`/wall${res.pretty_id}`)});
+                    NewNotification(tr('information_-1'), tr('shared_succ'), null, () => {window.router.route(`/wall${res.pretty_id}`)});
                 } catch(e) {
                     console.error(e)
                     fastError(e.message)
diff --git a/Web/static/js/router.js b/Web/static/js/router.js
index 3be9b7e1..d72249c5 100644
--- a/Web/static/js/router.js
+++ b/Web/static/js/router.js
@@ -240,7 +240,7 @@ u(document).on('click', 'a', async (e) => {
     let url = target.nodes[0].href
 
     if(id) {
-        if(['act_tab_a', 'ki', 'used', '_pinGroup', 'profile_link'].indexOf(id) == -1) {
+        if(['act_tab_a', 'ki', 'used', '_pinGroup', 'profile_link', 'minilink-friends', 'minilink-albums', 'minilink-messenger', 'minilink-groups', 'minilink-notifications'].indexOf(id) == -1) {
             console.log('AJAX | Skipping cuz maybe its function call link.')
             return
         }