gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-17 05:22:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-08-31 10:35:14 +02:00
commit 2418675822
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
views/bootstrap/class.WorkflowGraph.php
View File

@ -284,6 +284,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"));
@ -291,10 +293,12 @@ 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="savelayout">Save layout</button>
<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="savelayout">Save layout</button>
<button class="btn btn-mini" id="setlayout" data-layout="cose">Redraw</button>
</div>
</div>
<?php
// $this->contentContainerEnd();

2
views/bootstrap/class.WorkflowMgr.php
View File

@ -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 }
} /* }}} */