From 2fa36e123dd9358e8afff905ef2c600122397e3a Mon Sep 17 00:00:00 2001
From: veselcraft <veselcraft@icloud.com>
Date: Sat, 27 Aug 2022 01:18:51 +0300
Subject: [PATCH] Notification: Redesign it little bit

Also halffully closes #657
---
 .../templates/Notification/Feed.xml           | 60 ++++++++++++-------
 .../components/notifications/0/_14_18_.xml    |  5 +-
 .../components/notifications/1/_14_18_.xml    |  5 +-
 .../components/notifications/2/@default.xml   |  5 +-
 .../components/notifications/3/_14_18_.xml    |  5 +-
 .../components/notifications/5/_5_18_.xml     |  5 +-
 .../components/notifications/9601/_20_18_.xml |  5 +-
 .../components/notifications/9602/_18_18_.xml |  3 +
 .../components/notifications/9603/_18_18_.xml |  3 +
 9 files changed, 69 insertions(+), 27 deletions(-)

diff --git a/Web/Presenters/templates/Notification/Feed.xml b/Web/Presenters/templates/Notification/Feed.xml
index adcc29a8..8c54a5d7 100644
--- a/Web/Presenters/templates/Notification/Feed.xml
+++ b/Web/Presenters/templates/Notification/Feed.xml
@@ -1,4 +1,4 @@
-{extends "../@listView.xml"}
+{extends "../@layout.xml"}
 {var $sorting = false}
 
 {block title}
@@ -10,29 +10,47 @@
     {_feedback}
 {/block}
 
-{block tabs}
+{block content}
+<div n:ifcontent class="tabs">
     <div n:attr="id => ($mode === 'new' ? 'activetabs' : 'ki')" class="tab">
         <a n:attr="id => ($mode === 'new' ? 'act_tab_a' : 'ki')" href="?act=new">{_unread}</a>
     </div>
     <div n:attr="id => ($mode === 'archived' ? 'activetabs' : 'ki')" class="tab">
         <a n:attr="id => ($mode === 'archived' ? 'act_tab_a' : 'ki')" href="?act=archived">{_archive}</a>
     </div>
-{/block}
-
-{* BEGIN ELEMENTS DESCRIPTION *}
-
-{block link|strip|stripHtml}
-    javascript:void(0)
-{/block}
-
-{block preview}
-    <img src="{$x->getModel(1)->getAvatarUrl('miniscule')}" width=64 />
-{/block}
-
-{block name}
-    <span style="color: #000; font-weight: 100;"></span>
-{/block}
-
-{block description}
-    {include $x->getTemplatePath(), notification => $x}
-{/block}
+</div>
+{var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)}
+{if sizeof($data) > 0}
+    <table class="post post-divider" border="0" style="font-size: 11px;" n:foreach="$data as $dat">
+        <tbody>
+            <tr>
+                <td width="54" valign="top">
+                    <a href="/sysop">
+                        <img src="{$dat->getModel(1)->getAvatarUrl('miniscule')}" width=50 />
+                    </a>
+                </td>
+                <td width="100%" valign="top">
+                    <div class="post-content">
+                        <div class="text" style="line-height: 12pt;">
+                            {include $dat->getTemplatePath(), notification => $dat}
+                        </div>
+                    </div>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+        {include "../components/paginator.xml", conf => (object) [
+            "page"     => $page,
+            "count"    => $count,
+            "amount"   => sizeof($data),
+            "perPage"  => $perPage ?? OPENVK_DEFAULT_PER_PAGE,
+            "atBottom" => true,
+        ]}
+{else}
+    {ifset customErrorMessage}
+        {include customErrorMessage}
+    {else}
+        {include "../components/nothing.xml"}
+    {/ifset}
+{/if}
+{/block}
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/notifications/0/_14_18_.xml b/Web/Presenters/templates/components/notifications/0/_14_18_.xml
index 119434e8..50f99ad7 100644
--- a/Web/Presenters/templates/components/notifications/0/_14_18_.xml
+++ b/Web/Presenters/templates/components/notifications/0/_14_18_.xml
@@ -2,5 +2,8 @@
 {var $user = $notification->getModel(1)}
 
 <a href="{$user->getURL()}"><b>{$user->getCanonicalName()}</b></a>  
-{$notification->getDateTime()} {_nt_liked_yours}
+{_nt_liked_yours}
 <a href="/wall{$post->getPrettyId()}"><b>{_nt_post_nominative}</b></a> {_nt_from} {$post->getPublicationTime()}.
+<div class="nobold">
+    {$notification->getDateTime()}
+</div>
diff --git a/Web/Presenters/templates/components/notifications/1/_14_18_.xml b/Web/Presenters/templates/components/notifications/1/_14_18_.xml
index a227b4ec..0211481d 100644
--- a/Web/Presenters/templates/components/notifications/1/_14_18_.xml
+++ b/Web/Presenters/templates/components/notifications/1/_14_18_.xml
@@ -2,5 +2,8 @@
 {var $user = $notification->getModel(1)}
 
 <a href="{$user->getURL()}"><b>{$user->getCanonicalName()}</b></a>
-{$notification->getDateTime()} {_nt_shared_yours}
+{_nt_shared_yours}
 <a href="/wall{$post->getPrettyId()}"><b>{_nt_post_instrumental}</b></a> {_nt_from} {$post->getPublicationTime()}.
+<div class="nobold">
+    {$notification->getDateTime()}
+</div>
diff --git a/Web/Presenters/templates/components/notifications/2/@default.xml b/Web/Presenters/templates/components/notifications/2/@default.xml
index a18b5689..6371e99e 100644
--- a/Web/Presenters/templates/components/notifications/2/@default.xml
+++ b/Web/Presenters/templates/components/notifications/2/@default.xml
@@ -1,4 +1,7 @@
 {var $user = $notification->getModel(1)}
 
 <a href="{$user->getURL()}"><b>{$user->getCanonicalName()}</b></a>
-{$notification->getDateTime()} {_nt_commented_yours} {include under}: "{$notification->getData()}".
+{_nt_commented_yours} {include under}: "{$notification->getData()}".
+<div class="nobold">
+    {$notification->getDateTime()}
+</div>
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/notifications/3/_14_18_.xml b/Web/Presenters/templates/components/notifications/3/_14_18_.xml
index 03712fb6..53110fed 100644
--- a/Web/Presenters/templates/components/notifications/3/_14_18_.xml
+++ b/Web/Presenters/templates/components/notifications/3/_14_18_.xml
@@ -2,5 +2,8 @@
 {var $user = $notification->getModel(1)}
 
 <a href="{$user->getURL()}"><b>{$user->getCanonicalName()}</b></a>
-{$notification->getDateTime()} {_nt_written_on_your_wall}
+{_nt_written_on_your_wall}
 <a href="/wall{$post->getPrettyId()}"><b>{_nt_post_nominative}</b></a>: "{$notification->getData()}".
+<div class="nobold">
+    {$notification->getDateTime()}
+</div>
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/notifications/5/_5_18_.xml b/Web/Presenters/templates/components/notifications/5/_5_18_.xml
index c489b46d..570ff977 100644
--- a/Web/Presenters/templates/components/notifications/5/_5_18_.xml
+++ b/Web/Presenters/templates/components/notifications/5/_5_18_.xml
@@ -3,4 +3,7 @@
 
 <a href="{$user->getURL()}"><b>{$user->getCanonicalName()}</b></a>
 {_nt_made_you_admin}
-<a href="{$club->getURL()}"><b>{$club->getCanonicalName()}</b></a> {$notification->getDateTime()}.
+<a href="{$club->getURL()}"><b>{$club->getCanonicalName()}</b></a>.
+<div class="nobold">
+    {$notification->getDateTime()}
+</div>
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/notifications/9601/_20_18_.xml b/Web/Presenters/templates/components/notifications/9601/_20_18_.xml
index 26ec1825..08a80a54 100644
--- a/Web/Presenters/templates/components/notifications/9601/_20_18_.xml
+++ b/Web/Presenters/templates/components/notifications/9601/_20_18_.xml
@@ -1,4 +1,7 @@
 {var $gift   = $notification->getModel(0)}
 {var $sender = $notification->getModel(1)}
 
-<a href="{$sender->getURL()}"><b>{$sender->getCanonicalName()}</b></a> отправил вам {$notification->getDateTime()} подарок.
+<a href="{$sender->getURL()}"><b>{$sender->getCanonicalName()}</b></a> отправил вам подарок.
+<div class="nobold">
+    {$notification->getDateTime()}
+</div>
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/notifications/9602/_18_18_.xml b/Web/Presenters/templates/components/notifications/9602/_18_18_.xml
index e54d2a0a..1addeeb1 100644
--- a/Web/Presenters/templates/components/notifications/9602/_18_18_.xml
+++ b/Web/Presenters/templates/components/notifications/9602/_18_18_.xml
@@ -6,3 +6,6 @@
 {if !empty($message)}
     {_message}: "{$message}".
 {/if}
+<div class="nobold">
+    {$notification->getDateTime()}
+</div>
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/notifications/9603/_18_18_.xml b/Web/Presenters/templates/components/notifications/9603/_18_18_.xml
index d32cb442..4781f6ec 100644
--- a/Web/Presenters/templates/components/notifications/9603/_18_18_.xml
+++ b/Web/Presenters/templates/components/notifications/9603/_18_18_.xml
@@ -6,3 +6,6 @@
 {if !empty($message)}
     {_message}: "{$message}".
 {/if}
+<div class="nobold">
+    {$notification->getDateTime()}
+</div>
\ No newline at end of file