Fixing #669 and #670

wso2 · Nov 21, 2017 · 571ee31 · 571ee31
1 parent 9690a26
commit 571ee31
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/...nents/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/css/simulator.css b/...nents/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/css/simulator.css
@@ -451,4 +451,8 @@ hr {
 
 .fw-helper-stroke::after, .fw-stroke::before {
   text-shadow: -2px -2px 0 #999, 2px -2px 0 #999, -2px 2px 0 #999, 2px 2px 0 #999;
-}
+}
+
+.single-event-form .btn-sm {
+  padding: 1px 10px;
+}
diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/css/console.css b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/css/console.css
@@ -152,11 +152,15 @@
 }
 
 .console-container .close {
-    font-size: 10px;
+    font-size: 8px;
 }
 
 .console-container .close i {
     color: #ccc;
-    line-height: 19px;
+    line-height: 20px;
     padding-right: 10px;
 }
+
+.output-console-content-wrapper {
+  margin-bottom: 25px;
+}
diff --git a/...org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/event-simulator/simulator.js b/...org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/event-simulator/simulator.js
@@ -81,7 +81,7 @@ define(['jquery', 'log', './simulator-rest-client', 'lodash', /* void libs */'bo
 
             $streamNameSelect.empty();
             $timestamp.val('');
-            $siddhiAppMode.html('mode : ' + self.siddhiAppDetailsMap[siddhiAppName]);
+            $siddhiAppMode.html('Status : ' + self.siddhiAppDetailsMap[siddhiAppName]);
             self.removeSingleEventAttributeRules(uuid);
             $attributes.empty();
             $runDebugButtons.empty();
@@ -433,16 +433,15 @@ define(['jquery', 'log', './simulator-rest-client', 'lodash', /* void libs */'bo
 // if the siddhi app is not on run or debug mode, append buttons to start siddhi app in either of the modes
     self.createRunDebugButtons = function () {
         var runDebugButtons =
-            '<div class="col-md-8 btn-group " data-toggle="buttons">' +
-            '   <label class="btn btn-default active"> ' +
-            '       <input type="radio" name="run-debug" value="run" autocomplete="off" checked> Run ' +
-            '   </label> ' +
-            '   <label class="btn btn-default"> ' +
-            '       <input type="radio" name="run-debug" value="debug" autocomplete="off"> Debug ' +
-            '   </label> ' +
+            '<div class="switch-toggle switch-ios col-md-6">' +
+                '<input id="run" name="run-debug" checked type="radio" value="run">' +
+                '<label for="run" onclick="">Run</label>' +
+                '<input id="debug" name="run-debug" type="radio" value="debug">' +
+                '<label for="debug" onclick="">Debug</label>' +
+                '<a></a>' +
             '</div>' +
-            '<div class="col-md-2">' +
-            '   <button type="button" class="btn btn-primary pull-right" name="start">Start</button>' +
+            '<div class="col-md-4">' +
+            '   <button type="button" class="btn btn-primary pull-right btn-sm" name="start">Start</button>' +
             '</div>' +
             '<div class="col-md-12">' +
             '<label data-name="siddhi-app-start-msg">' +
@@ -461,7 +460,7 @@ define(['jquery', 'log', './simulator-rest-client', 'lodash', /* void libs */'bo
                 var mode = self.siddhiAppDetailsMap[siddhiAppName];
                 $form
                     .find('div[data-name="siddhi-app-name-mode"]')
-                    .html('mode : ' + mode);
+                    .html('Status : ' + mode);
                 $form
                     .find('label[data-name="siddhi-app-start-msg"]')
                     .html('Started siddhi app \'' +