From b5d8c4de5b6fb3cec8fa1a0dff3a67acfd835629 Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Thu, 2 Jul 2020 15:01:46 +0200 Subject: [PATCH] start shared/local decision on entity creation --- .../App/components/buttons/add-button.vue | 99 +++++++++++++++++++ .../App/components/overlays/dropdown.vue | 17 +++- zero.Web.UI/App/navigation.vue | 1 - .../App/pages/settings/application.vue | 2 +- zero.Web.UI/App/pages/settings/languages.vue | 9 +- .../Resources/Localization/zero.en-us.json | 4 +- 6 files changed, 125 insertions(+), 7 deletions(-) create mode 100644 zero.Web.UI/App/components/buttons/add-button.vue diff --git a/zero.Web.UI/App/components/buttons/add-button.vue b/zero.Web.UI/App/components/buttons/add-button.vue new file mode 100644 index 00000000..98ecbb77 --- /dev/null +++ b/zero.Web.UI/App/components/buttons/add-button.vue @@ -0,0 +1,99 @@ + + + + + + \ No newline at end of file diff --git a/zero.Web.UI/App/components/overlays/dropdown.vue b/zero.Web.UI/App/components/overlays/dropdown.vue index cd18e54b..a8da2f28 100644 --- a/zero.Web.UI/App/components/overlays/dropdown.vue +++ b/zero.Web.UI/App/components/overlays/dropdown.vue @@ -3,7 +3,7 @@
- @@ -19,6 +19,10 @@ type: String, default: 'left' }, + theme: { + type: String, + default: null + }, locked: { type: Boolean, default: false @@ -31,9 +35,16 @@ computed: { - alignClasses() + dropdownClasses() { - return 'align-' + this.align.split(' ').join(' align-'); + let classes = 'align-' + this.align.split(' ').join(' align-'); + + if (!!this.theme) + { + classes += ' theme-' + this.theme; + } + + return classes; } }, diff --git a/zero.Web.UI/App/navigation.vue b/zero.Web.UI/App/navigation.vue index 4d4bd514..363b24a1 100644 --- a/zero.Web.UI/App/navigation.vue +++ b/zero.Web.UI/App/navigation.vue @@ -148,7 +148,6 @@ applicationChanged(item, opts) { - console.info(item, opts); opts.loading(true); AuthApi.switchApp(item.id).then(success => diff --git a/zero.Web.UI/App/pages/settings/application.vue b/zero.Web.UI/App/pages/settings/application.vue index 048b1f48..77fa7ec9 100644 --- a/zero.Web.UI/App/pages/settings/application.vue +++ b/zero.Web.UI/App/pages/settings/application.vue @@ -45,7 +45,7 @@ { opts.hide(); this.$refs.form.onDelete(ApplicationsApi.delete.bind(this, this.id)); - } + } } } \ No newline at end of file diff --git a/zero.Web.UI/App/pages/settings/languages.vue b/zero.Web.UI/App/pages/settings/languages.vue index 01a11902..d822678b 100644 --- a/zero.Web.UI/App/pages/settings/languages.vue +++ b/zero.Web.UI/App/pages/settings/languages.vue @@ -2,7 +2,7 @@
- +
@@ -47,6 +47,13 @@ }, items: LanguagesApi.getAll }; + }, + + methods: { + onAdd() + { + console.info('add'); + } } } \ No newline at end of file diff --git a/zero.Web/Resources/Localization/zero.en-us.json b/zero.Web/Resources/Localization/zero.en-us.json index ae41727d..3747c98e 100644 --- a/zero.Web/Resources/Localization/zero.en-us.json +++ b/zero.Web/Resources/Localization/zero.en-us.json @@ -369,7 +369,9 @@ "domains": "Domains", "domains_text": "Select domains for this application", "domains_help": "Valid domain names are: \"example.com\", \"www.example.com\", \"example.com:8080\", or \"https://www.example.com\".", - "domains_add": "Add domain" + "domains_add": "Add domain", + "features": "Features", + "features_text": "Enable additional features for this application" } },