From 034a0721a5544cdf646ff53e4da2e51356e2b78c Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 4 Mar 2016 18:15:01 +0100 Subject: [PATCH] Feature #4330: Refactor Sunstone left menu --- src/sunstone/etc/sunstone-views/admin.yaml | 664 ++++++++--------- .../etc/sunstone-views/admin_vcenter.yaml | 525 ++++++++------ .../etc/sunstone-views/groupadmin.yaml | 666 ++++++++--------- .../sunstone-views/groupadmin_vcenter.yaml | 666 ++++++++--------- src/sunstone/etc/sunstone-views/user.yaml | 668 +++++++++--------- src/sunstone/public/app/main.js | 30 +- src/sunstone/public/app/sunstone.js | 10 +- src/sunstone/public/app/tabs/acls-tab.js | 5 +- src/sunstone/public/app/tabs/clusters-tab.js | 7 +- src/sunstone/public/app/tabs/dashboard-tab.js | 4 +- .../public/app/tabs/datastores-tab.js | 7 +- src/sunstone/public/app/tabs/files-tab.js | 9 +- src/sunstone/public/app/tabs/groups-tab.js | 7 +- src/sunstone/public/app/tabs/hosts-tab.js | 7 +- src/sunstone/public/app/tabs/images-tab.js | 7 +- ...infra-tab.js => infrastructure-top-tab.js} | 4 +- .../{system-tab.js => instances-top-tab.js} | 4 +- .../public/app/tabs/marketplaceapps-tab.js | 11 +- .../public/app/tabs/marketplaces-tab.js | 11 +- ...ow-dashboard-tab.js => network-top-tab.js} | 4 +- .../public/app/tabs/oneflow-services-tab.js | 7 +- .../public/app/tabs/oneflow-templates-tab.js | 9 +- src/sunstone/public/app/tabs/secgroups-tab.js | 9 +- src/sunstone/public/app/tabs/settings-tab.js | 4 +- .../public/app/tabs/storage-top-tab.js | 27 + src/sunstone/public/app/tabs/support-tab.js | 4 +- .../{vresources-tab.js => system-top-tab.js} | 8 +- src/sunstone/public/app/tabs/templates-tab.js | 9 +- .../public/app/tabs/templates-top-tab.js | 28 + src/sunstone/public/app/tabs/users-tab.js | 7 +- src/sunstone/public/app/tabs/vdcs-tab.js | 7 +- src/sunstone/public/app/tabs/vms-tab.js | 9 +- src/sunstone/public/app/tabs/vnets-tab.js | 7 +- .../public/app/tabs/vnets-topology-tab.js | 5 +- src/sunstone/public/app/tabs/vrouters-tab.js | 9 +- src/sunstone/public/app/tabs/zones-tab.js | 7 +- src/sunstone/public/scss/_menu.scss | 26 + 37 files changed, 1849 insertions(+), 1649 deletions(-) rename src/sunstone/public/app/tabs/{infra-tab.js => infrastructure-top-tab.js} (91%) rename src/sunstone/public/app/tabs/{system-tab.js => instances-top-tab.js} (92%) rename src/sunstone/public/app/tabs/{oneflow-dashboard-tab.js => network-top-tab.js} (92%) create mode 100644 src/sunstone/public/app/tabs/storage-top-tab.js rename src/sunstone/public/app/tabs/{vresources-tab.js => system-top-tab.js} (88%) create mode 100644 src/sunstone/public/app/tabs/templates-top-tab.js create mode 100644 src/sunstone/public/scss/_menu.scss diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index 2b9fc83bea..a109b9c3cf 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -2,30 +2,32 @@ small_logo: images/opennebula-sunstone-v4.14-small.png provision_logo: images/one_small_logo.png enabled_tabs: - dashboard-tab - - system-tab + - system-top-tab - users-tab - groups-tab - vdcs-tab - acls-tab - - vresources-tab - - vms-tab + - templates-top-tab - templates-tab - - images-tab - - files-tab - - infra-tab + - oneflow-templates-tab + - instances-top-tab + - vms-tab + - oneflow-services-tab + - infrastructure-top-tab - clusters-tab - hosts-tab - - datastores-tab - - vnets-topology-tab - - vnets-tab - - secgroups-tab - - vrouters-tab - zones-tab - - oneflow-dashboard-tab - - oneflow-services-tab - - oneflow-templates-tab + - storage-top-tab + - datastores-tab + - images-tab + - files-tab - marketplaces-tab - marketplaceapps-tab + - network-top-tab + - vnets-tab + - vrouters-tab + - vnets-topology-tab + - secgroups-tab - settings-tab - support-tab autorefresh: true @@ -46,7 +48,7 @@ tabs: - hosts - users widgets_one_footer: - system-tab: + system-top-tab: panel_tabs: actions: users-tab: @@ -121,7 +123,6 @@ tabs: Vdc.update_dialog: true Vdc.rename: true Vdc.delete: true - acls-tab: panel_tabs: table_columns: @@ -137,7 +138,69 @@ tabs: Acl.refresh: true Acl.create_dialog: true Acl.delete: true - vresources-tab: + templates-top-tab: + panel_tabs: + actions: + templates-tab: + panel_tabs: + template_info_tab: true + template_template_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Registration time + #- 6 # Labels + actions: + Template.refresh: true + Template.create_dialog: true + Template.import_dialog: false + Template.update_dialog: true + Template.instantiate_vms: true + Template.rename: true + Template.chown: true + Template.chgrp: true + Template.chmod: true + Template.clone_dialog: true + Template.delete: true + Template.delete_recursive: true + Template.share: true + Template.unshare: true + template_creation_tabs: + general: true + storage: true + network: true + os_booting: true + features: true + input_output: true + context: true + scheduling: true + hybrid: true + other: true + oneflow-templates-tab: + panel_tabs: + service_template_info_tab: true + service_template_roles_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + actions: + ServiceTemplate.refresh: true + ServiceTemplate.create_dialog: true + ServiceTemplate.update_dialog: true + ServiceTemplate.instantiate: true + ServiceTemplate.chown: true + ServiceTemplate.chgrp: true + ServiceTemplate.chmod: true + ServiceTemplate.rename: true + ServiceTemplate.clone_dialog: true + ServiceTemplate.delete: true + instances-top-tab: panel_tabs: actions: vms-tab: @@ -207,44 +270,163 @@ tabs: VM.resched: true VM.unresched: true VM.saveas_template: true - templates-tab: + oneflow-services-tab: panel_tabs: - template_info_tab: true - template_template_tab: true + service_info_tab: true + service_roles_tab: true + service_log_tab: true + panel_tabs_actions: + service_roles_tab: + Role.scale: true + Role.hold: true + Role.release: true + Role.suspend: true + Role.resume: true + Role.stop: true + Role.reboot: true + Role.reboot_hard: true + Role.poweroff: true + Role.poweroff_hard: true + Role.undeploy: true + Role.undeploy_hard: true + Role.shutdown: true + Role.shutdown_hard: true + Role.delete: true + Role.delete_recreate: true + RoleVM.hold: true + RoleVM.release: true + RoleVM.suspend: true + RoleVM.resume: true + RoleVM.stop: true + RoleVM.reboot: true + RoleVM.reboot_hard: true + RoleVM.poweroff: true + RoleVM.poweroff_hard: true + RoleVM.undeploy: true + RoleVM.undeploy_hard: true + RoleVM.shutdown: true + RoleVM.shutdown_hard: true + RoleVM.delete: true + RoleVM.delete_recreate: true + RoleVM.resched: true + RoleVM.unresched: true + RoleVM.recover: true table_columns: - 0 # Checkbox - 1 # ID - 2 # Owner - 3 # Group - 4 # Name - - 5 # Registration time + - 5 # State + actions: + Service.refresh: true + Service.chown: true + Service.chgrp: true + Service.chmod: true + Service.rename: true + Service.shutdown: true + Service.recover: true + Service.delete: true + infrastructure-top-tab: + panel_tabs: + actions: + clusters-tab: + panel_tabs: + cluster_info_tab: true + cluster_host_tab: true + cluster_vnet_tab: true + cluster_datastore_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Hosts + - 4 # VNets + - 5 # Datastores #- 6 # Labels actions: - Template.refresh: true - Template.create_dialog: true - Template.import_dialog: false - Template.update_dialog: true - Template.instantiate_vms: true - Template.rename: true - Template.chown: true - Template.chgrp: true - Template.chmod: true - Template.clone_dialog: true - Template.delete: true - Template.delete_recursive: true - Template.share: true - Template.unshare: true - template_creation_tabs: - general: true - storage: true - network: true - os_booting: true - features: true - input_output: true - context: true - scheduling: true - hybrid: true - other: true + Cluster.refresh: true + Cluster.create_dialog: true + Cluster.update_dialog: true + Cluster.delete: true + Cluster.rename: true + hosts-tab: + panel_tabs: + host_info_tab: true + host_monitoring_tab: true + host_vms_tab: true + host_wilds_tab: true + host_esx_tab: true + host_pci_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Cluster + - 4 # RVMs + #- 5 # Real CPU + - 6 # Allocated CPU + #- 7 # Real MEM + - 8 # Allocated MEM + - 9 # Status + #- 10 # IM MAD + #- 11 # VM MAD + #- 12 # Last monitored on + #- 13 # Labels + actions: + Host.refresh: true + Host.create_dialog: true + Host.addtocluster: true + Host.rename: true + Host.enable: true + Host.disable: true + Host.delete: true + zones-tab: + panel_tabs: + zone_info_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Endpoint + #- 4 # Labels + actions: + Zone.refresh: true + Zone.create_dialog: true + Zone.rename: true + Zone.delete: true + storage-top-tab: + panel_tabs: + actions: + datastores-tab: + panel_tabs: + datastore_info_tab: true + datastore_image_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Capacity + - 6 # Cluster + #- 7 # Basepath + #- 8 # TM + #- 9 # DS + - 10 # Type + - 11 # Status + #- 12 # Labels + actions: + Datastore.refresh: true + Datastore.create_dialog: true + Datastore.addtocluster: true + Datastore.rename: true + Datastore.chown: true + Datastore.chgrp: true + Datastore.chmod: true + Datastore.delete: true + Datastore.enable: true + Datastore.disable: true images-tab: panel_tabs: image_info_tab: true @@ -310,289 +492,6 @@ tabs: File.enable: true File.disable: true File.delete: true - infra-tab: - panel_tabs: - actions: - clusters-tab: - panel_tabs: - cluster_info_tab: true - cluster_host_tab: true - cluster_vnet_tab: true - cluster_datastore_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Hosts - - 4 # VNets - - 5 # Datastores - #- 6 # Labels - actions: - Cluster.refresh: true - Cluster.create_dialog: true - Cluster.update_dialog: true - Cluster.delete: true - Cluster.rename: true - hosts-tab: - panel_tabs: - host_info_tab: true - host_monitoring_tab: true - host_vms_tab: true - host_wilds_tab: true - host_esx_tab: true - host_pci_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Cluster - - 4 # RVMs - #- 5 # Real CPU - - 6 # Allocated CPU - #- 7 # Real MEM - - 8 # Allocated MEM - - 9 # Status - #- 10 # IM MAD - #- 11 # VM MAD - #- 12 # Last monitored on - #- 13 # Labels - actions: - Host.refresh: true - Host.create_dialog: true - Host.addtocluster: true - Host.rename: true - Host.enable: true - Host.disable: true - Host.delete: true - datastores-tab: - panel_tabs: - datastore_info_tab: true - datastore_image_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # Capacity - - 6 # Cluster - #- 7 # Basepath - #- 8 # TM - #- 9 # DS - - 10 # Type - - 11 # Status - #- 12 # Labels - actions: - Datastore.refresh: true - Datastore.create_dialog: true - Datastore.addtocluster: true - Datastore.rename: true - Datastore.chown: true - Datastore.chgrp: true - Datastore.chmod: true - Datastore.delete: true - Datastore.enable: true - Datastore.disable: true - vnets-topology-tab: - panel_tabs: - actions: - NetworkTopology.refresh: true - NetworkTopology.fit: true - NetworkTopology.collapseVMs: true - NetworkTopology.openVMs: true - vnets-tab: - panel_tabs: - vnet_info_tab: true - vnet_ar_list_tab: true - vnet_leases_tab: true - vnet_sg_list_tab: true - vnet_vr_list_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # Reservation - - 6 # Cluster - #- 7 # Bridge - - 8 # Leases - #- 9 # VLAN ID - #- 10 # Labels - actions: - Network.refresh: true - Network.create_dialog: true - Network.import_dialog: false - Network.update_dialog: true - Network.reserve_dialog: true - Network.addtocluster: true - Network.rename: true - Network.chown: true - Network.chgrp: true - Network.chmod: true - Network.delete: true - Network.hold_lease: true - Network.release_lease: true - Network.add_ar: true - Network.remove_ar: true - Network.update_ar: true - secgroups-tab: - panel_tabs: - security_group_info_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - #- 5 # Labels - actions: - SecurityGroup.refresh: true - SecurityGroup.create_dialog: true - SecurityGroup.update_dialog: true - SecurityGroup.rename: true - SecurityGroup.chown: true - SecurityGroup.chgrp: true - SecurityGroup.chmod: true - SecurityGroup.clone_dialog: true - SecurityGroup.delete: true - vrouters-tab: - panel_tabs: - virtual_router_info_tab: true - virtual_router_vms_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - actions: - VirtualRouter.refresh: true - VirtualRouter.create_dialog: true - VirtualRouter.rename: true - VirtualRouter.chown: true - VirtualRouter.chgrp: true - VirtualRouter.chmod: true - VirtualRouter.delete: true - VirtualRouter.attachnic: true - VirtualRouter.detachnic: true - oneflow-dashboard-tab: - panel_tabs: - table_columns: - actions: - oneflow-services-tab: - panel_tabs: - service_info_tab: true - service_roles_tab: true - service_log_tab: true - panel_tabs_actions: - service_roles_tab: - Role.scale: true - Role.hold: true - Role.release: true - Role.suspend: true - Role.resume: true - Role.stop: true - Role.reboot: true - Role.reboot_hard: true - Role.poweroff: true - Role.poweroff_hard: true - Role.undeploy: true - Role.undeploy_hard: true - Role.shutdown: true - Role.shutdown_hard: true - Role.delete: true - Role.delete_recreate: true - RoleVM.hold: true - RoleVM.release: true - RoleVM.suspend: true - RoleVM.resume: true - RoleVM.stop: true - RoleVM.reboot: true - RoleVM.reboot_hard: true - RoleVM.poweroff: true - RoleVM.poweroff_hard: true - RoleVM.undeploy: true - RoleVM.undeploy_hard: true - RoleVM.shutdown: true - RoleVM.shutdown_hard: true - RoleVM.delete: true - RoleVM.delete_recreate: true - RoleVM.resched: true - RoleVM.unresched: true - RoleVM.recover: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # State - actions: - Service.refresh: true - Service.chown: true - Service.chgrp: true - Service.chmod: true - Service.rename: true - Service.shutdown: true - Service.recover: true - Service.delete: true - oneflow-templates-tab: - panel_tabs: - service_template_info_tab: true - service_template_roles_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - actions: - ServiceTemplate.refresh: true - ServiceTemplate.create_dialog: true - ServiceTemplate.update_dialog: true - ServiceTemplate.instantiate: true - ServiceTemplate.chown: true - ServiceTemplate.chgrp: true - ServiceTemplate.chmod: true - ServiceTemplate.rename: true - ServiceTemplate.clone_dialog: true - ServiceTemplate.delete: true - zones-tab: - panel_tabs: - zone_info_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Endpoint - #- 4 # Labels - actions: - Zone.refresh: true - Zone.create_dialog: true - Zone.rename: true - Zone.delete: true - support-tab: - panel_tabs: - support_info_tab: true - table_columns: - #- 0 # Checkbox - - 1 # ID - - 2 # Subject - - 3 # Created at - - 4 # Status - actions: - Support.refresh: true - Support.create_dialog: true - settings-tab: - panel_tabs: - user_info_tab: true - user_quotas_tab: true - group_quotas_tab: true - user_accounting_tab: true - user_showback_tab: true - actions: - User.quotas_dialog: false marketplaces-tab: panel_tabs: marketplace_info_tab: true @@ -644,3 +543,110 @@ tabs: MarketPlaceApp.enable: true MarketPlaceApp.disable: true MarketPlaceApp.delete: true + network-top-tab: + panel_tabs: + actions: + vnets-tab: + panel_tabs: + vnet_info_tab: true + vnet_ar_list_tab: true + vnet_leases_tab: true + vnet_sg_list_tab: true + vnet_vr_list_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Reservation + - 6 # Cluster + #- 7 # Bridge + - 8 # Leases + #- 9 # VLAN ID + #- 10 # Labels + actions: + Network.refresh: true + Network.create_dialog: true + Network.import_dialog: false + Network.update_dialog: true + Network.reserve_dialog: true + Network.addtocluster: true + Network.rename: true + Network.chown: true + Network.chgrp: true + Network.chmod: true + Network.delete: true + Network.hold_lease: true + Network.release_lease: true + Network.add_ar: true + Network.remove_ar: true + Network.update_ar: true + vrouters-tab: + panel_tabs: + virtual_router_info_tab: true + virtual_router_vms_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + actions: + VirtualRouter.refresh: true + VirtualRouter.create_dialog: true + VirtualRouter.rename: true + VirtualRouter.chown: true + VirtualRouter.chgrp: true + VirtualRouter.chmod: true + VirtualRouter.delete: true + VirtualRouter.attachnic: true + VirtualRouter.detachnic: true + vnets-topology-tab: + panel_tabs: + actions: + NetworkTopology.refresh: true + NetworkTopology.fit: true + NetworkTopology.collapseVMs: true + NetworkTopology.openVMs: true + secgroups-tab: + panel_tabs: + security_group_info_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + #- 5 # Labels + actions: + SecurityGroup.refresh: true + SecurityGroup.create_dialog: true + SecurityGroup.update_dialog: true + SecurityGroup.rename: true + SecurityGroup.chown: true + SecurityGroup.chgrp: true + SecurityGroup.chmod: true + SecurityGroup.clone_dialog: true + SecurityGroup.delete: true + support-tab: + panel_tabs: + support_info_tab: true + table_columns: + #- 0 # Checkbox + - 1 # ID + - 2 # Subject + - 3 # Created at + - 4 # Status + actions: + Support.refresh: true + Support.create_dialog: true + settings-tab: + panel_tabs: + user_info_tab: true + user_quotas_tab: true + group_quotas_tab: true + user_accounting_tab: true + user_showback_tab: true + actions: + User.quotas_dialog: false diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml index c053a245a6..2f4fe51e9c 100644 --- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml @@ -2,28 +2,32 @@ small_logo: images/opennebula-sunstone-v4.14-small.png provision_logo: images/one_small_logo.png enabled_tabs: - dashboard-tab - - system-tab + - system-top-tab - users-tab - groups-tab - vdcs-tab - acls-tab - - vresources-tab - - vms-tab + - templates-top-tab - templates-tab - #- images-tab - #- files-tab - - infra-tab + - oneflow-templates-tab + - instances-top-tab + - vms-tab + - oneflow-services-tab + - infrastructure-top-tab - clusters-tab - hosts-tab - #- datastores-tab - - vnets-topology-tab - - vnets-tab - #- secgroups-tab - - vrouters-tab - zones-tab - - oneflow-dashboard-tab - - oneflow-services-tab - - oneflow-templates-tab + - storage-top-tab + #- datastores-tab + #- images-tab + #- files-tab + - marketplaces-tab + - marketplaceapps-tab + - network-top-tab + - vnets-tab + - vrouters-tab + - vnets-topology-tab + #- secgroups-tab - settings-tab - support-tab autorefresh: true @@ -37,14 +41,14 @@ tabs: Sunstone.toggle_top: false widgets_three_per_row: widgets_two_per_row: -# - storage -# - network + #- storage + #- network widgets_one_per_row: - vms - hosts - users widgets_one_footer: - system-tab: + system-top-tab: panel_tabs: actions: users-tab: @@ -119,7 +123,6 @@ tabs: Vdc.update_dialog: true Vdc.rename: true Vdc.delete: true - acls-tab: panel_tabs: table_columns: @@ -135,7 +138,69 @@ tabs: Acl.refresh: true Acl.create_dialog: true Acl.delete: true - vresources-tab: + templates-top-tab: + panel_tabs: + actions: + templates-tab: + panel_tabs: + template_info_tab: true + template_template_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Registration time + #- 6 # Labels + actions: + Template.refresh: true + Template.create_dialog: true + Template.import_dialog: true + Template.update_dialog: true + Template.instantiate_vms: true + Template.rename: true + Template.chown: true + Template.chgrp: true + Template.chmod: true + Template.clone_dialog: true + Template.delete: true + Template.delete_recursive: false + Template.share: false + Template.unshare: false + template_creation_tabs: + general: true + storage: true + network: true + os_booting: true + features: true + input_output: true + context: true + scheduling: true + hybrid: true + other: true + oneflow-templates-tab: + panel_tabs: + service_template_info_tab: true + service_template_roles_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + actions: + ServiceTemplate.refresh: true + ServiceTemplate.create_dialog: true + ServiceTemplate.update_dialog: true + ServiceTemplate.instantiate: true + ServiceTemplate.chown: true + ServiceTemplate.chgrp: true + ServiceTemplate.chmod: true + ServiceTemplate.rename: true + ServiceTemplate.clone_dialog: true + ServiceTemplate.delete: true + instances-top-tab: panel_tabs: actions: vms-tab: @@ -205,44 +270,163 @@ tabs: VM.resched: true VM.unresched: true VM.saveas_template: false - templates-tab: + oneflow-services-tab: panel_tabs: - template_info_tab: true - template_template_tab: true + service_info_tab: true + service_roles_tab: true + service_log_tab: true + panel_tabs_actions: + service_roles_tab: + Role.scale: true + Role.hold: true + Role.release: true + Role.suspend: true + Role.resume: true + Role.stop: true + Role.reboot: true + Role.reboot_hard: true + Role.poweroff: true + Role.poweroff_hard: true + Role.undeploy: true + Role.undeploy_hard: true + Role.shutdown: true + Role.shutdown_hard: true + Role.delete: true + Role.delete_recreate: true + RoleVM.hold: true + RoleVM.release: true + RoleVM.suspend: true + RoleVM.resume: true + RoleVM.stop: true + RoleVM.reboot: true + RoleVM.reboot_hard: true + RoleVM.poweroff: true + RoleVM.poweroff_hard: true + RoleVM.undeploy: true + RoleVM.undeploy_hard: true + RoleVM.shutdown: true + RoleVM.shutdown_hard: true + RoleVM.delete: true + RoleVM.delete_recreate: true + RoleVM.resched: true + RoleVM.unresched: true + RoleVM.recover: true table_columns: - 0 # Checkbox - 1 # ID - 2 # Owner - 3 # Group - 4 # Name - - 5 # Registration time + - 5 # State + actions: + Service.refresh: true + Service.chown: true + Service.chgrp: true + Service.chmod: true + Service.rename: true + Service.shutdown: true + Service.recover: true + Service.delete: true + infrastructure-top-tab: + panel_tabs: + actions: + clusters-tab: + panel_tabs: + cluster_info_tab: true + cluster_host_tab: true + cluster_vnet_tab: true + cluster_datastore_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Hosts + - 4 # VNets + - 5 # Datastores #- 6 # Labels actions: - Template.refresh: true - Template.create_dialog: true - Template.import_dialog: true - Template.update_dialog: true - Template.instantiate_vms: true - Template.rename: true - Template.chown: true - Template.chgrp: true - Template.chmod: true - Template.clone_dialog: true - Template.delete: true - Template.delete_recursive: false - Template.share: false - Template.unshare: false - template_creation_tabs: - general: true - storage: true - network: true - os_booting: true - features: true - input_output: true - context: true - scheduling: true - hybrid: true - other: true + Cluster.refresh: true + Cluster.create_dialog: true + Cluster.update_dialog: true + Cluster.delete: true + Cluster.rename: true + hosts-tab: + panel_tabs: + host_info_tab: true + host_monitoring_tab: true + host_vms_tab: true + host_wilds_tab: true + host_esx_tab: true + host_pci_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Cluster + - 4 # RVMs + #- 5 # Real CPU + - 6 # Allocated CPU + #- 7 # Real MEM + - 8 # Allocated MEM + - 9 # Status + #- 10 # IM MAD + #- 11 # VM MAD + #- 12 # Last monitored on + #- 13 # Labels + actions: + Host.refresh: true + Host.create_dialog: true + Host.addtocluster: true + Host.rename: true + Host.enable: true + Host.disable: true + Host.delete: true + zones-tab: + panel_tabs: + zone_info_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Endpoint + #- 4 # Labels + actions: + Zone.refresh: true + Zone.create_dialog: true + Zone.rename: true + Zone.delete: true + storage-top-tab: + panel_tabs: + actions: + datastores-tab: + panel_tabs: + datastore_info_tab: true + datastore_image_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Capacity + - 6 # Cluster + #- 7 # Basepath + #- 8 # TM + #- 9 # DS + - 10 # Type + - 11 # Status + #- 12 # Labels + actions: + Datastore.refresh: true + Datastore.create_dialog: true + Datastore.addtocluster: true + Datastore.rename: true + Datastore.chown: true + Datastore.chgrp: true + Datastore.chmod: true + Datastore.delete: true + Datastore.enable: true + Datastore.disable: true images-tab: panel_tabs: image_info_tab: true @@ -307,64 +491,10 @@ tabs: File.enable: true File.disable: true File.delete: true - infra-tab: + marketplaces-tab: panel_tabs: - actions: - clusters-tab: - panel_tabs: - cluster_info_tab: true - cluster_host_tab: true - cluster_vnet_tab: true - cluster_datastore_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Hosts - - 4 # VNets - - 5 # Datastores - #- 6 # Labels - actions: - Cluster.refresh: true - Cluster.create_dialog: true - Cluster.update_dialog: true - Cluster.delete: true - Cluster.rename: true - hosts-tab: - panel_tabs: - host_info_tab: true - host_monitoring_tab: true - host_vms_tab: true - host_wilds_tab: true - host_esx_tab: true - host_pci_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Cluster - - 4 # RVMs - #- 5 # Real CPU - - 6 # Allocated CPU - #- 7 # Real MEM - - 8 # Allocated MEM - - 9 # Status - #- 10 # IM MAD - #- 11 # VM MAD - #- 12 # Last monitored on - #- 13 # Labels - actions: - Host.refresh: true - Host.create_dialog: true - Host.addtocluster: true - Host.rename: true - Host.enable: true - Host.disable: true - Host.delete: true - datastores-tab: - panel_tabs: - datastore_info_tab: true - datastore_image_tab: true + marketplace_info_tab: true + marketplace_apps_tab: true table_columns: - 0 # Checkbox - 1 # ID @@ -372,31 +502,49 @@ tabs: - 3 # Group - 4 # Name - 5 # Capacity - - 6 # Cluster - #- 7 # Basepath - #- 8 # TM - #- 9 # DS - - 10 # Type - - 11 # Status - #- 12 # Labels + - 6 # Apps + - 7 # Driver + #- 8 # Labels actions: - Datastore.refresh: true - Datastore.create_dialog: true - Datastore.addtocluster: true - Datastore.rename: true - Datastore.chown: true - Datastore.chgrp: true - Datastore.chmod: true - Datastore.delete: true - Datastore.enable: true - Datastore.disable: true - vnets-topology-tab: + MarketPlace.refresh: true + MarketPlace.create_dialog: true + MarketPlace.update_dialog: true + MarketPlace.rename: true + MarketPlace.chown: true + MarketPlace.chgrp: true + MarketPlace.chmod: true + MarketPlace.delete: true + marketplaceapps-tab: + panel_tabs: + marketplaceapp_info_tab: true + marketplaceapp_templates_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + #- 5 # Version + - 6 # Size + - 7 # State + #- 8 # Type + - 9 # Registration + - 10 # Marketplace + #- 11 # Labels + actions: + MarketPlaceApp.refresh: true + MarketPlaceApp.create_dialog: true + MarketPlaceApp.export_dialog: true + MarketPlaceApp.rename: true + MarketPlaceApp.chown: true + MarketPlaceApp.chgrp: true + MarketPlaceApp.chmod: true + MarketPlaceApp.enable: true + MarketPlaceApp.disable: true + MarketPlaceApp.delete: true + network-top-tab: panel_tabs: actions: - NetworkTopology.refresh: true - NetworkTopology.fit: true - NetworkTopology.collapseVMs: true - NetworkTopology.openVMs: true vnets-tab: panel_tabs: vnet_info_tab: true @@ -433,26 +581,6 @@ tabs: Network.add_ar: true Network.remove_ar: true Network.update_ar: true - secgroups-tab: - panel_tabs: - security_group_info_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - #- 5 # Labels - actions: - SecurityGroup.refresh: true - SecurityGroup.create_dialog: true - SecurityGroup.update_dialog: true - SecurityGroup.rename: true - SecurityGroup.chown: true - SecurityGroup.chgrp: true - SecurityGroup.chmod: true - SecurityGroup.clone_dialog: true - SecurityGroup.delete: true vrouters-tab: panel_tabs: virtual_router_info_tab: true @@ -473,102 +601,33 @@ tabs: VirtualRouter.delete: true VirtualRouter.attachnic: true VirtualRouter.detachnic: true - oneflow-dashboard-tab: + vnets-topology-tab: panel_tabs: - table_columns: actions: - oneflow-services-tab: + NetworkTopology.refresh: true + NetworkTopology.fit: true + NetworkTopology.collapseVMs: true + NetworkTopology.openVMs: true + secgroups-tab: panel_tabs: - service_info_tab: true - service_roles_tab: true - service_log_tab: true - panel_tabs_actions: - service_roles_tab: - Role.scale: true - Role.hold: true - Role.release: true - Role.suspend: true - Role.resume: true - Role.stop: true - Role.reboot: true - Role.reboot_hard: true - Role.poweroff: true - Role.poweroff_hard: true - Role.undeploy: true - Role.undeploy_hard: true - Role.shutdown: true - Role.shutdown_hard: true - Role.delete: true - Role.delete_recreate: true - RoleVM.hold: true - RoleVM.release: true - RoleVM.suspend: true - RoleVM.resume: true - RoleVM.stop: true - RoleVM.reboot: true - RoleVM.reboot_hard: true - RoleVM.poweroff: true - RoleVM.poweroff_hard: true - RoleVM.undeploy: true - RoleVM.undeploy_hard: true - RoleVM.shutdown: true - RoleVM.shutdown_hard: true - RoleVM.delete: true - RoleVM.delete_recreate: true - RoleVM.resched: true - RoleVM.unresched: true - RoleVM.recover: true + security_group_info_tab: true table_columns: - 0 # Checkbox - 1 # ID - 2 # Owner - 3 # Group - 4 # Name - - 5 # State + #- 5 # Labels actions: - Service.refresh: true - Service.chown: true - Service.chgrp: true - Service.chmod: true - Service.rename: true - Service.shutdown: true - Service.recover: true - Service.delete: true - oneflow-templates-tab: - panel_tabs: - service_template_info_tab: true - service_template_roles_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - actions: - ServiceTemplate.refresh: true - ServiceTemplate.create_dialog: true - ServiceTemplate.update_dialog: true - ServiceTemplate.instantiate: true - ServiceTemplate.chown: true - ServiceTemplate.chgrp: true - ServiceTemplate.chmod: true - ServiceTemplate.rename: true - ServiceTemplate.clone_dialog: true - ServiceTemplate.delete: true - zones-tab: - panel_tabs: - zone_info_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Endpoint - #- 4 # Labels - actions: - Zone.refresh: true - Zone.create_dialog: true - Zone.rename: true - Zone.delete: true + SecurityGroup.refresh: true + SecurityGroup.create_dialog: true + SecurityGroup.update_dialog: true + SecurityGroup.rename: true + SecurityGroup.chown: true + SecurityGroup.chgrp: true + SecurityGroup.chmod: true + SecurityGroup.clone_dialog: true + SecurityGroup.delete: true support-tab: panel_tabs: support_info_tab: true diff --git a/src/sunstone/etc/sunstone-views/groupadmin.yaml b/src/sunstone/etc/sunstone-views/groupadmin.yaml index 911d7ec904..96713dc71d 100644 --- a/src/sunstone/etc/sunstone-views/groupadmin.yaml +++ b/src/sunstone/etc/sunstone-views/groupadmin.yaml @@ -2,30 +2,32 @@ small_logo: images/opennebula-sunstone-v4.14-small.png provision_logo: images/one_small_logo.png enabled_tabs: - dashboard-tab - - system-tab + - system-top-tab - users-tab - groups-tab #- vdcs-tab #- acls-tab - - vresources-tab - - vms-tab + - templates-top-tab - templates-tab - #- images-tab - #- files-tab - - infra-tab + - oneflow-templates-tab + - instances-top-tab + - vms-tab + - oneflow-services-tab + #- infrastructure-top-tab #- clusters-tab #- hosts-tab - #- datastores-tab - - vnets-topology-tab - - vnets-tab - - secgroups-tab - - vrouters-tab #- zones-tab - - oneflow-dashboard-tab - - oneflow-services-tab - - oneflow-templates-tab + #- storage-top-tab + #- datastores-tab + #- images-tab + #- files-tab #- marketplaces-tab #- marketplaceapps-tab + - network-top-tab + - vnets-tab + - vrouters-tab + - vnets-topology-tab + - secgroups-tab - settings-tab #- support-tab autorefresh: true @@ -45,7 +47,7 @@ tabs: - vms - users widgets_one_footer: - system-tab: + system-top-tab: panel_tabs: actions: users-tab: @@ -120,7 +122,6 @@ tabs: Vdc.update_dialog: true Vdc.rename: true Vdc.delete: true - acls-tab: panel_tabs: table_columns: @@ -136,7 +137,69 @@ tabs: Acl.refresh: true Acl.create_dialog: true Acl.delete: true - vresources-tab: + templates-top-tab: + panel_tabs: + actions: + templates-tab: + panel_tabs: + template_info_tab: true + template_template_tab: false + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Registration time + #- 6 # Labels + actions: + Template.refresh: true + Template.create_dialog: false + Template.import_dialog: false + Template.update_dialog: false + Template.instantiate_vms: true + Template.rename: true + Template.chown: true + Template.chgrp: false + Template.chmod: false + Template.clone_dialog: false + Template.delete: false + Template.delete_recursive: true + Template.share: true + Template.unshare: true + template_creation_tabs: + general: true + storage: true + network: true + os_booting: true + features: true + input_output: true + context: true + scheduling: true + hybrid: true + other: true + oneflow-templates-tab: + panel_tabs: + service_template_info_tab: true + service_template_roles_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + actions: + ServiceTemplate.refresh: true + ServiceTemplate.create_dialog: false + ServiceTemplate.update_dialog: false + ServiceTemplate.instantiate: true + ServiceTemplate.chown: false + ServiceTemplate.chgrp: false + ServiceTemplate.chmod: false + ServiceTemplate.rename: false + ServiceTemplate.clone_dialog: false + ServiceTemplate.delete: false + instances-top-tab: panel_tabs: actions: vms-tab: @@ -206,44 +269,163 @@ tabs: VM.resched: false VM.unresched: false VM.saveas_template: true - templates-tab: + oneflow-services-tab: panel_tabs: - template_info_tab: true - template_template_tab: false + service_info_tab: true + service_roles_tab: true + service_log_tab: true + panel_tabs_actions: + service_roles_tab: + Role.scale: true + Role.hold: true + Role.release: true + Role.suspend: false + Role.resume: true + Role.stop: false + Role.reboot: true + Role.reboot_hard: true + Role.poweroff: true + Role.poweroff_hard: true + Role.undeploy: true + Role.undeploy_hard: true + Role.shutdown: true + Role.shutdown_hard: true + Role.delete: true + Role.delete_recreate: false + RoleVM.hold: true + RoleVM.release: true + RoleVM.suspend: false + RoleVM.resume: true + RoleVM.stop: false + RoleVM.reboot: true + RoleVM.reboot_hard: true + RoleVM.poweroff: true + RoleVM.poweroff_hard: true + RoleVM.undeploy: true + RoleVM.undeploy_hard: true + RoleVM.shutdown: true + RoleVM.shutdown_hard: true + RoleVM.delete: true + RoleVM.delete_recreate: false + RoleVM.resched: false + RoleVM.unresched: false + RoleVM.recover: false + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + #- 3 # Group + - 4 # Name + - 5 # State + actions: + Service.refresh: true + Service.chown: true + Service.chgrp: false + Service.chmod: false + Service.rename: true + Service.shutdown: true + Service.recover: true + Service.delete: true + infrastructure-top-tab: + panel_tabs: + actions: + clusters-tab: + panel_tabs: + cluster_info_tab: true + cluster_host_tab: true + cluster_vnet_tab: true + cluster_datastore_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Hosts + - 4 # VNets + - 5 # Datastores + #- 6 # Labels + actions: + Cluster.refresh: true + Cluster.create_dialog: true + Cluster.update_dialog: true + Cluster.delete: true + Cluster.rename: true + hosts-tab: + panel_tabs: + host_info_tab: true + host_monitoring_tab: true + host_vms_tab: true + host_wilds_tab: true + host_esx_tab: true + host_pci_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Cluster + - 4 # RVMs + #- 5 # Real CPU + - 6 # Allocated CPU + #- 7 # Real MEM + - 8 # Allocated MEM + - 9 # Status + #- 10 # IM MAD + #- 11 # VM MAD + #- 12 # Last monitored on + #- 13 # Labels + actions: + Host.refresh: true + Host.create_dialog: true + Host.addtocluster: true + Host.rename: true + Host.enable: true + Host.disable: true + Host.delete: true + zones-tab: + panel_tabs: + zone_info_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Endpoint + #- 4 # Labels + actions: + Zone.refresh: true + Zone.create_dialog: true + Zone.rename: true + Zone.delete: true + storage-top-tab: + panel_tabs: + actions: + datastores-tab: + panel_tabs: + datastore_info_tab: true + datastore_image_tab: true table_columns: - 0 # Checkbox - 1 # ID - 2 # Owner - 3 # Group - 4 # Name - - 5 # Registration time - #- 6 # Labels + - 5 # Capacity + - 6 # Cluster + #- 7 # Basepath + #- 8 # TM + #- 9 # DS + - 10 # Type + - 11 # Status + #- 12 # Labels actions: - Template.refresh: true - Template.create_dialog: false - Template.import_dialog: false - Template.update_dialog: false - Template.instantiate_vms: true - Template.rename: true - Template.chown: true - Template.chgrp: false - Template.chmod: false - Template.clone_dialog: false - Template.delete: false - Template.delete_recursive: true - Template.share: true - Template.unshare: true - template_creation_tabs: - general: true - storage: true - network: true - os_booting: true - features: true - input_output: true - context: true - scheduling: true - hybrid: true - other: true + Datastore.refresh: true + Datastore.create_dialog: true + Datastore.addtocluster: true + Datastore.rename: true + Datastore.chown: true + Datastore.chgrp: true + Datastore.chmod: true + Datastore.delete: true + Datastore.enable: true + Datastore.disable: true images-tab: panel_tabs: image_info_tab: true @@ -309,289 +491,6 @@ tabs: File.enable: true File.disable: true File.delete: true - infra-tab: - panel_tabs: - actions: - clusters-tab: - panel_tabs: - cluster_info_tab: true - cluster_host_tab: true - cluster_vnet_tab: true - cluster_datastore_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Hosts - - 4 # VNets - - 5 # Datastores - #- 6 # Labels - actions: - Cluster.refresh: true - Cluster.create_dialog: true - Cluster.update_dialog: true - Cluster.delete: true - Cluster.rename: true - hosts-tab: - panel_tabs: - host_info_tab: true - host_monitoring_tab: true - host_vms_tab: true - host_wilds_tab: true - host_esx_tab: true - host_pci_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Cluster - - 4 # RVMs - #- 5 # Real CPU - - 6 # Allocated CPU - #- 7 # Real MEM - - 8 # Allocated MEM - - 9 # Status - #- 10 # IM MAD - #- 11 # VM MAD - #- 12 # Last monitored on - #- 13 # Labels - actions: - Host.refresh: true - Host.create_dialog: true - Host.addtocluster: true - Host.rename: true - Host.enable: true - Host.disable: true - Host.delete: true - datastores-tab: - panel_tabs: - datastore_info_tab: true - datastore_image_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # Capacity - - 6 # Cluster - #- 7 # Basepath - #- 8 # TM - #- 9 # DS - - 10 # Type - - 11 # Status - #- 12 # Labels - actions: - Datastore.refresh: true - Datastore.create_dialog: true - Datastore.addtocluster: true - Datastore.rename: true - Datastore.chown: true - Datastore.chgrp: true - Datastore.chmod: true - Datastore.delete: true - Datastore.enable: true - Datastore.disable: true - vnets-topology-tab: - panel_tabs: - actions: - NetworkTopology.refresh: true - NetworkTopology.fit: true - NetworkTopology.collapseVMs: true - NetworkTopology.openVMs: true - vnets-tab: - panel_tabs: - vnet_info_tab: false - vnet_ar_list_tab: false - vnet_leases_tab: true - vnet_sg_list_tab: true - vnet_vr_list_tab: false - table_columns: - - 0 # Checkbox - - 1 # ID - #- 2 # Owner - #- 3 # Group - - 4 # Name - #- 5 # Reservation - #- 6 # Cluster - #- 7 # Bridge - #- 8 # Leases - #- 9 # VLAN ID - #- 10 # Labels - actions: - Network.refresh: true - Network.create_dialog: false - Network.import_dialog: false - Network.update_dialog: false - Network.reserve_dialog: false - Network.addtocluster: false - Network.rename: false - Network.chown: false - Network.chgrp: false - Network.chmod: false - Network.delete: false - Network.hold_lease: false - Network.release_lease: false - Network.add_ar: false - Network.remove_ar: false - Network.update_ar: false - secgroups-tab: - panel_tabs: - security_group_info_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - #- 2 # Owner - #- 3 # Group - - 4 # Name - #- 5 # Labels - actions: - SecurityGroup.refresh: true - SecurityGroup.create_dialog: false - SecurityGroup.update_dialog: false - SecurityGroup.rename: false - SecurityGroup.chown: false - SecurityGroup.chgrp: false - SecurityGroup.chmod: false - SecurityGroup.clone_dialog: false - SecurityGroup.delete: false - vrouters-tab: - panel_tabs: - virtual_router_info_tab: true - virtual_router_vms_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - #- 3 # Group - - 4 # Name - actions: - VirtualRouter.refresh: true - VirtualRouter.create_dialog: true - VirtualRouter.rename: true - VirtualRouter.chown: true - VirtualRouter.chgrp: false - VirtualRouter.chmod: false - VirtualRouter.delete: true - VirtualRouter.attachnic: false - VirtualRouter.detachnic: false - oneflow-dashboard-tab: - panel_tabs: - table_columns: - actions: - oneflow-services-tab: - panel_tabs: - service_info_tab: true - service_roles_tab: true - service_log_tab: true - panel_tabs_actions: - service_roles_tab: - Role.scale: true - Role.hold: true - Role.release: true - Role.suspend: false - Role.resume: true - Role.stop: false - Role.reboot: true - Role.reboot_hard: true - Role.poweroff: true - Role.poweroff_hard: true - Role.undeploy: true - Role.undeploy_hard: true - Role.shutdown: true - Role.shutdown_hard: true - Role.delete: true - Role.delete_recreate: false - RoleVM.hold: true - RoleVM.release: true - RoleVM.suspend: false - RoleVM.resume: true - RoleVM.stop: false - RoleVM.reboot: true - RoleVM.reboot_hard: true - RoleVM.poweroff: true - RoleVM.poweroff_hard: true - RoleVM.undeploy: true - RoleVM.undeploy_hard: true - RoleVM.shutdown: true - RoleVM.shutdown_hard: true - RoleVM.delete: true - RoleVM.delete_recreate: false - RoleVM.resched: false - RoleVM.unresched: false - RoleVM.recover: false - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - #- 3 # Group - - 4 # Name - - 5 # State - actions: - Service.refresh: true - Service.chown: true - Service.chgrp: false - Service.chmod: false - Service.rename: true - Service.shutdown: true - Service.recover: true - Service.delete: true - oneflow-templates-tab: - panel_tabs: - service_template_info_tab: true - service_template_roles_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - actions: - ServiceTemplate.refresh: true - ServiceTemplate.create_dialog: false - ServiceTemplate.update_dialog: false - ServiceTemplate.instantiate: true - ServiceTemplate.chown: false - ServiceTemplate.chgrp: false - ServiceTemplate.chmod: false - ServiceTemplate.rename: false - ServiceTemplate.clone_dialog: false - ServiceTemplate.delete: false - zones-tab: - panel_tabs: - zone_info_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Endpoint - #- 4 # Labels - actions: - Zone.refresh: true - Zone.create_dialog: true - Zone.rename: true - Zone.delete: true - support-tab: - panel_tabs: - support_info_tab: true - table_columns: - #- 0 # Checkbox - - 1 # ID - - 2 # Subject - - 3 # Created at - - 4 # Status - actions: - Support.refresh: true - Support.create_dialog: true - settings-tab: - panel_tabs: - user_info_tab: true - user_quotas_tab: true - group_quotas_tab: true - user_accounting_tab: true - user_showback_tab: true - actions: - User.quotas_dialog: false marketplaces-tab: panel_tabs: marketplace_info_tab: true @@ -643,3 +542,110 @@ tabs: MarketPlaceApp.enable: true MarketPlaceApp.disable: true MarketPlaceApp.delete: true + network-top-tab: + panel_tabs: + actions: + vnets-tab: + panel_tabs: + vnet_info_tab: false + vnet_ar_list_tab: false + vnet_leases_tab: true + vnet_sg_list_tab: true + vnet_vr_list_tab: false + table_columns: + - 0 # Checkbox + - 1 # ID + #- 2 # Owner + #- 3 # Group + - 4 # Name + #- 5 # Reservation + #- 6 # Cluster + #- 7 # Bridge + #- 8 # Leases + #- 9 # VLAN ID + #- 10 # Labels + actions: + Network.refresh: true + Network.create_dialog: false + Network.import_dialog: false + Network.update_dialog: false + Network.reserve_dialog: false + Network.addtocluster: false + Network.rename: false + Network.chown: false + Network.chgrp: false + Network.chmod: false + Network.delete: false + Network.hold_lease: false + Network.release_lease: false + Network.add_ar: false + Network.remove_ar: false + Network.update_ar: false + vrouters-tab: + panel_tabs: + virtual_router_info_tab: true + virtual_router_vms_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + #- 3 # Group + - 4 # Name + actions: + VirtualRouter.refresh: true + VirtualRouter.create_dialog: true + VirtualRouter.rename: true + VirtualRouter.chown: true + VirtualRouter.chgrp: false + VirtualRouter.chmod: false + VirtualRouter.delete: true + VirtualRouter.attachnic: false + VirtualRouter.detachnic: false + vnets-topology-tab: + panel_tabs: + actions: + NetworkTopology.refresh: true + NetworkTopology.fit: true + NetworkTopology.collapseVMs: true + NetworkTopology.openVMs: true + secgroups-tab: + panel_tabs: + security_group_info_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + #- 2 # Owner + #- 3 # Group + - 4 # Name + #- 5 # Labels + actions: + SecurityGroup.refresh: true + SecurityGroup.create_dialog: false + SecurityGroup.update_dialog: false + SecurityGroup.rename: false + SecurityGroup.chown: false + SecurityGroup.chgrp: false + SecurityGroup.chmod: false + SecurityGroup.clone_dialog: false + SecurityGroup.delete: false + support-tab: + panel_tabs: + support_info_tab: true + table_columns: + #- 0 # Checkbox + - 1 # ID + - 2 # Subject + - 3 # Created at + - 4 # Status + actions: + Support.refresh: true + Support.create_dialog: true + settings-tab: + panel_tabs: + user_info_tab: true + user_quotas_tab: true + group_quotas_tab: true + user_accounting_tab: true + user_showback_tab: true + actions: + User.quotas_dialog: false diff --git a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml index f2990e782d..f00a171c60 100644 --- a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml @@ -2,30 +2,32 @@ small_logo: images/opennebula-sunstone-v4.14-small.png provision_logo: images/one_small_logo.png enabled_tabs: - dashboard-tab - - system-tab + - system-top-tab - users-tab - groups-tab #- vdcs-tab #- acls-tab - - vresources-tab - - vms-tab + - templates-top-tab #- templates-tab - #- images-tab - #- files-tab - - infra-tab + - oneflow-templates-tab + - instances-top-tab + - vms-tab + - oneflow-services-tab + #- infrastructure-top-tab #- clusters-tab #- hosts-tab - #- datastores-tab - - vnets-topology-tab - - vnets-tab - #- secgroups-tab - - vrouters-tab #- zones-tab - - oneflow-dashboard-tab - - oneflow-services-tab - - oneflow-templates-tab + #- storage-top-tab + #- datastores-tab + #- images-tab + #- files-tab #- marketplaces-tab #- marketplaceapps-tab + - network-top-tab + - vnets-tab + - vrouters-tab + - vnets-topology-tab + #- secgroups-tab - settings-tab #- support-tab autorefresh: true @@ -45,7 +47,7 @@ tabs: - vms - users widgets_one_footer: - system-tab: + system-top-tab: panel_tabs: actions: users-tab: @@ -122,7 +124,6 @@ tabs: Vdc.update_dialog: true Vdc.rename: true Vdc.delete: true - acls-tab: panel_tabs: table_columns: @@ -138,7 +139,69 @@ tabs: Acl.refresh: true Acl.create_dialog: true Acl.delete: true - vresources-tab: + templates-top-tab: + panel_tabs: + actions: + templates-tab: + panel_tabs: + template_info_tab: true + template_template_tab: false + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Registration time + #- 6 # Labels + actions: + Template.refresh: true + Template.create_dialog: false + Template.import_dialog: false + Template.update_dialog: false + Template.instantiate_vms: true + Template.rename: true + Template.chown: true + Template.chgrp: false + Template.chmod: false + Template.clone_dialog: false + Template.delete: false + Template.delete_recursive: true + Template.share: true + Template.unshare: true + template_creation_tabs: + general: true + storage: true + network: true + os_booting: true + features: true + input_output: true + context: true + scheduling: true + hybrid: true + other: true + oneflow-templates-tab: + panel_tabs: + service_template_info_tab: true + service_template_roles_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + actions: + ServiceTemplate.refresh: true + ServiceTemplate.create_dialog: false + ServiceTemplate.update_dialog: false + ServiceTemplate.instantiate: true + ServiceTemplate.chown: false + ServiceTemplate.chgrp: false + ServiceTemplate.chmod: false + ServiceTemplate.rename: false + ServiceTemplate.clone_dialog: false + ServiceTemplate.delete: false + instances-top-tab: panel_tabs: actions: vms-tab: @@ -208,44 +271,163 @@ tabs: VM.resched: false VM.unresched: false VM.saveas_template: false - templates-tab: + oneflow-services-tab: panel_tabs: - template_info_tab: true - template_template_tab: false + service_info_tab: true + service_roles_tab: true + service_log_tab: true + panel_tabs_actions: + service_roles_tab: + Role.scale: true + Role.hold: true + Role.release: true + Role.suspend: false + Role.resume: true + Role.stop: false + Role.reboot: true + Role.reboot_hard: true + Role.poweroff: true + Role.poweroff_hard: true + Role.undeploy: true + Role.undeploy_hard: true + Role.shutdown: true + Role.shutdown_hard: true + Role.delete: true + Role.delete_recreate: false + RoleVM.hold: true + RoleVM.release: true + RoleVM.suspend: false + RoleVM.resume: true + RoleVM.stop: false + RoleVM.reboot: true + RoleVM.reboot_hard: true + RoleVM.poweroff: true + RoleVM.poweroff_hard: true + RoleVM.undeploy: true + RoleVM.undeploy_hard: true + RoleVM.shutdown: true + RoleVM.shutdown_hard: true + RoleVM.delete: true + RoleVM.delete_recreate: false + RoleVM.resched: false + RoleVM.unresched: false + RoleVM.recover: false + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + #- 3 # Group + - 4 # Name + - 5 # State + actions: + Service.refresh: true + Service.chown: true + Service.chgrp: false + Service.chmod: false + Service.rename: true + Service.shutdown: true + Service.recover: true + Service.delete: true + infrastructure-top-tab: + panel_tabs: + actions: + clusters-tab: + panel_tabs: + cluster_info_tab: true + cluster_host_tab: true + cluster_vnet_tab: true + cluster_datastore_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Hosts + - 4 # VNets + - 5 # Datastores + #- 6 # Labels + actions: + Cluster.refresh: true + Cluster.create_dialog: true + Cluster.update_dialog: true + Cluster.delete: true + Cluster.rename: true + hosts-tab: + panel_tabs: + host_info_tab: true + host_monitoring_tab: true + host_vms_tab: true + host_wilds_tab: true + host_esx_tab: true + host_pci_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Cluster + - 4 # RVMs + #- 5 # Real CPU + - 6 # Allocated CPU + #- 7 # Real MEM + - 8 # Allocated MEM + - 9 # Status + #- 10 # IM MAD + #- 11 # VM MAD + #- 12 # Last monitored on + #- 13 # Labels + actions: + Host.refresh: true + Host.create_dialog: true + Host.addtocluster: true + Host.rename: true + Host.enable: true + Host.disable: true + Host.delete: true + zones-tab: + panel_tabs: + zone_info_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Endpoint + #- 4 # Labels + actions: + Zone.refresh: true + Zone.create_dialog: true + Zone.rename: true + Zone.delete: true + storage-top-tab: + panel_tabs: + actions: + datastores-tab: + panel_tabs: + datastore_info_tab: true + datastore_image_tab: true table_columns: - 0 # Checkbox - 1 # ID - 2 # Owner - 3 # Group - 4 # Name - - 5 # Registration time - #- 6 # Labels + - 5 # Capacity + - 6 # Cluster + #- 7 # Basepath + #- 8 # TM + #- 9 # DS + - 10 # Type + - 11 # Status + #- 12 # Labels actions: - Template.refresh: true - Template.create_dialog: false - Template.import_dialog: false - Template.update_dialog: false - Template.instantiate_vms: true - Template.rename: true - Template.chown: true - Template.chgrp: false - Template.chmod: false - Template.clone_dialog: false - Template.delete: false - Template.delete_recursive: true - Template.share: true - Template.unshare: true - template_creation_tabs: - general: true - storage: true - network: true - os_booting: true - features: true - input_output: true - context: true - scheduling: true - hybrid: true - other: true + Datastore.refresh: true + Datastore.create_dialog: true + Datastore.addtocluster: true + Datastore.rename: true + Datastore.chown: true + Datastore.chgrp: true + Datastore.chmod: true + Datastore.delete: true + Datastore.enable: true + Datastore.disable: true images-tab: panel_tabs: image_info_tab: true @@ -311,289 +493,6 @@ tabs: File.enable: true File.disable: true File.delete: true - infra-tab: - panel_tabs: - actions: - clusters-tab: - panel_tabs: - cluster_info_tab: true - cluster_host_tab: true - cluster_vnet_tab: true - cluster_datastore_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Hosts - - 4 # VNets - - 5 # Datastores - #- 6 # Labels - actions: - Cluster.refresh: true - Cluster.create_dialog: true - Cluster.update_dialog: true - Cluster.delete: true - Cluster.rename: true - hosts-tab: - panel_tabs: - host_info_tab: true - host_monitoring_tab: true - host_vms_tab: true - host_wilds_tab: true - host_esx_tab: true - host_pci_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Cluster - - 4 # RVMs - #- 5 # Real CPU - - 6 # Allocated CPU - #- 7 # Real MEM - - 8 # Allocated MEM - - 9 # Status - #- 10 # IM MAD - #- 11 # VM MAD - #- 12 # Last monitored on - #- 13 # Labels - actions: - Host.refresh: true - Host.create_dialog: true - Host.addtocluster: true - Host.rename: true - Host.enable: true - Host.disable: true - Host.delete: true - datastores-tab: - panel_tabs: - datastore_info_tab: true - datastore_image_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # Capacity - - 6 # Cluster - #- 7 # Basepath - #- 8 # TM - #- 9 # DS - - 10 # Type - - 11 # Status - #- 12 # Labels - actions: - Datastore.refresh: true - Datastore.create_dialog: true - Datastore.addtocluster: true - Datastore.rename: true - Datastore.chown: true - Datastore.chgrp: true - Datastore.chmod: true - Datastore.delete: true - Datastore.enable: true - Datastore.disable: true - vnets-topology-tab: - panel_tabs: - actions: - NetworkTopology.refresh: true - NetworkTopology.fit: true - NetworkTopology.collapseVMs: true - NetworkTopology.openVMs: true - vnets-tab: - panel_tabs: - vnet_info_tab: false - vnet_ar_list_tab: false - vnet_leases_tab: true - vnet_sg_list_tab: false - vnet_vr_list_tab: false - table_columns: - - 0 # Checkbox - - 1 # ID - #- 2 # Owner - #- 3 # Group - - 4 # Name - #- 5 # Reservation - #- 6 # Cluster - #- 7 # Bridge - #- 8 # Leases - #- 9 # VLAN ID - #- 10 # Labels - actions: - Network.refresh: true - Network.create_dialog: false - Network.import_dialog: false - Network.update_dialog: false - Network.reserve_dialog: false - Network.addtocluster: false - Network.rename: false - Network.chown: false - Network.chgrp: false - Network.chmod: false - Network.delete: false - Network.hold_lease: false - Network.release_lease: false - Network.add_ar: false - Network.remove_ar: false - Network.update_ar: false - secgroups-tab: - panel_tabs: - security_group_info_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - #- 2 # Owner - #- 3 # Group - - 4 # Name - #- 5 # Labels - actions: - SecurityGroup.refresh: true - SecurityGroup.create_dialog: false - SecurityGroup.update_dialog: false - SecurityGroup.rename: false - SecurityGroup.chown: false - SecurityGroup.chgrp: false - SecurityGroup.chmod: false - SecurityGroup.clone_dialog: false - SecurityGroup.delete: false - vrouters-tab: - panel_tabs: - virtual_router_info_tab: true - virtual_router_vms_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - #- 3 # Group - - 4 # Name - actions: - VirtualRouter.refresh: true - VirtualRouter.create_dialog: true - VirtualRouter.rename: true - VirtualRouter.chown: true - VirtualRouter.chgrp: false - VirtualRouter.chmod: false - VirtualRouter.delete: true - VirtualRouter.attachnic: false - VirtualRouter.detachnic: false - oneflow-dashboard-tab: - panel_tabs: - table_columns: - actions: - oneflow-services-tab: - panel_tabs: - service_info_tab: true - service_roles_tab: true - service_log_tab: true - panel_tabs_actions: - service_roles_tab: - Role.scale: true - Role.hold: true - Role.release: true - Role.suspend: false - Role.resume: true - Role.stop: false - Role.reboot: true - Role.reboot_hard: true - Role.poweroff: true - Role.poweroff_hard: true - Role.undeploy: true - Role.undeploy_hard: true - Role.shutdown: true - Role.shutdown_hard: true - Role.delete: true - Role.delete_recreate: false - RoleVM.hold: true - RoleVM.release: true - RoleVM.suspend: false - RoleVM.resume: true - RoleVM.stop: false - RoleVM.reboot: true - RoleVM.reboot_hard: true - RoleVM.poweroff: true - RoleVM.poweroff_hard: true - RoleVM.undeploy: true - RoleVM.undeploy_hard: true - RoleVM.shutdown: true - RoleVM.shutdown_hard: true - RoleVM.delete: true - RoleVM.delete_recreate: false - RoleVM.resched: false - RoleVM.unresched: false - RoleVM.recover: false - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - #- 3 # Group - - 4 # Name - - 5 # State - actions: - Service.refresh: true - Service.chown: true - Service.chgrp: false - Service.chmod: false - Service.rename: true - Service.shutdown: true - Service.recover: true - Service.delete: true - oneflow-templates-tab: - panel_tabs: - service_template_info_tab: true - service_template_roles_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - actions: - ServiceTemplate.refresh: true - ServiceTemplate.create_dialog: false - ServiceTemplate.update_dialog: false - ServiceTemplate.instantiate: true - ServiceTemplate.chown: false - ServiceTemplate.chgrp: false - ServiceTemplate.chmod: false - ServiceTemplate.rename: false - ServiceTemplate.clone_dialog: false - ServiceTemplate.delete: false - zones-tab: - panel_tabs: - zone_info_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Endpoint - #- 4 # Labels - actions: - Zone.refresh: true - Zone.create_dialog: true - Zone.rename: true - Zone.delete: true - support-tab: - panel_tabs: - support_info_tab: true - table_columns: - #- 0 # Checkbox - - 1 # ID - - 2 # Subject - - 3 # Created at - - 4 # Status - actions: - Support.refresh: true - Support.create_dialog: true - settings-tab: - panel_tabs: - user_info_tab: true - user_quotas_tab: true - group_quotas_tab: true - user_accounting_tab: true - user_showback_tab: true - actions: - User.quotas_dialog: false marketplaces-tab: panel_tabs: marketplace_info_tab: true @@ -645,3 +544,110 @@ tabs: MarketPlaceApp.enable: true MarketPlaceApp.disable: true MarketPlaceApp.delete: true + network-top-tab: + panel_tabs: + actions: + vnets-tab: + panel_tabs: + vnet_info_tab: false + vnet_ar_list_tab: false + vnet_leases_tab: true + vnet_sg_list_tab: false + vnet_vr_list_tab: false + table_columns: + - 0 # Checkbox + - 1 # ID + #- 2 # Owner + #- 3 # Group + - 4 # Name + #- 5 # Reservation + #- 6 # Cluster + #- 7 # Bridge + #- 8 # Leases + #- 9 # VLAN ID + #- 10 # Labels + actions: + Network.refresh: true + Network.create_dialog: false + Network.import_dialog: false + Network.update_dialog: false + Network.reserve_dialog: false + Network.addtocluster: false + Network.rename: false + Network.chown: false + Network.chgrp: false + Network.chmod: false + Network.delete: false + Network.hold_lease: false + Network.release_lease: false + Network.add_ar: false + Network.remove_ar: false + Network.update_ar: false + vrouters-tab: + panel_tabs: + virtual_router_info_tab: true + virtual_router_vms_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + #- 3 # Group + - 4 # Name + actions: + VirtualRouter.refresh: true + VirtualRouter.create_dialog: true + VirtualRouter.rename: true + VirtualRouter.chown: true + VirtualRouter.chgrp: false + VirtualRouter.chmod: false + VirtualRouter.delete: true + VirtualRouter.attachnic: false + VirtualRouter.detachnic: false + vnets-topology-tab: + panel_tabs: + actions: + NetworkTopology.refresh: true + NetworkTopology.fit: true + NetworkTopology.collapseVMs: true + NetworkTopology.openVMs: true + secgroups-tab: + panel_tabs: + security_group_info_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + #- 2 # Owner + #- 3 # Group + - 4 # Name + #- 5 # Labels + actions: + SecurityGroup.refresh: true + SecurityGroup.create_dialog: false + SecurityGroup.update_dialog: false + SecurityGroup.rename: false + SecurityGroup.chown: false + SecurityGroup.chgrp: false + SecurityGroup.chmod: false + SecurityGroup.clone_dialog: false + SecurityGroup.delete: false + support-tab: + panel_tabs: + support_info_tab: true + table_columns: + #- 0 # Checkbox + - 1 # ID + - 2 # Subject + - 3 # Created at + - 4 # Status + actions: + Support.refresh: true + Support.create_dialog: true + settings-tab: + panel_tabs: + user_info_tab: true + user_quotas_tab: true + group_quotas_tab: true + user_accounting_tab: true + user_showback_tab: true + actions: + User.quotas_dialog: false diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml index c9440f2264..935c323e85 100644 --- a/src/sunstone/etc/sunstone-views/user.yaml +++ b/src/sunstone/etc/sunstone-views/user.yaml @@ -2,30 +2,32 @@ small_logo: images/opennebula-sunstone-v4.14-small.png provision_logo: images/one_small_logo.png enabled_tabs: - dashboard-tab - #- system-tab + #- system-top-tab #- users-tab #- groups-tab #- vdcs-tab #- acls-tab - - vresources-tab - - vms-tab + - templates-top-tab - templates-tab - - images-tab - - files-tab - - infra-tab + - oneflow-templates-tab + - instances-top-tab + - vms-tab + - oneflow-services-tab + #- infrastructure-top-tab #- clusters-tab #- hosts-tab - - datastores-tab - - vnets-topology-tab - - vnets-tab - - secgroups-tab - - vrouters-tab #- zones-tab - - oneflow-dashboard-tab - - oneflow-services-tab - - oneflow-templates-tab + - storage-top-tab + - datastores-tab + - images-tab + - files-tab - marketplaces-tab - marketplaceapps-tab + - network-top-tab + - vnets-tab + - vrouters-tab + - vnets-topology-tab + - secgroups-tab - settings-tab #- support-tab autorefresh: true @@ -47,7 +49,7 @@ tabs: #- hosts #- users widgets_one_footer: - system-tab: + system-top-tab: panel_tabs: actions: users-tab: @@ -124,7 +126,6 @@ tabs: Vdc.update_dialog: true Vdc.rename: true Vdc.delete: true - acls-tab: panel_tabs: table_columns: @@ -140,7 +141,69 @@ tabs: Acl.refresh: true Acl.create_dialog: true Acl.delete: true - vresources-tab: + templates-top-tab: + panel_tabs: + actions: + templates-tab: + panel_tabs: + template_info_tab: true + template_template_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Registration time + #- 6 # Labels + actions: + Template.refresh: true + Template.create_dialog: true + Template.import_dialog: false + Template.update_dialog: true + Template.instantiate_vms: true + Template.rename: true + Template.chown: false + Template.chgrp: false + Template.chmod: true + Template.clone_dialog: true + Template.delete: true + Template.delete_recursive: true + Template.share: true + Template.unshare: true + template_creation_tabs: + general: true + storage: true + network: true + os_booting: true + features: true + input_output: true + context: true + scheduling: false + hybrid: true + other: true + oneflow-templates-tab: + panel_tabs: + service_template_info_tab: true + service_template_roles_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + actions: + ServiceTemplate.refresh: true + ServiceTemplate.create_dialog: true + ServiceTemplate.update_dialog: true + ServiceTemplate.instantiate: true + ServiceTemplate.chown: false + ServiceTemplate.chgrp: false + ServiceTemplate.chmod: true + ServiceTemplate.rename: true + ServiceTemplate.clone_dialog: true + ServiceTemplate.delete: true + instances-top-tab: panel_tabs: actions: vms-tab: @@ -210,44 +273,163 @@ tabs: VM.resched: false VM.unresched: false VM.saveas_template: true - templates-tab: + oneflow-services-tab: panel_tabs: - template_info_tab: true - template_template_tab: true + service_info_tab: true + service_roles_tab: true + service_log_tab: true + panel_tabs_actions: + service_roles_tab: + Role.scale: true + Role.hold: true + Role.release: true + Role.suspend: true + Role.resume: true + Role.stop: true + Role.reboot: true + Role.reboot_hard: true + Role.poweroff: true + Role.poweroff_hard: true + Role.undeploy: true + Role.undeploy_hard: true + Role.shutdown: true + Role.shutdown_hard: true + Role.delete: true + Role.delete_recreate: true + RoleVM.hold: true + RoleVM.release: true + RoleVM.suspend: true + RoleVM.resume: true + RoleVM.stop: true + RoleVM.reboot: true + RoleVM.reboot_hard: true + RoleVM.poweroff: true + RoleVM.poweroff_hard: true + RoleVM.undeploy: true + RoleVM.undeploy_hard: true + RoleVM.shutdown: true + RoleVM.shutdown_hard: true + RoleVM.delete: true + RoleVM.delete_recreate: true + RoleVM.resched: false + RoleVM.unresched: false + RoleVM.recover: false table_columns: - 0 # Checkbox - 1 # ID - 2 # Owner - 3 # Group - 4 # Name - - 5 # Registration time + - 5 # State + actions: + Service.refresh: true + Service.chown: false + Service.chgrp: false + Service.chmod: true + Service.rename: true + Service.shutdown: true + Service.recover: true + Service.delete: true + infrastructure-top-tab: + panel_tabs: + actions: + clusters-tab: + panel_tabs: + cluster_info_tab: true + cluster_host_tab: true + cluster_vnet_tab: true + cluster_datastore_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Hosts + - 4 # VNets + - 5 # Datastores #- 6 # Labels actions: - Template.refresh: true - Template.create_dialog: true - Template.import_dialog: false - Template.update_dialog: true - Template.instantiate_vms: true - Template.rename: true - Template.chown: false - Template.chgrp: false - Template.chmod: true - Template.clone_dialog: true - Template.delete: true - Template.delete_recursive: true - Template.share: true - Template.unshare: true - template_creation_tabs: - general: true - storage: true - network: true - os_booting: true - features: true - input_output: true - context: true - scheduling: false - hybrid: true - other: true + Cluster.refresh: true + Cluster.create_dialog: true + Cluster.update_dialog: true + Cluster.delete: true + Cluster.rename: true + hosts-tab: + panel_tabs: + host_info_tab: true + host_monitoring_tab: true + host_vms_tab: true + host_wilds_tab: true + host_esx_tab: true + host_pci_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Cluster + - 4 # RVMs + #- 5 # Real CPU + - 6 # Allocated CPU + #- 7 # Real MEM + - 8 # Allocated MEM + - 9 # Status + #- 10 # IM MAD + #- 11 # VM MAD + #- 12 # Last monitored on + #- 13 # Labels + actions: + Host.refresh: true + Host.create_dialog: true + Host.addtocluster: true + Host.rename: true + Host.enable: true + Host.disable: true + Host.delete: true + zones-tab: + panel_tabs: + zone_info_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Endpoint + #- 4 # Labels + actions: + Zone.refresh: true + Zone.create_dialog: true + Zone.rename: true + Zone.delete: true + storage-top-tab: + panel_tabs: + actions: + datastores-tab: + panel_tabs: + datastore_info_tab: false + datastore_image_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Capacity + - 6 # Cluster + #- 7 # Basepath + #- 8 # TM + #- 9 # DS + #- 10 # Type + #- 11 # Status + #- 12 # Labels + actions: + Datastore.refresh: true + Datastore.create_dialog: false + Datastore.addtocluster: false + Datastore.rename: true + Datastore.chown: false + Datastore.chgrp: false + Datastore.chmod: true + Datastore.delete: false + Datastore.enable: false + Datastore.disable: false images-tab: panel_tabs: image_info_tab: true @@ -313,289 +495,6 @@ tabs: File.enable: true File.disable: true File.delete: true - infra-tab: - panel_tabs: - actions: - clusters-tab: - panel_tabs: - cluster_info_tab: true - cluster_host_tab: true - cluster_vnet_tab: true - cluster_datastore_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Hosts - - 4 # VNets - - 5 # Datastores - #- 6 # Labels - actions: - Cluster.refresh: true - Cluster.create_dialog: true - Cluster.update_dialog: true - Cluster.delete: true - Cluster.rename: true - hosts-tab: - panel_tabs: - host_info_tab: true - host_monitoring_tab: true - host_vms_tab: true - host_wilds_tab: true - host_esx_tab: true - host_pci_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Cluster - - 4 # RVMs - #- 5 # Real CPU - - 6 # Allocated CPU - #- 7 # Real MEM - - 8 # Allocated MEM - - 9 # Status - #- 10 # IM MAD - #- 11 # VM MAD - #- 12 # Last monitored on - #- 13 # Labels - actions: - Host.refresh: true - Host.create_dialog: true - Host.addtocluster: true - Host.rename: true - Host.enable: true - Host.disable: true - Host.delete: true - datastores-tab: - panel_tabs: - datastore_info_tab: false - datastore_image_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # Capacity - - 6 # Cluster - #- 7 # Basepath - #- 8 # TM - #- 9 # DS - #- 10 # Type - #- 11 # Status - #- 12 # Labels - actions: - Datastore.refresh: true - Datastore.create_dialog: false - Datastore.addtocluster: false - Datastore.rename: true - Datastore.chown: false - Datastore.chgrp: false - Datastore.chmod: true - Datastore.delete: false - Datastore.enable: false - Datastore.disable: false - vnets-topology-tab: - panel_tabs: - actions: - NetworkTopology.refresh: true - NetworkTopology.fit: true - NetworkTopology.collapseVMs: true - NetworkTopology.openVMs: true - vnets-tab: - panel_tabs: - vnet_info_tab: true - vnet_ar_list_tab: true - vnet_leases_tab: true - vnet_sg_list_tab: true - vnet_vr_list_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # Reservation - - 6 # Cluster - #- 7 # Bridge - - 8 # Leases - #- 9 # VLAN ID - #- 10 # Labels - actions: - Network.refresh: true - Network.create_dialog: false - Network.import_dialog: false - Network.update_dialog: true - Network.reserve_dialog: true - Network.addtocluster: false - Network.rename: true - Network.chown: false - Network.chgrp: false - Network.chmod: true - Network.delete: true - Network.hold_lease: true - Network.release_lease: true - Network.add_ar: false - Network.remove_ar: true - Network.update_ar: true - secgroups-tab: - panel_tabs: - security_group_info_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - #- 5 # Labels - actions: - SecurityGroup.refresh: true - SecurityGroup.create_dialog: true - SecurityGroup.update_dialog: true - SecurityGroup.rename: true - SecurityGroup.chown: true - SecurityGroup.chgrp: true - SecurityGroup.chmod: true - SecurityGroup.clone_dialog: true - SecurityGroup.delete: true - vrouters-tab: - panel_tabs: - virtual_router_info_tab: true - virtual_router_vms_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - actions: - VirtualRouter.refresh: true - VirtualRouter.create_dialog: true - VirtualRouter.rename: true - VirtualRouter.chown: true - VirtualRouter.chgrp: true - VirtualRouter.chmod: true - VirtualRouter.delete: true - VirtualRouter.attachnic: true - VirtualRouter.detachnic: true - oneflow-dashboard-tab: - panel_tabs: - table_columns: - actions: - oneflow-services-tab: - panel_tabs: - service_info_tab: true - service_roles_tab: true - service_log_tab: true - panel_tabs_actions: - service_roles_tab: - Role.scale: true - Role.hold: true - Role.release: true - Role.suspend: true - Role.resume: true - Role.stop: true - Role.reboot: true - Role.reboot_hard: true - Role.poweroff: true - Role.poweroff_hard: true - Role.undeploy: true - Role.undeploy_hard: true - Role.shutdown: true - Role.shutdown_hard: true - Role.delete: true - Role.delete_recreate: true - RoleVM.hold: true - RoleVM.release: true - RoleVM.suspend: true - RoleVM.resume: true - RoleVM.stop: true - RoleVM.reboot: true - RoleVM.reboot_hard: true - RoleVM.poweroff: true - RoleVM.poweroff_hard: true - RoleVM.undeploy: true - RoleVM.undeploy_hard: true - RoleVM.shutdown: true - RoleVM.shutdown_hard: true - RoleVM.delete: true - RoleVM.delete_recreate: true - RoleVM.resched: false - RoleVM.unresched: false - RoleVM.recover: false - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # State - actions: - Service.refresh: true - Service.chown: false - Service.chgrp: false - Service.chmod: true - Service.rename: true - Service.shutdown: true - Service.recover: true - Service.delete: true - oneflow-templates-tab: - panel_tabs: - service_template_info_tab: true - service_template_roles_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - actions: - ServiceTemplate.refresh: true - ServiceTemplate.create_dialog: true - ServiceTemplate.update_dialog: true - ServiceTemplate.instantiate: true - ServiceTemplate.chown: false - ServiceTemplate.chgrp: false - ServiceTemplate.chmod: true - ServiceTemplate.rename: true - ServiceTemplate.clone_dialog: true - ServiceTemplate.delete: true - zones-tab: - panel_tabs: - zone_info_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Endpoint - #- 4 # Labels - actions: - Zone.refresh: true - Zone.create_dialog: true - Zone.rename: true - Zone.delete: true - support-tab: - panel_tabs: - support_info_tab: true - table_columns: - #- 0 # Checkbox - - 1 # ID - - 2 # Subject - - 3 # Created at - - 4 # Status - actions: - Support.refresh: true - Support.create_dialog: true - settings-tab: - panel_tabs: - user_info_tab: true - user_quotas_tab: true - group_quotas_tab: true - user_accounting_tab: true - user_showback_tab: true - actions: - User.quotas_dialog: false marketplaces-tab: panel_tabs: marketplace_info_tab: true @@ -647,3 +546,114 @@ tabs: MarketPlaceApp.enable: true MarketPlaceApp.disable: true MarketPlaceApp.delete: true + network-top-tab: + panel_tabs: + actions: + vnets-tab: + panel_tabs: + vnet_info_tab: true + vnet_ar_list_tab: true + vnet_leases_tab: true + vnet_sg_list_tab: true + vnet_vr_list_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Reservation + - 6 # Cluster + #- 7 # Bridge + - 8 # Leases + #- 9 # VLAN ID + #- 10 # Labels + actions: + Network.refresh: true + Network.create_dialog: false + Network.import_dialog: false + Network.update_dialog: true + Network.reserve_dialog: true + Network.addtocluster: false + Network.rename: true + Network.chown: false + Network.chgrp: false + Network.chmod: true + Network.delete: true + Network.hold_lease: true + Network.release_lease: true + Network.add_ar: false + Network.remove_ar: true + Network.update_ar: true + vrouters-tab: + panel_tabs: + virtual_router_info_tab: true + virtual_router_vms_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + actions: + VirtualRouter.refresh: true + VirtualRouter.create_dialog: true + VirtualRouter.rename: true + VirtualRouter.chown: true + VirtualRouter.chgrp: true + VirtualRouter.chmod: true + VirtualRouter.delete: true + VirtualRouter.attachnic: true + VirtualRouter.detachnic: true + vnets-topology-tab: + panel_tabs: + actions: + NetworkTopology.refresh: true + NetworkTopology.fit: true + NetworkTopology.collapseVMs: true + NetworkTopology.openVMs: true + secgroups-tab: + panel_tabs: + security_group_info_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + #- 5 # Labels + actions: + SecurityGroup.refresh: true + SecurityGroup.create_dialog: true + SecurityGroup.update_dialog: true + SecurityGroup.rename: true + SecurityGroup.chown: true + SecurityGroup.chgrp: true + SecurityGroup.chmod: true + SecurityGroup.clone_dialog: true + SecurityGroup.delete: true + oneflow-dashboard-tab: + panel_tabs: + table_columns: + actions: + support-tab: + panel_tabs: + support_info_tab: true + table_columns: + #- 0 # Checkbox + - 1 # ID + - 2 # Subject + - 3 # Created at + - 4 # Status + actions: + Support.refresh: true + Support.create_dialog: true + settings-tab: + panel_tabs: + user_info_tab: true + user_quotas_tab: true + group_quotas_tab: true + user_accounting_tab: true + user_showback_tab: true + actions: + User.quotas_dialog: false diff --git a/src/sunstone/public/app/main.js b/src/sunstone/public/app/main.js index 2749b3ce67..2c1ebfe275 100644 --- a/src/sunstone/public/app/main.js +++ b/src/sunstone/public/app/main.js @@ -116,30 +116,32 @@ require.config({ 'foundation', 'tabs/provision-tab', 'tabs/dashboard-tab', - 'tabs/system-tab', + 'tabs/system-top-tab', 'tabs/users-tab', 'tabs/groups-tab', 'tabs/vdcs-tab', 'tabs/acls-tab', - 'tabs/vresources-tab', - 'tabs/vms-tab', + 'tabs/templates-top-tab', 'tabs/templates-tab', - 'tabs/images-tab', - 'tabs/files-tab', - 'tabs/infra-tab', + 'tabs/oneflow-templates-tab', + 'tabs/instances-top-tab', + 'tabs/vms-tab', + 'tabs/oneflow-services-tab', + 'tabs/infrastructure-top-tab', 'tabs/clusters-tab', 'tabs/hosts-tab', - 'tabs/datastores-tab', - 'tabs/vnets-topology-tab', - 'tabs/vnets-tab', - 'tabs/secgroups-tab', - 'tabs/vrouters-tab', 'tabs/zones-tab', - 'tabs/oneflow-dashboard-tab', - 'tabs/oneflow-services-tab', - 'tabs/oneflow-templates-tab', + 'tabs/storage-top-tab', + 'tabs/datastores-tab', + 'tabs/images-tab', + 'tabs/files-tab', 'tabs/marketplaces-tab', 'tabs/marketplaceapps-tab', + 'tabs/network-top-tab', + 'tabs/vnets-tab', + 'tabs/vrouters-tab', + 'tabs/vnets-topology-tab', + 'tabs/secgroups-tab', 'tabs/settings-tab', 'tabs/support-tab' ] diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js index bb0913f810..7f728e3ae0 100644 --- a/src/sunstone/public/app/sunstone.js +++ b/src/sunstone/public/app/sunstone.js @@ -165,15 +165,21 @@ define(function(require) { } var liItem; + var title = ''; + if (tabInfo.icon) { + title += ' '; + } + title += tabInfo.title; + if (parent !== '') { liItem = '
  • ' + - '' + tabInfo.title + '' + + '' + title + '' + '
  • '; $('#menu ul#navigation #li_' + parent + ' .menu').append(liItem); } else { liItem = '
  • ' + - '' + tabInfo.title + '' + + '' + title + '' + '' + '
  • '; diff --git a/src/sunstone/public/app/tabs/acls-tab.js b/src/sunstone/public/app/tabs/acls-tab.js index 68af4428a9..b6e85fbce9 100644 --- a/src/sunstone/public/app/tabs/acls-tab.js +++ b/src/sunstone/public/app/tabs/acls-tab.js @@ -36,9 +36,10 @@ define(function(require) { var Tab = { tabId: TAB_ID, title: Locale.tr("ACLs"), + icon: 'fa-key', tabClass: "subTab", - parentTab: "system-tab", - listHeader: ' '+Locale.tr("Access Control Lists"), + parentTab: "system-top-tab", + listHeader: Locale.tr("Access Control Lists"), subheader: ' ', resource: 'Acl', buttons: Buttons, diff --git a/src/sunstone/public/app/tabs/clusters-tab.js b/src/sunstone/public/app/tabs/clusters-tab.js index b9d450a95b..8ed11b267e 100644 --- a/src/sunstone/public/app/tabs/clusters-tab.js +++ b/src/sunstone/public/app/tabs/clusters-tab.js @@ -44,10 +44,11 @@ define(function(require) { var Tab = { tabId: TAB_ID, title: Locale.tr("Clusters"), + icon: 'fa-server', tabClass: "subTab", - parentTab: "infra-tab", - listHeader: ' '+Locale.tr("Clusters"), - infoHeader: ' '+Locale.tr("Cluster"), + parentTab: "infrastructure-top-tab", + listHeader: Locale.tr("Clusters"), + infoHeader: Locale.tr("Cluster"), subheader: '  ', resource: 'Cluster', buttons: Buttons, diff --git a/src/sunstone/public/app/tabs/dashboard-tab.js b/src/sunstone/public/app/tabs/dashboard-tab.js index 9630f29354..2532f76c2e 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab.js +++ b/src/sunstone/public/app/tabs/dashboard-tab.js @@ -236,8 +236,8 @@ define(function(require) { var Tab = { tabId: TAB_ID, resource: 'Dashboard', - title: ' ' + Locale.tr("Dashboard"), - listHeader: ' ' + Locale.tr("Dashboard"), + title: Locale.tr("Dashboard"), + listHeader: Locale.tr("Dashboard"), buttons: _buttons, actions: _actions, content: _html() diff --git a/src/sunstone/public/app/tabs/datastores-tab.js b/src/sunstone/public/app/tabs/datastores-tab.js index 80ce09f4ac..e8a43a1ba4 100644 --- a/src/sunstone/public/app/tabs/datastores-tab.js +++ b/src/sunstone/public/app/tabs/datastores-tab.js @@ -42,10 +42,11 @@ define(function(require) { var DatastoresTab = { tabId: TAB_ID, title: Locale.tr("Datastores"), + icon: 'fa-folder-open', tabClass: "subTab", - parentTab: "infra-tab", - listHeader: ' ' + Locale.tr("Datastores"), - infoHeader: ' ' + Locale.tr("Datastore"), + parentTab: "storage-top-tab", + listHeader: Locale.tr("Datastores"), + infoHeader: Locale.tr("Datastore"), subheader: '', resource: 'Datastore', buttons: Buttons, diff --git a/src/sunstone/public/app/tabs/files-tab.js b/src/sunstone/public/app/tabs/files-tab.js index b2cb964163..613e2c3c47 100644 --- a/src/sunstone/public/app/tabs/files-tab.js +++ b/src/sunstone/public/app/tabs/files-tab.js @@ -39,11 +39,12 @@ define(function(require) { var Tab = { tabId: TAB_ID, - title: Locale.tr("Files & Kernels"), + title: Locale.tr("Files"), + icon: 'fa-archive', tabClass: "subTab", - parentTab: "vresources-tab", - listHeader: ' ' + Locale.tr("Files & Kernels"), - infoHeader: ' ' + Locale.tr("File"), + parentTab: "storage-top-tab", + listHeader: Locale.tr("Files"), + infoHeader: Locale.tr("File"), subheader: '', resource: 'File', content: '
    \ diff --git a/src/sunstone/public/app/tabs/groups-tab.js b/src/sunstone/public/app/tabs/groups-tab.js index 65b52b9a6f..fadb322930 100644 --- a/src/sunstone/public/app/tabs/groups-tab.js +++ b/src/sunstone/public/app/tabs/groups-tab.js @@ -46,10 +46,11 @@ define(function(require) { var Tab = { tabId: TAB_ID, title: Locale.tr("Groups"), + icon: 'fa-users', tabClass: "subTab", - parentTab: "system-tab", - listHeader: ' '+Locale.tr("Groups"), - infoHeader: ' '+Locale.tr("Group"), + parentTab: "system-top-tab", + listHeader: Locale.tr("Groups"), + infoHeader: Locale.tr("Group"), subheader: '\ '+Locale.tr("TOTAL")+'\ ', diff --git a/src/sunstone/public/app/tabs/hosts-tab.js b/src/sunstone/public/app/tabs/hosts-tab.js index d40a0b8a28..852db37032 100644 --- a/src/sunstone/public/app/tabs/hosts-tab.js +++ b/src/sunstone/public/app/tabs/hosts-tab.js @@ -48,10 +48,11 @@ define(function(require) { var Tab = { tabId: TAB_ID, title: Locale.tr("Hosts"), + icon: 'fa-hdd-o', tabClass: "subTab", - parentTab: "infra-tab", - listHeader: ' ' + Locale.tr("Hosts"), - infoHeader: ' ' + Locale.tr("Host"), + parentTab: "infrastructure-top-tab", + listHeader: Locale.tr("Hosts"), + infoHeader: Locale.tr("Host"), subheader: ' ' + Locale.tr("TOTAL") + ' \ ' + Locale.tr("ON") + ' \ ' + Locale.tr("OFF") + ' \ diff --git a/src/sunstone/public/app/tabs/images-tab.js b/src/sunstone/public/app/tabs/images-tab.js index cbd7b6a79e..8078aec62a 100644 --- a/src/sunstone/public/app/tabs/images-tab.js +++ b/src/sunstone/public/app/tabs/images-tab.js @@ -44,10 +44,11 @@ define(function(require) { var Tab = { tabId: TAB_ID, title: Locale.tr("Images"), + icon: 'fa-download', tabClass: "subTab", - parentTab: "vresources-tab", - listHeader: ' ' + Locale.tr("Images"), - infoHeader: ' ' + Locale.tr("Image"), + parentTab: "storage-top-tab", + listHeader: Locale.tr("Images"), + infoHeader: Locale.tr("Image"), subheader: '', resource: 'Image', content: '
    ', diff --git a/src/sunstone/public/app/tabs/infra-tab.js b/src/sunstone/public/app/tabs/infrastructure-top-tab.js similarity index 91% rename from src/sunstone/public/app/tabs/infra-tab.js rename to src/sunstone/public/app/tabs/infrastructure-top-tab.js index 3951e37227..d141a66e62 100644 --- a/src/sunstone/public/app/tabs/infra-tab.js +++ b/src/sunstone/public/app/tabs/infrastructure-top-tab.js @@ -16,11 +16,11 @@ define(function(require) { var Locale = require('utils/locale'); - var TAB_ID = 'infra-tab'; + var TAB_ID = 'infrastructure-top-tab'; var InfraTab = { tabId: TAB_ID, - title: ' ' + Locale.tr("Infrastructure"), + title: Locale.tr("Infrastructure"), no_content: true } diff --git a/src/sunstone/public/app/tabs/system-tab.js b/src/sunstone/public/app/tabs/instances-top-tab.js similarity index 92% rename from src/sunstone/public/app/tabs/system-tab.js rename to src/sunstone/public/app/tabs/instances-top-tab.js index 3cb99e888a..09e5b4e032 100644 --- a/src/sunstone/public/app/tabs/system-tab.js +++ b/src/sunstone/public/app/tabs/instances-top-tab.js @@ -16,11 +16,11 @@ define(function(require) { var Locale = require('utils/locale'); - var TAB_ID = 'system-tab'; + var TAB_ID = 'instances-top-tab'; var Tab = { tabId: TAB_ID, - title: ' '+Locale.tr("System"), + title: Locale.tr("Instances"), no_content: true } diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab.js b/src/sunstone/public/app/tabs/marketplaceapps-tab.js index 1a3d89a8e3..9670ee52cc 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab.js @@ -42,10 +42,13 @@ define(function(require) { var Tab = { tabId: TAB_ID, - title: ' ' + Locale.tr("Apps"), - listHeader: ' '+Locale.tr("Apps"), - infoHeader: ' '+Locale.tr("App"), - subheader: '  ', + title: Locale.tr("Apps"), + icon: 'fa-cloud-download', + tabClass: "subTab", + parentTab: "storage-top-tab", + listHeader: Locale.tr("Apps"), + infoHeader: Locale.tr("App"), + subheader: '', resource: 'MarketPlaceApp', buttons: Buttons, actions: Actions, diff --git a/src/sunstone/public/app/tabs/marketplaces-tab.js b/src/sunstone/public/app/tabs/marketplaces-tab.js index 69c90b4bae..6f1fb9e4ad 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab.js @@ -41,10 +41,13 @@ define(function(require) { var Tab = { tabId: TAB_ID, - title: ' ' + Locale.tr("MarketPlaces"), - listHeader: ' '+Locale.tr("MarketPlaces"), - infoHeader: ' '+Locale.tr("MarketPlace"), - subheader: '  ', + title: Locale.tr("MarketPlaces"), + icon: 'fa-shopping-cart', + tabClass: "subTab", + parentTab: "storage-top-tab", + listHeader: Locale.tr("MarketPlaces"), + infoHeader: Locale.tr("MarketPlace"), + subheader: '', resource: 'MarketPlace', buttons: Buttons, actions: Actions, diff --git a/src/sunstone/public/app/tabs/oneflow-dashboard-tab.js b/src/sunstone/public/app/tabs/network-top-tab.js similarity index 92% rename from src/sunstone/public/app/tabs/oneflow-dashboard-tab.js rename to src/sunstone/public/app/tabs/network-top-tab.js index 56bf03a346..1f3ecb4722 100644 --- a/src/sunstone/public/app/tabs/oneflow-dashboard-tab.js +++ b/src/sunstone/public/app/tabs/network-top-tab.js @@ -15,11 +15,11 @@ /* -------------------------------------------------------------------------- */ define(function(require) { - var TAB_ID = 'oneflow-dashboard-tab'; + var TAB_ID = 'network-top-tab'; var Tab = { tabId: TAB_ID, - title: ' OneFlow', + title: 'Network', no_content: true }; diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab.js b/src/sunstone/public/app/tabs/oneflow-services-tab.js index 85287c3b1a..6614f1fda5 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab.js @@ -44,10 +44,11 @@ define(function(require) { var Tab = { tabId: TAB_ID, title: Locale.tr("Services"), + icon: 'fa-cubes', tabClass: "subTab", - parentTab: "oneflow-dashboard-tab", - listHeader: ' '+Locale.tr("OneFlow - Services"), - infoHeader: ' '+Locale.tr("OneFlow - Service"), + parentTab: "instances-top-tab", + listHeader: Locale.tr("Services"), + infoHeader: Locale.tr("Service"), subheader: '', content: '