From 7b3be36ba5a692ace448cc197dbf2599b03446b4 Mon Sep 17 00:00:00 2001
From: formsdev <136701234+formsdev@users.noreply.github.com>
Date: Wed, 15 Nov 2023 14:47:39 +0530
Subject: [PATCH] =?UTF-8?q?Rename=20=E2=80=9CPublic=E2=80=9D=20status=20to?=
 =?UTF-8?q?=20=E2=80=9CPublished=E2=80=9D=20(#236)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Julien Nahum <julien@nahum.net>
---
 .../forms/components/form-components/FormInformation.vue | 6 +++---
 resources/js/pages/forms/show/index.vue                  | 9 ++++++---
 resources/js/pages/home.vue                              | 6 +++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/resources/js/components/open/forms/components/form-components/FormInformation.vue b/resources/js/components/open/forms/components/form-components/FormInformation.vue
index 26a53f43b..07de6a40b 100644
--- a/resources/js/components/open/forms/components/form-components/FormInformation.vue
+++ b/resources/js/components/open/forms/components/form-components/FormInformation.vue
@@ -84,15 +84,15 @@ export default {
       copyFormId: null,
       visibilityOptions: [
         {
-          name: "Public",
+          name: "Published",
           value: "public"
         },
         {
-          name: "Draft (form won't be accessible)",
+          name: "Draft - not publicly accessible",
           value: "draft"
         },
         {
-          name: "Closed",
+          name: "Closed - won\'t accept new submissions",
           value: "closed"
         }
       ],
diff --git a/resources/js/pages/forms/show/index.vue b/resources/js/pages/forms/show/index.vue
index 6b4d92b06..095eb5301 100644
--- a/resources/js/pages/forms/show/index.vue
+++ b/resources/js/pages/forms/show/index.vue
@@ -49,14 +49,17 @@
               <span class="pr-1">- {{ form.submissions_count }}
                 submission{{ form.submissions_count > 0 ? 's' : '' }}
               </span>
-              <span class="pr-1 text-blue-500" v-if="form.visibility=='closed'">- Closed</span>
-              <span class="">- Edited {{ form.last_edited_human }}</span>
+              <span>- Edited {{ form.last_edited_human }}</span>
             </p>
-            <div v-if="form.visibility=='draft' || (form.tags && form.tags.length > 0)" class="mt-2 flex items-center flex-wrap gap-3">
+            <div v-if="['draft','closed'].includes(form.visibility) || (form.tags && form.tags.length > 0)" class="mt-2 flex items-center flex-wrap gap-3">
               <span v-if="form.visibility=='draft'" 
                   class="inline-flex items-center rounded-full bg-yellow-100 px-2 py-1 text-xs font-medium text-yellow-600 ring-1 ring-inset ring-gray-500/10 dark:text-white dark:bg-gray-700">
                 Draft - not publicly accessible
               </span>
+              <span v-else-if="form.visibility=='closed'" 
+                  class="inline-flex items-center rounded-full bg-yellow-100 px-2 py-1 text-xs font-medium text-yellow-600 ring-1 ring-inset ring-gray-500/10 dark:text-white dark:bg-gray-700">
+                Closed - won't accept new submissions
+              </span>
               <span v-for="(tag,i) in form.tags" :key="tag"
                   class="inline-flex items-center rounded-full bg-gray-50 px-2 py-1 text-xs font-medium text-gray-600 ring-1 ring-inset ring-gray-500/10 dark:text-white dark:bg-gray-700"
               >
diff --git a/resources/js/pages/home.vue b/resources/js/pages/home.vue
index 5424c2209..883813ec6 100644
--- a/resources/js/pages/home.vue
+++ b/resources/js/pages/home.vue
@@ -65,11 +65,15 @@
                     </li>
                     <li class="list-disc ml-6">Edited {{ form.last_edited_human }}</li>
                   </ul>
-                  <div v-if="form.visibility=='draft' || (form.tags && form.tags.length > 0)" class="mt-1 flex items-center flex-wrap gap-3">
+                  <div v-if="['draft','closed'].includes(form.visibility) || (form.tags && form.tags.length > 0)" class="mt-1 flex items-center flex-wrap gap-3">
                     <span v-if="form.visibility=='draft'" 
                         class="inline-flex items-center rounded-full bg-yellow-100 px-2 py-1 text-xs font-medium text-yellow-600 ring-1 ring-inset ring-gray-500/10 dark:text-white dark:bg-gray-700">
                       Draft
                     </span>
+                    <span v-else-if="form.visibility=='closed'" 
+                        class="inline-flex items-center rounded-full bg-yellow-100 px-2 py-1 text-xs font-medium text-yellow-600 ring-1 ring-inset ring-gray-500/10 dark:text-white dark:bg-gray-700">
+                      Closed
+                    </span>
                     <span v-for="(tag,i) in form.tags" :key="tag"
                         class="inline-flex items-center rounded-full bg-gray-50 px-2 py-1 text-xs font-medium text-gray-600 ring-1 ring-inset ring-gray-500/10 dark:text-white dark:bg-gray-700"
                     >