Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/mail.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2022-09-06 18:00:10 +0300
committerChristoph Wurst <christoph@winzerhof-wurst.at>2022-09-06 18:00:10 +0300
commita2ba8821f119ffd556bdfc21f41409c40dc7b5bd (patch)
tree73ce7554833eb763d73c147d6bdd13af5db53b8a
parent318b01308ec42e8ebfea51d45f997a730ddba02d (diff)
Fix double <ul> in nav
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
-rw-r--r--src/components/Navigation.vue78
1 files changed, 38 insertions, 40 deletions
diff --git a/src/components/Navigation.vue b/src/components/Navigation.vue
index db622dad9..7a8888381 100644
--- a/src/components/Navigation.vue
+++ b/src/components/Navigation.vue
@@ -22,49 +22,47 @@
<template>
<AppNavigation>
<template #list>
- <ul id="accounts-list">
- <!-- Special mailboxes first -->
- <NavigationMailbox
- v-for="mailbox in unifiedMailboxes"
- :key="'mailbox-' + mailbox.databaseId"
- :account="unifiedAccount"
- :mailbox="mailbox" />
- <NavigationOutbox />
- <AppNavigationSpacer />
+ <!-- Special mailboxes first -->
+ <NavigationMailbox
+ v-for="mailbox in unifiedMailboxes"
+ :key="'mailbox-' + mailbox.databaseId"
+ :account="unifiedAccount"
+ :mailbox="mailbox" />
+ <NavigationOutbox />
+ <AppNavigationSpacer />
- <!-- All other mailboxes grouped by their account -->
- <template v-for="group in menu">
- <NavigationAccount
- v-if="group.account"
- :key="group.account.id"
+ <!-- All other mailboxes grouped by their account -->
+ <template v-for="group in menu">
+ <NavigationAccount
+ v-if="group.account"
+ :key="group.account.id"
+ :account="group.account"
+ :first-mailbox="group.mailboxes[0]"
+ :is-first="isFirst(group.account)"
+ :is-last="isLast(group.account)" />
+ <template v-for="item in group.mailboxes">
+ <NavigationMailbox
+ v-show="
+ !group.isCollapsible ||
+ !group.account.collapsed ||
+ !isCollapsed(group.account, item)
+ "
+ :key="'mailbox-' + item.databaseId"
:account="group.account"
- :first-mailbox="group.mailboxes[0]"
- :is-first="isFirst(group.account)"
- :is-last="isLast(group.account)" />
- <template v-for="item in group.mailboxes">
- <NavigationMailbox
- v-show="
- !group.isCollapsible ||
- !group.account.collapsed ||
- !isCollapsed(group.account, item)
- "
- :key="'mailbox-' + item.databaseId"
- :account="group.account"
- :mailbox="item" />
- <NavigationMailbox
- v-if="!group.account.isUnified && item.specialRole === 'inbox'"
- :key="item.databaseId + '-starred'"
- :account="group.account"
- :mailbox="item"
- filter="starred" />
- </template>
- <NavigationAccountExpandCollapse
- v-if="!group.account.isUnified && group.isCollapsible"
- :key="'collapse-' + group.account.id"
- :account="group.account" />
- <AppNavigationSpacer :key="'spacer-' + group.account.id" />
+ :mailbox="item" />
+ <NavigationMailbox
+ v-if="!group.account.isUnified && item.specialRole === 'inbox'"
+ :key="item.databaseId + '-starred'"
+ :account="group.account"
+ :mailbox="item"
+ filter="starred" />
</template>
- </ul>
+ <NavigationAccountExpandCollapse
+ v-if="!group.account.isUnified && group.isCollapsible"
+ :key="'collapse-' + group.account.id"
+ :account="group.account" />
+ <AppNavigationSpacer :key="'spacer-' + group.account.id" />
+ </template>
</template>
<template #footer>
<AppNavigationSettings :title="t('mail', 'Mail settings')">