From 358662db9a7d7aad7a40ce478454a9f421714e74 Mon Sep 17 00:00:00 2001
From: Corban-Lee Jones <corbz.jones@gmail.com>
Date: Tue, 9 Jul 2024 23:38:38 +0100
Subject: [PATCH] cleanup sub modal

---
 apps/templates/home/includes/submodal.html | 36 +++++++++++++---------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/apps/templates/home/includes/submodal.html b/apps/templates/home/includes/submodal.html
index bb31b60..7ecf916 100644
--- a/apps/templates/home/includes/submodal.html
+++ b/apps/templates/home/includes/submodal.html
@@ -18,15 +18,6 @@
                                 <input type="text" id="subName" name="subName" class="form-control rounded-1" placeholder="My News Feed" tabindex="1">
                                 <div class="form-text">Use a unique name to refer to this subscription.</div>
                             </div>
-                            <div class="mb-4">
-                                <label for="subChannels" class="form-label">Channels</label>
-                                <select name="subChannels" id="subChannels" class="select-2" multiple data-dropdownparent="#subFormModal" tabindex="3"></select>
-                                <div class="form-text">Subscription content will be sent to these channels.</div>
-                            </div>
-                            <div class="mb-4 mb-lg-0">
-                                <label for="subExtraNotes" class="form-label">Extra Notes</label>   
-                                <textarea id="subExtraNotes" name="subExtraNotes" class="form-control rounded-1" placeholder="" tabindex="5" style="resize: none; height: 7rem"></textarea>
-                            </div>
                         </div>
                         <div class="col-lg-6 ps-lg-4">
                             <div class="mb-4">
@@ -34,11 +25,28 @@
                                 <input type="url" id="subUrl" name="subUrl" class="form-control rounded-1" placeholder="http://example.com/rss.xml" tabindex="2">
                                 <div class="form-text">Must point to a valid <a href="https://en.wikipedia.org/wiki/RSS" class="text-decoration-none">RSS</a> feed.</div>
                             </div>
+                        </div>
+                        <div class="col-lg-6 pe-lg-4">
+                            <div class="mb-4">
+                                <label for="subChannels" class="form-label">Channels</label>
+                                <select name="subChannels" id="subChannels" class="select-2" multiple data-dropdownparent="#subFormModal" tabindex="3"></select>
+                                <div class="form-text">Subscription content will be sent to these channels.</div>
+                            </div>
+                        </div>
+                        <div class="col-lg-6 ps-lg-4">
                             <div class="mb-4">
                                 <label for="subFilters" class="form-label">Filters</label>
                                 <select name="subFilters" id="subFilters" class="select-2" multiple data-dropdownparent="#subFormModal" tabindex="4"></select>
                                 <div class="form-text">Filters to apply to this subscription's content.</div>
                             </div>
+                        </div>
+                        <div class="col-lg-6 pe-lg-4">
+                            <div class="mb-4 mb-lg-0">
+                                <label for="subExtraNotes" class="form-label">Extra Notes</label>   
+                                <textarea id="subExtraNotes" name="subExtraNotes" class="form-control rounded-1" placeholder="" tabindex="5" style="resize: none; height: 7rem"></textarea>
+                            </div>
+                        </div>
+                        <div class="col-lg-6 ps-lg-4">
                             <div class="form-switch mb-4 ps-0">
                                 <label for="subActive" class="form-check-label mb-2">Active</label>
                                 <br>
@@ -91,14 +99,14 @@
                                 <div class="form-text">Apply mutators to article descriptions.</div>
                             </div>
                         </div>
-                        <div class="col-lg-6 pe-lg-4">
+                        <div class="col-lg-6 pe-lg-4 d-none">
                             <div class="mb-4">
                                 <label for="" class="form-label">Article Fetch Limit</label>
                                 <input type="number" id="subFetchLimit" class="form-control rounded-1" max="10" min="1">
                                 <div class="form-text">Limit the number of articles fetched every cycle.</div>
                             </div>
                         </div>
-                        <div class="col-lg-6 ps-lg-4">
+                        <div class="col-lg-6 ps-lg-4 d-none">
                             <div class="form-switch ps-0 mb-4">
                                 <label for="subResetFetchLimit" class="form-check-label mb-2">Max Fetch Limit after the First Cycle</label>
                                 <br>
@@ -120,16 +128,16 @@
                                         <i class="bi bi-dice-5"></i>
                                     </button>
                                 </div>
-                                <div class="form-text">Colour of each article's embed in Discord.</div>
+                                <div class="form-text">Colour of each embed in Discord.</div>
                             </div>
                         </div>
                         <div class="col-lg-6 ps-lg-4">
                             <div class="form-switch ps-0">
-                                <label for="subArticleFetchImage" class="form-check-label mb-2">Fetch &amp; Embed Article Images?</label>
+                                <label for="subArticleFetchImage" class="form-check-label mb-2">Show Images on Embed?</label>
                                 <br>
                                 <input type="checkbox" id="subArticleFetchImage" name="subArticleFetchImage" class="form-check-input ms-0 mt-0" tabindex="6">
                                 <br>
-                                <div class="form-text">Not all articles have images, but should PYRSS try to find and attach them to the embed?</div>
+                                <div class="form-text">Show images on the discord embed?</div>
                             </div>
                         </div>
                     </div>