From 4b184998bcf01dff5628b3e898e7f431a1971762 Mon Sep 17 00:00:00 2001
From: Son Nguyen Kim <nguyenkims@users.noreply.github.com>
Date: Sat, 21 Aug 2021 16:11:17 +0200
Subject: [PATCH] make alias note always visible. Rename it to description

---
 app/dashboard/templates/dashboard/index.html | 40 ++++++++++----------
 static/js/index.js                           |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html
index b2b54f66..2d3c0ac4 100644
--- a/app/dashboard/templates/dashboard/index.html
+++ b/app/dashboard/templates/dashboard/index.html
@@ -305,7 +305,7 @@
                     {{ email_log.created_at | dt }}
                   {% endif %}
                 {% else %}
-                  No Activity in the last 14 days. Alias created {{ alias.created_at | dt }}
+                  No emails received/sent in the last 14 days. Created {{ alias.created_at | dt }}.
                 {% endif %}
 
               </div>
@@ -313,6 +313,25 @@
           </div>
           <!-- END Email Activity -->
 
+          <div class="small-text mt-1">Alias description</div>
+          <div class="d-flex mb-2">
+            <div class="flex-grow-1 mr-2">
+                <textarea
+                    id="note-{{ alias.id }}"
+                    name="note"
+                    class="form-control"
+                    rows="2"
+                    placeholder="e.g. where the alias is used or why is it created">{{ alias.note or "" }}</textarea>
+            </div>
+
+            <div class="">
+              <a data-alias="{{ alias.id }}"
+                 class="save-note btn btn-sm btn-outline-success w-100">
+                Save
+              </a>
+            </div>
+          </div>
+
           <!-- Send Email && More button -->
           <div class="row">
             <div class="col">
@@ -390,25 +409,6 @@
               </div>
             {% endif %}
 
-            <div class="small-text mt-2">Note</div>
-            <div class="d-flex">
-              <div class="flex-grow-1 mr-2">
-                <textarea
-                    id="note-{{ alias.id }}"
-                    name="note"
-                    class="form-control"
-                    rows="2"
-                    placeholder="e.g. where the alias is used or why is it created">{{ alias.note or "" }}</textarea>
-              </div>
-
-              <div class="">
-                <a data-alias="{{ alias.id }}"
-                   class="save-note btn btn-sm btn-outline-success w-100">
-                  Save
-                </a>
-              </div>
-            </div>
-
             <div class="small-text mt-2" data-toogle="tooltip"
                  title="When sending an email from this alias, the email will have 'Display Name <{{ alias.email }}>' as sender.">
               Display name
diff --git a/static/js/index.js b/static/js/index.js
index 4e8a8e53..dab6b406 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -172,7 +172,7 @@ $(".save-note").on("click", async function () {
     });
 
     if (res.ok) {
-      toastr.success(`Note Saved`);
+      toastr.success(`Saved`);
     } else {
       toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
       // reset to the original value