[NIFI-3038] Update cluster summary dialog layout. This closes apache#…

…1534
nexr · Feb 28, 2017 · c3dbbb8 · c3dbbb8
1 parent cfe899d
commit c3dbbb8
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 84 deletions.
diff --git a/...ifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-connection-summary-dialog.jsp b/...ifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-connection-summary-dialog.jsp
@@ -18,11 +18,6 @@
 <div id="cluster-connection-summary-dialog" class="hidden large-dialog">
     <div class="dialog-content">
         <div id="cluster-connection-summary-header">
-            <button id="cluster-connection-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
-            <div id="cluster-connection-summary-last-refreshed-container" class="last-refreshed-container">
-                Last updated:&nbsp;<span id="cluster-connection-summary-last-refreshed"></span>
-            </div>
-            <div id="cluster-connection-summary-loading-container" class="loading-container"></div>
             <div id="cluster-connection-details-container">
                 <div id="cluster-connection-icon"></div>
                 <div id="cluster-connection-details">
@@ -35,4 +30,9 @@
         </div>
         <div id="cluster-connection-summary-table"></div>
     </div>
+    <button id="cluster-connection-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
+    <div id="cluster-connection-summary-last-refreshed-container" class="last-refreshed-container">
+        Last updated:&nbsp;<span id="cluster-connection-summary-last-refreshed" class="value-color"></span>
+    </div>
+    <div id="cluster-connection-summary-loading-container" class="loading-container"></div>
 </div>
diff --git a/...ifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-input-port-summary-dialog.jsp b/...ifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-input-port-summary-dialog.jsp
@@ -18,11 +18,6 @@
 <div id="cluster-input-port-summary-dialog" class="hidden large-dialog">
     <div class="dialog-content">
         <div id="cluster-input-port-summary-header">
-            <button id="cluster-input-port-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
-            <div id="cluster-input-port-summary-last-refreshed-container" class="last-refreshed-container">
-                Last updated:&nbsp;<span id="cluster-input-port-summary-last-refreshed"></span>
-            </div>
-            <div id="cluster-input-port-summary-loading-container" class="loading-container"></div>
             <div id="cluster-input-port-details-container">
                 <div id="cluster-input-port-icon"></div>
                 <div id="cluster-input-port-details">
@@ -35,4 +30,9 @@
         </div>
         <div id="cluster-input-port-summary-table"></div>
     </div>
+    <button id="cluster-input-port-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
+    <div id="cluster-input-port-summary-last-refreshed-container" class="last-refreshed-container">
+        Last updated:&nbsp;<span id="cluster-input-port-summary-last-refreshed" class="value-color"></span>
+    </div>
+    <div id="cluster-input-port-summary-loading-container" class="loading-container"></div>
 </div>
diff --git a/...fi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-output-port-summary-dialog.jsp b/...fi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-output-port-summary-dialog.jsp
@@ -18,11 +18,6 @@
 <div id="cluster-output-port-summary-dialog" class="hidden large-dialog">
     <div class="dialog-content">
         <div id="cluster-output-port-summary-header">
-            <button id="cluster-output-port-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
-            <div id="cluster-output-port-summary-last-refreshed-container" class="last-refreshed-container">
-                Last updated:&nbsp;<span id="cluster-output-port-summary-last-refreshed"></span>
-            </div>
-            <div id="cluster-output-port-summary-loading-container" class="loading-container"></div>
             <div id="cluster-output-port-details-container">
                 <div id="cluster-output-port-icon"></div>
                 <div id="cluster-output-port-details">
@@ -35,4 +30,9 @@
         </div>
         <div id="cluster-output-port-summary-table"></div>
     </div>
+    <button id="cluster-output-port-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
+    <div id="cluster-output-port-summary-last-refreshed-container" class="last-refreshed-container">
+        Last updated:&nbsp;<span id="cluster-output-port-summary-last-refreshed" class="value-color"></span>
+    </div>
+    <div id="cluster-output-port-summary-loading-container" class="loading-container"></div>
 </div>
diff --git a/...-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-process-group-summary-dialog.jsp b/...-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-process-group-summary-dialog.jsp
@@ -18,11 +18,6 @@
 <div id="cluster-process-group-summary-dialog" class="hidden large-dialog">
     <div class="dialog-content">
         <div id="cluster-process-group-summary-header">
-            <button id="cluster-process-group-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
-            <div id="cluster-process-group-summary-last-refreshed-container" class="last-refreshed-container">
-                Last updated:&nbsp;<span id="cluster-process-group-summary-last-refreshed"></span>
-            </div>
-            <div id="cluster-process-group-summary-loading-container" class="loading-container"></div>
             <div id="cluster-process-group-details-container">
                 <div id="cluster-process-group-icon"></div>
                 <div id="cluster-process-group-details">
@@ -34,4 +29,9 @@
         </div>
         <div id="cluster-process-group-summary-table"></div>
     </div>
+    <button id="cluster-process-group-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
+    <div id="cluster-process-group-summary-last-refreshed-container" class="last-refreshed-container">
+        Last updated:&nbsp;<span id="cluster-process-group-summary-last-refreshed" class="value-color"></span>
+    </div>
+    <div id="cluster-process-group-summary-loading-container" class="loading-container"></div>
 </div>
diff --git a/...nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-processor-summary-dialog.jsp b/...nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-processor-summary-dialog.jsp
@@ -18,11 +18,6 @@
 <div id="cluster-processor-summary-dialog" class="hidden large-dialog">
     <div class="dialog-content">
         <div id="cluster-processor-summary-header">
-            <button id="cluster-processor-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
-            <div id="cluster-processor-summary-last-refreshed-container" class="last-refreshed-container">
-                Last updated:&nbsp;<span id="cluster-processor-summary-last-refreshed"></span>
-            </div>
-            <div id="cluster-processor-summary-loading-container" class="loading-container"></div>
             <div id="cluster-processor-details-container">
                 <div id="cluster-processor-icon"></div>
                 <div id="cluster-processor-details">
@@ -35,4 +30,9 @@
         </div>
         <div id="cluster-processor-summary-table"></div>
     </div>
+    <button id="cluster-processor-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
+    <div id="cluster-processor-summary-last-refreshed-container" class="last-refreshed-container">
+        Last updated:&nbsp;<span id="cluster-processor-summary-last-refreshed" class="value-color"></span>
+    </div>
+    <div id="cluster-processor-summary-loading-container" class="loading-container"></div>
 </div>
diff --git a/.../src/main/webapp/WEB-INF/partials/summary/cluster-remote-process-group-summary-dialog.jsp b/.../src/main/webapp/WEB-INF/partials/summary/cluster-remote-process-group-summary-dialog.jsp
@@ -18,11 +18,6 @@
 <div id="cluster-remote-process-group-summary-dialog" class="hidden large-dialog">
     <div class="dialog-content">
         <div id="cluster-remote-process-group-summary-header">
-            <button id="cluster-remote-process-group-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
-            <div id="cluster-remote-process-group-summary-last-refreshed-container" class="last-refreshed-container">
-                Last updated:&nbsp;<span id="cluster-remote-process-group-summary-last-refreshed"></span>
-            </div>
-            <div id="cluster-remote-process-group-summary-loading-container" class="loading-container"></div>
             <div id="cluster-remote-process-group-details-container">
                 <div id="cluster-remote-process-group-icon"></div>
                 <div id="cluster-remote-process-group-details">
@@ -35,4 +30,9 @@
         </div>
         <div id="cluster-remote-process-group-summary-table"></div>
     </div>
+    <button id="cluster-remote-process-group-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
+    <div id="cluster-remote-process-group-summary-last-refreshed-container" class="last-refreshed-container">
+        Last updated:&nbsp;<span id="cluster-remote-process-group-summary-last-refreshed" class="value-color"></span>
+    </div>
+    <div id="cluster-remote-process-group-summary-loading-container" class="loading-container"></div>
 </div>