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 80df99c71dfc004dcce5a4f14e038bcec1f0c692..a42115382976259c3999ecbca32fe40b3a9f63a1 100644 (file)
--- a/server/user.mediacube.gui/css/jquery.flowchart.css
+++ b/server/user.mediacube.gui/css/jquery.flowchart.css
@@ -69,7 +69,7 @@
     height: 0px;\r
     border-top: 5px solid transparent;\r
     border-bottom: 5px solid transparent;\r
-    border-left: 5px solid transparent; rgb(100, 100, 100);\r
+    border-left: 5px solid transparent;\r
     position: absolute;\r
     top: 5px;\r
     pointer-events: none;\r
@@ -116,6 +116,7 @@
     width: 140px;\r
     border: 1px solid #CCCCCC;\r
     background: #FAFAFA;\r
+/*    background-image: linear-gradient(red, yellow);*/\r
     pointer-events: auto;\r
 }\r
 \r

diff --git a/server/user.mediacube.gui/js/jquery.flowchart.js b/server/user.mediacube.gui/js/jquery.flowchart.js
index 493986308b42ae607f839272fdd033ce5adc79a0..0b3d1e52e61366cbfdc87f2a8eda871f1e9d19b9 100644 (file)
--- 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 7a2472b6c4c743b57a01ca00b60c36f76c75f5cf..a30bfce742c847ee7b6e10574e0d89ebc9113774 100644 (file)
--- a/server/user.mediacube.gui/js/processVisualizer.js
+++ b/server/user.mediacube.gui/js/processVisualizer.js
@@ -1,5 +1,4 @@
 \r
-/*\r
 var defaultFlowchartData = {\r
        operators: {\r
                operator1: {\r
@@ -7,6 +6,7 @@ var defaultFlowchartData = {
                        left: 20,\r
                        properties: {\r
                                title: 'Operator 1',\r
+                               extrastyle: "mctype-blue",\r
                                inputs: {},\r
                                outputs: {\r
                                        output_1: {\r
@@ -20,6 +20,7 @@ var defaultFlowchartData = {
                        left: 300,\r
                        properties: {\r
                                title: 'Operator 2',\r
+                               extrastyle: "mctype-green",\r
                                inputs: {\r
                                        input_1: {\r
                                                label: 'Input 1',\r
@@ -41,7 +42,8 @@ var defaultFlowchartData = {
                },\r
        }\r
 };\r
-*/\r
+\r
+/*\r
 \r
 var defaultFlowchartData = {\r
        operators: {\r
@@ -51,6 +53,7 @@ var defaultFlowchartData = {
                        properties: {\r
                                title: 'Operator 1',\r
                                inputs: {},\r
+                               extrastyle: "mctype-blue",\r
                                outputs: {\r
                                        output_1: {\r
                                                label: 'Output 1',\r
@@ -60,7 +63,7 @@ var defaultFlowchartData = {
                }\r
        }\r
 };\r
-\r
+*/\r
 var flowChartWidget = null;\r
 \r
 $(document).ready(function() {\r

diff --git a/server/user.mediacube.gui/pages/processVisualizer.zul b/server/user.mediacube.gui/pages/processVisualizer.zul
index e117404f7b9c90f136bf6b2cee6f0dee36acf410..837f3a0682ed5d60e05347b8e97672d06033f9bd 100644 (file)
--- a/server/user.mediacube.gui/pages/processVisualizer.zul
+++ b/server/user.mediacube.gui/pages/processVisualizer.zul
@@ -1,8 +1,13 @@
 <zk xmlns:h="xhtml">   \r
        <style src="/css/jquery.flowchart.css" />\r
-       <script src="/js/jquery-ui.js?v=17" />\r
-       <script src="/js/jquery.flowchart.js?v=17" />\r
-       <h:script src="/js/processVisualizer.js?v=18" />\r
+       <style>\r
+               .mctype-blue {\r
+                       background-image: linear-gradient(blue, white);\r
+               }               \r
+               .mctype-green {\r
+                       background-image: linear-gradient(green, white);\r
+               }\r
+       </style>\r
        <div viewModel="@id('jlm') @init('user.jobengine.zk.model.JobFlowChartModel')">\r
                <h:div id="chart_container">\r
                        <h:div class="flowchart-example-container" id="flowchartworkspace" />\r
@@ -10,4 +15,7 @@
                <button id="loadChartButton" label="Load chart" onClick="@command('loadChart')" />\r
                \r
        </div>\r
+       <script src="/js/jquery-ui.js?v=20" />\r
+       <script src="/js/jquery.flowchart.js?v=21" />\r
+       <h:script src="/js/processVisualizer.js?v=24" />\r
 </zk>\r