nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcgil...@apache.org
Subject [09/25] incubator-nifi git commit: Squashed commit of the following:
Date Tue, 31 Mar 2015 21:07:53 GMT
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
index 3afdc12..e161efc 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
@@ -126,6 +126,10 @@ div.nifi-tooltip {
     white-space: normal;
 }
 
+input.filter-list {
+    color: #888;
+}
+
 .table-cell {
     overflow: hidden;
     white-space: nowrap;
@@ -134,6 +138,14 @@ div.nifi-tooltip {
     margin-top: 4px;
 }
 
+.collapsed {
+    background: transparent url(../images/iconTwistArrow.png) no-repeat scroll top left;
+}
+
+.expanded {
+    background: transparent url(../images/iconTwistArrow.png) no-repeat scroll top right;
+}
+
 input[type=text], textarea {
     background: white url(../images/bgInputText.png) repeat-x scroll top;
     border: 1px solid #ccc;
@@ -177,6 +189,15 @@ div.ajax-loading {
     background-image: url(../images/iconLoading.gif);
 }
 
+div.ajax-complete {
+    background-image: url(../images/iconCommit.png);
+}
+
+div.ajax-error {
+    /*margin-left: -2px;*/
+    background-image: url(../images/iconDelete.png);
+}
+
 div.button-refresh {
     background: transparent url(../images/buttonRefresh.png) no-repeat scroll top left;
 }
@@ -198,6 +219,13 @@ div.disabled {
     background: transparent url(../images/iconDisable.png) repeat scroll 0 0;
 }
 
+div.enabled {
+    float: left;
+    width: 16px;
+    height: 16px;
+    background: transparent url(../images/iconEnable.png) repeat scroll 0 0;
+}
+
 div.stopped {
     float: left;
     width: 16px;
@@ -249,20 +277,6 @@ div.has-bulletins {
     Styles for status/history/user tables.
 */
 
-div.expansion-button {
-    width: 11px;
-    height: 11px;
-    margin-left: 5px;
-}
-
-div.collapsed {
-    background: transparent url(../images/buttonExpandCollapse.png) no-repeat scroll top left;
-}
-
-div.expanded {
-    background: transparent url(../images/buttonExpandCollapse.png) no-repeat scroll top right;
-}
-
 span.label, div.label {
     font-weight: bold;
 }

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-controller-service-dialog.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-controller-service-dialog.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-controller-service-dialog.css
new file mode 100644
index 0000000..ff8d19e
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-controller-service-dialog.css
@@ -0,0 +1,152 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* 
+    New controller service dialog.
+*/
+
+#new-controller-service-dialog {
+    z-index: 1301;
+    display: none;
+    width: 800px;
+    height: 450px;
+    line-height: normal;
+}
+
+#controller-service-tag-cloud-container {
+    float: left;
+    width: 190px;
+    height: 350px;
+}
+
+#controller-service-types-container {
+    float: left;
+    width: 588px;
+    height: 350px;
+}
+
+#controller-service-description-container {
+    width: 588px;
+    height: 100px;
+    margin-top: 10px;
+}
+
+#controller-service-type-name {
+    font-size: 12pt;
+    font-weight: bold;
+    color: #527991;
+    margin-bottom: 8px;
+    width: 588px;
+}
+
+#controller-service-type-description {
+    width: 588px;
+    height: 60px;
+}
+
+#controller-service-availability-container {
+    position: relative;
+    left: 190px;
+    top: 9px;
+}
+
+div.availability-label {
+    float: left;
+    height: 24px;
+    line-height: 24px;
+}
+
+#controller-service-availability-combo {
+    float: left;
+    margin-left: 6px;
+    width: 125px;
+    height: 18px;
+    line-height: 18px;
+}
+
+#controller-service-types-table {
+    width: 586px;
+    height: 249px;
+    border: 1px solid #666;
+}
+
+#controller-service-types-table-container th {
+    vertical-align: middle;
+}
+
+/*
+    Processor tag cloud
+*/
+
+#controller-service-tag-cloud ul.tag-cloud {
+    max-height: 257px;
+}
+
+#controller-service-tag-cloud ul.tag-cloud li {
+    max-width: 180px;
+}
+
+#controller-service-tag-cloud div.tag-cloud-separator {
+    width: 180px;
+}
+
+#controller-service-tag-cloud ul.tag-filter li {
+    width: 180px;
+}
+
+#controller-service-tag-cloud div.selected-tag-text {
+    width: 160px;
+}
+
+/*
+    Processor type table filter
+*/
+
+#controller-service-type-filter-controls {
+    float: right;
+    margin-top: -35px;
+    margin-right: 2px;
+    margin-bottom: 7px;
+}
+
+#controller-service-type-filter-status {
+    font-size: 9px;
+    font-weight: bold;
+    color: #9f6000;
+    clear: left; 
+    line-height: normal;
+    margin-left: 5px;
+}
+
+#controller-service-type-filter {
+    padding: 3px 0px 1px 3px;
+    font-size: 12px;
+    height: 18px;
+    line-height: 20px;
+    width: 173px;
+    border: 1px solid #ccc;
+    margin-right: 3px;
+    float: left;
+}
+
+#controller-service-type-filter-options {
+    float: left;
+    height: 17px;
+    line-height: 17px;
+    width: 85px;
+    margin-top: 1px;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css
index 5456dea..d5871ac 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css
@@ -23,11 +23,10 @@
     display: none;
     width: 800px;
     height: 450px;
-    border: 1px solid #eee;
     line-height: normal;
 }
 
-#tag-cloud-container {
+#processor-tag-cloud-container {
     float: left;
     width: 190px;
     height: 350px;
@@ -69,56 +68,29 @@
 }
 
 /*
-    Tag cloud
+    Processor tag cloud
 */
 
-#tag-cloud {
-    font-size: 90%;
-    padding: 2px;
-    margin-left: -5px;
+#processor-tag-cloud ul.tag-cloud {
     max-height: 257px;
-    overflow: hidden;
 }
 
-#tag-cloud li {
-    float: left;
-    list-style-type: none;
-    margin: 0 3px;
-    height: 20px;
-    line-height: 20px;
+#processor-tag-cloud ul.tag-cloud li {
     max-width: 180px;
-    overflow: hidden;
-    white-space: nowrap;
 }
 
-#tag-cloud-separator {
+#processor-tag-cloud div.tag-cloud-separator {
     width: 180px;
-    height: 1px;
-    border-bottom: 1px solid #aaa;
-    margin: 3px 0;
-}
-
-#tag-filter {
-    overflow: hidden;
 }
 
-#tag-filter li {
-    width: 185px;
-    height: 18px;
-    line-height: 18px;
-    padding: 2px;
+#processor-tag-cloud ul.tag-filter li {
+    width: 180px;
 }
 
-div.selected-tag-text {
-    float: left;
+#processor-tag-cloud div.selected-tag-text {
     width: 160px;
 }
 
-img.remove-selected-tag {
-    float: left;
-    margin-top: 1px;
-}
-
 /*
     Processor type table filter
 */
@@ -150,19 +122,10 @@ img.remove-selected-tag {
     float: left;
 }
 
-input.filter-list {
-    color: #888;
-}
-
 #processor-type-filter-options {
     float: left;
     height: 17px;
     line-height: 17px;
     width: 85px;
     margin-top: 1px;
-}
-
-.no-select {
-    -webkit-user-select: none;
-    -moz-user-select: none;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-reporting-task-dialog.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-reporting-task-dialog.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-reporting-task-dialog.css
new file mode 100644
index 0000000..24b4380
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-reporting-task-dialog.css
@@ -0,0 +1,152 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* 
+    New controller service dialog.
+*/
+
+#new-reporting-task-dialog {
+    z-index: 1301;
+    display: none;
+    width: 800px;
+    height: 450px;
+    line-height: normal;
+}
+
+#reporting-task-tag-cloud-container {
+    float: left;
+    width: 190px;
+    height: 350px;
+}
+
+#reporting-task-types-container {
+    float: left;
+    width: 588px;
+    height: 350px;
+}
+
+#reporting-task-description-container {
+    width: 588px;
+    height: 100px;
+    margin-top: 10px;
+}
+
+#reporting-task-type-name {
+    font-size: 12pt;
+    font-weight: bold;
+    color: #527991;
+    margin-bottom: 8px;
+    width: 588px;
+}
+
+#reporting-task-type-description {
+    width: 588px;
+    height: 60px;
+}
+
+#reporting-task-availability-container {
+    position: relative;
+    left: 190px;
+    top: 9px;
+}
+
+div.availability-label {
+    float: left;
+    height: 24px;
+    line-height: 24px;
+}
+
+#reporting-task-availability-combo {
+    float: left;
+    margin-left: 6px;
+    width: 125px;
+    height: 18px;
+    line-height: 18px;
+}
+
+#reporting-task-types-table {
+    width: 586px;
+    height: 249px;
+    border: 1px solid #666;
+}
+
+#reporting-task-types-table-container th {
+    vertical-align: middle;
+}
+
+/*
+    Processor tag cloud
+*/
+
+#reporting-task-tag-cloud ul.tag-cloud {
+    max-height: 257px;
+}
+
+#reporting-task-tag-cloud ul.tag-cloud li {
+    max-width: 180px;
+}
+
+#reporting-task-tag-cloud div.tag-cloud-separator {
+    width: 180px;
+}
+
+#reporting-task-tag-cloud ul.tag-filter li {
+    width: 180px;
+}
+
+#reporting-task-tag-cloud div.selected-tag-text {
+    width: 160px;
+}
+
+/*
+    Processor type table filter
+*/
+
+#reporting-task-type-filter-controls {
+    float: right;
+    margin-top: -35px;
+    margin-right: 2px;
+    margin-bottom: 7px;
+}
+
+#reporting-task-type-filter-status {
+    font-size: 9px;
+    font-weight: bold;
+    color: #9f6000;
+    clear: left; 
+    line-height: normal;
+    margin-left: 5px;
+}
+
+#reporting-task-type-filter {
+    padding: 3px 0px 1px 3px;
+    font-size: 12px;
+    height: 18px;
+    line-height: 20px;
+    width: 173px;
+    border: 1px solid #ccc;
+    margin-right: 3px;
+    float: left;
+}
+
+#reporting-task-type-filter-options {
+    float: left;
+    height: 17px;
+    line-height: 17px;
+    width: 85px;
+    margin-top: 1px;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-configuration.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-configuration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-configuration.css
index b8fc87c..ce1f00a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-configuration.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-configuration.css
@@ -23,7 +23,6 @@
     display: none;
     width: 400px;
     height: 375px;
-    border: 1px solid #eee;
 }
 
 #port-name {
@@ -66,7 +65,6 @@ div.port-enabled-container {
     display: none;
     width: 400px;
     height: 450px;
-    border: 1px solid #eee;
 }
 
 #secure-port-configuration div.dialog-content {

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-details.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-details.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-details.css
index 2cd8505..831c5ee 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-details.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-details.css
@@ -23,7 +23,6 @@
     display: none;
     width: 400px;
     height: 300px;
-    border: 1px solid #eee;
 }
 
 /*
@@ -35,7 +34,6 @@
     display: none;
     height: 425px;
     width: 400px;
-    border: 1px solid #eee;
 }
 
 #secure-port-details-tabs {

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
index cfa3ce4..f0d781d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
@@ -19,7 +19,6 @@
     display: none;
     width: 400px;
     height: 300px;
-    border: 1px solid #eee;
 }
 
 #process-group-configuration div.dialog-content {

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css
index ada6af9..af7c382 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css
@@ -19,7 +19,6 @@
     display: none;
     width: 400px;
     height: 270px;
-    border: 1px solid #eee;
 }
 
 #process-group-details div.dialog-content {

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
index add52e0..1dc52f3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
@@ -26,7 +26,6 @@
     font-size: 10px;
     z-index: 1201;
     display: none;
-    border: 1px solid #eee;
 }
 
 div.processor-configuration-tab-container {
@@ -225,158 +224,6 @@ div.relationship-description {
     float: right;
 }
 
-/* properties */
-
-#processor-properties-header {
-    margin-bottom: 10px;
-    height: 19px;
-}
-
-#add-property {
-    float: right;
-    margin-right: 20px;
-}
-
-#processor-property-dialog .nfel-editor {
-    margin-bottom: 35px;
-}
-
-#new-property-name-container {
-    position: absolute;
-    height: 25px;
-    left: 10px;
-    right: 10px;
-    padding-right: 10px;
-    overflow: hidden; 
-    margin-bottom: 10px;
-}
-
-#new-property-name {
-    height: 14px;
-    width: 100%;
-}
-
-#new-property-button-container {
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    padding: 0 8px 10px;
-}
-
-#add-property-icon {
-    width: 19px;
-    height: 19px;
-    cursor: pointer;
-    float: left;
-}
-
-div.add-icon-bg {
-    background: transparent url(../images/buttonNewProperty.png) no-repeat scroll top left;
-}
-
-div.add-icon-bg-hover {
-    background: transparent url(../images/buttonNewProperty.png) no-repeat scroll top right;
-}
-
-#add-text {
-    float: left;
-    margin-left: 5px;
-    height: 19px;
-    line-height: 19px;
-}
-
-#required-property-note {
-    font-weight: bold;
-    float: left;
-    height: 19px;
-    line-height: 19px;
-    margin-left: 6px;
-}
-
-#processor-properties {
-    width: 758px;
-    height: 290px;
-    border-bottom: 1px solid #666;
-    background-color: #fff;
-}
-
-#configuration-buttons {
-    text-align: center;
-    position: absolute;
-    right: 10px;
-    bottom: 10px;
-}
-
-/*
-    Styles for the processor property editor.
-*/
-
-div.slickgrid-nfel-editor .nfel-editor {
-    margin-bottom: 30px;
-}
-
-div.edit-property-value {
-    height: 20px;
-    padding-right: 60px;
-}
-
-textarea.value-field {
-    float: left;
-    width: 95%;
-    height: 26px;
-    font-size: 11px !important;
-    resize: vertical;
-    overflow-y: auto;
-}
-
-div.string-check-container {
-    float: left;
-    margin-top: 1px;
-    height: 20px;
-    line-height: 20px;
-}
-
-div.string-check {
-    width: 12px;
-    height: 12px;
-    float: left;
-    margin-top: 4px;
-    margin-left: 4px;
-}
-
-span.string-check-label {
-    font-size: 9px;
-    font-weight: normal;
-}
-
-div.value pre {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    overflow: hidden;
-}
-
-/*
-    Styles for the property value combo
-*/
-
-div.edit-property-value-combo {
-    height: 22px;
-}
-
-div.value-combo {
-    height: 18px;
-    margin-top: 0px;
-    float: left;
-}
-
-/*
-    Table styles
-*/
-
-td.right-border {
-    border-right: 1px solid #aaa;
-}
-
 /*
     Comments
 */

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-details.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-details.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-details.css
index ef770cb..c259a30 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-details.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-details.css
@@ -26,7 +26,6 @@
     font-size: 10px;
     z-index: 1301;
     display: none;
-    border: 1px solid #eee;
 }
 
 div.processor-details-tab-container {
@@ -90,30 +89,4 @@ div.concurrently-schedulable-tasks-setting, div.scheduling-period-setting, div.p
 
 div.scheduling-period-setting, div.yield-duration-setting {
     margin-left: 36px;
-}
-
-/* properties */
-
-#read-only-processor-properties-header {
-    margin-bottom: 10px;
-    height: 19px;
-}
-
-#read-only-required-property-note {
-    font-weight: bold;
-    float: left;
-    height: 19px;
-    line-height: 19px;
-    margin-left: 6px;
-}
-
-#read-only-processor-properties {
-    border-bottom: 1px solid #666;
-    width: 758px;
-    height: 290px;
-    background-color: #fff;
-}
-
-div.processor-property-detail .nfel-editor {
-    margin-bottom: 30px;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/registration.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/registration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/registration.css
index d81596e..d4fdc7e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/registration.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/registration.css
@@ -42,12 +42,4 @@
 #registration-justification {
     width: 600px;
     height: 200px;
-}
-
-div.registration-collapsed {
-    background: transparent url(../images/iconTwistArrow.png) no-repeat scroll top left;
-}
-
-div.registration-expanded {
-    background: transparent url(../images/iconTwistArrow.png) no-repeat scroll top right;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css
index fdbe745..ead5714 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css
@@ -26,7 +26,6 @@
     font-size: 10px;
     z-index: 1201;
     display: none;
-    border: 1px solid #eee;
 }
 
 #remote-process-group-details {
@@ -37,7 +36,6 @@
     font-size: 10px;
     z-index: 1201;
     display: none;
-    border: 1px solid #eee;
 }
 
 #remote-process-group-ports {
@@ -48,7 +46,6 @@
     font-size: 10px;
     z-index: 1201;
     display: none;
-    border: 1px solid #eee;
 }
 
 /* remote process group settings */

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/reporting-task.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/reporting-task.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/reporting-task.css
new file mode 100644
index 0000000..8d5291e
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/reporting-task.css
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+    Reporting task configuration styles.
+*/
+
+#reporting-task-configuration {
+    position: absolute;
+    overflow: hidden;
+    width: 800px;
+    height: 450px;
+    font-size: 10px;
+    z-index: 1301;
+    display: none;
+}
+
+div.reporting-task-configuration-tab-container {
+    margin-top: -10px;
+    padding: 5px 11px;
+}
+
+#reporting-task-configuration-advanced {
+    display: none;
+}
+
+#reporting-task-configuration-tabs {
+    background-color: transparent;
+    width: 778px;
+    height: 21px;
+    border-bottom: 3px solid #666;
+}
+
+#reporting-task-configuration div.configuration-tab {
+    height: 320px;
+    overflow: auto;
+    padding: 10px;
+    background: #eee url(../images/bgTabContainer.png) repeat-x;
+    display: none;
+}
+
+/* reporting-task settings */
+
+#reporting-task-configuration div.settings-left {
+    float: left;
+    width: 356px;
+}
+
+#reporting-task-configuration div.settings-right {
+    float: left;
+    width: 356px;
+}
+
+#reporting-task-configuration div.spacer {
+    float: left;
+    margin-right: 40px;
+}
+
+#reporting-task-name {
+    font-size: 11px !important;
+    width: 250px;
+    float: left;
+}
+
+#reporting-task-enabled {
+    width: 12px;
+    height: 12px;
+    float: left;
+    margin-right: 4px;
+}
+
+div.reporting-task-enabled-container {
+    float: left;
+    margin-top: 5px;
+    margin-left: 10px;
+}
+
+div.availability-setting {
+    float: left;
+    width: 140px;
+}
+
+#reporting-task-scheduling-strategy-combo {
+    width: 150px;
+    height: 18px;
+    line-height: 18px;
+}
+
+input.reporting-task-scheduling-period {
+    font-size: 11px !important;
+    width: 150px;
+}
+
+/*
+    Comments
+*/
+
+#reporting-task-comments {
+    height: 250px;
+    width: 748px !important;
+    margin-top: 10px;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css
index e9d78d4..91805e1 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #settings {
     position: absolute;
     top: 0px;
@@ -21,23 +22,146 @@
     bottom: 0px;
     left: 0px;
     display: none;
+    padding: 20px;
 }
 
 #settings-header-text {
     height: 35px;
-    margin-top: 20px;
-    margin-left: 20px;
     font-size: 16px;
     font-weight: bold;
 }
 
 #settings-container {
-    margin-top: -10px;
+    margin-top: 18px;
+}
+
+#new-service-or-task {
+    float: right;
+    width: 19px;
+    height: 19px;
+    margin-top: 4px;
+    cursor: pointer;
+}
+
+span.expansion-button {
+    width: 10px;
+    height: 10px;
+    float: left;
+}
+
+span.ancestor-type {
+    font-weight: bold;
+}
+
+span.ancestor-type-rollup {
+    margin-left: 3px;
+    color: #aaa;
+}
+
+/* settings tabs */
+
+#settings-tabs-container {
+    border-bottom: 2px solid #666;
+}
+
+#settings-tabs {
+    float: left;
+}
+
+.settings-tab {
+    display: block;
+    padding: 0 5px;
+    height: 26px;
+    float: left;
+    color: #666;
+    background-color: #ccc;
+    border-left: 1px solid #b5b5b5;
+    border-top: 1px solid #b5b5b5;
+    border-right: 1px solid #b5b5b5;
+    margin-right: 5px;
+    text-align: center;
+    cursor: pointer;
+    line-height: 26px;
+    font-weight: bold;
+}
+
+.settings-selected-tab {
+    color: #fff;
+    background-color: #666;
+    border-left: 1px solid #666;
+    border-top: 1px solid #666;
+    border-right: 1px solid #666;
+}
+
+#settings-tab-background {
+    height: 200px;
+    margin-top: 1px;
+    background-color: transparent;
+    background: linear-gradient(to bottom, #dddddd, #ffffff);
+    filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr=#dddddd, endColorstr=#ffffff);
 }
 
+#settings div.configuration-tab {
+    display: none;
+}
+
+div.settings-table {
+    position: absolute;
+    top: 115px;
+    left: 25px;
+    bottom: 20px;
+    right: 25px;
+    border: 1px solid #666;
+    overflow: hidden;
+    background-color: #fff;
+}
+
+span.sorted {
+    text-decoration: underline;
+}
+
+#settings-refresh-button {
+    height: 24px;
+    width: 26px;
+    float: left;
+}
+
+#settings-last-refreshed-container {
+    float: left;
+    color: #666;
+    font-weight: normal;
+    margin-top: 6px;
+    margin-left: 3px;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+}
+
+#settings-loading-container {
+    float: left;
+    width: 16px;
+    height: 16px;
+    background-color: transparent;
+    margin-top: 4px;
+    margin-left: 3px;
+}
+
+#settings-last-refreshed {
+    font-weight: bold;
+}
+
+#settings-refresh-required-icon {
+    float: left;
+    margin-top: 4px;
+    margin-left: 3px;
+    width: 18px;
+    height: 16px;
+    background-image: url(../images/iconAlert.png);
+}
+
+/* general */
+
 #general-settings {
-    padding-left: 10px;
-    margin-top: 15px;
+    margin-top: -190px;
     margin-left: 10px;
 }
 
@@ -53,11 +177,11 @@
 }
 
 #settings-buttons {
-    margin-left: 260px;
+    margin-left: 304px;
     margin-top: 10px;
 }
 
-#settings-save, #settings-cancel {
+#settings-save {
     float: left;
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css
index 48e3d66..2cc8cfc 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css
@@ -20,7 +20,7 @@
 
 #shell-dialog {
     display: none;
-    z-index: 1250;
+    z-index: 1201;
     position: absolute;
     top: 20px;
     left: 20px;

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css
index 0590ec8..e6d477c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css
@@ -19,7 +19,6 @@
 #status-history-dialog {
     display: none;
     z-index: 1301;
-    border: 1px solid #eee;
     padding: 10px;
     border: 3px solid #365C6A;
     box-shadow: 4px 4px 6px rgba(0, 0, 0, 0.9);

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonNewProperty.png
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonNewProperty.png b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonNewProperty.png
deleted file mode 100755
index 3e51a15..0000000
Binary files a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonNewProperty.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconEnable.png
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconEnable.png b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconEnable.png
new file mode 100644
index 0000000..154403f
Binary files /dev/null and b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconEnable.png differ

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconUndo.png
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconUndo.png b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconUndo.png
deleted file mode 100755
index f48895d..0000000
Binary files a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconUndo.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/jquery.each.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/jquery.each.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/jquery.each.js
index dd83159..90f76b8 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/jquery.each.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/jquery.each.js
@@ -27,5 +27,5 @@
             return origEach.call(this, object, callback, args);
         }
         return object;
-    }
+    };
 })(jQuery);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
index 555698d..f834275 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
@@ -24,11 +24,13 @@
     background-color: #eee;
 }
 
-.dialog-border {
-    background-color: #294c58;
-    z-index: 1300;
-    opacity: 0.65;
-    filter: alpha(opacity=65);
+.show-border {
+    border: 3px solid #365C6A;
+    box-shadow: 4px 4px 6px rgba(0, 0, 0, 0.9);
+}
+
+.overlay {
+    border: 1px solid #eee;
 }
 
 .dialog-header {

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
index 9091db8..9faaefd 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 /**
  * Create a new dialog. The options are specified in the following
  * format:
@@ -36,11 +37,14 @@
  *      close: closeHandler
  *   }
  * }
+ * 
+ * The content of the dialog should be in a element with the class dialog-content
+ * directly under the dialog.
+ * 
+ * @argument {jQuery} $
  */
 (function ($) {
 
-    var overlayBackground = 'overlay-background';
-
     var isUndefined = function (obj) {
         return typeof obj === 'undefined';
     };
@@ -73,20 +77,12 @@
         }
     };
 
-    // private function for adding the border
-    var addBorder = function (dialog) {
-        var dialogParent = dialog.parent();
-
-        // detach the dialog
-        dialog.detach();
-
-        // create the wrapper
-        $('<div/>').append('<div class="dialog-border"></div>').append(dialog).appendTo(dialogParent);
-    };
-
     var methods = {
+        
         /**
          * Initializes the dialog.
+         * 
+         * @argument {object} options The options for the plugin
          */
         init: function (options) {
             return this.each(function () {
@@ -110,8 +106,10 @@
                     dialog.prepend(dialogHeader);
 
                     // determine whether a dialog border is necessary
-                    if (options.overlayBackground === false) {
-                        addBorder(dialog);
+                    if (options.overlayBackground === true) {
+                        dialog.addClass('overlay');
+                    } else {
+                        dialog.addClass('show-border');
                     }
 
                     // add the buttons
@@ -119,44 +117,44 @@
                 }
             });
         },
+        
         /**
          * Sets the handler that is used when the dialog is closed.
+         * 
+         * @argument {function} handler The function to call when hiding the dialog
          */
         setHandler: function (handler) {
             return this.each(function () {
                 $(this).data('handler', handler);
             });
         },
+        
         /**
          * Sets whether to overlay the background or if a border should be shown around the dialog.
+         * 
+         * @argument {boolean} overlayBackground Whether or not to overlay the background
          */
         setOverlayBackground: function (overlayBackground) {
             return this.each(function () {
                 if (isDefinedAndNotNull(overlayBackground)) {
                     var dialog = $(this);
-                    var prev = dialog.prev();
 
                     // if we should overlay the background
                     if (overlayBackground === true) {
-                        // if we're currently configured for a border
-                        if (prev.hasClass('dialog-border')) {
-                            // detach the dialog
-                            dialog.detach();
-
-                            // reinsert appropriately
-                            prev.parent().replaceWith(dialog);
-                        }
+                        dialog.addClass('overlay');
+                        dialog.removeClass('show-border');
                     } else {
-                        // if we're currently configured to overlay the background
-                        if (!prev.hasClass('dialog-border')) {
-                            addBorder(dialog);
-                        }
+                        dialog.addClass('show-border');
+                        dialog.removeClass('overlay');
                     }
                 }
             });
         },
+        
         /**
          * Updates the button model for the selected dialog.
+         * 
+         * @argument {array} buttons The new button model
          */
         setButtonModel: function (buttons) {
             return this.each(function () {
@@ -171,14 +169,18 @@
                 }
             });
         },
+        
         /**
          * Sets the header text of the dialog.
+         * 
+         * @argument {string} text Text to use a as a header
          */
         setHeaderText: function (text) {
             return this.each(function () {
                 $(this).find('span.dialog-header-text').text(text);
             });
         },
+        
         /**
          * Shows the dialog.
          */
@@ -187,33 +189,19 @@
                 // show the dialog
                 var dialog = $(this);
                 if (!dialog.is(':visible')) {
-                    // position the background/border
-                    var background;
-                    var prev = dialog.prev();
-                    if (!prev.hasClass('dialog-border')) {
-                        // add a marker style so we know how to remove the style when hiding the dialog
-                        dialog.addClass(overlayBackground);
-
-                        // get the faded background
-                        background = $('#faded-background');
+                    var title = dialog.find('span.dialog-header-text').text();
+                    if (isBlank(title)) {
+                        dialog.find('.dialog-content').css('margin-top', '-20px');
                     } else {
-                        // get the dialog border
-                        background = prev;
-
-                        // get the width and the height of the dialog container
-                        var width = parseInt(dialog.css('width'));
-                        var height = parseInt(dialog.css('height'));
-
-                        // set the width and height and center the dialog border
-                        background.css({
-                            'width': (width + 20) + 'px',
-                            'height': (height + 20) + 'px'
-                        }).center();
-
-                        // show the glass pane
+                        dialog.find('.dialog-content').css('margin-top', '0');
+                    }
+                    
+                    // show the appropriate background
+                    if (dialog.hasClass('show-border')) {
                         $('#glass-pane').show();
+                    } else {
+                        $('#faded-background').show();
                     }
-                    background.show();
 
                     // show the centered dialog - performing these operation in the
                     // opposite order one might expect. for some reason, the call to
@@ -223,6 +211,7 @@
                 }
             });
         },
+        
         /**
          * Hides the dialog.
          */
@@ -230,27 +219,21 @@
             return this.each(function () {
                 var dialog = $(this);
                 if (dialog.is(':visible')) {
-                    // determine how to hide the dialog
-                    if (dialog.hasClass(overlayBackground)) {
-                        dialog.removeClass(overlayBackground);
-
-                        // hide the faded background
-                        $('#faded-background').hide();
-                    } else {
-                        // hide the dialog border
-                        dialog.prev().hide();
-
-                        // hide the glass pane
+                    // hide the appropriate backgroun
+                    if (dialog.hasClass('show-border')) {
                         $('#glass-pane').hide();
+                    } else {
+                        $('#faded-background').hide();
                     }
 
+                    // hide the dialog
+                    dialog.hide();
+                    
+                    // invoke the handler
                     var handler = dialog.data('handler');
                     if (isDefinedAndNotNull(handler) && typeof handler.close === 'function') {
                         handler.close.call(dialog);
                     }
-
-                    // hide the dialog
-                    dialog.hide();
                 }
             });
         }

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js
index 84dd454..550ed37 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js
@@ -14,6 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/* global CodeMirror, nf */
+
 /**
  * Create a new nf editor. The options are specified in the following
  * format:
@@ -30,7 +33,7 @@
  *   minHeight: 150
  * }
  * 
- * This editor requires
+ * @param {type} $
  */
 (function ($) {
 

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/buttonNewProperty.png
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/buttonNewProperty.png b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/buttonNewProperty.png
new file mode 100755
index 0000000..3e51a15
Binary files /dev/null and b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/buttonNewProperty.png differ

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9647717/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css
new file mode 100644
index 0000000..74b6f4c
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css
@@ -0,0 +1,173 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+    Styles for the property table.
+*/
+
+div.properties-header {
+    margin-bottom: 10px;
+    height: 19px;
+}
+
+div.required-property-note {
+    font-weight: bold;
+    float: left;
+    height: 19px;
+    line-height: 19px;
+    margin-left: 6px;
+}
+
+div.add-property {
+    float: right;
+    margin-right: 20px;
+}
+
+div.add-property-icon {
+    width: 19px;
+    height: 19px;
+    cursor: pointer;
+    float: left;
+}
+
+div.add-icon-bg {
+    background: transparent url(buttonNewProperty.png) no-repeat scroll top left;
+}
+
+div.add-icon-bg-hover {
+    background: transparent url(buttonNewProperty.png) no-repeat scroll top right;
+}
+
+div.add-property-text {
+    float: left;
+    margin-left: 5px;
+    height: 19px;
+    line-height: 19px;
+}
+
+div.property-table {
+    width: 758px;
+    height: 290px;
+    border-bottom: 1px solid #666;
+    background-color: #fff;
+}
+
+/*
+    New property dialog
+*/
+
+div.new-property-dialog {
+    z-index: 1301;
+    display: none;
+    padding: 10px;
+    border: 3px solid #365C6A;
+    box-shadow: 4px 4px 6px rgba(0, 0, 0, 0.9);
+    cursor: move;
+    width: 300px;
+    height: 72px;
+}
+
+div.new-property-name-container {
+    position: absolute;
+    height: 25px;
+    left: 10px;
+    right: 10px;
+    padding-right: 10px;
+    overflow: hidden; 
+}
+
+input.new-property-name {
+    height: 14px;
+    width: 100%;
+}
+
+div.new-property-button-container {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    padding: 0 8px 10px;
+}
+
+/*
+    Styles for the property editor.
+*/
+
+div.slickgrid-nfel-editor .nfel-editor, div.property-detail .nfel-editor {
+    margin-bottom: 30px;
+}
+
+div.edit-property-value {
+    height: 20px;
+    padding-right: 60px;
+}
+
+textarea.value-field {
+    float: left;
+    width: 95%;
+    height: 26px;
+    font-size: 11px !important;
+    resize: vertical;
+    overflow-y: auto;
+}
+
+div.string-check-container {
+    float: left;
+    margin-top: 1px;
+    height: 20px;
+    line-height: 20px;
+}
+
+div.string-check {
+    width: 12px;
+    height: 12px;
+    float: left;
+    margin-top: 4px;
+    margin-left: 4px;
+}
+
+span.string-check-label {
+    font-size: 9px;
+    font-weight: normal;
+}
+
+div.value pre {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    overflow: hidden;
+}
+
+/*
+    Styles for the property value combo
+*/
+
+div.edit-property-value-combo {
+    height: 22px;
+}
+
+div.value-combo {
+    height: 18px;
+    margin-top: 0px;
+    float: left;
+}
+
+/*
+    Table styles
+*/
+
+td.right-border {
+    border-right: 1px solid #aaa;
+}
\ No newline at end of file


Mime
View raw message