diff --git a/src/sunstone/etc/sunstone-views/kvm/admin.yaml b/src/sunstone/etc/sunstone-views/kvm/admin.yaml index 420dfa1bfa..b1a3ad44c0 100644 --- a/src/sunstone/etc/sunstone-views/kvm/admin.yaml +++ b/src/sunstone/etc/sunstone-views/kvm/admin.yaml @@ -37,7 +37,6 @@ enabled_tabs: - acls-tab - settings-tab - support-tab - - upgrade-top-tab - vmgroup-tab features: # True to show showback monthly reports, and VM cost @@ -903,9 +902,6 @@ tabs: # Edit button in settings_quotas_tab User.two_factor_auth: true User.quotas_dialog: false - upgrade-top-tab: - panel_tabs: - actions: vmgroup-tab: panel_tabs: vm_group_info_tab: true diff --git a/src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml b/src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml index f14cd41a05..fc19968f8b 100644 --- a/src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml +++ b/src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml @@ -37,7 +37,6 @@ enabled_tabs: #- acls-tab - settings-tab #- support-tab - #- upgrade-top-tab - vmgroup-tab features: # True to show showback monthly reports, and VM cost @@ -903,9 +902,6 @@ tabs: Settings.two_factor_auth: true # Edit button in settings_quotas_tab User.quotas_dialog: false - upgrade-top-tab: - panel_tabs: - actions: vmgroup-tab: panel_tabs: vm_group_info_tab: true diff --git a/src/sunstone/etc/sunstone-views/kvm/user.yaml b/src/sunstone/etc/sunstone-views/kvm/user.yaml index 9049ecb620..c820c5291d 100644 --- a/src/sunstone/etc/sunstone-views/kvm/user.yaml +++ b/src/sunstone/etc/sunstone-views/kvm/user.yaml @@ -37,7 +37,6 @@ enabled_tabs: #- acls-tab - settings-tab #- support-tab - #- upgrade-top-tab - vmgroup-tab features: # True to show showback monthly reports, and VM cost @@ -896,9 +895,6 @@ tabs: Settings.two_factor_auth: true # Edit button in settings_quotas_tab User.quotas_dialog: false - upgrade-top-tab: - panel_tabs: - actions: vmgroup-tab: panel_tabs: vm_group_info_tab: true diff --git a/src/sunstone/etc/sunstone-views/mixed/admin.yaml b/src/sunstone/etc/sunstone-views/mixed/admin.yaml index 029052f3a8..b4f547b0f0 100644 --- a/src/sunstone/etc/sunstone-views/mixed/admin.yaml +++ b/src/sunstone/etc/sunstone-views/mixed/admin.yaml @@ -37,7 +37,6 @@ enabled_tabs: - acls-tab - settings-tab - support-tab - - upgrade-top-tab - vmgroup-tab features: # True to show showback monthly reports, and VM cost @@ -906,9 +905,6 @@ tabs: Settings.two_factor_auth: true # Edit button in settings_quotas_tab User.quotas_dialog: false - upgrade-top-tab: - panel_tabs: - actions: vmgroup-tab: panel_tabs: vm_group_info_tab: true diff --git a/src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml b/src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml index cc2fc2605c..44a4c5a8b4 100644 --- a/src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml +++ b/src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml @@ -37,7 +37,6 @@ enabled_tabs: #- acls-tab - settings-tab #- support-tab - #- upgrade-top-tab - vmgroup-tab features: # True to show showback monthly reports, and VM cost @@ -904,9 +903,6 @@ tabs: Settings.two_factor_auth: true # Edit button in settings_quotas_tab User.quotas_dialog: false - upgrade-top-tab: - panel_tabs: - actions: vmgroup-tab: panel_tabs: vm_group_info_tab: true diff --git a/src/sunstone/etc/sunstone-views/mixed/user.yaml b/src/sunstone/etc/sunstone-views/mixed/user.yaml index 46af25cc35..00df71087c 100644 --- a/src/sunstone/etc/sunstone-views/mixed/user.yaml +++ b/src/sunstone/etc/sunstone-views/mixed/user.yaml @@ -37,7 +37,6 @@ enabled_tabs: #- acls-tab - settings-tab #- support-tab - #- upgrade-top-tab - vmgroup-tab features: # True to show showback monthly reports, and VM cost @@ -897,9 +896,6 @@ tabs: Settings.two_factor_auth: true # Edit button in settings_quotas_tab User.quotas_dialog: false - upgrade-top-tab: - panel_tabs: - actions: vmgroup-tab: panel_tabs: vm_group_info_tab: true diff --git a/src/sunstone/etc/sunstone-views/vcenter/admin.yaml b/src/sunstone/etc/sunstone-views/vcenter/admin.yaml index f759a28db7..dcf77d99c0 100644 --- a/src/sunstone/etc/sunstone-views/vcenter/admin.yaml +++ b/src/sunstone/etc/sunstone-views/vcenter/admin.yaml @@ -37,7 +37,6 @@ enabled_tabs: - acls-tab - settings-tab - support-tab - - upgrade-top-tab - vmgroup-tab features: # True to show showback monthly reports, and VM cost @@ -903,9 +902,6 @@ tabs: Settings.two_factor_auth: true # Edit button in settings_quotas_tab User.quotas_dialog: false - upgrade-top-tab: - panel_tabs: - actions: vmgroup-tab: panel_tabs: vm_group_info_tab: true diff --git a/src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml b/src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml index 35924622f7..7663fc76fe 100644 --- a/src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml +++ b/src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml @@ -37,7 +37,6 @@ enabled_tabs: #- acls-tab - settings-tab #- support-tab - #- upgrade-top-tab - vmgroup-tab features: # True to show showback monthly reports, and VM cost @@ -904,9 +903,6 @@ tabs: Settings.two_factor_auth: true # Edit button in settings_quotas_tab User.quotas_dialog: false - upgrade-top-tab: - panel_tabs: - actions: vmgroup-tab: panel_tabs: vm_group_info_tab: true diff --git a/src/sunstone/etc/sunstone-views/vcenter/user.yaml b/src/sunstone/etc/sunstone-views/vcenter/user.yaml index 46af25cc35..00df71087c 100644 --- a/src/sunstone/etc/sunstone-views/vcenter/user.yaml +++ b/src/sunstone/etc/sunstone-views/vcenter/user.yaml @@ -37,7 +37,6 @@ enabled_tabs: #- acls-tab - settings-tab #- support-tab - #- upgrade-top-tab - vmgroup-tab features: # True to show showback monthly reports, and VM cost @@ -897,9 +896,6 @@ tabs: Settings.two_factor_auth: true # Edit button in settings_quotas_tab User.quotas_dialog: false - upgrade-top-tab: - panel_tabs: - actions: vmgroup-tab: panel_tabs: vm_group_info_tab: true diff --git a/src/sunstone/public/app/main.js b/src/sunstone/public/app/main.js index b55ab3a0f3..7fe358788d 100644 --- a/src/sunstone/public/app/main.js +++ b/src/sunstone/public/app/main.js @@ -155,7 +155,6 @@ require.config({ "tabs/settings-tab", "tabs/support-tab", "tabs/official-support-tab", - "tabs/upgrade-top-tab", "tabs/vmgroup-tab", "addons/start", "addons/end" diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js index ebfd395e69..984d24f22b 100644 --- a/src/sunstone/public/app/sunstone.js +++ b/src/sunstone/public/app/sunstone.js @@ -66,7 +66,6 @@ define(function(require) { "support-tab", "official-support-tab", "settings-tab", - "upgrade-top-tab", "vmgroup-tab", "secgroups-tab", "provision-tab" diff --git a/src/sunstone/public/app/tabs/upgrade-top-tab.js b/src/sunstone/public/app/tabs/upgrade-top-tab.js deleted file mode 100644 index b4a6b381ae..0000000000 --- a/src/sunstone/public/app/tabs/upgrade-top-tab.js +++ /dev/null @@ -1,69 +0,0 @@ -/* -------------------------------------------------------------------------- */ -/* Copyright 2002-2019, 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. */ -/* -------------------------------------------------------------------------- */ - -define(function(require) { - var Locale = require('utils/locale'); - var TAB_ID = 'upgrade-top-tab'; - - var Tab = { - tabId: TAB_ID, - title: "", - setup: _setup, - content: "" - } - - return Tab; - - function _setup() { - $('#li_upgrade-top-tab > a').on("click", function(e){ - var redirect_port = config['upgrade']['redirect_port']; - var upgrade_url = config['upgrade']['url']; - - if (redirect_port) { - window.location = document.URL.replace(/(https?:\/\/)([^:\/]+).*$/,"http://$2:"+redirect_port) - } else { - window.location = upgrade_url - } - - return false; - }); - - $.ajax({ - url: '/version', - type: "GET", - dataType: "json", - success: function(response) { - var version = response["version"]; - - // remote_version could be null if the server cannot reach the url - var remote_version = response["remote_version"]; - - var tab_title; - - if (remote_version && (version < remote_version)) { - tab_title = config['upgrade']['upgrade']; - } else { - tab_title = config['upgrade']['no_upgrade']; - } - - $("li[id$='upgrade-top-tab'] > a").html(tab_title); - }, - error: function(response) { - return null; - } - }); - } -});