1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-25 02:50:08 +03:00

F #4793 Added the posibility of add a new link and text under the logo (#177)

This commit is contained in:
juanmont 2016-12-22 15:45:55 +01:00 committed by Tino Vázquez
parent 40e43b0147
commit a7d3f4aaea
10 changed files with 34 additions and 11 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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');

View File

@ -24,6 +24,11 @@
</li>
<li>
<img class="opennebula-img" src="{{logo}}"/>
{{#if link_text}}
{{#if link}}
<a class="opennebula-img" href="{{link}}" style="font-size:smaller; text-align:center">{{link_text}}</a>
{{/if}}
{{/if}}
</li>
</ul>
<div class="small-4 medium-8 large-8 columns">