http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/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 94515cb..d421f85 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 @@ -18,29 +18,23 @@ <div id="settings"> <div id="settings-header-text" class="settings-header-text">NiFi Settings</div> <div class="settings-container"> - <div class="settings-tabs-container"> + <div class="tab-container"> <div id="settings-tabs" class="settings-tabs"></div> - <div id="settings-refresh-button" class="pointer settings-refresh-button" title="Refresh"></div> - <div class="settings-last-refreshed-container"> - Last updated: <span id="settings-last-refreshed"></span> - </div> - <div id="settings-loading-container" class="loading-container"></div> - <div id="new-service-or-task" class="add-icon-bg"></div> + <button id="new-service-or-task" class="add-button fa fa-plus"></button> <div class="clear"></div> </div> - <div class="settings-tab-background"></div> - <div> + <div id="settings-tabs-content"> <div id="general-settings-tab-content" class="configuration-tab"> <div id="general-settings"> <div class="setting"> <div class="setting-name"> Maximum timer driven thread count - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The maximum number of threads for timer driven processors available to the system."/> + <div class="fa fa-question-circle" alt="Info" title="The maximum number of threads for timer driven processors available to the system."></div> </div> <div class="editable setting-field"> <input type="text" id="maximum-timer-driven-thread-count-field" class="setting-input"/> <span id="archive-flow-link" class="link">Back-up flow</span> - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Archives the flow configuration."/> + <div class="fa fa-question-circle" alt="Info" title="Archives the flow configuration."></div> </div> <div class="read-only setting-field"> <span id="read-only-maximum-timer-driven-thread-count-field"></span> @@ -49,7 +43,7 @@ <div class="setting"> <div class="setting-name"> Maximum event driven thread count - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The maximum number of threads for event driven processors available to the system."/> + <div class="fa fa-question-circle" alt="Info" title="The maximum number of threads for event driven processors available to the system."></div> </div> <div class="editable setting-field"> <input type="text" id="maximum-event-driven-thread-count-field" class="setting-input"/> @@ -72,4 +66,11 @@ </div> </div> </div> + <div id="settings-refresh-container"> + <button id="settings-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button> + <div id="settings-last-refreshed-container" class="last-refreshed-container"> + Last updated: <span id="settings-last-refreshed" class="value-color"></span> + </div> + <div id="settings-loading-container" class="loading-container"></div> + </div> </div> \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/shell.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/shell.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/shell.jsp index 4e6bddc..4673178 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/shell.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/shell.jsp @@ -15,11 +15,15 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="shell-dialog" class="dialog cancellable"> - <div id="shell-container"> +<div id="shell-dialog" class="hidden cancellable" data-nf-dialog='{"resizable": "false", "responsive": {"x": "false", "y": "false"}}'> + <div id="shell-container" class="dialog-content"> <div id="shell-close-container"> - <div id="shell-undock-button" class="undock-normal pointer" title="Open in New Window"></div> - <div id="shell-close-button" class="close-normal pointer" title="Close"></div> + <button id="shell-undock-button" class="undock-normal pointer " title="Open in New Window"> + <div class="fa fa-external-link-square"></div> + </button> + <button id="shell-close-button" class="close-normal pointer" title="Close"> + <div class="fa fa-times"></div> + </button> <div class="clear"></div> </div> <div id="shell"></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp index 3e5d953..68c4da2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp @@ -18,22 +18,22 @@ <div id="cluster"> <div id="cluster-header-and-filter"> <div id="cluster-header-text">NiFi Cluster</div> - <div id="cluster-filter-controls"> - <div id="cluster-filter-container"> - <input type="text" id="cluster-filter"/> - <div id="cluster-filter-type"></div> - </div> - <div id="cluster-filter-stats"> + <div id="cluster-filter-controls" class="filter-controls"> + <div id="cluster-filter-stats" class="filter-status"> Displaying <span id="displayed-nodes"></span> of <span id="total-nodes"></span> </div> + <div id="cluster-filter-container" class="filter-container"> + <input type="text" id="cluster-filter" class="filter"/> + <div id="cluster-filter-type" class="filter-type"></div> + </div> </div> </div> - <div id="cluster-refresh-container"> - <div id="refresh-button" class="cluster-refresh pointer" title="Refresh"></div> - <div id="cluster-last-refreshed-container"> - Last updated: <span id="cluster-last-refreshed"></span> - </div> - <div id="cluster-loading-container" class="loading-container"></div> - </div> <div id="cluster-table"></div> -</div> \ No newline at end of file +</div> +<div id="cluster-refresh-container"> + <button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button> + <div id="cluster-last-refreshed-container" class="last-refreshed-container"> + Last updated: <span id="cluster-last-refreshed"></span> + </div> + <div id="cluster-loading-container" class="loading-container"></div> +</div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/node-details-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/node-details-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/node-details-dialog.jsp index ba7a8c5..655d390 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/node-details-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/node-details-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="node-details-dialog"> +<div id="node-details-dialog" class="hidden medium-dialog"> <div class="dialog-content"> <div class="setting"> <div class="setting-name">Address</div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp index d985de1..2bbd480 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp @@ -16,8 +16,8 @@ --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <div id="connection-details"> - <div class="connection-details-tab-container"> - <div id="connection-details-tabs"></div> + <div class="connection-details-tab-container dialog-content"> + <div id="connection-details-tabs" class="tab-container"></div> <div id="connection-details-tabs-content"> <div id="read-only-connection-details-tab-content" class="configuration-tab"> <div class="settings-left"> @@ -36,7 +36,7 @@ <div id="read-only-relationship-names-container" class="setting"> <div class="setting-name"> Relationships - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Selected relationships are in bold."/> + <div class="fa fa-question-circle" alt="Info" title="Selected relationships are in bold."></div> </div> <div class="setting-field"> <div id="read-only-relationship-names"></div> @@ -76,7 +76,7 @@ <div class="setting"> <div class="setting-name"> FlowFile expiration - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The maximum amount of time an object may be in the flow before it will be automatically aged out of the flow."/> + <div class="fa fa-question-circle" alt="Info" title="The maximum amount of time an object may be in the flow before it will be automatically aged out of the flow."></div> </div> <div class="setting-field"> <span id="read-only-flow-file-expiration"></span> @@ -86,7 +86,7 @@ <div class="setting"> <div class="setting-name"> Back pressure object threshold - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The maximum number of objects that can be queued before back pressure is applied."/> + <div class="fa fa-question-circle" alt="Info" title="The maximum number of objects that can be queued before back pressure is applied."></div> </div> <div class="setting-field"> <span id="read-only-back-pressure-object-threshold"></span> @@ -96,7 +96,7 @@ <div class="setting"> <div class="setting-name"> Back pressure data size threshold - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The maximum data size of objects that can be queued before back pressure is applied."/> + <div class="fa fa-question-circle" alt="Info" title="The maximum data size of objects that can be queued before back pressure is applied."></div> </div> <div class="setting-field"> <span id="read-only-back-pressure-data-size-threshold"></span> @@ -109,7 +109,7 @@ <div class="setting"> <div class="setting-name"> Prioritizers - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Prioritizers that have been selected to reprioritize FlowFiles in this processors work queue."/> + <div class="fa fa-question-circle" alt="Info" title="Prioritizers that have been selected to reprioritize FlowFiles in this processors work queue."></div> </div> <div class="setting-field"> <div id="read-only-prioritizers"></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp index dbf8381..0472332 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp @@ -18,22 +18,22 @@ <div id="counters"> <div id="counters-header-and-filter"> <div id="counters-header-text">NiFi Counters</div> - <div id="counters-filter-controls"> - <div id="counters-filter-container"> - <input type="text" id="counters-filter"/> - <div id="counters-filter-type"></div> - </div> - <div id="counters-filter-stats"> + <div id="counters-filter-controls" class="filter-controls"> + <div id="counters-filter-stats" class="filter-status"> Displaying <span id="displayed-counters"></span> of <span id="total-counters"></span> </div> + <div id="counters-filter-container" class="filter-container"> + <input type="text" id="counters-filter" class="filter"/> + <div id="counters-filter-type" class="filter-type"></div> + </div> </div> </div> - <div id="counters-refresh-container"> - <div id="refresh-button" class="counters-refresh pointer" title="Refresh"></div> - <div id="counters-last-refreshed-container"> - Last updated: <span id="counters-last-refreshed"></span> - </div> - <div id="counters-loading-container" class="loading-container"></div> - </div> <div id="counters-table"></div> +</div> +<div id="counters-refresh-container"> + <button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button> + <div id="counters-last-refreshed-container" class="last-refreshed-container"> + Last updated: <span id="counters-last-refreshed" class="value-color"></span> + </div> + <div id="counters-loading-container" class="loading-container"></div> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/action-details-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/action-details-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/action-details-dialog.jsp index e151eea..cc52f6b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/action-details-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/action-details-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="action-details-dialog"> +<div id="action-details-dialog" class="hidden small-dialog"> <div class="dialog-content"> <div class="setting"> <div class="setting-field"> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp index 9309fac..75c3e95 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp @@ -17,20 +17,20 @@ <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <div id="history"> <div id="history-header-text">NiFi History</div> - <div id="history-refresh-container"> - <div id="refresh-button" class="history-refresh pointer" title="Refresh"></div> - <div id="history-last-refreshed-container"> - Last updated: <span id="history-last-refreshed"></span> - </div> - <div id="history-loading-container" class="loading-container"></div> - <div id="history-filter-container"> - <div id="history-filter-overview"> - A filter has been applied. - <span id="clear-history-filter">Clear filter</span> - </div> - <div id="history-filter-button" class="button button-normal pointer">Filter</div> - <div id="history-purge-button" class="button button-normal pointer hidden">Purge</div> + <div id="history-filter-container"> + <div id="history-filter-overview"> + A filter has been applied. + <span id="clear-history-filter" class="link">Clear filter</span> </div> + <button id="history-filter-button" title="Filter History" class="fa fa-filter"></button> + <button id="history-purge-button" title="Purge History" class="fa fa-eraser hidden"></button> </div> <div id="history-table"></div> +</div> +<div id="history-refresh-container"> + <button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button> + <div id="history-last-refreshed-container" class="last-refreshed-container"> + Last updated: <span id="history-last-refreshed" class="value-color"></span> + </div> + <div id="history-loading-container" class="loading-container"></div> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-filter-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-filter-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-filter-dialog.jsp index 05d55cf..b1f2a9e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-filter-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-filter-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="history-filter-dialog"> +<div id="history-filter-dialog" class="hidden medium-dialog"> <div class="dialog-content"> <div class="setting"> <div class="setting-name">Filter</div> @@ -31,7 +31,7 @@ <div class="start-date-setting"> <div class="setting-name"> Start date - <img class="icon-info" src="images/iconInfo.png" alt="Info" title="The start date in the format 'mm/dd/yyyy'. Must also specify start time."/> + <div class="fa fa-question-circle" alt="Info" title="The start date in the format 'mm/dd/yyyy'. Must also specify start time."></div> </div> <div class="setting-field"> <input type="text" id="history-filter-start-date" class="history-small-input"/> @@ -40,7 +40,7 @@ <div class="start-time-setting"> <div class="setting-name"> Start time (<span class="timezone"></span>) - <img class="icon-info" src="images/iconInfo.png" alt="Info" title="The start time in the format 'hh:mm:ss'. Must also specify start date."/> + <div class="fa fa-question-circle" alt="Info" title="The start time in the format 'hh:mm:ss'. Must also specify start date."></div> </div> <div class="setting-field"> <input type="text" id="history-filter-start-time" class="history-small-input"/> @@ -52,7 +52,7 @@ <div class="end-date-setting"> <div class="setting-name"> End date - <img class="icon-info" src="images/iconInfo.png" alt="Info" title="The end date in the format 'mm/dd/yyyy'. Must also specify end time."/> + <div class="fa fa-question-circle" alt="Info" title="The end date in the format 'mm/dd/yyyy'. Must also specify end time."></div> </div> <div class="setting-field"> <input type="text" id="history-filter-end-date" class="history-small-input"/> @@ -61,7 +61,7 @@ <div class="end-time-setting"> <div class="setting-name"> End time (<span class="timezone"></span>) - <img class="icon-info" src="images/iconInfo.png" alt="Info" title="The end time in the format 'hh:mm:ss'. Must also specify end date."/> + <div class="fa fa-question-circle" alt="Info" title="The end time in the format 'hh:mm:ss'. Must also specify end date."></div> </div> <div class="setting-field"> <input type="text" id="history-filter-end-time" class="history-small-input"/> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-purge-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-purge-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-purge-dialog.jsp index a9f256d..a80b7dd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-purge-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-purge-dialog.jsp @@ -15,13 +15,13 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="history-purge-dialog"> +<div id="history-purge-dialog" class="hidden medium-dialog"> <div class="dialog-content"> <div class="setting" style="margin-bottom: 0px;"> <div class="end-date-setting"> <div class="setting-name"> End date - <img class="icon-info" src="images/iconInfo.png" alt="Info" title="The purge end date in the format 'mm/dd/yyyy'. Must also specify end time."/> + <div class="fa fa-question-circle" alt="Info" title="The purge end date in the format 'mm/dd/yyyy'. Must also specify end time."></div> </div> <div class="setting-field"> <input type="text" id="history-purge-end-date" class="history-small-input"/> @@ -30,7 +30,7 @@ <div class="end-time-setting"> <div class="setting-name"> End time (<span class="timezone"></span>) - <img id="purge-end-time-info" class="icon-info" src="images/iconInfo.png" alt="Info" title="The end time in the format 'hh:mm:ss'. Must also specify end date."/> + <div class="fa fa-question-circle" id="purge-end-time-info" alt="Info" title="The end time in the format 'hh:mm:ss'. Must also specify end date."></div> </div> <div class="setting-field"> <input type="text" id="history-purge-end-time" class="history-small-input"/> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/ok-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/ok-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/ok-dialog.jsp index b07ff94..92a3d4a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/ok-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/ok-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="nf-ok-dialog"> +<div id="nf-ok-dialog" class="hidden small-dialog"> <div class="dialog-content"> <div id="nf-ok-dialog-content"></div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/processor-details.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/processor-details.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/processor-details.jsp index 5375174..37cd9ac 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/processor-details.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/processor-details.jsp @@ -15,9 +15,9 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="processor-details"> - <div class="processor-details-tab-container"> - <div id="processor-details-tabs"></div> +<div id="processor-details" class="hidden large-dialog"> + <div class="dialog-content"> + <div id="processor-details-tabs" class="tab-container"></div> <div id="processor-details-tabs-content"> <div id="details-standard-settings-tab-content" class="details-tab"> <div class="settings-left"> @@ -45,7 +45,7 @@ <div class="penalty-duration-setting"> <div class="setting-name"> Penalty duration - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The amount of time used when this processor penalizes a FlowFile."/> + <div class="fa fa-question-circle" alt="Info" title="The amount of time used when this processor penalizes a FlowFile."></div> </div> <div class="setting-field"> <span id="read-only-penalty-duration"></span> @@ -54,7 +54,7 @@ <div class="yield-duration-setting"> <div class="setting-name"> Yield duration - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="When a processor yields, it will not be scheduled again until this amount of time elapses."/> + <div class="fa fa-question-circle" alt="Info" title="When a processor yields, it will not be scheduled again until this amount of time elapses."></div> </div> <div class="setting-field"> <span id="read-only-yield-duration"></span> @@ -66,7 +66,7 @@ <div class="bulletin-setting"> <div class="setting-name"> Bulletin level - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The level at which this processor will generate bulletins."/> + <div class="fa fa-question-circle" alt="Info" title="The level at which this processor will generate bulletins."></div> </div> <div class="setting-field"> <span id="read-only-bulletin-level"></span> @@ -80,7 +80,7 @@ <div class="setting"> <div class="setting-name"> Auto terminate relationships - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Will automatically terminate FlowFiles sent to all relationships in bold."/> + <div class="fa fa-question-circle" alt="Info" title="Will automatically terminate FlowFiles sent to all relationships in bold."></div> </div> <div class="setting-field"> <div id="read-only-auto-terminate-relationship-names"></div> @@ -94,7 +94,7 @@ <div class="scheduling-strategy-setting"> <div class="setting-name"> Scheduling strategy - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The strategy used to schedule this processor."/> + <div class="fa fa-question-circle" alt="Info" title="The strategy used to schedule this processor."></div> </div> <div class="setting-field"> <span id="read-only-scheduling-strategy"></span> @@ -106,7 +106,7 @@ <div class="concurrently-schedulable-tasks-setting"> <div class="setting-name"> Concurrent tasks - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The number of tasks that should be concurrently scheduled for this processor."/> + <div class="fa fa-question-circle" alt="Info" title="The number of tasks that should be concurrently scheduled for this processor."></div> </div> <div class="setting-field"> <span id="read-only-concurrently-schedulable-tasks"></span> @@ -115,7 +115,7 @@ <div id="read-only-run-schedule" class="scheduling-period-setting"> <div class="setting-name"> Run schedule - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The minimum number of seconds that should elapse between task executions."/> + <div class="fa fa-question-circle" alt="Info" title="The minimum number of seconds that should elapse between task executions."></div> </div> <div class="setting-field"> <span id="read-only-scheduling-period"></span> @@ -129,8 +129,7 @@ <div class="setting"> <div class="setting-name"> Run duration - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" - title="When scheduled to run, the processor will continue running for up to this duration. A run duration of 0ms will execute once when scheduled."/> + <div class="fa fa-question-circle" alt="Info" title="When scheduled to run, the processor will continue running for up to this duration. A run duration of 0ms will execute once when scheduled."></div> </div> <div class="setting-field"> <span id="read-only-run-duration"></span> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp index f609693..70b3809 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="lineage-query-dialog"> +<div id="lineage-query-dialog" class="hidden medium-dialog"> <div class="dialog-content"> <div class="setting"> <div class="setting-field"> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp index e700e7c..5c2d8ed 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp @@ -23,36 +23,36 @@ <span id="nifi-content-viewer-url" class="hidden"></span> <div id="provenance-header-and-filter"> <div id="provenance-header-text">NiFi Data Provenance</div> - <div id="provenance-filter-controls"> - <div id="provenance-filter-container"> - <input type="text" id="provenance-filter"/> - <div id="provenance-filter-type"></div> - </div> - <div id="provenance-filter-stats"> + <div id="provenance-filter-controls" class="filter-controls"> + <div id="provenance-filter-stats" class="filter-status"> Displaying <span id="displayed-events"></span> of <span id="total-events"></span> </div> + <div id="oldest-event-message"> + Oldest event available: <span id="oldest-event" class="value-color"></span> + </div> + <div id="provenance-filter-container" class="filter-container"> + <input type="text" id="provenance-filter" class="filter"/> + <div id="provenance-filter-type" class="filter-type"></div> + </div> </div> - <div id="oldest-event-message"> - Oldest event available: <span id="oldest-event"></span> + <div id="provenance-search-container"> + <div id="provenance-search-overview"> + <span id="provenance-query-message"></span> + <span id="clear-provenance-search" class="link">Clear search</span> + </div> + <button id="provenance-search-button" class="fa fa-search"></button> </div> </div> <div id="provenance-event-search" class="provenance-panel"> - <div id="provenance-refresh-container"> - <div id="refresh-button" class="history-refresh pointer" title="Refresh"></div> - <div id="provenance-last-refreshed-container"> - Last updated: <span id="provenance-last-refreshed"></span> - </div> - <div id="provenance-loading-container" class="loading-container"></div> - <div id="provenance-search-container"> - <div id="provenance-search-overview"> - <span id="provenance-query-message"></span> - <span id="clear-provenance-search">Clear search</span> - </div> - <div id="provenance-search-button" class="button button-normal pointer">Search</div> - </div> - </div> <div id="provenance-table"></div> </div> + <div id="provenance-refresh-container" class="last-refreshed-container"> + <button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button> + <div id="provenance-last-refreshed-container" class="last-refreshed-container"> + Last updated: <span id="provenance-last-refreshed" class="value-color"></span> + </div> + <div id="provenance-loading-container" class="loading-container"></div> + </div> <div id="provenance-lineage" class="provenance-panel hidden"> <div id="provenance-lineage-loading-container"> <div id="provenance-lineage-loading" class="loading-container"></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-event-details-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-event-details-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-event-details-dialog.jsp index fc4c835..6c2a376 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-event-details-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-event-details-dialog.jsp @@ -15,9 +15,9 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="event-details-dialog"> - <div id="event-details-dialog-content"> - <div id="event-details-tabs"></div> +<div id="event-details-dialog" class="hidden large-dialog"> + <div id="event-details-dialog-content"class="dialog-content"> + <div id="event-details-tabs" class="tab-container"></div> <div id="event-details-tabs-content"> <div id="event-details-tab-content" class="details-tab"> <span id="provenance-event-id" class="hidden"></span> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-query-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-query-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-query-dialog.jsp index 127874a..a999177 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-query-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-query-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="provenance-query-dialog"> +<div id="provenance-query-dialog" class="hidden small-dialog"> <div class="dialog-content"> <div class="setting"> <div class="setting-field"> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp index bb9716c..565d016 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="provenance-search-dialog"> +<div id="provenance-search-dialog" class="hidden medium-dialog"> <div class="dialog-content"> <div class="setting"> <div class="setting-name">Fields</div> @@ -29,7 +29,7 @@ <div class="start-date-setting"> <div class="setting-name"> Start date - <img class="icon-info" src="images/iconInfo.png" alt="Info" title="The start date in the format 'mm/dd/yyyy'. Must also specify start time."/> + <div class="fa fa-question-circle" title="The start date in the format 'mm/dd/yyyy'. Must also specify start time."></div> </div> <div class="setting-field"> <input type="text" id="provenance-search-start-date" class="provenance-small-input"/> @@ -38,7 +38,7 @@ <div class="start-time-setting"> <div class="setting-name"> Start time (<span class="timezone"></span>) - <img class="icon-info" src="images/iconInfo.png" alt="Info" title="The start time in the format 'hh:mm:ss'. Must also specify start date."/> + <div class="fa fa-question-circle" title="The start time in the format 'hh:mm:ss'. Must also specify start date."></div> </div> <div class="setting-field"> <input type="text" id="provenance-search-start-time" class="provenance-time-input"/> @@ -50,7 +50,7 @@ <div class="end-date-setting"> <div class="setting-name"> End date - <img class="icon-info" src="images/iconInfo.png" alt="Info" title="The end date in the format 'mm/dd/yyyy'. Must also specify end time."/> + <div class="fa fa-question-circle" title="The end date in the format 'mm/dd/yyyy'. Must also specify end time."></div> </div> <div class="setting-field"> <input type="text" id="provenance-search-end-date" class="provenance-small-input"/> @@ -59,7 +59,7 @@ <div class="end-time-setting"> <div class="setting-name"> End time (<span class="timezone"></span>) - <img class="icon-info" src="images/iconInfo.png" alt="Info" title="The end time in the format 'hh:mm:ss'. Must also specify end date."/> + <div class="fa fa-question-circle" title="The end time in the format 'hh:mm:ss'. Must also specify end date."></div> </div> <div class="setting-field"> <input type="text" id="provenance-search-end-time" class="provenance-time-input"/> @@ -71,7 +71,7 @@ <div class="end-date-setting"> <div class="setting-name"> Minimum file size - <img class="icon-info" src="images/iconInfo.png" alt="Info" title="The minimum file size (e.g. 2 KB)."/> + <div class="fa fa-question-circle" title="The minimum file size (e.g. 2 KB)."></div> </div> <div class="setting-field"> <input type="text" id="provenance-search-minimum-file-size" class="provenance-small-input"/> @@ -80,7 +80,7 @@ <div class="end-time-setting"> <div class="setting-name"> Maximum file size - <img class="icon-info" src="images/iconInfo.png" alt="Info" title="The maximum file size (e.g. 4 GB)."/> + <div class="fa fa-question-circle" title="The maximum file size (e.g. 4 GB)."></div> </div> <div class="setting-field"> <input type="text" id="provenance-search-maximum-file-size" class="provenance-time-input"/> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp index 010c7ba..1cd4a6f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp @@ -15,19 +15,21 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="status-history-dialog"> - <div id="status-history-details"></div> - <div id="status-history-container"> - <div id="status-history-refresh-container"> - <div id="status-history-refresh-button" class="summary-refresh pointer" title="Refresh"></div> - <div id="status-history-last-refreshed-container"> - Last updated: <span id="status-history-last-refreshed"></span> +<div id="status-history-dialog" class="hidden" data-nf-dialog='{"resizable": "true", "glasspane": "true", "responsive": {"x": "false", "y": "false"}}'> + <div class="dialog-content"> + <div id="status-history-details"></div> + <div id="status-history-container"> + <div id="status-history-refresh-container"> + <button id="status-history-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button> + <div id="status-history-last-refreshed-container" class="last-refreshed-container"> + Last updated: <span id="status-history-last-refreshed"></span> + </div> + <div id="status-history-loading-container" class="loading-container"></div> + <div id="status-history-metric-combo"></div> </div> - <div id="status-history-loading-container" class="loading-container"></div> - <div id="status-history-metric-combo"></div> + <div id="status-history-chart-container"></div> + <div id="status-history-chart-control-container"></div> </div> - <div id="status-history-chart-container"></div> - <div id="status-history-chart-control-container"></div> + <div class="clear"></div> </div> - <div class="clear"></div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-connection-summary-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-connection-summary-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-connection-summary-dialog.jsp index 6091c92..de2d890 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-connection-summary-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-connection-summary-dialog.jsp @@ -15,11 +15,11 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="cluster-connection-summary-dialog"> +<div id="cluster-connection-summary-dialog" class="hidden large-dialog"> <div class="dialog-content"> <div id="cluster-connection-summary-header"> - <div id="cluster-connection-refresh-button" class="summary-refresh pointer" title="Refresh"></div> - <div id="cluster-connection-summary-last-refreshed-container"> + <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: <span id="cluster-connection-summary-last-refreshed"></span> </div> <div id="cluster-connection-summary-loading-container" class="loading-container"></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-input-port-summary-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-input-port-summary-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-input-port-summary-dialog.jsp index d87de98..82d6a1d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-input-port-summary-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-input-port-summary-dialog.jsp @@ -15,11 +15,11 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="cluster-input-port-summary-dialog"> +<div id="cluster-input-port-summary-dialog" class="hidden large-dialog"> <div class="dialog-content"> <div id="cluster-input-port-summary-header"> - <div id="cluster-input-port-refresh-button" class="summary-refresh pointer" title="Refresh"></div> - <div id="cluster-input-port-summary-last-refreshed-container"> + <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: <span id="cluster-input-port-summary-last-refreshed"></span> </div> <div id="cluster-input-port-summary-loading-container" class="loading-container"></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-output-port-summary-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-output-port-summary-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-output-port-summary-dialog.jsp index a6e3a1c..e30bbdc 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-output-port-summary-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-output-port-summary-dialog.jsp @@ -15,11 +15,11 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="cluster-output-port-summary-dialog"> +<div id="cluster-output-port-summary-dialog" class="hidden large-dialog"> <div class="dialog-content"> <div id="cluster-output-port-summary-header"> - <div id="cluster-output-port-refresh-button" class="summary-refresh pointer" title="Refresh"></div> - <div id="cluster-output-port-summary-last-refreshed-container"> + <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: <span id="cluster-output-port-summary-last-refreshed"></span> </div> <div id="cluster-output-port-summary-loading-container" class="loading-container"></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-process-group-summary-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-process-group-summary-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-process-group-summary-dialog.jsp index 94526d0..820bf4f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-process-group-summary-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-process-group-summary-dialog.jsp @@ -15,11 +15,11 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="cluster-process-group-summary-dialog"> +<div id="cluster-process-group-summary-dialog" class="hidden large-dialog"> <div class="dialog-content"> <div id="cluster-process-group-summary-header"> - <div id="cluster-process-group-refresh-button" class="summary-refresh pointer" title="Refresh"></div> - <div id="cluster-process-group-summary-last-refreshed-container"> + <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: <span id="cluster-process-group-summary-last-refreshed"></span> </div> <div id="cluster-process-group-summary-loading-container" class="loading-container"></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-processor-summary-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-processor-summary-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-processor-summary-dialog.jsp index 7444bf5..40167a9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-processor-summary-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-processor-summary-dialog.jsp @@ -15,11 +15,11 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="cluster-processor-summary-dialog"> +<div id="cluster-processor-summary-dialog" class="hidden large-dialog"> <div class="dialog-content"> <div id="cluster-processor-summary-header"> - <div id="cluster-processor-refresh-button" class="summary-refresh pointer" title="Refresh"></div> - <div id="cluster-processor-summary-last-refreshed-container"> + <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: <span id="cluster-processor-summary-last-refreshed"></span> </div> <div id="cluster-processor-summary-loading-container" class="loading-container"></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-remote-process-group-summary-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-remote-process-group-summary-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-remote-process-group-summary-dialog.jsp index e27fe2c..ce126c5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-remote-process-group-summary-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-remote-process-group-summary-dialog.jsp @@ -15,11 +15,11 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="cluster-remote-process-group-summary-dialog"> +<div id="cluster-remote-process-group-summary-dialog" class="hidden large-dialog"> <div class="dialog-content"> <div id="cluster-remote-process-group-summary-header"> - <div id="cluster-remote-process-group-refresh-button" class="summary-refresh pointer" title="Refresh"></div> - <div id="cluster-remote-process-group-summary-last-refreshed-container"> + <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: <span id="cluster-remote-process-group-summary-last-refreshed"></span> </div> <div id="cluster-remote-process-group-summary-loading-container" class="loading-container"></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/summary-content.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/summary-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/summary-content.jsp index 5be3e2b..3ffe381 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/summary-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/summary-content.jsp @@ -18,32 +18,21 @@ <div id="summary"> <div id="summary-header-and-filter"> <div id="summary-header-text">NiFi Summary</div> - <div id="summary-filter-controls"> - <div id="summary-filter-container"> - <input type="text" id="summary-filter"/> - <div id="summary-filter-type"></div> - </div> - <div id="summary-filter-status"> - Displaying <span id="displayed-items"></span> of <span id="total-items"></span> - </div> - </div> - <div id="view-options-container"> - View: - <span id="view-single-node-link" class="view-summary-link">Single node</span> <span id="view-cluster-link" class="view-summary-link">Cluster</span> - </div> </div> - <div id="flow-summary-refresh-container"> - <div id="summary-tabs"></div> - <div id="refresh-button" class="summary-refresh pointer" title="Refresh"></div> - <div id="summary-last-refreshed-container"> - Last updated: <span id="summary-last-refreshed"></span> + <div id="summary-tabs" class="tab-container"></div> + <div id="summary-filter-controls" class="filter-controls"> + <div id="summary-filter-status" class="filter-status"> + Displaying <span id="displayed-items"></span> of <span id="total-items"></span> </div> - <div id="summary-loading-container" class="loading-container"></div> - <div id="system-diagnostics-link-container"> - <span id="system-diagnostics-link" class="link">system diagnostics</span> + <div id="summary-filter-container" class="filter-container"> + <input type="text" placeholder="Filter" id="summary-filter" class="filter"/> + <div id="summary-filter-type" class="filter-type"></div> </div> </div> - <div id="summary-tab-background"></div> + <div id="view-options-container"> + View: + <span id="view-single-node-link" class="link">Single node</span> <span id="view-cluster-link" class="link">Cluster</span> + </div> <div id="summary-tabs-content"> <div id="processor-summary-tab-content" class="configuration-tab"> <div id="processor-summary-table" class="summary-table"></div> @@ -64,4 +53,14 @@ <div id="remote-process-group-summary-table" class="summary-table"></div> </div> </div> +</div> +<div id="flow-summary-refresh-container"> + <button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button> + <div id="summary-last-refreshed-container" class="last-refreshed-container"> + Last updated: <span id="summary-last-refreshed" class="value-color"></span> + </div> + <div id="summary-loading-container" class="loading-container"></div> + <div id="system-diagnostics-link-container"> + <span id="system-diagnostics-link" class="link">system diagnostics</span> + </div> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp index 577c1d8..9614505 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp @@ -15,68 +15,102 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="system-diagnostics-dialog"> - <div id="system-diagnostics-refresh-container"> - <div id="system-diagnostics-tabs"></div> - <div id="system-diagnostics-refresh-button" class="summary-refresh pointer" title="Refresh"></div> - <div id="system-diagnostics-last-refreshed-container"> - Last updated: <span id="system-diagnostics-last-refreshed"></span> - </div> - <div id="system-diagnostics-loading-container" class="loading-container"></div> - </div> +<div id="system-diagnostics-dialog" class="hidden large-dialog"> <div class="dialog-content"> + <div id="system-diagnostics-tabs" class="tab-container"></div> <div id="jvm-tab-content" class="configuration-tab"> <div class="settings-left"> <div class="setting"> <input type="hidden" id=""/> - <div class="setting-name">Heap <span id="utilization-heap"></span></div> + <div class="setting-header">Heap <span id="utilization-heap"></span></div> <div class="setting-field"> <table id="heap-table"> <tbody> - <tr> - <td class="memory-header"><b>Max</b></td> - <td><span id="max-heap"></span></td> - </tr> - <tr> - <td><b>Total</b></td> - <td><span id="total-heap"></span></td> - </tr> - <tr> - <td><b>Used</b></td> - <td><span id="used-heap"></span></td> - </tr> - <tr> - <td><b>Free</b></td> - <td><span id="free-heap"></span></td> - </tr> + <tr> + <td class="memory-header setting-name">Max:</td> + </tr> + <tr> + <td><span id="max-heap"></span></td> + </tr> + <tr> + <td></td> + </tr> + <tr> + <td class="setting-name">Total:</td> + </tr> + <tr> + <td><span id="total-heap"></span></td> + </tr> + <tr> + <td></td> + </tr> + <tr> + <td class="setting-name">Used:</td> + </tr> + <tr> + <td><span id="used-heap"></span></td> + </tr> + <tr> + <td></td> + </tr> + <tr> + <td class="setting-name">Free:</td> + </tr> + <tr> + <td><span id="free-heap"></span></td> + </tr> + <tr> + <td></td> + </tr> </tbody> </table> </div> <div class="clear"></div> </div> </div> + <div class="spacer"></div> <div class="settings-right"> <div class="setting"> - <div class="setting-name">Non heap <span id="utilization-non-heap"></span></div> + <div class="setting-header">Non-heap <span id="utilization-non-heap"></span></div> <div class="setting-field"> <table id="heap-table"> <tbody> - <tr> - <td class="memory-header"><b>Max</b></td> - <td><span id="max-non-heap"></span></td> - </tr> - <tr> - <td><b>Total</b></td> - <td><span id="total-non-heap"></span></td> - </tr> - <tr> - <td><b>Used</b></td> - <td><span id="used-non-heap"></span></td> - </tr> - <tr> - <td><b>Free</b></td> - <td><span id="free-non-heap"></span></td> - </tr> + <tr> + <td class="memory-header setting-name">Max:</td> + </tr> + <tr> + <td><span id="max-non-heap"></span></td> + </tr> + <tr> + <td></td> + </tr> + <tr> + <td class="setting-name">Total:</td> + </tr> + <tr> + <td><span id="total-non-heap"></span></td> + </tr> + <tr> + <td></td> + </tr> + <tr> + <td class="setting-name">Used:</td> + </tr> + <tr> + <td><span id="used-non-heap"></span></td> + </tr> + <tr> + <td></td> + </tr> + <tr> + <td class="setting-name">Free:</td> + </tr> + <tr> + <td><span id="free-non-heap"></span></td> + </tr> + <tr> + <td></td> + </tr> </tbody> </table> </div> @@ -85,7 +119,7 @@ </div> <div class="clear"></div> <div class="setting"> - <div class="setting-name">Garbage collection</div> + <div class="setting-header">Garbage Collection</div> <div id="garbage-collection-container" class="setting-field"> <table id="garbage-collection-table"> <tbody></tbody> @@ -96,17 +130,18 @@ <div id="system-tab-content"class="configuration-tab"> <div class="settings-left"> <div class="setting"> - <div class="setting-name">Available processors</div> + <div class="setting-name">Available Processors:</div> <div class="setting-field"> <div id="available-processors"></div> </div> </div> </div> + <div class="spacer"></div> <div class="settings-right"> <div class="setting"> <div class="setting-name"> - Processor load average - <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Processor load average for the last minute. Not available on all platforms."/> + Processor Load Average: + <div class="fa fa-question-circle" alt="Info" title="Processor load average for the last minute. Not available on all platforms."></div> </div> <div class="setting-field"> <div id="processor-load-average"></div> @@ -115,17 +150,24 @@ </div> <div class="clear"></div> <div class="setting"> - <div class="setting-name">FlowFile repository storage usage</div> + <div class="setting-header">FlowFile Repository Storage</div> <div class="setting-field"> <div id="flow-file-repository-storage-usage-container"></div> </div> </div> <div class="setting"> - <div class="setting-name">Content repository storage usage</div> + <div class="setting-header">Content Repository Storage</div> <div class="setting-field"> <div id="content-repository-storage-usage-container"></div> </div> </div> </div> + <div id="system-diagnostics-refresh-container"> + <button id="system-diagnostics-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button> + <div id="system-diagnostics-last-refreshed-container" class="last-refreshed-container"> + <span id="system-diagnostics-last-refreshed" class="value-color"></span> + </div> + <div id="system-diagnostics-loading-container" class="loading-container"></div> + </div> </div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp index 4a3338c..baee3c8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="view-single-node-dialog"> +<div id="view-single-node-dialog" class="hidden small-dialog"> <div class="dialog-content"> <input id="cluster-search-field" type="text"/> <div id="cluster-search-example">(e.g. my.host:80)</div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp index f4f7bab..8ec0a59 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp @@ -20,37 +20,29 @@ <span id="template-group-id" class="hidden"><c:out value="${param.groupId}"/></span> <div id="templates-header-and-filter"> <div id="templates-header-text">NiFi Templates</div> - <div id="templates-filter-controls"> - <div id="templates-filter-container"> - <input type="text" id="templates-filter"/> - <div id="templates-filter-type"></div> - </div> - <div id="templates-filter-stats"> + <div id="templates-filter-controls" class="filter-controls"> + <div id="templates-filter-stats" class="filter-status"> Displaying <span id="displayed-templates"></span> of <span id="total-templates"></span> </div> + <div id="templates-filter-container" class="filter-container"> + <input type="text" id="templates-filter" class="filter"/> + <div id="templates-filter-type" class="filter-type"></div> + </div> </div> - </div> - <div id="templates-refresh-container"> - <div id="refresh-button" class="templates-refresh pointer" title="Refresh"></div> - <div id="templates-last-refreshed-container"> - Last updated: <span id="templates-last-refreshed"></span> - </div> - <div id="templates-loading-container" class="loading-container"></div> <div id="upload-template-container" class="hidden"> <div id="select-template-container"> <div id="template-browse-container"> - <div id="select-template-button" class="template-button"> - <span>Browse</span> + <button id="select-template-button" class="fa fa-plus"> <form id="template-upload-form" enctype="multipart/form-data" method="post"> <input type="file" name="template" id="template-file-field"/> </form> - </div> + </button> <div id="upload-template-status" class="import-status"></div> </div> </div> <div id="submit-template-container"> - <div id="upload-template-button" class="template-button">Import</div> - <div id="cancel-upload-template-button" class="template-button">Cancel</div> + <button><div id="upload-template-button" title="Upload template" class="icon icon-template-import"></div></button> + <button id="cancel-upload-template-button" title="Cancel" class="fa fa-undo"></button> <div id="selected-template-name"></div> </div> <div id="template-upload-form-container"> @@ -58,4 +50,11 @@ </div> </div> <div id="templates-table"></div> +</div> +<div id="templates-refresh-container"> + <button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button> + <div id="templates-last-refreshed-container" class="last-refreshed-container"> + Last updated: <span id="templates-last-refreshed" class="value-color"></span> + </div> + <div id="templates-loading-container" class="loading-container"></div> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/yes-no-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/yes-no-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/yes-no-dialog.jsp index 81d1415..657d6d9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/yes-no-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/yes-no-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="nf-yes-no-dialog"> +<div id="nf-yes-no-dialog" class="hidden small-dialog"> <div class="dialog-content"> <div id="nf-yes-no-dialog-content"></div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/about.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/about.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/about.css index df48ee8..95485da 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/about.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/about.css @@ -15,34 +15,38 @@ * limitations under the License. */ #nf-about { - position: absolute; overflow: hidden; - width: 367px; - height: 386px; - font-size: 8pt; - z-index: 1201; - display: none; + width: 450px; + height: 450px; + max-height: 450px; } #nf-about-pic { - width: 100%; - height: 153px; - background-image: url(../images/nifi_about.png); + height: 50%; + background: url(../images/nifi-logo-about.svg) #000000 no-repeat center center; + top: 25%; + position: relative; +} + +#nf-about-pic-container { + height: 50%; + background: #000000; } #nf-about-content { - background-color: #EEEEEE; - margin: 25px 15px 0px 15px; + margin: 10px 0px 0px 0px; } #nf-version { - font-weight:900; - font-size: 8pt; + font-weight:500; + font-size: 13px; } #nf-about-content p { padding-top: 9px; padding-bottom: 9px; + font-size: 15px; + line-height: 15px; } #nf-about-content span.link {
