You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by pp...@apache.org on 2017/04/11 06:21:07 UTC
ambari git commit: AMBARI-20704.Need a way to indicate the action
node type in workflow manager.(Venkata Sairam via padmapriyanitt)
Repository: ambari
Updated Branches:
refs/heads/trunk 735cbda86 -> e64bff0d9
AMBARI-20704.Need a way to indicate the action node type in workflow manager.(Venkata Sairam via padmapriyanitt)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e64bff0d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e64bff0d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e64bff0d
Branch: refs/heads/trunk
Commit: e64bff0d99f9f159863598d00992d86b0f3c04fd
Parents: 735cbda
Author: padmapriyanitt <pa...@gmail.com>
Authored: Tue Apr 11 11:50:56 2017 +0530
Committer: padmapriyanitt <pa...@gmail.com>
Committed: Tue Apr 11 11:50:56 2017 +0530
----------------------------------------------------------------------
.../main/resources/ui/app/domain/cytoscape-style.js | 10 +++++++++-
.../wfmanager/src/main/resources/ui/app/index.html | 14 ++++++++++++++
.../src/main/resources/ui/public/assets/custom.png | Bin 0 -> 350 bytes
.../src/main/resources/ui/public/assets/distcp.png | Bin 0 -> 229 bytes
.../src/main/resources/ui/public/assets/email.png | Bin 0 -> 340 bytes
.../src/main/resources/ui/public/assets/fs.png | Bin 0 -> 254 bytes
.../src/main/resources/ui/public/assets/hive.png | Bin 0 -> 270 bytes
.../src/main/resources/ui/public/assets/hive2.png | Bin 0 -> 270 bytes
.../src/main/resources/ui/public/assets/java.png | Bin 0 -> 385 bytes
.../main/resources/ui/public/assets/map-reduce.png | Bin 0 -> 552 bytes
.../src/main/resources/ui/public/assets/pig.png | Bin 0 -> 342 bytes
.../src/main/resources/ui/public/assets/shell.png | Bin 0 -> 222 bytes
.../src/main/resources/ui/public/assets/spark.png | Bin 0 -> 381 bytes
.../src/main/resources/ui/public/assets/sqoop.png | Bin 0 -> 482 bytes
.../src/main/resources/ui/public/assets/ssh.png | Bin 0 -> 222 bytes
.../main/resources/ui/public/assets/sub-workflow.png | Bin 0 -> 433 bytes
16 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-style.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-style.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-style.js
index 5a85573..c685038 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-style.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-style.js
@@ -28,6 +28,13 @@ var labelFunction=function(target) {
return target.data().node.name;
}
};
+
+var actionNodeImage = function(target) {
+ if (target && target.data() && target.data().node && target.data().node.actionType) {
+ return 'assets/' + target.data().node.actionType + '.png';
+ }
+};
+
export default Ember.Object.create({
style: [
{
@@ -100,7 +107,8 @@ export default Ember.Object.create({
{
selector: 'node[type = "action"]',
style: {
- 'background-color': actionNodeColor,
+ 'background-image': actionNodeImage,
+ 'background-position-x': 10,
width: 150
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/app/index.html
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/index.html b/contrib/views/wfmanager/src/main/resources/ui/app/index.html
index df243ad..311441c 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/index.html
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/index.html
@@ -40,6 +40,20 @@
<img src="assets/stop.png"/>
<img src="assets/join.png"/>
<img src="assets/sitemap.png"/>
+ <img src="assets/hive.png"/>
+ <img src="assets/hive2.png"/>
+ <img src="assets/sqoop.png"/>
+ <img src="assets/pig.png"/>
+ <img src="assets/sub-workflow.png"/>
+ <img src="assets/java.png"/>
+ <img src="assets/shell.png"/>
+ <img src="assets/distcp.png"/>
+ <img src="assets/map-reduce.png"/>
+ <img src="assets/ssh.png"/>
+ <img src="assets/spark.png"/>
+ <img src="assets/email.png"/>
+ <img src="assets/fs.png"/>
+ <img src="assets/custom.png"/>
</div>
{{content-for "body"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/custom.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/custom.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/custom.png
new file mode 100644
index 0000000..3ff3156
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/custom.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/distcp.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/distcp.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/distcp.png
new file mode 100644
index 0000000..c377f82
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/distcp.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/email.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/email.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/email.png
new file mode 100644
index 0000000..a7d9f98
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/email.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/fs.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/fs.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/fs.png
new file mode 100644
index 0000000..1dd73ce
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/fs.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/hive.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/hive.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/hive.png
new file mode 100644
index 0000000..91dfead
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/hive.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/hive2.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/hive2.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/hive2.png
new file mode 100644
index 0000000..91dfead
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/hive2.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/java.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/java.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/java.png
new file mode 100644
index 0000000..ef23574
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/java.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/map-reduce.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/map-reduce.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/map-reduce.png
new file mode 100644
index 0000000..69b034a
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/map-reduce.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/pig.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/pig.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/pig.png
new file mode 100644
index 0000000..15a65fa
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/pig.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/shell.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/shell.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/shell.png
new file mode 100644
index 0000000..43b431d
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/shell.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/spark.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/spark.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/spark.png
new file mode 100644
index 0000000..23a9043
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/spark.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/sqoop.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/sqoop.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/sqoop.png
new file mode 100644
index 0000000..70fb58e
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/sqoop.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/ssh.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/ssh.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/ssh.png
new file mode 100644
index 0000000..43b431d
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/ssh.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/e64bff0d/contrib/views/wfmanager/src/main/resources/ui/public/assets/sub-workflow.png
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/public/assets/sub-workflow.png b/contrib/views/wfmanager/src/main/resources/ui/public/assets/sub-workflow.png
new file mode 100644
index 0000000..83cfeb7
Binary files /dev/null and b/contrib/views/wfmanager/src/main/resources/ui/public/assets/sub-workflow.png differ