From c69d30fac05883b0e40f22a54a184b60001672ec Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Wed, 27 Mar 2019 14:00:14 +0000 Subject: [webapp] small style fixes in groups module and selectbox --- webapp/src/components/GroupModule.vue | 10 ++++++++- webapp/src/components/GroupModuleClientView.vue | 14 ++++++++---- webapp/src/components/GroupModuleGroupView.vue | 13 +++++++---- webapp/src/components/SelectBox.vue | 29 +++++++++++++++---------- webapp/src/config/dashboard.js | 4 ++-- webapp/src/config/i18n.js | 2 +- 6 files changed, 48 insertions(+), 24 deletions(-) (limited to 'webapp') diff --git a/webapp/src/components/GroupModule.vue b/webapp/src/components/GroupModule.vue index d12be50..36d6fcb 100644 --- a/webapp/src/components/GroupModule.vue +++ b/webapp/src/components/GroupModule.vue @@ -18,7 +18,7 @@ home computer - +
{{ item.name ? item.name : item.id !== 'create' ? item.id : ' . . . . . . . . . . ' }}
@@ -118,3 +118,11 @@ export default { } } + + diff --git a/webapp/src/components/GroupModuleClientView.vue b/webapp/src/components/GroupModuleClientView.vue index 5f6ec5e..191c626 100644 --- a/webapp/src/components/GroupModuleClientView.vue +++ b/webapp/src/components/GroupModuleClientView.vue @@ -45,10 +45,16 @@
device_hub{{ $t('groups') }}
-
- - {{ group.name || group.id }} - +
+ + + {{ group.name || group.id }} + + + {{ client.groups.length - 5 }} {{ $t('more') }} -
diff --git a/webapp/src/components/GroupModuleGroupView.vue b/webapp/src/components/GroupModuleGroupView.vue index fcfd390..33145a3 100644 --- a/webapp/src/components/GroupModuleGroupView.vue +++ b/webapp/src/components/GroupModuleGroupView.vue @@ -57,10 +57,15 @@
device_hub{{ $t('parents') }}
-
- - {{ parent.name || parent.id }} - +
+ + + {{ parent.name || parent.id }} + + {{ group.parents.length - 5 }} {{ $t('more') }} -
diff --git a/webapp/src/components/SelectBox.vue b/webapp/src/components/SelectBox.vue index 98a207c..900b604 100644 --- a/webapp/src/components/SelectBox.vue +++ b/webapp/src/components/SelectBox.vue @@ -20,18 +20,22 @@ :class="labelClasses" >{{ label }}
- -
{{ item.name || item.id }}
-
+ + + {{ item.name || item.id }} + + {{ value.length - maxShow }} {{ $t('more') }} @@ -192,6 +196,7 @@ export default { display: flex; flex-wrap: wrap; flex: 1; + width: 0; } .select-input-chip-text { diff --git a/webapp/src/config/dashboard.js b/webapp/src/config/dashboard.js index 7a5244e..e049dc5 100644 --- a/webapp/src/config/dashboard.js +++ b/webapp/src/config/dashboard.js @@ -11,11 +11,11 @@ import EventModule from '@/components/EventModule' export default [ { path: 'groups', component: GroupModule, icon: 'category' }, { path: 'configurator', component: ConfiguratorModule, icon: 'list' }, + { path: 'events', component: EventModule, icon: 'event' }, { path: 'registration', component: RegistrationModule, icon: 'assignment' }, { path: 'backends', component: BackendModule, icon: 'cloud' }, { path: 'permissions', component: PermissionModule, icon: 'lock_open' }, { path: 'ipxe', component: IpxeBuilderModule, icon: 'merge_type' }, { path: 'users', component: UserModule, icon: 'contacts' }, - { path: 'log', component: LogModule, icon: 'error_outline' }, - { path: 'events', component: EventModule, icon: 'event' } + { path: 'log', component: LogModule, icon: 'error_outline' } ] diff --git a/webapp/src/config/i18n.js b/webapp/src/config/i18n.js index 25e6f3a..478695b 100644 --- a/webapp/src/config/i18n.js +++ b/webapp/src/config/i18n.js @@ -58,7 +58,7 @@ export default { 'noDataText': 'Keine Daten verfügbar' }, '$dashboardModules': { - 'GroupModule': 'Gruppen / Clienten', + 'GroupModule': 'Gruppen / Clients', 'ConfiguratorModule': 'iPXE Konfigurator', 'RegistrationModule': 'Client Registrierung', 'BackendModule': 'Externe Backends', -- cgit v1.2.3-55-g7522