You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/03/10 21:39:32 UTC

incubator-nifi git commit: NIFI-250: - Updating the progress label when enabling/disabling controller services and their referencing components.

Repository: incubator-nifi
Updated Branches:
  refs/heads/NIFI-250 51d70bff3 -> 048c5d9aa


NIFI-250:
- Updating the progress label when enabling/disabling controller services and their referencing components.

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

Branch: refs/heads/NIFI-250
Commit: 048c5d9aa757e3d2917d558857a59c4b6a6221f0
Parents: 51d70bf
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Mar 10 16:39:15 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Mar 10 16:39:15 2015 -0400

----------------------------------------------------------------------
 .../disable-controller-service-dialog.jsp       | 20 ++++++++++++++++----
 .../canvas/enable-controller-service-dialog.jsp | 20 ++++++++++++++++----
 .../src/main/webapp/css/controller-service.css  |  2 +-
 .../js/nf/canvas/nf-controller-service.js       | 14 ++++++++------
 4 files changed, 41 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/048c5d9a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp
index b107b8f..0cb1195 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp
@@ -33,12 +33,24 @@
                 </div>
             </div>
             <div id="disable-controller-service-progress-container" class="setting hidden">
-                <div class="setting-name">Progress</div>
+                <div id="disable-progress-label" class="setting-name"></div>
                 <div class="setting-field">
                     <ol id="disable-controller-service-progress">
-                        <li>Stopping referencing processors and reporting tasks<div id="disable-referencing-schedulable" class="disable-referencing-components"></div></li>
-                        <li>Disabling referencing controller services<div id="disable-referencing-services" class="disable-referencing-components"></div></li>
-                        <li>Disabling this controller service<div id="disable-controller-service" class="disable-referencing-components"></div></li>
+                        <li>
+                            Stopping referencing processors and reporting tasks
+                            <div id="disable-referencing-schedulable" class="disable-referencing-components"></div>
+                            <div class="clear"></div>
+                        </li>
+                        <li>
+                            Disabling referencing controller services
+                            <div id="disable-referencing-services" class="disable-referencing-components"></div>
+                            <div class="clear"></div>
+                        </li>
+                        <li>
+                            Disabling this controller service
+                            <div id="disable-controller-service" class="disable-referencing-components"></div>
+                            <div class="clear"></div>
+                        </li>
                     </ol>
                 </div>
             </div>

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/048c5d9a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp
index d415774..25c5f8f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp
@@ -32,12 +32,24 @@
                 </div>
             </div>
             <div id="enable-controller-service-progress-container" class="setting hidden">
-                <div class="setting-name">Progress</div>
+                <div id="enable-progress-label" class="setting-name"></div>
                 <div class="setting-field">
                     <ol id="enable-controller-service-progress">
-                        <li>Enabling this controller service<div id="enable-controller-service" class="enable-referencing-components"></div></li>
-                        <li class="referencing-component">Enabling referencing controller services<div id="enable-referencing-services" class="enable-referencing-components"></div></li>
-                        <li class="referencing-component">Starting referencing processors and reporting tasks<div id="enable-referencing-schedulable" class="enable-referencing-components"></div></li>
+                        <li>
+                            Enabling this controller service
+                            <div id="enable-controller-service" class="enable-referencing-components"></div>
+                            <div class="clear"></div>
+                        </li>
+                        <li class="referencing-component">
+                            Enabling referencing controller services
+                            <div id="enable-referencing-services" class="enable-referencing-components"></div>
+                            <div class="clear"></div>
+                        </li>
+                        <li class="referencing-component">
+                            Starting referencing processors and reporting tasks
+                            <div id="enable-referencing-schedulable" class="enable-referencing-components"></div>
+                            <div class="clear"></div>
+                        </li>
                     </ol>
                 </div>
             </div>

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/048c5d9a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
index 771b037..42f5f53 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
@@ -242,7 +242,7 @@ div.referencing-component-references {
 }
 
 #enable-controller-service-referencing-components {
-    border: 0 solid #CCCCCC;
+    border: 0 solid #ccc;
     padding: 2px;
     width: 432px;
     height: 335px;

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/048c5d9a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
index ad330fb..4b1d8e7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
@@ -425,7 +425,7 @@ nf.ControllerService = (function () {
         // wait unil the polling of each service finished
         return $.Deferred(function(deferred) {
             updated.done(function() {
-                var updateService = pollReferencingComponents(controllerService, function (service) {
+                var serviceUpdated = pollReferencingComponents(controllerService, function (service) {
                     if (enabled) {
                         return service.state === 'ENABLED';
                     } else {
@@ -433,7 +433,7 @@ nf.ControllerService = (function () {
                     }
                 }, pollCondition);
 
-                updateService.done(function () {
+                serviceUpdated.done(function () {
                     deferred.resolve();
                 }).fail(function() {
                     deferred.reject();
@@ -800,7 +800,7 @@ nf.ControllerService = (function () {
                     canceled = true;
                 }
             }
-        }]).modal('setHeaderText', 'Disabling Controller Service');
+        }]);
 
         // show the progress
         $('#disable-controller-service-service-container').hide();
@@ -828,6 +828,7 @@ nf.ControllerService = (function () {
             }]);
         };
 
+        $('#disable-progress-label').text('Steps to disable ' + controllerService.name);
         var disableReferencingSchedulable = $('#disable-referencing-schedulable').addClass('ajax-loading');
 
         // stop all referencing schedulable components
@@ -879,7 +880,7 @@ nf.ControllerService = (function () {
                     canceled = true;
                 }
             }
-        }]).modal('setHeaderText', 'Enabling Controller Service');
+        }]);
 
         // determine if we want to also activate referencing components
         var scope = $('#enable-controller-service-scope').combo('getSelectedOption').value;
@@ -913,6 +914,7 @@ nf.ControllerService = (function () {
             }]);
         };
 
+        $('#enable-progress-label').text('Steps to enable ' + controllerService.name);
         var enableControllerService = $('#enable-controller-service').addClass('ajax-loading');
 
         // enable this controller service
@@ -1077,7 +1079,7 @@ nf.ControllerService = (function () {
                             handler: {
                                 click: closeModal
                             }
-                        }]).modal('setHeaderText', 'Disable Controller Service');
+                        }]);
                     }
                 }
             }).draggable({
@@ -1146,7 +1148,7 @@ nf.ControllerService = (function () {
                             handler: {
                                 click: closeModal
                             }
-                        }]).modal('setHeaderText', 'Enable Controller Service');
+                        }]);
                     }
                 }
             }).draggable({