diff --git a/ui/src/components/view/ResourceView.vue b/ui/src/components/view/ResourceView.vue index 8a52b223211..d497c776559 100644 --- a/ui/src/components/view/ResourceView.vue +++ b/ui/src/components/view/ResourceView.vue @@ -29,8 +29,9 @@ + + + + + + + + diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js index 3715c5f4d31..e2a51880b16 100644 --- a/ui/src/config/section/compute.js +++ b/ui/src/config/section/compute.js @@ -50,7 +50,7 @@ export default { component: () => import('@/views/compute/InstanceHardware.vue') }, { name: 'settings', - component: () => import('@/views/setting/ResourceSettingsTab.vue') + component: () => import('@/views/compute/InstanceSettings.vue') }], actions: [ { diff --git a/ui/src/config/section/image.js b/ui/src/config/section/image.js index 8eb75b883c1..0b4ee5f7424 100644 --- a/ui/src/config/section/image.js +++ b/ui/src/config/section/image.js @@ -29,6 +29,16 @@ export default { params: { 'templatefilter': 'executable' }, columns: ['name', 'ostypename', 'status', 'hypervisor', 'account', 'domain'], details: ['name', 'id', 'displaytext', 'checksum', 'hypervisor', 'format', 'ostypename', 'size', 'isready', 'passwordenabled', 'directdownload', 'isextractable', 'isdynamicallyscalable', 'ispublic', 'isfeatured', 'crosszones', 'type', 'account', 'domain', 'created'], + tabs: [{ + name: 'details', + component: () => import('@/components/view/DetailsTab.vue') + }, { + name: 'zones', + component: () => import('@/views/image/TemplateZones.vue') + }, { + name: 'settings', + component: () => import('@/views/image/TemplateSettings.vue') + }], actions: [ { api: 'registerTemplate', diff --git a/ui/src/views/compute/InstanceSettings.vue b/ui/src/views/compute/InstanceSettings.vue new file mode 100644 index 00000000000..1790a8447eb --- /dev/null +++ b/ui/src/views/compute/InstanceSettings.vue @@ -0,0 +1,60 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + + diff --git a/ui/src/views/image/TemplateSettings.vue b/ui/src/views/image/TemplateSettings.vue new file mode 100644 index 00000000000..1790a8447eb --- /dev/null +++ b/ui/src/views/image/TemplateSettings.vue @@ -0,0 +1,60 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + + diff --git a/ui/src/views/image/TemplateZones.vue b/ui/src/views/image/TemplateZones.vue new file mode 100644 index 00000000000..3e024acba1d --- /dev/null +++ b/ui/src/views/image/TemplateZones.vue @@ -0,0 +1,41 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + +