diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index 4762bb4182..fc23e5a765 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -1,6 +1,8 @@ small_logo: images/opennebula-5.0.png provision_logo: images/opennebula-5.0.png -confirm_vms: true +link_logo: +text_link_logo: +confirm_vms: false enabled_tabs: - dashboard-tab - instances-top-tab diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml index 2c6063efb5..b021aed090 100644 --- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml @@ -1,5 +1,8 @@ small_logo: images/opennebula-5.0.png provision_logo: images/opennebula-5.0.png +link_logo: +text_link_logo: +confirm_vms: false enabled_tabs: - dashboard-tab - instances-top-tab diff --git a/src/sunstone/etc/sunstone-views/cloud.yaml b/src/sunstone/etc/sunstone-views/cloud.yaml index 7201d6b9e9..68c83cbe2e 100644 --- a/src/sunstone/etc/sunstone-views/cloud.yaml +++ b/src/sunstone/etc/sunstone-views/cloud.yaml @@ -1,5 +1,7 @@ provision_logo: images/opennebula-5.0.png -confirm_vms: true +link_logo: +text_link_logo: +confirm_vms: false enabled_tabs: - provision-tab - settings-tab diff --git a/src/sunstone/etc/sunstone-views/cloud_vcenter.yaml b/src/sunstone/etc/sunstone-views/cloud_vcenter.yaml index 25fcc441a0..accf0e1587 100644 --- a/src/sunstone/etc/sunstone-views/cloud_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/cloud_vcenter.yaml @@ -1,4 +1,7 @@ provision_logo: images/opennebula-5.0.png +link_logo: +text_link_logo: +confirm_vms: false enabled_tabs: - provision-tab - settings-tab diff --git a/src/sunstone/etc/sunstone-views/groupadmin.yaml b/src/sunstone/etc/sunstone-views/groupadmin.yaml index fc4d2775da..435c88aa32 100644 --- a/src/sunstone/etc/sunstone-views/groupadmin.yaml +++ b/src/sunstone/etc/sunstone-views/groupadmin.yaml @@ -1,6 +1,8 @@ small_logo: images/opennebula-5.0.png provision_logo: images/opennebula-5.0.png -confirm_vms: true +link_logo: +text_link_logo: +confirm_vms: false enabled_tabs: - dashboard-tab - instances-top-tab diff --git a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml index 3576094085..a9f1ef612a 100644 --- a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml @@ -1,5 +1,8 @@ small_logo: images/opennebula-5.0.png provision_logo: images/opennebula-5.0.png +link_logo: +text_link_logo: +confirm_vms: false enabled_tabs: - dashboard-tab - instances-top-tab diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml index 1116db74e9..28b52a6961 100644 --- a/src/sunstone/etc/sunstone-views/user.yaml +++ b/src/sunstone/etc/sunstone-views/user.yaml @@ -1,5 +1,8 @@ small_logo: images/opennebula-5.0.png provision_logo: images/opennebula-5.0.png +link_logo: +text_link_logo: +confirm_vms: false enabled_tabs: - dashboard-tab - instances-top-tab diff --git a/src/sunstone/public/app/sunstone-config.js b/src/sunstone/public/app/sunstone-config.js index 6666a9a9e9..a6c1f9a576 100644 --- a/src/sunstone/public/app/sunstone-config.js +++ b/src/sunstone/public/app/sunstone-config.js @@ -134,7 +134,7 @@ define(function(require) { } } }, - "logo": (_config['view']["provision_logo"] || "images/one_small_logo.png") + "logo": (_config['view']["provision_logo"] || "images/one_small_logo.png"), }, 'autoRefresh' : _config['view']['autorefresh'], @@ -143,6 +143,8 @@ define(function(require) { 'vncWSS': _config['user_config']['vnc_wss'], 'requestVNCPassword': _config['system_config']['vnc_request_password'], 'logo': (_config['view']["small_logo"] || "images/one_small_logo.png"), + "link_logo": (_config['view']["link_logo"] || false), + "text_link_logo": (_config['view']["text_link_logo"] || false), 'vmLogos': (_config['vm_logos']), 'enabledTabs': _config['view']['enabled_tabs'], 'onedConf': _config['oned_conf'], @@ -151,10 +153,6 @@ define(function(require) { "allTabs": function() { return Object.keys(_config['view']['tabs']); } - - /*"isConfirmVmsActionsEnable": function() { - Console.Log(_config['view']['confirm_vms']); - }*/ } return Config; diff --git a/src/sunstone/public/app/utils/menu.js b/src/sunstone/public/app/utils/menu.js index 50dc291fc1..41c8495fc6 100644 --- a/src/sunstone/public/app/utils/menu.js +++ b/src/sunstone/public/app/utils/menu.js @@ -19,7 +19,6 @@ define(function(require) { var TopRowHTML = require('hbs!./menu/top-row'); var ProvisionTopRowHTML = require('hbs!./menu/provision-top-row'); var Config = require('sunstone-config'); - return { 'insert': _insert, 'insertProvision': _insertProvision, @@ -30,7 +29,11 @@ define(function(require) { }; function _insert(){ - $('#top-row').html(TopRowHTML({logo: Config.logo})); + $('#top-row').html(TopRowHTML({ + logo: Config.logo, + link: Config.link_logo, + link_text: Config.text_link_logo + })); _setup(); } @@ -44,7 +47,6 @@ define(function(require) { function _setup(){ $('#menu-toggle').on('click', function(){ var hiding = $('.sunstone-content').hasClass("large-10"); - if(!hiding){ $('.sunstone-content').toggleClass('large-10'); $('.sunstone-content').toggleClass('large-12'); diff --git a/src/sunstone/public/app/utils/menu/top-row.hbs b/src/sunstone/public/app/utils/menu/top-row.hbs index 82ababb00c..500c7ffb73 100644 --- a/src/sunstone/public/app/utils/menu/top-row.hbs +++ b/src/sunstone/public/app/utils/menu/top-row.hbs @@ -24,6 +24,11 @@