From 2e15de74fc580e2e5e9cbbccbe6d4e2a5ae395b3 Mon Sep 17 00:00:00 2001
From: Celestora <kitsuruko@gmail.com>
Date: Tue, 12 Oct 2021 14:16:39 +0300
Subject: [PATCH] Wall: Move input TextArea to separate file

Fixes #44
---
 Web/Presenters/templates/Wall/Feed.xml        | 17 +------
 Web/Presenters/templates/Wall/Wall.xml        | 46 +-----------------
 .../templates/components/comments.xml         |  9 +---
 .../templates/components/textArea.xml         | 44 +++++++++++++++++
 Web/Presenters/templates/components/wall.xml  | 47 +------------------
 5 files changed, 50 insertions(+), 113 deletions(-)
 create mode 100644 Web/Presenters/templates/components/textArea.xml

diff --git a/Web/Presenters/templates/Wall/Feed.xml b/Web/Presenters/templates/Wall/Feed.xml
index 4d331832..e8d65d99 100644
--- a/Web/Presenters/templates/Wall/Feed.xml
+++ b/Web/Presenters/templates/Wall/Feed.xml
@@ -18,22 +18,7 @@
         <div class="content_title_expanded" onclick="hidePanel(this);">
             {_"publish_post"}
         </div>
-        <div style="margin: 0 5px;"><br>
-            <form action="/wall{$thisUser->getId()}/makePost" method="POST" enctype="multipart/form-data" style="margin:0;">
-                <textarea id="wall-post-input" name="text" style="width: 100%;resize: none;"></textarea>
-                <input type="file" name="_pic_attachment" accept="image/*" style="display:none;" />
-                <input type="hidden" name="type" value="1" />
-                <input type="hidden" name="hash" value="{$csrfToken}" />
-                <div></div>
-                <br/>
-                <input type="submit" value="{_'write'}" class="button" />
-                <div style="float: right;">
-                    <a href="javascript:void(document.querySelector(`input[name=_pic_attachment]`).click());">
-                        {_"attach_photo"}
-                    </a>
-                </div>
-            </form>
-        </div>
+        {include "../components/textArea.xml", route => "/wall" . $thisUser->getId() . "/makePost"}
     </div>
     <br/>
     
diff --git a/Web/Presenters/templates/Wall/Wall.xml b/Web/Presenters/templates/Wall/Wall.xml
index 03de0e44..69de494e 100644
--- a/Web/Presenters/templates/Wall/Wall.xml
+++ b/Web/Presenters/templates/Wall/Wall.xml
@@ -15,52 +15,8 @@
 {block content}
 <div class="content_divider">
     <div>
-        <!-- TODO: Move the creating post form to dedicated file -->
         <div n:if="$canPost" class="content_subtitle">
-            <div id="write" style="padding: 5px 0;" >
-                <form action="/wall{$owner}/makePost" method="post" enctype="multipart/form-data" style="margin:0;">
-                    <textarea id="wall-post-input" placeholder="{_write}" name="text" style="width: 100%;resize: none;" class="expanded-textarea"></textarea>
-                    <div>
-                        <!-- padding to fix <br/> bug -->
-                    </div>
-                    <div id="post-buttons">
-                        <div class="post-upload">
-                            Вложение: <span>(unknown)</span>
-                        </div>
-                        <div class="post-opts">
-                            {if !is_null($thisUser) && $owner < 0 && $club->canBeModifiedBy($thisUser)}
-                                <script>
-                                    function onWallAsGroupClick(el) {
-                                        _display = el.checked ? "block" : "none";
-                                        document.querySelector("#forceSignOpt").style.display = _display;
-                                    }
-                                </script>
-                                
-                                <label>
-                                    <input type="checkbox" name="as_group" onchange="onWallAsGroupClick(this)" /> От имени сообщества
-                                </label>
-                                <label id="forceSignOpt" style="display: none;">
-                                    <input type="checkbox" name="force_sign" /> Подпись автора
-                                </label>
-                            {/if}
-                            
-                            <label>
-                                <input type="checkbox" name="nsfw" /> Содержит NSFW-контент
-                            </label>
-                        </div>
-                        <input type="file" name="_pic_attachment" accept="image/*" style="display:none;" />
-                        <input type="hidden" name="type" value="1" />
-                        <input type="hidden" name="hash" value="{$csrfToken}" />
-                        <br/>
-                        <input type="submit" value="{_'write'}" class="button" />
-                        <div style="float: right;">
-                            <a href="javascript:void(document.querySelector(`input[name=_pic_attachment]`).click());">
-                                {_attach_photo}
-                            </a>
-                        </div>
-                    </div>
-                </form>
-            </div>
+            {include "../components/textArea.xml", route => "/wall$owner/makePost"}
         </div>
         
         <div class="content">
diff --git a/Web/Presenters/templates/components/comments.xml b/Web/Presenters/templates/components/comments.xml
index 08a6408c..961ba376 100644
--- a/Web/Presenters/templates/components/comments.xml
+++ b/Web/Presenters/templates/components/comments.xml
@@ -1,13 +1,8 @@
 <h4>{_"comments"} ({$count})</h4>
 
 <div n:ifset="$thisUser">
-    <form action="/al_comments.pl/create/{$model}/{$parent->getId()}" method="POST" style="margin-top: 2pt;">
-        <textarea name="text" style="width: 411px; margin: 0px; height: 53px; resize: none;"></textarea>
-        <br/>
-        <input type="hidden" value="{$csrfToken}" name="hash" />
-        <br/>
-        <input type="submit" value="{_'write'}" class="button" style="bottom-right: 50px;" />
-     </form>
+    {var commentsURL = "/al_comments.pl/create/$model/" . $parent->getId()}
+    {include "textArea.xml", route => $commentsURL, postOpts => false}
 </div>
 
 {if sizeof($comments) > 0}
diff --git a/Web/Presenters/templates/components/textArea.xml b/Web/Presenters/templates/components/textArea.xml
new file mode 100644
index 00000000..5cfce31d
--- /dev/null
+++ b/Web/Presenters/templates/components/textArea.xml
@@ -0,0 +1,44 @@
+<div id="write" style="padding: 5px 0;" onfocusin="expand_wall_textarea();">
+    <form action="{$route}" method="post" enctype="multipart/form-data" style="margin:0;">
+        <textarea id="wall-post-input" placeholder="{_write}" name="text" style="width: 100%;resize: none;" class="small-textarea"></textarea>
+        <div>
+            <!-- padding to fix <br/> bug -->
+        </div>
+        <div id="post-buttons" style="display: none;">
+            <div class="post-upload">
+                Вложение: <span>(unknown)</span>
+            </div>
+            <div n:if="$postOpts ?? true" class="post-opts">
+                {if !is_null($thisUser) && !is_null($club) && $owner < 0 && $club->canBeModifiedBy($thisUser)}
+                    <script>
+                        function onWallAsGroupClick(el) {
+                            _display = el.checked ? "block" : "none";
+                            document.querySelector("#forceSignOpt").style.display = _display;
+                        }
+                    </script>
+                    
+                    <label>
+                        <input type="checkbox" name="as_group" onchange="onWallAsGroupClick(this)" /> {_"post_as_group"}
+                    </label>
+                    <label id="forceSignOpt" style="display: none;">
+                        <input type="checkbox" name="force_sign" /> {_"add_signature"}
+                    </label>
+                {/if}
+                
+                <label>
+                    <input type="checkbox" name="nsfw" /> {_"contains_nsfw"}
+                </label>
+            </div>
+            <input type="file" name="_pic_attachment" accept="image/*" style="display:none;" />
+            <input type="hidden" name="type" value="1" />
+            <input type="hidden" name="hash" value="{$csrfToken}" />
+            <br/>
+            <input type="submit" value="{_'write'}" class="button" />
+            <div style="float: right;">
+                <a href="javascript:void(document.querySelector('input[name=_pic_attachment]').click());">
+                    {_attach_photo}
+                </a>
+            </div>
+        </div>
+    </form>
+</div>
diff --git a/Web/Presenters/templates/components/wall.xml b/Web/Presenters/templates/components/wall.xml
index db3669a7..b9eda187 100644
--- a/Web/Presenters/templates/components/wall.xml
+++ b/Web/Presenters/templates/components/wall.xml
@@ -8,50 +8,7 @@
     </div>
     <div>
         <div n:if="$canPost" class="content_subtitle">
-            <div id="write" style="padding: 5px 0;"  onfocusin="expand_wall_textarea();">
-                <form action="/wall{$owner}/makePost" method="post" enctype="multipart/form-data" style="margin:0;">
-                    <textarea id="wall-post-input" placeholder="{_write}" name="text" style="width: 100%;resize: none;" class="small-textarea"></textarea>
-                    <div>
-                        <!-- padding to fix <br/> bug -->
-                    </div>
-                    <div id="post-buttons" style="display: none;">
-                        <div class="post-upload">
-                            {_"attachment"}: <span>(unknown)</span>
-                        </div>
-                        <div class="post-opts">
-                            {if !is_null($thisUser) && $owner < 0 && $club->canBeModifiedBy($thisUser)}
-                                <script>
-                                    function onWallAsGroupClick(el) {
-                                        _display = el.checked ? "block" : "none";
-                                        document.querySelector("#forceSignOpt").style.display = _display;
-                                    }
-                                </script>
-                                
-                                <label>
-                                    <input type="checkbox" name="as_group" onchange="onWallAsGroupClick(this)" /> {_"post_as_group"}
-                                </label>
-                                <label id="forceSignOpt" style="display: none;">
-                                    <input type="checkbox" name="force_sign" /> {_"add_signature"}
-                                </label>
-                            {/if}
-                            
-                            <label>
-                                <input type="checkbox" name="nsfw" /> {_"contains_nsfw"}
-                            </label>
-                        </div>
-                        <input type="file" name="_pic_attachment" accept="image/*" style="display:none;" />
-                        <input type="hidden" name="type" value="1" />
-                        <input type="hidden" name="hash" value="{$csrfToken}" />
-                        <br/>
-                        <input type="submit" value="{_'write'}" class="button" />
-                        <div style="float: right;">
-                            <a href="javascript:void(document.querySelector(`input[name=_pic_attachment]`).click());">
-                                {_attach_photo}
-                            </a>
-                        </div>
-                    </div>
-                </form>
-            </div>
+            {include "../components/textArea.xml", route => "/wall$owner/makePost"}
         </div>
         
         <div class="content">
@@ -67,4 +24,4 @@
             {/if}
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>