Skip to content

E
Evoksi
Commit 8a37e8c7 by uros.spasojevic
Options

Marina's changes

parent 3c2acc98
Showing with 73 additions and 53 deletions
classic/sass/src/view/evoksi/Evoksi.scss
.#{$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 !important;
@include box-shadow(none !important);
.#{$prefix}btn-inner {
color: #1b72af;
}
}
&.#{$prefix}btn-pressed.#{$prefix}btn-focus {
// background-color: ;
}
}
.evoksi-view-evoksi { .evoksi-view-evoksi {
.#{$prefix}toolbar { .#{$prefix}toolbar {
...@@ -5,28 +30,6 @@ ...@@ -5,28 +30,6 @@
border: 1px solid #d7e9f5; border: 1px solid #d7e9f5;
@include box-shadow(rgba(0, 0, 0, 0.7) 0 -1px 6px); @include box-shadow(rgba(0, 0, 0, 0.7) 0 -1px 6px);
.#{$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;
}
}
}
} }
} }
...@@ -68,45 +71,21 @@ ...@@ -68,45 +71,21 @@
} }
} }
} }
label { label {
span { span {
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;
...@@ -159,4 +138,42 @@ ...@@ -159,4 +138,42 @@
} }
} }
} }
} }
\ No newline at end of file
.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', { ...@@ -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;
store.loadData(marker.performers); if(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', { ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment