diff options
3 files changed, 16 insertions, 7 deletions
diff --git a/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java b/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java index fe2d5cb3..d88a17e8 100755 --- a/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java +++ b/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java @@ -64,7 +64,7 @@ public class Painter { adjustGraphics2DProperties(); - Point origin = new Point(0, rectHeight / 2); + Point origin = new Point(1, rectHeight / 2); ImageBuilder ib = new ImageBuilder(g2d, documentBuilder, origin, baseLength, rectHeight); doTheActualDrawing(collector, microServices, policy, ib); diff --git a/src/main/resources/META-INF/resources/designer/modeler/dist/index.html b/src/main/resources/META-INF/resources/designer/modeler/dist/index.html index ead478a4..ab337de8 100644 --- a/src/main/resources/META-INF/resources/designer/modeler/dist/index.html +++ b/src/main/resources/META-INF/resources/designer/modeler/dist/index.html @@ -20,6 +20,11 @@ =================================================================== --> +<style> +.ERROR{color: red;} +.WARNING{color: orange;} +.INFO{color: green;} +</style> <html> <head> @@ -43,9 +48,12 @@ </div> </div> - <div class="canvas" id="js-canvas" style="margin-top: 100px"> + <div class="canvas" id="js-canvas" style="margin-top: 100px; margin-left: 20px;"> + <div id="loop-content"> + </div> + <label for="loop-log-div" class="col-sm-4 control-label">Loop Logs</label> - <div id="loop-log-div" style="border: 2px solid gray;height: 20vh"> + <div id="loop-log-div" style="border: 2px solid gray;height: 20vh; margin-right: 40px;"> <div id="loop-log-table-scroll" style="width: 100%;height: 87%;overflow: auto;margin-top: 20px;"> <table id="loop-log-table" style="width: 100%"> <thead> @@ -57,9 +65,9 @@ </thead> <tbody> <tr ng-repeat="log in loop_logs" ng-class="{reverse: reverse}"> - <td>{{log.logInstant}}</td> - <td>{{log.logType}}</td> - <td>{{log.message}}</td> + <td width="20%">{{log.logInstant}}</td> + <td width="10%" ng-class="log.logType">{{log.logType}}</td> + <td width="70">{{log.message}}</td> </tr> </tbody> </table> @@ -67,6 +75,7 @@ </div> </div> + </div> </body> diff --git a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js index a75326de..0cc5c38f 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js +++ b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js @@ -191,7 +191,7 @@ app var svg = pars; if ($("#svgContainer").length > 0) $("#svgContainer").remove(); - $("#js-canvas").append( + $("#loop-content").append( "<span id=\"svgContainer\">" + svg + "</span>"); $("#svgContainer svg").attr('width', '100%'); $("#svgContainer svg").attr('height', '100%'); |