diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js index cd4971aa3a..5291e5bb5e 100644 --- a/src/sunstone/public/app/sunstone.js +++ b/src/sunstone/public/app/sunstone.js @@ -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( + '' + + ''); + } } } diff --git a/src/sunstone/public/app/sunstone/buttons.hbs b/src/sunstone/public/app/sunstone/buttons.hbs index 4dd0633f36..f02abe6c6b 100644 --- a/src/sunstone/public/app/sunstone/buttons.hbs +++ b/src/sunstone/public/app/sunstone/buttons.hbs @@ -29,10 +29,7 @@ - -
    - +
      diff --git a/src/sunstone/public/app/utils/labels/utils.js b/src/sunstone/public/app/utils/labels/utils.js index 027deceb7c..caec175cac 100644 --- a/src/sunstone/public/app/utils/labels/utils.js +++ b/src/sunstone/public/app/utils/labels/utils.js @@ -124,6 +124,8 @@ define(function(require) { } } }); + + $('.newLabelInput', labelsDropdown).focus(); } recountLabels(tabName);