Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-3941 - Clarify tab name for controller-level controller services dialog 

* Changed the tab title since sharing the name makes things
less clear for newcomers.
* Suggested info sentence is omitted.

This closes #2124.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
This commit is contained in:
yuri1969 2017-09-01 21:59:17 +02:00 committed by Andy LoPresto
parent 03e51ee8ac
commit 20d23e836e
No known key found for this signature in database
GPG Key ID: 6EC293152D90B61D
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
View File

@ -23,7 +23,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="settings-tabs-content"> <div id="settings-tabs-content">
<button id="new-service-or-task" class="add-button fa fa-plus" title="Create a new controller service" style="display: block;"></button> <button id="new-service-or-task" class="add-button fa fa-plus" title="Create a new reporting task controller service" style="display: block;"></button>
<div id="general-settings-tab-content" class="configuration-tab"> <div id="general-settings-tab-content" class="configuration-tab">
<div id="general-settings"> <div id="general-settings">
<div class="setting"> <div class="setting">

10
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
View File

@ -1224,7 +1224,7 @@
name: 'General', name: 'General',
tabContentId: 'general-settings-tab-content' tabContentId: 'general-settings-tab-content'
}, { }, {
name: 'Controller Services', name: 'Reporting Task Controller Services',
tabContentId: 'controller-services-tab-content' tabContentId: 'controller-services-tab-content'
}, { }, {
name: 'Reporting Tasks', name: 'Reporting Tasks',
@ -1249,9 +1249,9 @@
// update the tooltip on the button // update the tooltip on the button
$('#new-service-or-task').attr('title', function () { $('#new-service-or-task').attr('title', function () {
if (tab === 'Controller Services') { if (tab === 'Reporting Task Controller Services') {
$('#settings-save').hide(); $('#settings-save').hide();
return 'Create a new controller service'; return 'Create a new reporting task controller service';
} else if (tab === 'Reporting Tasks') { } else if (tab === 'Reporting Tasks') {
$('#settings-save').hide(); $('#settings-save').hide();
return 'Create a new reporting task'; return 'Create a new reporting task';
@ -1262,7 +1262,7 @@
$('div.controller-settings-table').css('top', '0'); $('div.controller-settings-table').css('top', '0');
} }
if (tab === 'Controller Services') { if (tab === 'Reporting Task Controller Services') {
$('#controller-cs-availability').show(); $('#controller-cs-availability').show();
} else if (tab === 'Reporting Tasks') { } else if (tab === 'Reporting Tasks') {
$('#controller-cs-availability').hide(); $('#controller-cs-availability').hide();
@ -1282,7 +1282,7 @@
// create a new controller service or reporting task // create a new controller service or reporting task
$('#new-service-or-task').on('click', function () { $('#new-service-or-task').on('click', function () {
var selectedTab = $('#settings-tabs li.selected-tab').text(); var selectedTab = $('#settings-tabs li.selected-tab').text();
if (selectedTab === 'Controller Services') { if (selectedTab === 'Reporting Task Controller Services') {
var controllerServicesUri = config.urls.api + '/controller/controller-services'; var controllerServicesUri = config.urls.api + '/controller/controller-services';
nfControllerServices.promptNewControllerService(controllerServicesUri, getControllerServicesTable()); nfControllerServices.promptNewControllerService(controllerServicesUri, getControllerServicesTable());
} else if (selectedTab === 'Reporting Tasks') { } else if (selectedTab === 'Reporting Tasks') {