From 000fed17d2c3a896085f5fef6de2f46a9b4cbc7f Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Mon, 25 Feb 2019 19:22:13 +0000 Subject: [webapp/registration] switch to the new selctbox for groups selection --- webapp/src/components/GroupModuleClientView.vue | 13 +++- webapp/src/components/GroupModuleGroupList.vue | 2 +- webapp/src/components/GroupModuleGroupView.vue | 13 +++- webapp/src/components/RegistrationModuleEdit.vue | 40 ++++------- webapp/src/components/SelectBox.vue | 92 ++++++++++++++++-------- 5 files changed, 102 insertions(+), 58 deletions(-) (limited to 'webapp') diff --git a/webapp/src/components/GroupModuleClientView.vue b/webapp/src/components/GroupModuleClientView.vue index f01b5c7..d8e8f6e 100644 --- a/webapp/src/components/GroupModuleClientView.vue +++ b/webapp/src/components/GroupModuleClientView.vue @@ -44,10 +44,10 @@
device_hub{{ $t('groups') }}
- +
- {{ group.name || group.id }} + {{ group.name || group.id }} + {{ client.groups.length - 5 }} {{ $t('more') }} - @@ -237,6 +237,15 @@ export default { width: 100%; } +.chip-container >>> .v-chip__content { + width: 100%; +} + +.chip-text { + overflow: hidden; + text-overflow: ellipsis; +} + .and-more { font-size: 13px; display: flex; diff --git a/webapp/src/components/GroupModuleGroupList.vue b/webapp/src/components/GroupModuleGroupList.vue index c721241..2faee43 100644 --- a/webapp/src/components/GroupModuleGroupList.vue +++ b/webapp/src/components/GroupModuleGroupList.vue @@ -64,7 +64,7 @@ export default { headers () { return [ { key: 'id', text: this.$t('id'), width: '50px' }, - { key: 'name', text: this.$t('name'), width: '180px' }, + { key: 'name', text: this.$t('name'), width: '200px' }, { key: 'description', text: this.$t('description') }, { key: 'actions', width: '60px' } ] diff --git a/webapp/src/components/GroupModuleGroupView.vue b/webapp/src/components/GroupModuleGroupView.vue index 6f78d07..a174eb5 100644 --- a/webapp/src/components/GroupModuleGroupView.vue +++ b/webapp/src/components/GroupModuleGroupView.vue @@ -56,10 +56,10 @@
device_hub{{ $t('parents') }}
- +
- {{ parent.name || parent.id }} + {{ parent.name || parent.id }} + {{ group.parents.length - 5 }} {{ $t('more') }} - @@ -295,6 +295,15 @@ export default { width: 100%; } +.chip-container >>> .v-chip__content { + width: 100%; +} + +.chip-text { + overflow: hidden; + text-overflow: ellipsis; +} + .and-more { font-size: 13px; display: flex; diff --git a/webapp/src/components/RegistrationModuleEdit.vue b/webapp/src/components/RegistrationModuleEdit.vue index f90295a..829a605 100644 --- a/webapp/src/components/RegistrationModuleEdit.vue +++ b/webapp/src/components/RegistrationModuleEdit.vue @@ -3,12 +3,11 @@ "en": { "name": "Name", "description": "Description", - "type": "Script type", + "type": "Script Type", "groups": "Groups", "script": "Script", - "titleNew": "Create hook", - "titleExisting": "Edit hook", - "groupRestricted": "Restrict to groups" + "titleNew": "Create Hook", + "titleExisting": "Edit Hook" }, "de": { "name": "Name", @@ -17,8 +16,7 @@ "groups": "Gruppen", "script": "Skript", "titleNew": "Hook erstellen", - "titleExisting": "Hook bearbeiten", - "groupRestricted": "Auf Gruppen beschränken" + "titleExisting": "Hook bearbeiten" } } @@ -30,27 +28,19 @@ - + - - - - - device_hub{{ groups.length > 0 ? groups.length : '' }} - - - - - - {{ $t('groupRestricted') }} - - - + + + + + + + -
code{{ $t('script') }}
@@ -64,13 +54,13 @@