From 080888bb60f677e59c02b7ac2d672b8e8f3e5060 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 31 Aug 2016 10:14:28 +0200
Subject: [PATCH 1/2] add redraw of layout, set 'cose' as default layout

---
 views/bootstrap/class.WorkflowGraph.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index 974e55bea..9a3584a52 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -116,8 +116,16 @@ cy.on('free', 'node', function(evt) {
 		if(!$renderdata)
 			$this->printGraph();
 ?>
-	cy.layout({ name: '<?php echo $renderdata ? 'preset' : 'grid'; ?>', condense: true });
-$('#png').attr('src', cy.png({'full': true}));
+	cy.layout({ name: '<?php echo $renderdata ? 'preset' : 'cose'; ?>', condense: true, ready: function() {$('#png').attr('src', cy.png({'full': true}))} });
+//	$('#png').attr('src', cy.png({'full': true}));
+
+$(document).ready(function() {
+	$('body').on('click', '#setlayout', function(ev){
+		ev.preventDefault();
+		var element = $(this);
+		cy.layout({name: element.data('layout'), ready: function() {$('#png').attr('src', cy.png({'full': true}))}});
+	});
+});
 <?php
 	} /* }}} */
 
@@ -244,6 +252,8 @@ $('#png').attr('src', cy.png({'full': true}));
 		$this->htmlAddHeader('
 <style type="text/css">
 body {padding: 0px;}
+div.buttons {float: right; padding-left: 4px; height: 100px; width: 120px; margin-right: 5px;}
+div.buttons button {margin: 3px; float: right;}
 </style>
 ', 'css');
 		$this->htmlStartPage(getMLText("admin_tools"));
@@ -252,6 +262,9 @@ body {padding: 0px;}
 ?>
 <div id="canvas" style="width: 100%; height:546px; _border: 1px solid #bbb;"></div>
 <img id="png" style="float: left; border: 1px solid #bbb; min-height: 100px; min-width: 100px; height: 100px; _width: 100px; padding: 3px;" />
+<div class="buttons">
+	<button class="btn btn-mini" id="setlayout" data-layout="cose">Redraw</button>
+</div>
 <?php
 //		$this->contentContainerEnd();
 		if(method_exists($this, 'js'))

From 92da72b153704334c4e83c205913b52b451909b1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 31 Aug 2016 10:33:06 +0200
Subject: [PATCH 2/2] add redrawing of graph, minor css improvements

---
 views/bootstrap/class.WorkflowGraph.php | 10 +++++++---
 views/bootstrap/class.WorkflowMgr.php   |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index 9a3584a52..9dd04aead 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -254,6 +254,8 @@ $(document).ready(function() {
 body {padding: 0px;}
 div.buttons {float: right; padding-left: 4px; height: 100px; width: 120px; margin-right: 5px;}
 div.buttons button {margin: 3px; float: right;}
+#preview {background: #f5f5f5; border-top: 1px solid #e3e3e3;}
+#preview img {border: 1px solid #bbb; background: #fff; min-height: 100px; min-width: 100px; height: 100px; _width: 100px; padding: 3px; margin: 3px;}
 </style>
 ', 'css');
 		$this->htmlStartPage(getMLText("admin_tools"));
@@ -261,9 +263,11 @@ div.buttons button {margin: 3px; float: right;}
 
 ?>
 <div id="canvas" style="width: 100%; height:546px; _border: 1px solid #bbb;"></div>
-<img id="png" style="float: left; border: 1px solid #bbb; min-height: 100px; min-width: 100px; height: 100px; _width: 100px; padding: 3px;" />
-<div class="buttons">
-	<button class="btn btn-mini" id="setlayout" data-layout="cose">Redraw</button>
+<div id="preview">
+	<img id="png" />
+	<div class="buttons">
+		<button class="btn btn-mini" id="setlayout" data-layout="cose">Redraw</button>
+	</div>
 </div>
 <?php
 //		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.WorkflowMgr.php b/views/bootstrap/class.WorkflowMgr.php
index b2b0de938..f9c005d56 100644
--- a/views/bootstrap/class.WorkflowMgr.php
+++ b/views/bootstrap/class.WorkflowMgr.php
@@ -75,7 +75,7 @@ $(document).ready(function() {
 		$selworkflow = $this->params['selworkflow'];
 		if($selworkflow) { ?>
 <div id="workflowgraph">
-<iframe src="out.WorkflowGraph.php?workflow=<?php echo $selworkflow->getID(); ?>" width="100%" height="654" style="border: 1px solid #AAA;"></iframe>
+<iframe src="out.WorkflowGraph.php?workflow=<?php echo $selworkflow->getID(); ?>" width="100%" height="661" style="border: 1px solid #e3e3e3; border-radius: 4px; margin: -1px;"></iframe>
 </div>
 <?php }
 	} /* }}} */