nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alopre...@apache.org
Subject nifi git commit: NIFI-3941 - Clarify tab name for controller-level controller services dialog
Date Fri, 08 Sep 2017 01:29:26 GMT
Repository: nifi
Updated Branches:
  refs/heads/master 03e51ee8a -> 20d23e836


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>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/20d23e83
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/20d23e83
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/20d23e83

Branch: refs/heads/master
Commit: 20d23e836ea28198a2cc2234d09362b674f2a19d
Parents: 03e51ee
Author: yuri1969 <1969yuri1969@gmail.com>
Authored: Fri Sep 1 21:59:17 2017 +0200
Committer: Andy LoPresto <alopresto@apache.org>
Committed: Thu Sep 7 18:29:13 2017 -0700

----------------------------------------------------------------------
 .../webapp/WEB-INF/partials/canvas/settings-content.jsp   |  2 +-
 .../src/main/webapp/js/nf/canvas/nf-settings.js           | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/20d23e83/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
index 9bbb3aa..ca22c04 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
@@ -23,7 +23,7 @@
             <div class="clear"></div>
         </div>
         <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">
                     <div class="setting">

http://git-wip-us.apache.org/repos/asf/nifi/blob/20d23e83/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
index 3f346f5..ee2dfda 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
@@ -1224,7 +1224,7 @@
                     name: 'General',
                     tabContentId: 'general-settings-tab-content'
                 }, {
-                    name: 'Controller Services',
+                    name: 'Reporting Task Controller Services',
                     tabContentId: 'controller-services-tab-content'
                 }, {
                     name: 'Reporting Tasks',
@@ -1249,9 +1249,9 @@
 
                             // update the tooltip on the button
                             $('#new-service-or-task').attr('title', function () {
-                                if (tab === 'Controller Services') {
+                                if (tab === 'Reporting Task Controller Services') {
                                     $('#settings-save').hide();
-                                    return 'Create a new controller service';
+                                    return 'Create a new reporting task controller service';
                                 } else if (tab === 'Reporting Tasks') {
                                     $('#settings-save').hide();
                                     return 'Create a new reporting task';
@@ -1262,7 +1262,7 @@
                             $('div.controller-settings-table').css('top', '0');
                         }
 
-                        if (tab === 'Controller Services') {
+                        if (tab === 'Reporting Task Controller Services') {
                             $('#controller-cs-availability').show();
                         } else if (tab === 'Reporting Tasks') {
                             $('#controller-cs-availability').hide();
@@ -1282,7 +1282,7 @@
             // create a new controller service or reporting task
             $('#new-service-or-task').on('click', function () {
                 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';
                     nfControllerServices.promptNewControllerService(controllerServicesUri,
getControllerServicesTable());
                 } else if (selectedTab === 'Reporting Tasks') {


Mime
View raw message