Marina's changes

classic/sass/src/view/evoksi/Evoksi.scss

-.evoksi-view-evoksi {
-    
-        .#{$prefix}toolbar {
-            background-color: #d7e9f5;
-            border: 1px solid #d7e9f5;
-            @include box-shadow(rgba(0, 0, 0, 0.7) 0 -1px 6px);
-    
-            .#{$prefix}btn {
+.#{$prefix}btn {
     background-color: #1b72af;
     background-color: #1b72af;
     border: 2px solid #1b72af;
     border: 2px solid #1b72af;
     @include border-radius(3px);
     @include border-radius(3px);
@@ -18,14 +11,24 @@
     &.#{$prefix}btn-pressed,
     &.#{$prefix}btn-pressed,
     &.#{$prefix}btn-over,
     &.#{$prefix}btn-over,
     &.#{$prefix}btn-focus {
     &.#{$prefix}btn-focus {
-                    background-color: #ebeef0;
-                    @include box-shadow(none);
+        background-color: #ebeef0 !important;
+        @include box-shadow(none !important);
 
 
         .#{$prefix}btn-inner {
         .#{$prefix}btn-inner {
             color: #1b72af;
             color: #1b72af;
         }
         }
     }
     }
+    &.#{$prefix}btn-pressed.#{$prefix}btn-focus {
+       // background-color: ;
     }
     }
+}
+
+.evoksi-view-evoksi {
+    
+        .#{$prefix}toolbar {
+            background-color: #d7e9f5;
+            border: 1px solid #d7e9f5;
+            @include box-shadow(rgba(0, 0, 0, 0.7) 0 -1px 6px);
     
     
         }
         }
     }
     }
@@ -75,38 +78,14 @@
                 border-bottom: 2px solid #1b72af;
                 border-bottom: 2px solid #1b72af;
                 color: #1b72af;
                 color: #1b72af;
                 font-weight: bold;
                 font-weight: bold;
+                width: 81px !important;
             }
             }
         }
         }
     
     
-        .#{$prefix}form-item-body {
-            padding-left: 10px;
-        }
-    
         .#{$prefix}toolbar {
         .#{$prefix}toolbar {
             background-color: #d7e9f5;
             background-color: #d7e9f5;
             border-color: #d7e9f5;
             border-color: #d7e9f5;
 
 
-            .#{$prefix}btn {
-                background-color: #1b72af;
-                border: 2px solid #1b72af;
-                @include border-radius(3px);
-    
-                .#{$prefix}btn-inner {
-                    color: #fff;
-                    font-weight: bold;
-                }
-    
-                &.#{$prefix}btn-pressed,
-                &.#{$prefix}btn-over,
-                &.#{$prefix}btn-focus {
-                    background-color: #ebeef0;
-                    @include box-shadow(none);
-    
-                    .#{$prefix}btn-inner {
-                        color: #1b72af;
-                    }
-                }
-            }
     
     
             .#{$prefix}btn:last-child {
             .#{$prefix}btn:last-child {
                 margin-right: 50px;
                 margin-right: 50px;
@@ -160,3 +139,41 @@
             }
             }
         }
         }
     }
     }
+
+.evoksi-add-performer {
+
+    .#{$prefix}title {
+
+        div {
+            font-weight: bold;
+        }
+    }
+
+    .#{$prefix}panel-body {
+        padding: 40px 15px 0;
+        background-color: #d7e9f5;
+        border-color: #d7e9f5;
+    }
+
+    label {
+
+        width: 80px !important;
+
+        span {
+            border-bottom: 2px solid #1b72af;
+            color: #1b72af;
+            font-weight: bold;
+            width: 43px !important;
+        }
+    }
+
+    .#{$prefix}form-text-field-body-default {
+        min-width: 190px;
+        max-width: 190px;
+    }
+
+    .#{$prefix}toolbar {
+        background-color: #d7e9f5;
+        border-color: #d7e9f5;
+    }
+}
\ No newline at end of file

classic/src/view/evoksi/EvoksiController.js

@@ -17,7 +17,9 @@ Ext.define('Evoksi.view.evoksi.EvoksiController', {
                     markerClick: function (marker) {
                     markerClick: function (marker) {
                         var store = this.getView().getViewModel().getStore('myStore');
                         var store = this.getView().getViewModel().getStore('myStore');
                         var first = true;
                         var first = true;
+                        if(marker.performers) {
                             store.loadData(marker.performers);
                             store.loadData(marker.performers);
+                        };
                         var win = Ext.create('Ext.window.Window', {
                         var win = Ext.create('Ext.window.Window', {
                             title: marker.title == "" ? "New event" : marker.title, // Marker title
                             title: marker.title == "" ? "New event" : marker.title, // Marker title
                             height: 600,
                             height: 600,
@@ -94,6 +96,7 @@ Ext.define('Evoksi.view.evoksi.EvoksiController', {
                                         var popup = Ext.create('Ext.panel.Panel', {
                                         var popup = Ext.create('Ext.panel.Panel', {
                                             floating: true,
                                             floating: true,
                                             centered: true,
                                             centered: true,
+                                            cls: 'evoksi-add-performer',
                                             title: 'Add performer',
                                             title: 'Add performer',
                                             modal: true,
                                             modal: true,
                                             width: 300,
                                             width: 300,