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

This commit is contained in:
Uwe Steinmann 2016-08-31 16:09:59 +02:00
commit c825356430
2 changed files with 1285 additions and 2 deletions

File diff suppressed because it is too large Load Diff

View File

@ -109,9 +109,14 @@ var cy = cytoscape({
}
}]
<?php if($renderdata) echo ",".$renderdata; ?>
}
});
);
cy.gridGuide({
discreteDrag: false,
guidelinesStyle: {
strokeStyle: "red"
}
});
cy.on('free', 'node', function(evt) {
$('#png').attr('src', cy.png({'full': true}));
@ -270,6 +275,8 @@ $(document).ready(function() {
$this->htmlAddHeader(
'<script type="text/javascript" src="../styles/bootstrap/cytoscape/cytoscape.min.js"></script>'."\n");
$this->htmlAddHeader(
'<script type="text/javascript" src="../styles/bootstrap/cytoscape/cytoscape-grid-guide.js"></script>'."\n");
$this->htmlAddHeader('
<style type="text/css">
body {padding: 0px;}