From: vasary.daniel <TFS\vasary.daniel>
Date: Sat, 16 Apr 2022 20:00:31 +0000 (+0000)
Subject: gradiens szinezes ok, layout szetesve
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=2fee31db94119f9956aa173c717b3f46233e9e86;p=mediacube.git

gradiens szinezes ok, layout szetesve

git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33175
---

diff --git a/server/user.mediacube.gui/css/jquery.flowchart.css b/server/user.mediacube.gui/css/jquery.flowchart.css
index 80df99c7..a4211538 100644
--- a/server/user.mediacube.gui/css/jquery.flowchart.css
+++ b/server/user.mediacube.gui/css/jquery.flowchart.css
@@ -69,7 +69,7 @@
     height: 0px;
     border-top: 5px solid transparent;
     border-bottom: 5px solid transparent;
-    border-left: 5px solid transparent; rgb(100, 100, 100);
+    border-left: 5px solid transparent;
     position: absolute;
     top: 5px;
     pointer-events: none;
@@ -116,6 +116,7 @@
     width: 140px;
     border: 1px solid #CCCCCC;
     background: #FAFAFA;
+/*    background-image: linear-gradient(red, yellow);*/
     pointer-events: auto;
 }
 
diff --git a/server/user.mediacube.gui/js/jquery.flowchart.js b/server/user.mediacube.gui/js/jquery.flowchart.js
index 49398630..0b3d1e52 100644
--- a/server/user.mediacube.gui/js/jquery.flowchart.js
+++ b/server/user.mediacube.gui/js/jquery.flowchart.js
@@ -513,11 +513,12 @@ jQuery(function ($) {
         },
 
         _getOperatorFullElement: function (operatorData) {
-            var infos = this.getOperatorCompleteData(operatorData);
+			console.log("adding operator", operatorData); 
+           var infos = this.getOperatorCompleteData(operatorData);
 
             var $operator = $('<div class="flowchart-operator"></div>');
             $operator.addClass(infos.class);
-
+			$operator.addClass(operatorData.properties.extrastyle);
             var $operator_title = $('<div class="flowchart-operator-title"></div>');
             $operator_title.html(infos.title);
             $operator_title.appendTo($operator);
diff --git a/server/user.mediacube.gui/js/processVisualizer.js b/server/user.mediacube.gui/js/processVisualizer.js
index 7a2472b6..a30bfce7 100644
--- a/server/user.mediacube.gui/js/processVisualizer.js
+++ b/server/user.mediacube.gui/js/processVisualizer.js
@@ -1,5 +1,4 @@
 
-/*
 var defaultFlowchartData = {
 	operators: {
 		operator1: {
@@ -7,6 +6,7 @@ var defaultFlowchartData = {
 			left: 20,
 			properties: {
 				title: 'Operator 1',
+				extrastyle: "mctype-blue",
 				inputs: {},
 				outputs: {
 					output_1: {
@@ -20,6 +20,7 @@ var defaultFlowchartData = {
 			left: 300,
 			properties: {
 				title: 'Operator 2',
+				extrastyle: "mctype-green",
 				inputs: {
 					input_1: {
 						label: 'Input 1',
@@ -41,7 +42,8 @@ var defaultFlowchartData = {
 		},
 	}
 };
-*/
+
+/*
 
 var defaultFlowchartData = {
 	operators: {
@@ -51,6 +53,7 @@ var defaultFlowchartData = {
 			properties: {
 				title: 'Operator 1',
 				inputs: {},
+				extrastyle: "mctype-blue",
 				outputs: {
 					output_1: {
 						label: 'Output 1',
@@ -60,7 +63,7 @@ var defaultFlowchartData = {
 		}
 	}
 };
-
+*/
 var flowChartWidget = null;
 
 $(document).ready(function() {
diff --git a/server/user.mediacube.gui/pages/processVisualizer.zul b/server/user.mediacube.gui/pages/processVisualizer.zul
index e117404f..837f3a06 100644
--- a/server/user.mediacube.gui/pages/processVisualizer.zul
+++ b/server/user.mediacube.gui/pages/processVisualizer.zul
@@ -1,8 +1,13 @@
 <zk xmlns:h="xhtml"> 	
  	<style src="/css/jquery.flowchart.css" />
- 	<script src="/js/jquery-ui.js?v=17" />
- 	<script src="/js/jquery.flowchart.js?v=17" />
-	<h:script src="/js/processVisualizer.js?v=18" />
+ 	<style>
+ 		.mctype-blue {
+ 			background-image: linear-gradient(blue, white);
+ 		} 		
+ 		.mctype-green {
+ 			background-image: linear-gradient(green, white);
+ 		}
+ 	</style>
 	<div viewModel="@id('jlm') @init('user.jobengine.zk.model.JobFlowChartModel')">
 		<h:div id="chart_container">
 			<h:div class="flowchart-example-container" id="flowchartworkspace" />
@@ -10,4 +15,7 @@
 		<button id="loadChartButton" label="Load chart" onClick="@command('loadChart')" />
 		
 	</div>
+ 	<script src="/js/jquery-ui.js?v=20" />
+ 	<script src="/js/jquery.flowchart.js?v=21" />
+	<h:script src="/js/processVisualizer.js?v=24" />
 </zk>