From 954b9f350dd1051eb2ae990194c3f35b62e1477e Mon Sep 17 00:00:00 2001
From: KosFurler <kosfurler@gmail.com>
Date: Tue, 25 Jan 2022 22:26:19 +0300
Subject: [PATCH] Notes: Update layout (beta)

---
 Web/Presenters/templates/Notes/View.xml | 18 ++++++++++--------
 Web/static/css/style.css                |  9 +++++++++
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Web/Presenters/templates/Notes/View.xml b/Web/Presenters/templates/Notes/View.xml
index dd1e8348..e9858c64 100644
--- a/Web/Presenters/templates/Notes/View.xml
+++ b/Web/Presenters/templates/Notes/View.xml
@@ -35,7 +35,7 @@
         }
     </style>
     
-    <article id="userContent" style="min-height: 300pt;margin: 10px;">
+    <article id="userContent" style="margin: 10px 10px 0;">
 	<div class="note_header">
      <div class="note_title">
       <div class="note_title">
@@ -46,10 +46,18 @@
       <span><a href="{$author->getURL()}">{$author->getCanonicalName()}</a></span> {$note->getPublicationTime()}
      </div>
     </div>
-	<div style="margin-left: 6px;">
+	<div style="margin-left: 6px; width: 535px;">
         {$note->getText()|noescape}
 		</div>
     </article>
+	
+	<div class="note_footer">
+     <div class="comments_count">Комментарии ({$note->getCommentsCount()})
+	 <span n:if="isset($thisUser) && $thisUser->getId() === $note->getOwner()->getId()">&nbsp;|&nbsp;
+        <a id="_noteDelete" href="/note{$note->getOwner()->getId()}_{$note->getId()}/delete">удалить</a>
+		</span>
+		</div>
+    </div>
     
     <div style="width: 100%; min-height: 100px;">
         <div style="float: left; min-height: 100px; width: 70%;">
@@ -60,11 +68,5 @@
                  model => "notes",
                  parent => $note}
         </div>
-        <div style="float: right; min-height: 100px; width: 30%;">
-            <h4>{_actions}</h4>
-            <div n:if="isset($thisUser) && $thisUser->getId() === $note->getOwner()->getId()">
-                <a id="_noteDelete" href="/note{$note->getOwner()->getId()}_{$note->getId()}/delete" class="profile_link" style="display:block;width:96%;">{_delete}</a>
-            </div>
-        </div>
     </div>
 {/block}
diff --git a/Web/static/css/style.css b/Web/static/css/style.css
index add49c26..7fe91ff0 100644
--- a/Web/static/css/style.css
+++ b/Web/static/css/style.css
@@ -1820,3 +1820,12 @@ body.scrolled .toTop:hover {
   margin: 0;
   padding: 0 0 1px 0;
 }
+.note_footer {
+  border-top: 1px solid #ddd;
+  clear: both;
+  margin-top: 10px;
+  padding: 0px 2px 0px 6px;
+}
+.comments_count {
+  padding: 5px 0px 0px 0px;
+}
\ No newline at end of file