You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/05/18 02:12:57 UTC
[20/54] [abbrv] incubator-nifi git commit: NIFI-576: - Fixing clear
button. - Fixing issue with default selection in search location combo. -
Showing 0% during initial search request.
NIFI-576:
- Fixing clear button.
- Fixing issue with default selection in search location combo.
- Showing 0% during initial search request.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/40438f12
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/40438f12
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/40438f12
Branch: refs/heads/master
Commit: 40438f12352a41fbb6de4c60b02153b48e15bf5f
Parents: a43eecf
Author: Matt Gilman <ma...@gmail.com>
Authored: Sun May 3 17:59:41 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Sun May 3 17:59:41 2015 -0400
----------------------------------------------------------------------
.../nifi-web-ui/src/main/webapp/css/provenance.css | 3 ++-
.../webapp/js/nf/provenance/nf-provenance-lineage.js | 7 ++++++-
.../main/webapp/js/nf/provenance/nf-provenance-table.js | 12 ++++++++++--
3 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/40438f12/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
index 751a647..58a0bbc 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
@@ -238,6 +238,7 @@ input.searchable-field-input {
#provenance-search-location {
height: 18px;
line-height: 18px;
+ width: 424px;
}
/* event details dialog */
@@ -465,8 +466,8 @@ div.progress-label {
display: block;
font-weight: bold;
text-align: center;
- margin-top: -19px;
width: 378px;
+ margin-top: 4px;
}
/* provenance table */
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/40438f12/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
index 42c49cf..eb7c6de 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
@@ -44,7 +44,12 @@ nf.ProvenanceLineage = (function () {
handler: {
close: function () {
// reset the progress bar
- $('#lineage-percent-complete').progressbar('value', 0);
+ var lineageProgressBar = $('#lineage-percent-complete');
+ lineageProgressBar.find('div.progress-label').remove();
+
+ // update the progress bar
+ var label = $('<div class="progress-label"></div>').text('0%');
+ lineageProgressBar.progressbar('value', 0).append(label);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/40438f12/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
index 9451a34..499925d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
@@ -418,7 +418,12 @@ nf.ProvenanceTable = (function () {
handler: {
close: function () {
// reset the progress bar
- $('#provenance-percent-complete').progressbar('value', 0);
+ var provenanceProgressBar = $('#provenance-percent-complete');
+ provenanceProgressBar.find('div.progress-label').remove();
+
+ // update the progress bar
+ var label = $('<div class="progress-label"></div>').text('0%');
+ provenanceProgressBar.progressbar('value', 0).append(label);
}
}
});
@@ -535,7 +540,7 @@ nf.ProvenanceTable = (function () {
}
// reset the stored query
- query = {};
+ cachedQuery = {};
// reload the table
nf.ProvenanceTable.loadProvenanceTable();
@@ -975,6 +980,9 @@ nf.ProvenanceTable = (function () {
// update the progress bar
var label = $('<div class="progress-label"></div>').text(value + '%');
+ if (value > 0) {
+ label.css('margin-top', '-19px');
+ }
progressBar.progressbar('value', value).append(label);
},