fixes and more replacements

Signed-off-by: dartcafe <github@dartcafe.de>

4 files changed, 22 insertions, 8 deletions

diff --git a/src/js/views/Administration.vue b/src/js/views/Administration.vue
index 9533510a..ca70926e 100644
--- a/src/js/views/Administration.vue
+++ b/src/js/views/Administration.vue
@@ -30,14 +30,14 @@
 		</HeaderBar>
 
 		<div class="area__main">
-			<EmptyContent v-if="noPolls" icon="icon-polls">
-				{{ t('polls', 'No polls found for this category') }}
+			<EmptyContent v-if="noPolls">
 				<template #icon>
 					<PollsAppIcon />
 				</template>
 				<template #desc>
 					{{ t('polls', 'Add one or change category!') }}
 				</template>
+				{{ t('polls', 'No polls found for this category') }}
 			</EmptyContent>
 
 			<transition-group v-else
diff --git a/src/js/views/Combo.vue b/src/js/views/Combo.vue
index cf7fba2c..5110c6ac 100644
--- a/src/js/views/Combo.vue
+++ b/src/js/views/Combo.vue
@@ -37,11 +37,14 @@
 		<div class="area__main">
 			<ComboTable v-show="polls.length" />
 
-			<EmptyContent v-if="!polls.length" icon="icon-polls">
-				{{ t('polls', 'No polls selected') }}
+			<EmptyContent v-if="!polls.length">
+				<template #icon>
+					<PollsAppIcon />
+				</template>
 				<template #desc>
 					{{ t('polls', 'Select polls by clicking on them in the right sidebar!') }}
 				</template>
+				{{ t('polls', 'No polls selected') }}
 			</EmptyContent>
 		</div>
 
@@ -56,6 +59,7 @@ import { emit } from '@nextcloud/event-bus'
 import ComboTable from '../components/Combo/ComboTable.vue'
 import ActionToggleSidebar from '../components/Actions/ActionToggleSidebar.vue'
 import HeaderBar from '../components/Base/HeaderBar.vue'
+import PollsAppIcon from '../components/AppIcons/PollsAppIcon.vue'
 
 export default {
 	name: 'Combo',
@@ -66,6 +70,7 @@ export default {
 		ComboTable,
 		EmptyContent,
 		HeaderBar,
+		PollsAppIcon,
 		LoadingOverlay: () => import('../components/Base/LoadingOverlay.vue'),
 	},
 
diff --git a/src/js/views/PollList.vue b/src/js/views/PollList.vue
index 8c0d5c83..da2a7ca3 100644
--- a/src/js/views/PollList.vue
+++ b/src/js/views/PollList.vue
@@ -30,11 +30,14 @@
 		</HeaderBar>
 
 		<div class="area__main">
-			<EmptyContent v-if="noPolls" icon="icon-polls">
-				{{ t('polls', 'No polls found for this category') }}
+			<EmptyContent v-if="noPolls">
+				<template #icon>
+					<PollsAppIcon />
+				</template>
 				<template #desc>
 					{{ t('polls', 'Add one or change category!') }}
 				</template>
+				{{ t('polls', 'No polls found for this category') }}
 			</EmptyContent>
 
 			<transition-group v-else
@@ -107,6 +110,7 @@ import DeletePollIcon from 'vue-material-design-icons/Delete.vue'
 import ClonePollIcon from 'vue-material-design-icons/ContentCopy.vue'
 import ArchivePollIcon from 'vue-material-design-icons/Archive.vue'
 import RestorePollIcon from 'vue-material-design-icons/Recycle.vue'
+import PollsAppIcon from '../components/AppIcons/PollsAppIcon.vue'
 
 export default {
 	name: 'PollList',
@@ -121,6 +125,7 @@ export default {
 		ClonePollIcon,
 		ArchivePollIcon,
 		RestorePollIcon,
+		PollsAppIcon,
 		LoadingOverlay: () => import('../components/Base/LoadingOverlay.vue'),
 		PollItem: () => import('../components/PollList/PollItem.vue'),
 	},
diff --git a/src/js/views/SideBarCombo.vue b/src/js/views/SideBarCombo.vue
index d9de70c2..e5c4c8b5 100644
--- a/src/js/views/SideBarCombo.vue
+++ b/src/js/views/SideBarCombo.vue
@@ -27,8 +27,10 @@
 		@close="closeSideBar()">
 		<AppSidebarTab :id="'polls'"
 			:order="1"
-			:name="t('polls', 'Polls')"
-			icon="icon-polls">
+			:name="t('polls', 'Polls')">
+			<template #icon>
+				<PollsAppIcon />
+			</template>
 			<SideBarTabDatePolls />
 		</AppSidebarTab>
 	</AppSidebar>
@@ -38,6 +40,7 @@
 import { AppSidebar, AppSidebarTab } from '@nextcloud/vue'
 import { mapGetters } from 'vuex'
 import { emit } from '@nextcloud/event-bus'
+import PollsAppIcon from '../components/AppIcons/PollsAppIcon.vue'
 
 export default {
 	name: 'SideBarCombo',
@@ -46,6 +49,7 @@ export default {
 		SideBarTabDatePolls: () => import('../components/SideBar/SideBarTabDatePolls.vue'),
 		AppSidebar,
 		AppSidebarTab,
+		PollsAppIcon,
 	},
 
 	props: {