shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-27 10:50:10 +03:00
Code Releases Wiki Activity

feature #4184: Show labels dropdown only if the tab supports it

Browse Source
This commit is contained in:
Daniel Molina 2015-12-17 12:54:41 +01:00 committed by Ruben S. Montero
parent 22adcb773f
commit f949ecfc03
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/sunstone/public/app/sunstone.js
View File

@ -131,8 +131,15 @@ define(function(require) {
}
var _setupDataTable = function(tabName) {
if (SunstoneCfg['tabs'][tabName].dataTable) {
SunstoneCfg['tabs'][tabName].dataTable.initialize();
var dataTable = SunstoneCfg['tabs'][tabName].dataTable;
if (dataTable) {
dataTable.initialize();
if (dataTable.labelsColumn) {
$('#' + tabName + 'labels_buttons').html(
'<button href="#" data-dropdown="' + tabName + 'LabelsDropdown" class="only-right-info only-right-list top_button small secondary button dropdown radius">' +
'<i class="fa fa-tags"/></button>' +
'<ul id="' + tabName + 'LabelsDropdown" class="only-right-info only-right-list labels-dropdown f-dropdown" data-dropdown-content></ul>');
}
}
}

5
src/sunstone/public/app/sunstone/buttons.hbs
View File

@ -29,10 +29,7 @@
</span>
<span class="right" style="margin-left: 20px">
<button href='#' data-dropdown='{{customId}}LabelsDropdown' class='only-right-info only-right-list top_button small secondary button dropdown radius'>
<i class='fa fa-tags'/></button>
<ul id='{{customId}}LabelsDropdown' class='labels-dropdown only-right-info only-right-list f-dropdown' data-dropdown-content></ul>
<span id='{{customId}}labels_buttons' class='only-right-info only-right-list'></span>
<button href='#' data-dropdown='{{customId}}user_buttons' class='only-right-info only-right-list top_button small secondary button dropdown radius'>
<i class='fa fa-user'/></button>
<ul id='{{customId}}user_buttons' class='only-right-info only-right-list f-dropdown' data-dropdown-content></ul>

2
src/sunstone/public/app/utils/labels/utils.js
View File

@ -124,6 +124,8 @@ define(function(require) {
}
}
});
$('.newLabelInput', labelsDropdown).focus();
}
recountLabels(tabName);