From df62565a6e357e2299e97f2b225bf939bd43bc02 Mon Sep 17 00:00:00 2001
From: weichien <weichien00@gmail.com>
Date: Wed, 9 Jun 2021 11:53:44 +0800
Subject: [PATCH] style: redefine label and css .

---
 .../forms/AnnouncementFormComponent.vue       | 35 +++----------------
 .../forms/DeleteAnnouncementFormComponent.vue |  2 +-
 resources/views/pages/settings.blade.php      |  2 +-
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue b/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
index 683c24ad..1430a078 100644
--- a/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
+++ b/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
@@ -6,7 +6,7 @@
                 <div class="col">
                     <div class="row m-b-20">
                         <div class="col">
-                            <h6 class="all-caps m-b-5 bold no-margin">{{this.data?"Update":"Add"}} Announcement</h6>
+                            <h6 class="all-caps m-b-5 bold no-margin">{{this.data?"Update":"Create"}} Announcement</h6>
                         </div>
                     </div>
                     <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
@@ -17,44 +17,19 @@
                     <div class="row m-b-10">
                         <div class="col">
                             <validation-wrapper-component :validator="$v.parameters.title">
-                                <label class="muted">Annouchement Title</label>
+                                <label class="muted">Title</label>
                                 <input type="text" class="form-control" v-model="parameters.title">
                             </validation-wrapper-component>
                         </div>
                     </div>
-                    <div class="row m-b-10">
+                    <div class="row">
                         <div class="col">
                             <validation-wrapper-component :validator="$v.parameters.description">
-                                <label class="muted">announcement Message.</label>
-                                <textarea class="form-control" v-model="parameters.description"  rows="20"></textarea>
+                                <label class="muted">Message</label>
+                                <textarea class="form-control h-75" v-model="parameters.description"  rows="20"></textarea>
                             </validation-wrapper-component>
                         </div>
                     </div>
-                    <!-- <div class="row m-b-20">
-                        <div class="col-5">
-                            <validation-wrapper-component selecatable :validator="$v.parameters.segment_id">
-                                <label class="muted">Segment</label>
-                                <selectable-component :endpoint="route('api.segment.list')" :options="{'type': 2}" section="segmentsListSection" valueColumn="id" :labelColumn="['name']" v-model="parameters.segment_id"></selectable-component>
-                            </validation-wrapper-component>
-                        </div>
-                        <div class="col-5">
-                            <announcement-assign-to-segment-form-component :data="data" section="announcementEditSection"></announcement-assign-to-segment-form-component>
-                        </div>
-                    </div>
-
-                     <div class="row  m-b-20">
-                         <div class="col-auto no-padding m-r-10 m-b-5 m-t-5"  v-for="segment in parameters.segments" v-bind:key="segment.id" v-if="segment.id !== 1">
-                             <div class="font-heading fs-10 lh-20 p-l-10 p-r-10 bg-master-lightest btn-rounded">
-                                 {{segment.name}}
-                                 <i class="fa fa-times muted m-l-10 pointer requestModal" data-type="announcementDetachSegment" ></i>
-                                 </div>
-                                 
-                                 <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="announcementDetachSegment">
-                                     <announcement-detach-segment-form-component :data="segment" :announcement_id="parameters.id" section="announcementEditSection"></announcement-detach-segment-form-component>
-                                     </modal-component>
-                                    </div>
-                    </div> -->
-
 
                     <div class="row m-b-20">
                         <div class="col-6">
diff --git a/resources/assets/vue/components/settings/forms/DeleteAnnouncementFormComponent.vue b/resources/assets/vue/components/settings/forms/DeleteAnnouncementFormComponent.vue
index 14a43c80..5c59b264 100644
--- a/resources/assets/vue/components/settings/forms/DeleteAnnouncementFormComponent.vue
+++ b/resources/assets/vue/components/settings/forms/DeleteAnnouncementFormComponent.vue
@@ -7,7 +7,7 @@
                     <div class="row m-b-20">
                         <div class="col">
                             <h3 class="all-caps">Are you Sure?</h3>
-                            <div class="fs-11">Are you sure you want to delete <b>{{item.title}}</b> announcement?</div>
+                            <div class="fs-11">Are you sure you want to delete announcement with title <b>{{item.title}}</b> ?</div>
                         </div>
                     </div>
                     <div class="row">
diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php
index 9c7c02ea..ca07e88a 100644
--- a/resources/views/pages/settings.blade.php
+++ b/resources/views/pages/settings.blade.php
@@ -486,7 +486,7 @@
                                                 <div class="col-auto">
                                                     <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
                                                         <i class="fa fa-plus m-r-5"></i>
-                                                        Add New Announcement
+                                                        Create Announcement
                                                     </button>
                                                     <modal-form-component section="allAnnouncementsSection">
                                                         <template slot="form" slot-scope="{section}">