diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css index 8770c1e78..eeb24d007 100644 --- a/public/css/components/dashboard.css +++ b/public/css/components/dashboard.css @@ -1,6 +1,19 @@ @import './calendar.css'; @import './dashboard/news.css'; +@media (max-width: 576px){ + .widget-icon { + max-height: 250px; + object-fit: cover; + } + .widget-icon-container{ + max-width: 250px; + margin-left: auto; + margin-right: auto; + } +} + + .empty-tile-hover { height: 100%; width: 100%; diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js index fc25fbdfe..ada267900 100644 --- a/public/js/apps/Dashboard/Fhc.js +++ b/public/js/apps/Dashboard/Fhc.js @@ -299,6 +299,7 @@ app.use(primevue.config.default, { tooltip: 8000 } }) +app.directive('tooltip', primevue.tooltip); app.use(PluginsPhrasen); app.directive('contrast', contrast); app.mount('#fhccontent'); \ No newline at end of file diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js index a463ff20b..825bad3f7 100644 --- a/public/js/components/Dashboard/Dashboard.js +++ b/public/js/components/Dashboard/Dashboard.js @@ -177,7 +177,13 @@ export default { }); remove.forEach(wid => this.widgetRemove(name, wid)); } - this.sections = this.sections.sort((section1, section2) => section2.widgets.length - section1.widgets.length); + this.sections = this.sections.sort((section1, section2) => { + if(section1.name == 'custom') + return 1; + if (section2.name == 'custom') + return -1; + return section2.widgets.length - section1.widgets.length; + }); }).catch(err => console.error('ERROR:', err)); }, async beforeMount() { diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js index 07e636cf5..05c3f940f 100644 --- a/public/js/components/Dashboard/Section.js +++ b/public/js/components/Dashboard/Section.js @@ -1,5 +1,4 @@ import BsConfirm from "../Bootstrap/Confirm.js"; -import SectionModal from "../Bootstrap/Alert.js"; import DropGrid from '../Drop/Grid.js' import DashboardItem from "./Item.js"; import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js"; @@ -109,13 +108,13 @@ export default { }, showSectionInformation(){ if (this.name == "general"){ - SectionModal.popup(this.$p.t('dashboard', 'dashboardGeneralSectionDescription')); + return this.$p.t('dashboard', 'dashboardGeneralSectionDescription'); } else if(this.name == "custom"){ - SectionModal.popup(this.$p.t('dashboard', 'dashboardCustomSectionDescription')); + return this.$p.t('dashboard', 'dashboardCustomSectionDescription'); } else{ - SectionModal.popup(this.$p.t('dashboard', 'dashboardSectionDescription', [this.name])); + return this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]); } }, handleConfigOpened() { @@ -211,14 +210,14 @@ export default { }, template: `

- + {{sectionNameTranslation()}}: