diff --git a/scipost_django/apimail/static/apimail/assets/vue/components/AttachmentListEditable.vue b/scipost_django/apimail/static/apimail/assets/vue/components/AttachmentListEditable.vue index 9707c43e344823e6cb648d9455cbda864d0128cf..f6296f7ca36927667d2bdcd18ce0dd409568df21 100644 --- a/scipost_django/apimail/static/apimail/assets/vue/components/AttachmentListEditable.vue +++ b/scipost_django/apimail/static/apimail/assets/vue/components/AttachmentListEditable.vue @@ -1,6 +1,6 @@ <template> - <b-row> - <b-col class="col-lg-6"> + <div class="row"> + <div class="col col-lg-6"> <b-form-file v-model="newAttachment" placeholder="Select a file, or drop it here" @@ -15,8 +15,8 @@ Upload this attachment and add it to your message </button> </div> - </b-col> - <b-col class="col-lg-6"> + </div> + <div class="col col-lg-6"> <div v-if="attachments.length > 0"> <h3>Current attachments to this message:</h3> <ul> @@ -30,8 +30,8 @@ </li> </ul> </div> - </b-col> - </b-row> + </div> + </div> </template> <script> diff --git a/scipost_django/apimail/static/apimail/assets/vue/components/MessageComposer.vue b/scipost_django/apimail/static/apimail/assets/vue/components/MessageComposer.vue index 1e5f09f542f85f600d0d640c95ff44e6b0f09613..739f01f82da025e221ee079b07b94ee2ad9b4e74 100644 --- a/scipost_django/apimail/static/apimail/assets/vue/components/MessageComposer.vue +++ b/scipost_django/apimail/static/apimail/assets/vue/components/MessageComposer.vue @@ -106,8 +106,8 @@ </div> <hr> <b-form> - <b-row> - <b-col class="col-lg-6"> + <div class="row"> + <div class="col col-lg-6"> <b-form-group id="from_account" label="From:" @@ -123,8 +123,8 @@ > </b-form-select> </b-form-group> - </b-col> - <b-col class="col-lg-6"> + </div> + <div class="col col-lg-6"> <b-form-group id="to-recipient" label="To:" @@ -135,26 +135,26 @@ </ul> <select-from-address-book @selected="onToRecipientSelected"></select-from-address-book> </b-form-group> - </b-col> - </b-row> - <b-row> - <b-col class="col-lg-6"> + </div> + </div> + <div class="row"> + <div class="col col-lg-6"> <b-form-group id="cc" label="cc:" > <email-list-editable :emails="form.cc_recipients" keyword="cc"></email-list-editable> </b-form-group> - </b-col> - <b-col class="col-lg-6"> + </div> + <div class="col col-lg-6"> <b-form-group id="bcc" label="bcc:" > <email-list-editable :emails="form.bcc_recipients" keyword="bcc"></email-list-editable> </b-form-group> - </b-col> - </b-row> + </div> + </div> <b-form-group id="attachments" label="Attachments:" diff --git a/scipost_django/apimail/static/apimail/assets/vue/components/MessageContent.vue b/scipost_django/apimail/static/apimail/assets/vue/components/MessageContent.vue index 4e14cf1de55075d72100e59a81ef7124e96232a7..35f4e30d9810af4d22702f54ba644cc927dadd73 100644 --- a/scipost_django/apimail/static/apimail/assets/vue/components/MessageContent.vue +++ b/scipost_django/apimail/static/apimail/assets/vue/components/MessageContent.vue @@ -160,8 +160,8 @@ </ul> <hr> <div class="text-dark"> - <b-row> - <b-col class="col-lg-10"> + <div class="row"> + <div class="col col-lg-10"> On: {{ message.datetimestamp }} <br> Subject: <strong>{{ message.data.subject }}</strong> @@ -169,8 +169,8 @@ From: {{ message.data.from }} <br> Recipients: {{ message.data.recipients }} - </b-col> - <b-col class="col-lg-2"> + </div> + <div class="col col-lg-2"> <button type="button" class="btn btn-secondary" @@ -213,8 +213,8 @@ </div> </div> </div> - </b-col> - </b-row> + </div> + </div> </div> </template> <b-card-text> diff --git a/scipost_django/apimail/static/apimail/assets/vue/components/MessagesTable.vue b/scipost_django/apimail/static/apimail/assets/vue/components/MessagesTable.vue index cc9776208f4d5ab3f5e1a367c3f344a44ada366b..ea935d662c6095414e14c48dd509ef954e9bec7d 100644 --- a/scipost_django/apimail/static/apimail/assets/vue/components/MessagesTable.vue +++ b/scipost_django/apimail/static/apimail/assets/vue/components/MessagesTable.vue @@ -234,8 +234,8 @@ <b-card bg-variant="light"> <h2 class="text-center mb-2">Messages for <strong>{{ accountSelected.email }}</strong></h2> <hr class="my-2"> - <b-row class="mb-0"> - <b-col class="col-lg-6"> + <div class="row mb-0"> + <div class="col col-lg-6"> <small class="p-2">Last loaded: {{ lastLoaded }}</small> <b-badge class="p-2" @@ -250,8 +250,8 @@ A network problem occurred on {{ lastFetched }} </small> </div> - </b-col> - <b-col class="col-lg-6"> + </div> + <div class="col col-lg-6"> <b-form-group label="Refresh interval: " label-cols-sm="6" @@ -269,14 +269,15 @@ mins </b-form-radio-group> </b-form-group> - </b-col> - </b-row> + </div> + </div> <hr class="hr-lightweight mt-1 mb-2"> - <b-row class="mb-0"> - <b-col class="col-lg-1"> + <div class="row mb-0"> + <div class="col col-lg-1"> <strong>Restrict:</strong> - </b-col> - <b-col class="col-lg-4"> + </div> + <div class="col +col-lg-4"> <b-form-group label="Last: " label-cols-sm="3" @@ -293,8 +294,8 @@ > </b-form-radio-group> </b-form-group> - </b-col> - <b-col class="col-lg-4"> + </div> + <div class="col col-lg-4"> <b-form-group label="Status:" label-cols-sm="3" @@ -311,8 +312,8 @@ > </b-form-radio-group> </b-form-group> - </b-col> - <b-col class="col-lg-3"> + </div> + <div class="col col-lg-3"> <b-form-group label="Flow:" label-cols-sm="3" @@ -329,14 +330,14 @@ > </b-form-radio-group> </b-form-group> - </b-col> - </b-row> + </div> + </div> <hr class="hr-lightweight mt-1 mb-2"> - <b-row class="mb-0"> - <b-col class="col-lg-1"> + <div class="row mb-0"> + <div class="col col-lg-1"> <strong>Tags:</strong> - </b-col> - <b-col class="col-lg-9"> + </div> + <div class="col col-lg-9"> <b-form-group label-align-sm="right" label-size="sm" @@ -355,8 +356,8 @@ </b-form-checkbox> </b-form-checkbox-group> </b-form-group> - </b-col> - <b-col class="col-lg-2"> + </div> + <div class="col col-lg-2"> <button type="button" class="btn btn-sm btn-primary pb-2" @@ -365,11 +366,11 @@ > <small>Manage your tags</small> </button> - </b-col> - </b-row> + </div> + </div> <hr class="hr-lightweight mt-1 mb-2"> - <b-row class="mb-0"> - <b-col class="col-lg-6"> + <div class="row mb-0"> + <div class="col col-lg-6"> <b-form-group> <b-input-group size="sm"> <b-form-input @@ -390,8 +391,8 @@ </b-input-group-append> </b-input-group> </b-form-group> - </b-col> - <b-col class="col-lg-6 mb-0"> + </div> + <div class="col col-lg-6 mb-0"> <b-form-group description="Leave all unchecked to filter on all fields" class="mb-0" @@ -410,13 +411,13 @@ <b-form-checkbox value="attachment">Attachments</b-form-checkbox> </b-form-checkbox-group> </b-form-group> - </b-col> - </b-row> + </div> + </div> </b-card> <div v-if="threadOf" class="bg-primary text-white"> - <b-row class="mt-2 p-2"> - <b-col class="my-auto"><h2 class="my-0 px-2">Thread focusing is active</h2></b-col> - <b-col class="mx-auto"> + <div class="row mt-2 p-2"> + <div class="col my-auto"><h2 class="my-0 px-2">Thread focusing is active</h2></div> + <div class="col mx-auto"> <button type="button" class="btn btn-warning text-white float-right" @@ -424,8 +425,8 @@ > <strong>Turn off</strong> </button> - </b-col> - </b-row> + </div> + </div> </div> <b-table id="my-table" @@ -488,8 +489,8 @@ </template> </b-table> <b-card bg-variant="light" class="pb-0"> - <b-row class="mb-0"> - <b-col class="col-lg-4"> + <div class="row mb-0"> + <div class="col col-lg-4"> <div class="text-center"> <button type="button" @@ -498,8 +499,8 @@ {{ totalRows }} messages </button> </div> - </b-col> - <b-col class="col-lg-4"> + </div> + <div class="col col-lg-4"> <b-pagination v-model="currentPage" :total-rows="totalRows" @@ -510,8 +511,8 @@ aria-controls="my-table" > </b-pagination> - </b-col> - <b-col class="col-lg-4"> + </div> + <div class="col col-lg-4"> <b-form-group label="Per page:" label-cols-sm="3" @@ -525,8 +526,8 @@ > </b-form-radio-group> </b-form-group> - </b-col> - </b-row> + </div> + </div> </b-card> <b-tabs id="message-tabs" diff --git a/scipost_django/apimail/static/apimail/assets/vue/messages_table.js b/scipost_django/apimail/static/apimail/assets/vue/messages_table.js index e6f4bf5eccacc44b34aea78b97cb9a82f2e24b7d..323ad25a7265c1eb661387154f2b90e89e5b3030 100644 --- a/scipost_django/apimail/static/apimail/assets/vue/messages_table.js +++ b/scipost_django/apimail/static/apimail/assets/vue/messages_table.js @@ -35,9 +35,6 @@ import { VBTooltip, } from 'bootstrap-vue'; -// Layout -Vue.component('b-row', BRow) -Vue.component('b-col', BCol) // Badges Vue.component('b-badge', BBadge) // Cards @@ -61,8 +58,6 @@ Vue.component('b-pagination', BPagination) Vue.use(TablePlugin) // Tabs Vue.use(TabsPlugin) -// Toggle -Vue.directive('b-toggle', VBToggle) // Style