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 ecdf8ae4f5..3a99de8caf 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,6 +270,7 @@ tabs: VM.resched: true VM.unresched: true VM.saveas_template: false +<<<<<<< HEAD templates-tab: panel_tabs: template_info_tab: true @@ -281,205 +347,9 @@ tabs: Image.snapshot_revert: false Image.snapshot_delete: false files-tab: - panel_tabs: - file_info_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # Datastore - #- 6 # Size - - 7 # Type - #- 8 # Registration time - #- 9 # Persistent - - 10 # Status - #- 11 # #VMs - #- 12 # Target - #- 13 # Labels - actions: - File.refresh: true - File.create_dialog: true - File.rename: true - File.chown: true - File.chgrp: true - File.chmod: true - 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.update_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: false - 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: true - 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: +>>>>>>> feature-4363 panel_tabs: service_info_tab: true service_roles_tab: true @@ -536,27 +406,60 @@ tabs: Service.shutdown: true Service.recover: true Service.delete: true - oneflow-templates-tab: + infrastructure-top-tab: panel_tabs: - service_template_info_tab: true - service_template_roles_tab: true + 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 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Hosts + - 4 # VNets + - 5 # Datastores + #- 6 # Labels 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 + 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 @@ -571,6 +474,240 @@ tabs: 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.update_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 + image_vms_tab: true + image_snapshots_tab: false + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Datastore + #- 6 # Size + - 7 # Type + #- 8 # Registration time + #- 9 # Persistent + - 10 # Status + - 11 # #VMs + #- 12 # Target + #- 13 # Labels + actions: + Image.refresh: true + Image.create_dialog: true + Image.rename: true + Image.chown: true + Image.chgrp: true + Image.chmod: true + Image.enable: true + Image.disable: true + Image.persistent: true + Image.nonpersistent: true + Image.clone_dialog: true + Image.delete: true + Image.snapshot_flatten: false + Image.snapshot_revert: false + Image.snapshot_delete: false + files-tab: + panel_tabs: + file_info_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Datastore + #- 6 # Size + - 7 # Type + #- 8 # Registration time + #- 9 # Persistent + - 10 # Status + #- 11 # #VMs + #- 12 # Target + #- 13 # Labels + actions: + File.refresh: true + File.create_dialog: true + File.rename: true + File.chown: true + File.chgrp: true + File.chmod: true + File.enable: true + File.disable: true + File.delete: true + marketplaces-tab: + panel_tabs: + marketplace_info_tab: true + marketplace_apps_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Capacity + - 6 # Apps + - 7 # Driver + #- 8 # Labels + actions: + 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: + vnets-tab: + panel_tabs: + vnet_info_tab: true + vnet_ar_list_tab: true + vnet_leases_tab: true + vnet_sg_list_tab: false + 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: true + 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 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/Gruntfile.js b/src/sunstone/public/Gruntfile.js index 4936c28d66..0b5c03dd29 100644 --- a/src/sunstone/public/Gruntfile.js +++ b/src/sunstone/public/Gruntfile.js @@ -20,7 +20,7 @@ module.exports = function(grunt) { sass: { options: { - includePaths: ['bower_components/foundation/scss'] + includePaths: ['bower_components/foundation-sites/scss'] }, dist: { options: { @@ -38,7 +38,7 @@ module.exports = function(grunt) { }, sass: { - files: 'scss/**/*.scss', + files: 'scss/*.scss', tasks: ['sass'] }, diff --git a/src/sunstone/public/app/app.js b/src/sunstone/public/app/app.js index f271b96e2c..b17b159742 100644 --- a/src/sunstone/public/app/app.js +++ b/src/sunstone/public/app/app.js @@ -16,7 +16,13 @@ define(function(require) { require('jquery'); - require('foundation.dropdown'); + require('foundation'); + + Foundation.Dropdown.defaults.positionClass = 'left'; + Foundation.Dropdown.defaults.closeOnClick = true; + Foundation.DropdownMenu.defaults.closeOnClick = true; + Foundation.DropdownMenu.defaults.disableHover = true; + Foundation.DropdownMenu.defaults.clickOpen = true; var DASHBOARD_TAB_ID = require('tabs/dashboard-tab/tabId'); var SETTINGS_TAB_ID = require('tabs/settings-tab/tabId'); @@ -27,7 +33,8 @@ define(function(require) { var Notifier = require('utils/notifier'); var Menu = require('utils/menu'); var Locale = require('utils/locale'); - var UserInputs = require('utils/user-inputs'); + + var UserAndZoneTemplate = require('hbs!sunstone/user_and_zone'); var _commonDialogs = [ require('utils/dialogs/confirm'), @@ -35,14 +42,14 @@ define(function(require) { require('utils/dialogs/generic-confirm') ] - Sunstone.addDialogs(_commonDialogs); - Sunstone.addMainTabs(); //$(window).load(function() { // $('#loading').hide(); //}); $(document).ready(function() { + Sunstone.addDialogs(_commonDialogs); + Sunstone.addMainTabs(); Sunstone.insertTabs(); if (Config.isTabEnabled(PROVISION_TAB_ID)){ @@ -54,7 +61,6 @@ define(function(require) { _setupAccordion(); _setupCloseDropdownsOnClick(); _insertUserAndZoneSelector(); - UserInputs.initialSetup(); if (Config.isTabEnabled(PROVISION_TAB_ID)) { Sunstone.showTab(PROVISION_TAB_ID); @@ -87,46 +93,14 @@ define(function(require) { } function _insertUserAndZoneSelector() { - var user_login_content = - '\ - \ - \ - '; - - $(".user-zone-info").html(user_login_content); + $(".user-zone-info").html(UserAndZoneTemplate({ + displayName: config['display_name'], + settingsTabEnabled: Config.isTabEnabled(SETTINGS_TAB_ID), + availableViews: config['available_views'], + zoneName: config['zone_name'] + })).foundation(); + $('.quickconf_view[view="' + config['user_config']["default_view"] + '"] i').addClass('fa-check'); $(".user-zone-info a.quickconf_view_header").click(function() { var context = $(this).closest('ul'); $(".quickconf_view", context).toggle(); @@ -146,7 +120,8 @@ define(function(require) { success: function (request, obj_list) { $('.zone-ul').empty(); $.each(obj_list, function() { - $('.zone-ul').append('
  • ' + this.ZONE.NAME + '
  • '); + $('.zone-ul').append('
  • ' + + '' + this.ZONE.NAME + '
  • '); }); }, error: Notifier.onError @@ -186,7 +161,7 @@ define(function(require) { }); $(".user-zone-info a.configuration").click(function() { - $(document).foundation('dropdown', 'closeall'); + //$(document).foundation('dropdown', 'closeall'); Sunstone.showTab(SETTINGS_TAB_ID); }); } diff --git a/src/sunstone/public/app/main.js b/src/sunstone/public/app/main.js index a5796717ea..2c1ebfe275 100644 --- a/src/sunstone/public/app/main.js +++ b/src/sunstone/public/app/main.js @@ -23,40 +23,35 @@ require.config({ 'jquery': '../bower_components/jquery/dist/jquery', /* DataTables */ - 'datatables': '../bower_components/datatables/media/js/jquery.dataTables', - 'foundation-datatables': '../bower_components/foundation-datatables/integration/foundation/dataTables.foundation', + 'datatables.net': '../bower_components/datatables/media/js/jquery.dataTables', + 'datatables.foundation': '../bower_components/datatables/media/js/dataTables.foundation', /* DataTables */ 'jgrowl': '../bower_components/jgrowl/jquery.jgrowl', /* Foundation */ - 'foundation.core': '../bower_components/foundation/js/foundation/foundation', - 'foundation.abide': '../bower_components/foundation/js/foundation/foundation.abide', - 'foundation.accordion': '../bower_components/foundation/js/foundation/foundation.accordion', - 'foundation.alert': '../bower_components/foundation/js/foundation/foundation.alert', - 'foundation.clearing': '../bower_components/foundation/js/foundation/foundation.clearing', - 'foundation.dropdown': '../bower_components/foundation/js/foundation/foundation.dropdown', - 'foundation.equalizer': '../bower_components/foundation/js/foundation/foundation.equalizer', - 'foundation.interchange': '../bower_components/foundation/js/foundation/foundation.interchange', - 'foundation.joyride': '../bower_components/foundation/js/foundation/foundation.joyride', - 'foundation.magellan': '../bower_components/foundation/js/foundation/foundation.magellan', - 'foundation.offcanvas': '../bower_components/foundation/js/foundation/foundation.offcanvas', - 'foundation.orbit': '../bower_components/foundation/js/foundation/foundation.orbit', - 'foundation.reveal': '../bower_components/foundation/js/foundation/foundation.reveal', - 'foundation.slider': '../bower_components/foundation/js/foundation/foundation.slider', - 'foundation.tab': '../bower_components/foundation/js/foundation/foundation.tab', - 'foundation.tooltip': '../bower_components/foundation/js/foundation/foundation.tooltip', - 'foundation.topbar': '../bower_components/foundation/js/foundation/foundation.topbar', + 'foundation': '../bower_components/foundation-sites/dist/foundation', + //'foundation.core': '../bower_components/foundation/js/foundation/foundation', + //'foundation.abide': '../bower_components/foundation/js/foundation/foundation.abide', + //'foundation.accordion': '../bower_components/foundation/js/foundation/foundation.accordion', + //'foundation.alert': '../bower_components/foundation/js/foundation/foundation.alert', + //'foundation.clearing': '../bower_components/foundation/js/foundation/foundation.clearing', + //'foundation.dropdown': '../bower_components/foundation/js/foundation/foundation.dropdown', + //'foundation.equalizer': '../bower_components/foundation/js/foundation/foundation.equalizer', + //'foundation.interchange': '../bower_components/foundation/js/foundation/foundation.interchange', + //'foundation.joyride': '../bower_components/foundation/js/foundation/foundation.joyride', + //'foundation.magellan': '../bower_components/foundation/js/foundation/foundation.magellan', + //'foundation.offcanvas': '../bower_components/foundation/js/foundation/foundation.offcanvas', + //'foundation.orbit': '../bower_components/foundation/js/foundation/foundation.orbit', + //'foundation.reveal': '../bower_components/foundation/js/foundation/foundation.reveal', + //'foundation.slider': '../bower_components/foundation/js/foundation/foundation.slider', + //'foundation.tab': '../bower_components/foundation/js/foundation/foundation.tab', + //'foundation.tooltip': '../bower_components/foundation/js/foundation/foundation.tooltip', + //'foundation.topbar': '../bower_components/foundation/js/foundation/foundation.topbar', /* Handlebars */ 'hbs': '../bower_components/require-handlebars-plugin/hbs', - /* Vendor Scripts */ - 'jquery.cookie': '../bower_components/foundation/js/vendor/jquery.cookie', - 'fastclick': '../bower_components/foundation/js/vendor/fastclick', - 'modernizr': '../bower_components/foundation/js/vendor/modernizr', - 'placeholder': '../bower_components/foundation/js/vendor/placeholder', - /* Resumable */ 'resumable': '../bower_components/resumablejs/resumable', @@ -118,32 +113,35 @@ require.config({ /* Tabs */ 'app': { deps: [ + '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' ] @@ -159,78 +157,76 @@ require.config({ deps: ['jquery'] }, - /* dataTables */ - 'foundation-datatables': { - deps: ['jquery', 'datatables'] - }, - /* Foundation */ - 'foundation.core': { - deps: ['jquery', 'modernizr'], - exports: 'Foundation' - }, - 'foundation.abide': { - deps: ['foundation.core'] - }, - 'foundation.accordion': { - deps: ['foundation.core'] - }, - 'foundation.alert': { - deps: ['foundation.core'] - }, - 'foundation.clearing': { - deps: ['foundation.core'] - }, - 'foundation.dropdown': { - deps: ['foundation.core'] - }, - 'foundation.equalizer': { - deps: ['foundation.core'] - }, - 'foundation.interchange': { - deps: ['foundation.core'] - }, - 'foundation.joyride': { - deps: ['foundation.core', 'jquery.cookie'] - }, - 'foundation.magellan': { - deps: ['foundation.core'] - }, - 'foundation.offcanvas': { - deps: ['foundation.core'] - }, - 'foundation.orbit': { - deps: ['foundation.core'] - }, - 'foundation.reveal': { - deps: ['foundation.core'] - }, - 'foundation.slider': { - deps: ['foundation.core'] - }, - 'foundation.tab': { - deps: ['foundation.core'] - }, - 'foundation.tooltip': { - deps: ['foundation.core'] - }, - 'foundation.topbar': { - deps: ['foundation.core'] + 'foundation': { + deps: ['jquery'] }, + //'foundation.core': { + // deps: ['jquery', 'modernizr'], + // exports: 'Foundation' + //}, + //'foundation.abide': { + // deps: ['foundation.core'] + //}, + //'foundation.accordion': { + // deps: ['foundation.core'] + //}, + //'foundation.alert': { + // deps: ['foundation.core'] + //}, + //'foundation.clearing': { + // deps: ['foundation.core'] + //}, + //'foundation.dropdown': { + // deps: ['foundation.core'] + //}, + //'foundation.equalizer': { + // deps: ['foundation.core'] + //}, + //'foundation.interchange': { + // deps: ['foundation.core'] + //}, + //'foundation.joyride': { + // deps: ['foundation.core', 'jquery.cookie'] + //}, + //'foundation.magellan': { + // deps: ['foundation.core'] + //}, + //'foundation.offcanvas': { + // deps: ['foundation.core'] + //}, + //'foundation.orbit': { + // deps: ['foundation.core'] + //}, + //'foundation.reveal': { + // deps: ['foundation.core'] + //}, + //'foundation.slider': { + // deps: ['foundation.core'] + //}, + //'foundation.tab': { + // deps: ['foundation.core'] + //}, + //'foundation.tooltip': { + // deps: ['foundation.core'] + //}, + //'foundation.topbar': { + // deps: ['foundation.core'] + //}, /* Vendor Scripts */ - 'jquery.cookie': { - deps: ['jquery'] - }, - 'fastclick': { - exports: 'FastClick' - }, - 'modernizr': { - exports: 'Modernizr' - }, - 'placeholder': { - exports: 'Placeholders' - }, + //'jquery.cookie': { + // deps: ['jquery'] + //}, + //'fastclick': { + // exports: 'FastClick' + //}, + //'modernizr': { + // exports: 'Modernizr' + //}, + //'placeholder': { + // exports: 'Placeholders' + //}, /* Flot Graphs */ 'flot': { diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js index 4087c0abe5..07639b8d67 100644 --- a/src/sunstone/public/app/sunstone.js +++ b/src/sunstone/public/app/sunstone.js @@ -16,9 +16,9 @@ define(function(require) { require('jquery'); - require('foundation.reveal'); - require('foundation.tab'); - require('foundation.dropdown'); + //require('foundation.reveal'); + //require('foundation.tab'); + //require('foundation.dropdown'); var Config = require('sunstone-config'); var Locale = require('utils/locale'); @@ -136,9 +136,10 @@ define(function(require) { dataTable.initialize(); if (dataTable.labelsColumn) { $('#' + tabName + 'labels_buttons').html( - '' + - ''); + '').foundation(); + } } } @@ -156,26 +157,50 @@ define(function(require) { if (condition && !condition()) {return;} if (tabInfo.no_content === true) { - tabClass += " tab_with_no_content" + tabClass += " tab_with_no_content is-accordion-submenu-parent" } else { tabInfo['tabName'] = tabName; var TabTemplate = require('hbs!sunstone/tab') $('div.right-content').append(TabTemplate(tabInfo)); } - var liItem = '
  • ' + tabInfo.title + '
  • '; + var liItem; + var title = ''; + if (tabInfo.icon) { + title += ' '; + } + title += tabInfo.title; - $('div#menu ul#navigation').append(liItem); + if (parent !== '') { + liItem = '
  • ' + + '' + title + '' + + '
  • '; + + if ($('#menu ul#navigation #li_' + parent + ' .menu').length > 0) { + $('#menu ul#navigation #li_' + parent + ' .menu').append(liItem); + } else { + $('#menu ul#navigation #li_' + parent).append( + '') + } + } else { + liItem = '
  • ' + + '' + title + '' + + '
  • '; + + $('div#menu ul#navigation').append(liItem); + } //if this is a submenu... - if (parent.length) { - var children = $('div#menu ul#navigation #li_' + parent); - //if there are other submenus, insert after last of them - if (children.length) { - $('div#menu li#li_' + tabName).hide();//hide by default - $('div#menu li#li_' + parent + ' span').css("display", "inline-block"); - } - }; + //if (parent.length) { + // var children = $('div#menu ul#navigation #li_' + parent); + // //if there are other submenus, insert after last of them + // if (children.length) { + // $('div#menu li#li_' + tabName).hide();//hide by default + // $('div#menu li#li_' + parent + ' span').css("display", "inline-block"); + // } + //}; if (tabInfo.forms) { $.each(tabInfo.forms, function(key, value) { @@ -254,14 +279,14 @@ define(function(require) { buttonContext = $("#" + customId + "create_buttons", buttonsRow); icon = button.icon ? button.icon : ''; text = button.text ? icon + ' ' + button.text : icon; - strClass.push("success", "button", "small", "radius"); + strClass.push("success", "button"); buttonCode = ''; break; case "refresh": buttonContext = $("#" + customId + "refresh_buttons", buttonsRow); - icon = button.icon ? button.icon : ''; + icon = button.icon ? button.icon : ''; text = button.text ? icon + ' ' + button.text : icon; - strClass.push("white_button", "refresh", "secondary", "button", "small", "radius"); + strClass.push("white_button", "refresh", "button", "secondary"); buttonCode = ''; break; case "top": @@ -270,19 +295,19 @@ define(function(require) { '' + '' + ''; - strClass.push("white_button", "toggle_top_button", "only-right-list", "secondary", "button", "small", "radius"); + strClass.push("white_button", "toggle_top_button", "only-right-list", "button", "hollow"); buttonCode = '' + text + ''; break; case "main": buttonContext = $("#" + customId + "main_buttons", buttonsRow); text = button.text; - strClass.push("secondary", "button", "small", "radius"); + strClass.push("button"); buttonCode = ''; break; case "vmsplay_buttons": buttonContext = $("#" + customId + "vmsplay_buttons", buttonsRow); text = button.text; - strClass.push("secondary", "button", "small", "radius"); + strClass.push("button"); buttonCode = ''; break; case "vmspause_buttons": @@ -323,13 +348,13 @@ define(function(require) { case "del": buttonContext = $("#" + customId + "delete_buttons", buttonsRow); text = ' '; - strClass.push("alert", "button", "small", "radius"); + strClass.push("alert", "button"); buttonCode = ''; break; default: buttonContext = $("#" + customId + "main_buttons", buttonsRow); text = button.text; - strClass.push("secondary", "button", "small", "radius"); + strClass.push("button"); buttonCode = ''; } @@ -339,37 +364,39 @@ define(function(require) { //$('.top_button',actionBlock).addClass("secondary small button") actionBlock.append(buttonsRow); + //actionBlock.foundation(); + Foundation.reflow(actionBlock, 'dropdown'); if ($("#" + customId + "more_buttons li", actionBlock).length == 0) { - $("button[data-dropdown=" + customId + "more_buttons]", actionBlock).remove() + $("button[data-toggle=" + customId + "more_buttons]", actionBlock).remove() } if ($("#" + customId + "user_buttons li", actionBlock).length == 0) { - $("button[data-dropdown=" + customId + "user_buttons]", actionBlock).remove() + $("button[data-toggle=" + customId + "user_buttons]", actionBlock).remove() } if ($("#" + customId + "vmsplanification_buttons li", actionBlock).length == 0) { - $("button[data-dropdown=" + customId + "vmsplanification_buttons]", actionBlock).remove() + $("button[data-toggle=" + customId + "vmsplanification_buttons]", actionBlock).remove() } if ($("#" + customId + "vmsdelete_buttons li", actionBlock).length == 0) { - $("button[data-dropdown=" + customId + "vmsdelete_buttons]", actionBlock).remove() + $("button[data-toggle=" + customId + "vmsdelete_buttons]", actionBlock).remove() } if ($("#" + customId + "vmsstop_buttons li", actionBlock).length == 0) { - $("button[data-dropdown=" + customId + "vmsstop_buttons]", actionBlock).remove() + $("button[data-toggle=" + customId + "vmsstop_buttons]", actionBlock).remove() } if ($("#" + customId + "vmspause_buttons li", actionBlock).length == 0) { - $("button[data-dropdown=" + customId + "vmspause_buttons]", actionBlock).remove() + $("button[data-toggle=" + customId + "vmspause_buttons]", actionBlock).remove() } if ($("#" + customId + "vmsrepeat_buttons li", actionBlock).length == 0) { - $("button[data-dropdown=" + customId + "vmsrepeat_buttons]", actionBlock).remove() + $("button[data-toggle=" + customId + "vmsrepeat_buttons]", actionBlock).remove() } if ($("#" + customId + "user_buttons li", actionBlock).length == 0) { - $("button[data-dropdown=" + customId + "user_buttons]", actionBlock).remove() + $("button[data-toggle=" + customId + "user_buttons]", actionBlock).remove() } //actionBlock.foundationButtons(); $('.top_button, .list_button', actionBlock).prop('disabled', false); @@ -386,8 +413,6 @@ define(function(require) { _submitFormPanel(tabName); return false; }) - - $(document).foundation(); }//if tab exists } @@ -421,12 +446,6 @@ define(function(require) { error = _runAction(value); } - if (!error && !$(this).hasClass("refresh")) { - //proceed to close confirm dialog in - //case it was open - _getDialogInstance(CONFIRM_DIALOG_ID).hide(); - }; - return false; }); @@ -450,16 +469,18 @@ define(function(require) { return false; }); - $(document).foundation('dropdown', 'reflow'); + //$(document).foundation('dropdown', 'reflow'); // Button to return to the list view from the detailed view - $(document).on("click", "a[href='back']", function(e) { + $(document).on("click", "button[href='back']", function(e) { $(".navigation-active-li a", $("#navigation")).click(); e.preventDefault(); }); } var _setupTabs = function() { + Foundation.reflow($('#menu'), 'accordion-menu'); + Foundation.reflow($('div.right-content'), 'sticky') var topTabs = $(".left-content ul li.topTab"); var subTabs = $(".left-content ul li.subTab > a"); @@ -478,8 +499,8 @@ define(function(require) { if ($(this).hasClass("tab_with_no_content")) { //Subtabs have a class with the name of this tab - var subtabs = $('div#menu li.' + tabName); - subtabs.fadeToggle('fast'); + //var subtabs = $('div#menu li.' + tabName); + //subtabs.fadeToggle('fast'); return false; } else { _showTab(tabName); @@ -493,30 +514,34 @@ define(function(require) { var _showRighList = function(tabName) { var tab = $('#' + tabName); $(".tab").hide(); - tab.show(); + tab.fadeIn(); $(".right-info", tab).hide(); $(".right-form", tab).hide(); - $(".right-list", tab).show(); + $(".right-list", tab).fadeIn(); $(".only-right-info", tab).hide(); $(".only-right-form", tab).hide(); - $(".only-right-list", tab).show(); + $(".only-right-list", tab).fadeIn(); + $('.action_blocks', tab).removeClass('large-12').addClass('large-9'); }; var _showRighInfo = function(tabName) { var tab = $('#' + tabName); $(".tab").hide(); - tab.show(); + tab.fadeIn(); $(".right-list", tab).hide(); $(".right-form", tab).hide(); - $(".right-info", tab).show(); + $(".right-info", tab).fadeIn(); $(".only-right-list", tab).hide(); $(".only-right-form", tab).hide(); - $(".only-right-info", tab).show(); + $(".only-right-info", tab).fadeIn(); + $('.action_blocks', tab).removeClass('large-9').addClass('large-12'); } var _showTab = function(tabName) { + $('.labels-tree', '#navigation').remove(); + if (!SunstoneCfg['tabs'][tabName]) { return false; } @@ -534,7 +559,6 @@ define(function(require) { //clean selected menu $("#navigation li").removeClass("navigation-active-li"); $("#navigation li#li_" + tabName).addClass("navigation-active-li"); - $('.tree', '#navigation').remove(); var tab = $('#' + tabName); //show tab @@ -583,7 +607,7 @@ define(function(require) { context.data('element', info[Object.keys(info)[0]]); var containerId = tabName + '-panels'; - var activaTab = $("dd.active a", $("#" + containerId)); + var activaTab = $("li.is-active a", $("#" + containerId)); if (activaTab) { var activaTabHref = activaTab.attr('href'); } @@ -649,24 +673,26 @@ define(function(require) { }) context.html(html); - $.each(SunstoneCfg['tabs'][tabName]["panelInstances"], function(panelName, panel) { panel.setup(context); if(isRefresh && prevPanelStates[panelName] && panel.setState){ panel.setState( prevPanelStates[panelName], context ); } + }); - if (panel.onShow) { - context.off('click', '[href="#' + panel.panelId + '"]'); - context.on('click', '[href="#' + panel.panelId + '"]', function(){ - panel.onShow(context); - }); + $('#' + containerId + 'Tabs', context).on('change.zf.tabs', function(target) { + var tabIdWithHash = $('.is-active > a', this)[0].hash; + var panel = SunstoneCfg['tabs'][tabName]["panelInstances"][tabIdWithHash.substring(1)]; + if (panel && panel.onShow) { + panel.onShow(context); } }); - context.foundation('tab', 'reflow'); - $('[href=' + activaTabHref + ']', context).trigger("click"); + Foundation.reflow(context, 'tabs'); + + //context.foundation(); + $('[href="' + activaTabHref + '"]', context).trigger("click"); if (hooks) { $.each(hooks, function(i, hook){ @@ -789,9 +815,11 @@ define(function(require) { if (!formPanelInstance) { formContext = - $('
    \ -
    \ -
    \ + $('
    \ +
    \ +
    \
    ').appendTo( $(".contentForm", context) ); // Create panelInstance, insert in the DOM and setup @@ -801,6 +829,8 @@ define(function(require) { return false; } // Panel not defined + Foundation.reflow(context, 'tabs'); + formPanelInstance = new formPanel(); formPanelInstance.setAction(formContext, action); tab["formPanelInstances"][formPanelId] = formPanelInstance; @@ -846,9 +876,9 @@ define(function(require) { setTimeout(function() { var formPanelInstance = SunstoneCfg["tabs"][tabId].activeFormPanel - if ($(".wizardForms.active", context).length > 0) { + if ($(".wizardForms.is-active", context).length > 0) { $('#' + formPanelInstance.formPanelId + 'Wizard').submit(); - } else if ($(".advancedForms.active", context).length > 0) { + } else if ($(".advancedForms.is-active", context).length > 0) { $('#' + formPanelInstance.formPanelId + 'Advanced').submit(); } }, 13) @@ -908,14 +938,14 @@ define(function(require) { $(".right-form-title", context).text(formPanelInstance.title()); $(".submit_button", context).text(formPanelInstance.buttonText()); - $("div[form-panel-id="+formPanelInstance.formPanelId+"]", context).show(); + $("div[form-panel-id="+formPanelInstance.formPanelId+"]", context).fadeIn(); } } function _hideFormPanel(tabId) { var context = $("#" + tabId); - $("a[href=back]", context).trigger("click"); + $('[href="back"]', context).trigger("click"); } function _popFormPanelLoading(tabId) { @@ -926,6 +956,7 @@ define(function(require) { $(".only-right-list", context).hide(); $(".only-right-info", context).hide(); $(".only-right-form", context).show(); + $('.action_blocks', context).removeClass('large-9').addClass('large-12'); $(".right-form-title", context).text(Locale.tr("Loading...")); $(".submit_button", context).text(Locale.tr("Loading...")); diff --git a/src/sunstone/public/app/sunstone/buttons.hbs b/src/sunstone/public/app/sunstone/buttons.hbs index f02abe6c6b..709458f09b 100644 --- a/src/sunstone/public/app/sunstone/buttons.hbs +++ b/src/sunstone/public/app/sunstone/buttons.hbs @@ -14,79 +14,77 @@ {{! limitations under the License. }} {{! -------------------------------------------------------------------------- }} -
    - - - + {{#unless customContext}} - - -    - + + {{/unless}} - + + + + + - - - - -
      - - -
        - - -
        - - - - - -
          - - -
            - - -
              - - -
                - + - + + + + + + + + + + + + + + -
                  + + + + + + + + + + + + +
                  - -
                  -" diff --git a/src/sunstone/public/app/sunstone/panels.hbs b/src/sunstone/public/app/sunstone/panels.hbs index 63c26fc181..a82ea38728 100644 --- a/src/sunstone/public/app/sunstone/panels.hbs +++ b/src/sunstone/public/app/sunstone/panels.hbs @@ -15,9 +15,9 @@ {{! -------------------------------------------------------------------------- }}
                  -
                  +
                  -
                  + +
                  {{#each panels}} -
                  +
                  {{{html}}}
                  {{/each}} diff --git a/src/sunstone/public/app/sunstone/tab.hbs b/src/sunstone/public/app/sunstone/tab.hbs index 494cd4ae5a..2964a1fc77 100644 --- a/src/sunstone/public/app/sunstone/tab.hbs +++ b/src/sunstone/public/app/sunstone/tab.hbs @@ -13,43 +13,40 @@ {{! See the License for the specific language governing permissions and }} {{! limitations under the License. }} {{! -------------------------------------------------------------------------- }} - +
                  \ No newline at end of file diff --git a/src/sunstone/public/app/sunstone/user_and_zone.hbs b/src/sunstone/public/app/sunstone/user_and_zone.hbs new file mode 100644 index 0000000000..ade9bf2e6f --- /dev/null +++ b/src/sunstone/public/app/sunstone/user_and_zone.hbs @@ -0,0 +1,66 @@ +{{! -------------------------------------------------------------------------- }} +{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems }} +{{! }} +{{! Licensed 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. }} +{{! -------------------------------------------------------------------------- }} + + \ No newline at end of file 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/acls-tab/form-panels/create.js b/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js index 76b71381f6..9e08e01462 100644 --- a/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js @@ -19,7 +19,7 @@ define(function(require) { DEPENDENCIES */ - require('foundation.tab'); + //require('foundation.tab'); var BaseFormPanel = require('utils/form-panels/form-panel'); var Sunstone = require('sunstone'); var Locale = require('utils/locale'); 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/clusters-tab/form-panels/create.js b/src/sunstone/public/app/tabs/clusters-tab/form-panels/create.js index fb4a602149..58b0203e92 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/clusters-tab/form-panels/create.js @@ -19,7 +19,7 @@ define(function(require) { DEPENDENCIES */ - require('foundation.tab'); + //require('foundation.tab'); var BaseFormPanel = require('utils/form-panels/form-panel'); var Sunstone = require('sunstone'); var Locale = require('utils/locale'); @@ -99,7 +99,7 @@ define(function(require) { } function _setup(context) { - context.foundation('tab', 'reflow'); + Foundation.reflow(context, 'tabs') this.hostsTable.initialize(); this.vnetsTable.initialize(); this.datastoresTable.initialize(); diff --git a/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/wizard.hbs index 33edcefb10..9fb149615d 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/wizard.hbs @@ -21,18 +21,18 @@
                  -
                  -
                  +
                  +
                  {{{hostsTableHTML}}}
                  -
                  +
                  {{{vnetsTableHTML}}}
                  -
                  +
                  {{{datastoresTableHTML}}}
                  diff --git a/src/sunstone/public/app/tabs/dashboard-tab.js b/src/sunstone/public/app/tabs/dashboard-tab.js index 9630f29354..14976b0ba8 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab.js +++ b/src/sunstone/public/app/tabs/dashboard-tab.js @@ -236,9 +236,8 @@ define(function(require) { var Tab = { tabId: TAB_ID, resource: 'Dashboard', - title: ' ' + Locale.tr("Dashboard"), - listHeader: ' ' + Locale.tr("Dashboard"), - buttons: _buttons, + title: Locale.tr("Dashboard"), + listHeader: Locale.tr("Dashboard"), actions: _actions, content: _html() }; diff --git a/src/sunstone/public/app/tabs/dashboard-tab/hosts.hbs b/src/sunstone/public/app/tabs/dashboard-tab/hosts.hbs index dd530267a3..2e30f8cbbe 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab/hosts.hbs +++ b/src/sunstone/public/app/tabs/dashboard-tab/hosts.hbs @@ -14,61 +14,38 @@ {{! limitations under the License. }} {{! -------------------------------------------------------------------------- }} -
                  -
                  -
                  -

                  - {{tr "HOSTs"}} -
                  - - -

                  -
                  -
                  -
                  - -
                  - {{tr "ON"}} -
                  -
                  -
                  -
                  - -
                  - {{tr "OFF"}} -
                  -
                  -
                  -
                  - -
                  - {{tr "ERROR"}} -
                  -
                  -
                  -
                  - - - - - -
                  -
                  -
                  -
                  -
                  -
                  -
                  -
                  +
                  +
                  + + + +
                  + +
                  +
                  -
                  -
                  -
                  -
                  +
                  +
                  +
                  +
                  +
                  +
                  +
                  +
                  -
                  -
                  - diff --git a/src/sunstone/public/app/tabs/dashboard-tab/network.hbs b/src/sunstone/public/app/tabs/dashboard-tab/network.hbs index 7ff389ce63..47ba2c8cb5 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab/network.hbs +++ b/src/sunstone/public/app/tabs/dashboard-tab/network.hbs @@ -13,29 +13,21 @@ {{! See the License for the specific language governing permissions and }} {{! limitations under the License. }} {{! -------------------------------------------------------------------------- }} - - +
                  +
                  + + + +
                  +
                  \ No newline at end of file diff --git a/src/sunstone/public/app/tabs/dashboard-tab/storage.hbs b/src/sunstone/public/app/tabs/dashboard-tab/storage.hbs index ca421b465b..52c0258734 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab/storage.hbs +++ b/src/sunstone/public/app/tabs/dashboard-tab/storage.hbs @@ -13,29 +13,21 @@ {{! See the License for the specific language governing permissions and }} {{! limitations under the License. }} {{! -------------------------------------------------------------------------- }} - -