diff --git a/daliuge-engine/dlg/manager/web/static/css/session.css b/daliuge-engine/dlg/manager/web/static/css/session.css index cae39d2fe..2512d0399 100644 --- a/daliuge-engine/dlg/manager/web/static/css/session.css +++ b/daliuge-engine/dlg/manager/web/static/css/session.css @@ -54,10 +54,18 @@ svg { .node g div { color: #000; - padding: 4px 30px; + padding: 4px 25px 4px 25px; overflow: hidden; } +#pg-graph .drop-label.rect{ + padding: 4px 0px 4px 0px; +} + +#pg-graph .drop-label.parallelogram{ + padding: 4px 28px 4px 28px; +} + .node polygon+g div div { padding-left: 13% } diff --git a/daliuge-engine/dlg/manager/web/static/js/dm.js b/daliuge-engine/dlg/manager/web/static/js/dm.js index da1d3ee89..8afa139d6 100644 --- a/daliuge-engine/dlg/manager/web/static/js/dm.js +++ b/daliuge-engine/dlg/manager/web/static/js/dm.js @@ -547,9 +547,9 @@ function _addNode(g, doSpec) { else if( doSpec.type == 'plain' ) { notes += 'storage: ' + doSpec.storage; } - + var oid = doSpec.oid; - var html = '
'; + var html = '
'; html += '' + notes + ''; html += '' + oid + ''; html += "
"; diff --git a/daliuge-translator/dlg/dropmake/web/graph_init.js b/daliuge-translator/dlg/dropmake/web/graph_init.js index 05f653c74..9026be18e 100644 --- a/daliuge-translator/dlg/dropmake/web/graph_init.js +++ b/daliuge-translator/dlg/dropmake/web/graph_init.js @@ -209,8 +209,8 @@ function _addNode(g, node) { var typeShape = TYPE_SHAPES[node.category]; var notes = node.text; - var oid = node.oid; - var html = '
'; + var oid = node.oid; + var html = '
'; html += '' + notes + ''; html += '' + oid + ''; html += "
"; diff --git a/daliuge-translator/dlg/dropmake/web/src/main.css b/daliuge-translator/dlg/dropmake/web/src/main.css index 2d8a4a846..3367919d0 100644 --- a/daliuge-translator/dlg/dropmake/web/src/main.css +++ b/daliuge-translator/dlg/dropmake/web/src/main.css @@ -393,6 +393,7 @@ .node rect, .node polygon { stroke-width: 2.0px; stroke: #bbb; + height:60px; padding: 4px 8px; } @@ -400,8 +401,6 @@ #main #dagGraphArea .node :first-child, #main #dagGraphArea rect { fill: #9ab4d0; - width:300px; - height:85px; stroke: black; } @@ -414,8 +413,18 @@ font-weight: 700; } -#main #dagGraphArea .drop-label{ - padding: 5% 18%; +.node g div { + color: #000; + padding: 4px 28px 4px 28px; + overflow: hidden; +} + +#main #dagGraphArea .drop-label.rect{ + padding: 4px 0px 4px 0px; +} + +#main #dagGraphArea .drop-label.parallelogram{ + padding: 4px 28px 4px 28px; } #main #dagGraphArea path.path {