From 511afc464cb9d2825e25a4850f3d0d741b5c874b Mon Sep 17 00:00:00 2001
From: veselcraft <veselcraft@icloud.com>
Date: Wed, 22 Dec 2021 16:26:49 +0300
Subject: [PATCH] ListView: Add a actions block to the element of the list

---
 Web/Presenters/templates/@listView.xml       |  3 +
 Web/Presenters/templates/Group/Followers.xml | 84 ++++++++++----------
 Web/Presenters/templates/User/Friends.xml    | 34 ++++++++
 Web/Presenters/templates/User/Groups.xml     | 23 ++++--
 Web/static/css/style.css                     |  4 +
 5 files changed, 96 insertions(+), 52 deletions(-)

diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml
index 58d51dff..35c9a2f0 100644
--- a/Web/Presenters/templates/@listView.xml
+++ b/Web/Presenters/templates/@listView.xml
@@ -29,6 +29,9 @@
                                     
                                     {include description, x => $dat}
                                 </td>
+                                <td n:ifset="actions" valign="top" class="action_links" style="width: 150px">
+                                    {include actions, x => $dat}
+                                </td>
                             </tr>
                         </tbody>
                     </table>
diff --git a/Web/Presenters/templates/Group/Followers.xml b/Web/Presenters/templates/Group/Followers.xml
index e6409ac4..61daeae6 100644
--- a/Web/Presenters/templates/Group/Followers.xml
+++ b/Web/Presenters/templates/Group/Followers.xml
@@ -14,10 +14,6 @@
     <a n:if="$onlyShowManagers" href="/club{$club->getId()}/followers" style="float: right;">{_only_administrators}</a>
 {/block}
 
-{block actions}
-    
-{/block}
-
 {* BEGIN ELEMENTS DESCRIPTION *}
 
 {block tabs}
@@ -81,50 +77,13 @@
                     {/if}
                 </td>
             </tr>
-            <tr n:if="$club->canBeModifiedBy($thisUser ?? NULL)">
-                <td width="120" valign="top"><span class="nobold">{_actions}: </span></td>
-                <td>
-                    <a href="/club{$club->getId()}/setAdmin.jsp?user={$user->getId()}&hash={rawurlencode($csrfToken)}" n:if="$club->getOwner()->getId() !== $user->getId()">
-                        {if $manager}
-                            {_devote}
-                        {else}
-                            {_promote_to_admin}
-                        {/if}
-                    </a>
-                    {if $club->getOwner()->getId() != $user->getId() && $manager && $thisUser->getId() == $club->getOwner()->getId()}
-                        |
-                        <a href="javascript:changeOwner({$club->getId()}, {$user->getId()})">
-                            {_promote_to_owner}
-                        </a>
-                    {/if}
-                    {if $manager}
-                         | 
-                        <a href="javascript:setClubAdminComment('{$club->getId()}', '{$manager->getUserId()}', '{rawurlencode($csrfToken)}')">
-                            {_set_comment}
-                        </a>
-                    {/if}
-                    <a n:if="$club->getOwner()->getId() === $user->getId()" href="javascript:setClubAdminComment('{$club->getId()}', '{$club->getOwner()->getId()}', '{rawurlencode($csrfToken)}')">
-                        {_set_comment}
-                    </a>
-                    {if $manager}
-                         | 
-                        <a href="/club{$club->getId()}/setAdmin.jsp?user={$user->getId()}&hidden={(int) !$manager->isHidden()}&hash={rawurlencode($csrfToken)}">
-                            {if $manager->isHidden()}{_hidden_yes}{else}{_hidden_no}{/if}
-                        </a>
-                    {/if}
-                    {if $club->getOwner()->getId() == $user->getId()}
-                         | 
-                        <a href="/club{$club->getId()}/setAdmin.jsp?user={$user->getId()}&hidden={(int) !$club->isOwnerHidden()}&hash={rawurlencode($csrfToken)}">
-                            {if $club->isOwnerHidden()}{_hidden_yes}{else}{_hidden_no}{/if}
-                        </a>
-                    {/if}
-                </td>
-            </tr>
+            
         </tbody>
     </table>
 
     <script n:if="$club->getOwner()->getId() != $user->getId() && $manager && $thisUser->getId() == $club->getOwner()->getId()">
-        console.log("gayshit")
+        console.log("gayshit");
+        console.log("сам такой");
         function changeOwner(club, newOwner) {
             const action = "/groups/" + club + "/setNewOwner/" + newOwner;
 
@@ -145,3 +104,40 @@
         }
     </script>
 {/block}
+
+{block actions}
+    {var user    = $x instanceof $Manager ? $x->getUser() : $x}
+    {var manager = $x instanceof $Manager ? $x : $club->getManager($user, !$club->canBeModifiedBy($thisUser))}
+    {if $club->canBeModifiedBy($thisUser ?? NULL)}
+        <a class="profile_link" href="/club{$club->getId()}/setAdmin.jsp?user={$user->getId()}&hash={rawurlencode($csrfToken)}" n:if="$club->getOwner()->getId() !== $user->getId()">
+            {if $manager}
+                {_devote}
+            {else}
+                {_promote_to_admin}
+            {/if}
+        </a>
+        {if $club->getOwner()->getId() != $user->getId() && $manager && $thisUser->getId() == $club->getOwner()->getId()}
+            <a class="profile_link" href="javascript:changeOwner({$club->getId()}, {$user->getId()})">
+                {_promote_to_owner}
+            </a>
+        {/if}
+        {if $manager}
+            <a class="profile_link" href="javascript:setClubAdminComment('{$club->getId()}', '{$manager->getUserId()}', '{rawurlencode($csrfToken)}')">
+                {_set_comment}
+            </a>
+        {/if}
+        <a class="profile_link" n:if="$club->getOwner()->getId() === $user->getId()" href="javascript:setClubAdminComment('{$club->getId()}', '{$club->getOwner()->getId()}', '{rawurlencode($csrfToken)}')">
+            {_set_comment}
+        </a>
+        {if $manager}
+            <a class="profile_link" href="/club{$club->getId()}/setAdmin.jsp?user={$user->getId()}&hidden={(int) !$manager->isHidden()}&hash={rawurlencode($csrfToken)}">
+                {if $manager->isHidden()}{_hidden_yes}{else}{_hidden_no}{/if}
+            </a>
+        {/if}
+        {if $club->getOwner()->getId() == $user->getId()}
+            <a class="profile_link" href="/club{$club->getId()}/setAdmin.jsp?user={$user->getId()}&hidden={(int) !$club->isOwnerHidden()}&hash={rawurlencode($csrfToken)}">
+                {if $club->isOwnerHidden()}{_hidden_yes}{else}{_hidden_no}{/if}
+            </a>
+        {/if}
+    {/if}
+{/block}
\ No newline at end of file
diff --git a/Web/Presenters/templates/User/Friends.xml b/Web/Presenters/templates/User/Friends.xml
index 117ce1a0..e6c9f50c 100644
--- a/Web/Presenters/templates/User/Friends.xml
+++ b/Web/Presenters/templates/User/Friends.xml
@@ -79,3 +79,37 @@
         </tbody>
     </table>
 {/block}
+
+{block actions}
+    {var subStatus = $x->getSubscriptionStatus($thisUser)}
+    {if $subStatus === 0}
+        <form action="/setSub/user" method="post" class="profile_link_form">
+            <input type="hidden" name="act" value="add" />
+            <input type="hidden" name="id"  value="{$x->getId()}" />
+            <input type="hidden" name="hash" value="{$csrfToken}" />
+            <input type="submit" class="profile_link" value="{_"friends_add"}" />
+        </form>
+    {elseif $subStatus === 1}
+        <form action="/setSub/user" method="post" class="profile_link_form">
+            <input type="hidden" name="act" value="add" />
+            <input type="hidden" name="id"  value="{$x->getId()}" />
+            <input type="hidden" name="hash" value="{$csrfToken}" />
+            <input type="submit" class="profile_link" value="{_"friends_accept"}" />
+        </form>
+    {elseif $subStatus === 2}
+        <form action="/setSub/user" method="post" class="profile_link_form">
+            <input type="hidden" name="act" value="rem" />
+            <input type="hidden" name="id"  value="{$x->getId()}" />
+            <input type="hidden" name="hash" value="{$csrfToken}" />
+            <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>
+        <form action="/setSub/user" method="post" class="profile_link_form">
+            <input type="hidden" name="act" value="rem" />
+            <input type="hidden" name="id"  value="{$x->getId()}" />
+            <input type="hidden" name="hash" value="{$csrfToken}" />
+            <input type="submit" class="profile_link" value="{_"friends_delete"}" />
+        </form>
+    {/if}
+{/block}
diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml
index e740694d..b2268b6a 100644
--- a/Web/Presenters/templates/User/Groups.xml
+++ b/Web/Presenters/templates/User/Groups.xml
@@ -50,22 +50,29 @@
 {block description}
     {$x->getDescription()}
     {if $x->canBeModifiedBy($thisUser ?? NULL)}
-        {var clubPinned = $thisUser->isClubPinned($x)}
+        
         <table n:if="$clubPinned || $thisUser->getPinnedClubCount() <= 10">
             <tbody>
                 <tr>
                     <td width="120" valign="top"><span class="nobold">{_actions}: </span></td>
                     <td>
-                        <a href="/groups_pin?club={$x->getId()}&hash={rawurlencode($csrfToken)}" id="_pinGroup" data-group-name="{$x->getName()}" data-group-url="{$x->getUrl()}">
-                            {if $clubPinned}
-                                {_remove_from_left_menu}
-                            {else}
-                                {_add_to_left_menu}
-                            {/if}
-                        </a>
+                        
                     </td>
                 </tr>
             </tbody>
         </table>
     {/if}
 {/block}
+
+{var clubPinned = $thisUser->isClubPinned($x)}
+{if $clubPinned || $thisUser->getPinnedClubCount() <= 10}
+    {block actions}
+        <a class="profile_link" href="/groups_pin?club={$x->getId()}&hash={rawurlencode($csrfToken)}" id="_pinGroup" data-group-name="{$x->getName()}" data-group-url="{$x->getUrl()}">
+            {if $clubPinned}
+                {_remove_from_left_menu}
+            {else}
+                {_add_to_left_menu}
+            {/if}
+        </a>
+    {/block}
+{/if}
\ No newline at end of file
diff --git a/Web/static/css/style.css b/Web/static/css/style.css
index 489f7b8d..f5abe0c6 100644
--- a/Web/static/css/style.css
+++ b/Web/static/css/style.css
@@ -330,6 +330,10 @@ a {
     background: #ECECEC;
 }
 
+.action_links > .profile_link, .action_links > .profile_link_form > .profile_link {
+    width: 150px;
+}
+
 .page_footer {
     margin-left: 95px;
     padding-top: 5px;