Skip to content

E
Evoksi
Commit 253cf050 by Uros Spasojevic
Options

added login 

added conditional stuff

TODO: edit entry in grid
parent 72845748
Showing with 150 additions and 93 deletions
build/development/Evoksi/classic/resources/Evoksi-all_2.css
...@@ -8256,16 +8256,8 @@ tr.x-grid-subtable-row { ...@@ -8256,16 +8256,8 @@ tr.x-grid-subtable-row {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
opacity: 1; opacity: 1;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:3 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:1 */
.evoksi-view-evoksi .x-toolbar { .x-btn {
background-color: #d7e9f5;
border: 1px solid #d7e9f5;
-webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 -1px 6px;
-moz-box-shadow: rgba(0, 0, 0, 0.7) 0 -1px 6px;
box-shadow: rgba(0, 0, 0, 0.7) 0 -1px 6px;
}
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:8 */
.evoksi-view-evoksi .x-toolbar .x-btn {
background-color: #1b72af; background-color: #1b72af;
border: 2px solid #1b72af; border: 2px solid #1b72af;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
...@@ -8274,96 +8266,77 @@ tr.x-grid-subtable-row { ...@@ -8274,96 +8266,77 @@ tr.x-grid-subtable-row {
-o-border-radius: 3px; -o-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:13 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:6 */
.evoksi-view-evoksi .x-toolbar .x-btn .x-btn-inner { .x-btn .x-btn-inner {
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:18 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:11 */
.evoksi-view-evoksi .x-toolbar .x-btn.x-btn-pressed, .x-btn.x-btn-pressed,
.evoksi-view-evoksi .x-toolbar .x-btn.x-btn-over, .x-btn.x-btn-over,
.evoksi-view-evoksi .x-toolbar .x-btn.x-btn-focus { .x-btn.x-btn-focus {
background-color: #ebeef0; background-color: #ebeef0 !important;
-webkit-box-shadow: none !important;
-moz-box-shadow: none !important;
box-shadow: none !important;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:24 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:17 */
.evoksi-view-evoksi .x-toolbar .x-btn.x-btn-pressed .x-btn-inner, .x-btn.x-btn-pressed .x-btn-inner,
.evoksi-view-evoksi .x-toolbar .x-btn.x-btn-over .x-btn-inner, .x-btn.x-btn-over .x-btn-inner,
.evoksi-view-evoksi .x-toolbar .x-btn.x-btn-focus .x-btn-inner { .x-btn.x-btn-focus .x-btn-inner {
color: #1b72af; color: #1b72af;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:33 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:28 */
.evoksi-view-evoksi .x-toolbar {
background-color: #d7e9f5;
border: 1px solid #d7e9f5;
-webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 -1px 6px;
-moz-box-shadow: rgba(0, 0, 0, 0.7) 0 -1px 6px;
box-shadow: rgba(0, 0, 0, 0.7) 0 -1px 6px;
}
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:36 */
.evoksi-window { .evoksi-window {
border: none; border: none;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:38 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:41 */
.evoksi-window .x-title div { .evoksi-window .x-title div {
font-weight: bold; font-weight: bold;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:43 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:46 */
.evoksi-window .x-splitter { .evoksi-window .x-splitter {
background-color: #5fa2dd; background-color: #5fa2dd;
cursor: default; cursor: default;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:50 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:53 */
.evoksi-window .x-panel:first-child .gmnoprint { .evoksi-window .x-panel:first-child .gmnoprint {
display: none; display: none;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:58 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:61 */
.evoksi-panel-body .x-panel-body { .evoksi-panel-body .x-panel-body {
background-color: #d7e9f5; background-color: #d7e9f5;
border-color: #d7e9f5; border-color: #d7e9f5;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:62 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:65 */
.evoksi-panel-body .x-panel-body > div { .evoksi-panel-body .x-panel-body > div {
margin: auto; margin: auto;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:66 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:69 */
.evoksi-panel-body .x-panel-body > div .x-field:first-child { .evoksi-panel-body .x-panel-body > div .x-field:first-child {
margin-top: 50px; margin-top: 50px;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:74 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:77 */
.evoksi-panel-body label span { .evoksi-panel-body label span {
border-bottom: 2px solid #1b72af; border-bottom: 2px solid #1b72af;
color: #1b72af; color: #1b72af;
font-weight: bold; font-weight: bold;
} width: 81px !important;
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:81 */
.evoksi-panel-body .x-form-item-body {
padding-left: 10px;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:85 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:85 */
.evoksi-panel-body .x-toolbar { .evoksi-panel-body .x-toolbar {
background-color: #d7e9f5; background-color: #d7e9f5;
border-color: #d7e9f5; border-color: #d7e9f5;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:89 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:90 */
.evoksi-panel-body .x-toolbar .x-btn {
background-color: #1b72af;
border: 2px solid #1b72af;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
}
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:94 */
.evoksi-panel-body .x-toolbar .x-btn .x-btn-inner {
color: #fff;
font-weight: bold;
}
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:99 */
.evoksi-panel-body .x-toolbar .x-btn.x-btn-pressed,
.evoksi-panel-body .x-toolbar .x-btn.x-btn-over,
.evoksi-panel-body .x-toolbar .x-btn.x-btn-focus {
background-color: #ebeef0;
}
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:105 */
.evoksi-panel-body .x-toolbar .x-btn.x-btn-pressed .x-btn-inner,
.evoksi-panel-body .x-toolbar .x-btn.x-btn-over .x-btn-inner,
.evoksi-panel-body .x-toolbar .x-btn.x-btn-focus .x-btn-inner {
color: #1b72af;
}
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:111 */
.evoksi-panel-body .x-toolbar .x-btn:last-child { .evoksi-panel-body .x-toolbar .x-btn:last-child {
margin-right: 50px; margin-right: 50px;
background-color: #a9364d; background-color: #a9364d;
...@@ -8374,48 +8347,79 @@ tr.x-grid-subtable-row { ...@@ -8374,48 +8347,79 @@ tr.x-grid-subtable-row {
-o-border-radius: 3px; -o-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:117 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:96 */
.evoksi-panel-body .x-toolbar .x-btn:last-child .x-btn-inner { .evoksi-panel-body .x-toolbar .x-btn:last-child .x-btn-inner {
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:122 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:101 */
.evoksi-panel-body .x-toolbar .x-btn:last-child.x-btn-pressed, .evoksi-panel-body .x-toolbar .x-btn:last-child.x-btn-pressed,
.evoksi-panel-body .x-toolbar .x-btn:last-child.x-btn-over, .evoksi-panel-body .x-toolbar .x-btn:last-child.x-btn-over,
.evoksi-panel-body .x-toolbar .x-btn:last-child.x-btn-focus { .evoksi-panel-body .x-toolbar .x-btn:last-child.x-btn-focus {
background-color: #ebeef0; background-color: #ebeef0;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:128 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:107 */
.evoksi-panel-body .x-toolbar .x-btn:last-child.x-btn-pressed .x-btn-inner, .evoksi-panel-body .x-toolbar .x-btn:last-child.x-btn-pressed .x-btn-inner,
.evoksi-panel-body .x-toolbar .x-btn:last-child.x-btn-over .x-btn-inner, .evoksi-panel-body .x-toolbar .x-btn:last-child.x-btn-over .x-btn-inner,
.evoksi-panel-body .x-toolbar .x-btn:last-child.x-btn-focus .x-btn-inner { .evoksi-panel-body .x-toolbar .x-btn:last-child.x-btn-focus .x-btn-inner {
color: #a9364d; color: #a9364d;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:136 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:115 */
.evoksi-panel-body .x-column-header-text-inner::after { .evoksi-panel-body .x-column-header-text-inner::after {
display: none; display: none;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:141 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:120 */
.evoksi-panel-body .x-grid { .evoksi-panel-body .x-grid {
margin-top: 20px; margin-top: 20px;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:145 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:124 */
.evoksi-panel-body .x-grid-body { .evoksi-panel-body .x-grid-body {
border: 1px solid #d0d0d0; border: 1px solid #d0d0d0;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:148 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:127 */
.evoksi-panel-body .x-grid-body .x-grid-item { .evoksi-panel-body .x-grid-body .x-grid-item {
border: none; border: none;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:151 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:130 */
.evoksi-panel-body .x-grid-body .x-grid-item-selected { .evoksi-panel-body .x-grid-body .x-grid-item-selected {
background-color: #fce7eb; background-color: #fce7eb;
border-color: #fce7eb; border-color: #fce7eb;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:157 */ /* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:136 */
.evoksi-panel-body .x-grid-body .x-grid-item-focused .x-grid-cell-inner::before { .evoksi-panel-body .x-grid-body .x-grid-item-focused .x-grid-cell-inner::before {
border: 1px solid #bf4c63; border: 1px solid #bf4c63;
} }
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:148 */
.evoksi-add-performer .x-title div {
font-weight: bold;
}
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:153 */
.evoksi-add-performer .x-panel-body {
padding: 40px 15px 0;
background-color: #d7e9f5;
border-color: #d7e9f5;
}
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:159 */
.evoksi-add-performer label {
width: 80px !important;
}
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:163 */
.evoksi-add-performer label span {
border-bottom: 2px solid #1b72af;
color: #1b72af;
font-weight: bold;
width: 43px !important;
}
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:171 */
.evoksi-add-performer .x-form-text-field-body-default {
min-width: 190px;
max-width: 190px;
}
/* /Users/uros/workspace/git/Evoksi/classic/sass/src/view/evoksi/Evoksi.scss:176 */
.evoksi-add-performer .x-toolbar {
background-color: #d7e9f5;
border-color: #d7e9f5;
}
/* /Users/uros/workspace/git/Evoksi/ext/classic/theme-base/sass/etc/mixins/frame.scss:187 */ /* /Users/uros/workspace/git/Evoksi/ext/classic/theme-base/sass/etc/mixins/frame.scss:187 */
.x-tab-navigation-top { .x-tab-navigation-top {
-webkit-border-radius: 0; -webkit-border-radius: 0;
......
classic.json
This source diff could not be displayed because it is too large. You can view the blob instead.
classic.jsonp
This source diff could not be displayed because it is too large. You can view the blob instead.
classic/src/view/evoksi/EvoksiController.js
...@@ -165,10 +165,15 @@ Ext.define('Evoksi.view.evoksi.EvoksiController', { ...@@ -165,10 +165,15 @@ Ext.define('Evoksi.view.evoksi.EvoksiController', {
performers: perf, performers: perf,
lat: marker.lat, lat: marker.lat,
lng: marker.lng, lng: marker.lng,
animation: google.maps.Animation.DROP, animation: google.maps.Animation.DROP
access: marker.access
}; };
if((marker.saved != undefined) && (marker.saved == false)) {
newMarker.access = dbref.ref().child('data').push().key
} else {
newMarker.access = marker.access;
}
var updates = {}; var updates = {};
updates['/data/' + newMarker.access] = newMarker; updates['/data/' + newMarker.access] = newMarker;
...@@ -212,15 +217,10 @@ Ext.define('Evoksi.view.evoksi.EvoksiController', { ...@@ -212,15 +217,10 @@ Ext.define('Evoksi.view.evoksi.EvoksiController', {
title: "", title: "",
description: "", description: "",
performers: [], performers: [],
animation: google.maps.Animation.DROP animation: google.maps.Animation.DROP,
saved: false
}; };
var updates = {};
updates['/data/' + key] = marker;
dbref.ref().update(updates);
markers.push(map.addMarker(marker)); markers.push(map.addMarker(marker));
}, },
mapready: function () { mapready: function () {
...@@ -229,30 +229,82 @@ Ext.define('Evoksi.view.evoksi.EvoksiController', { ...@@ -229,30 +229,82 @@ Ext.define('Evoksi.view.evoksi.EvoksiController', {
google.maps.event.addListener(map.gmap, 'click', function (e) { google.maps.event.addListener(map.gmap, 'click', function (e) {
map.fireEvent('click', e); map.fireEvent('click', e);
}); });
}
}
}
}
},
Ext.Ajax.request({ showLogin: function() {
url: dataURL, var me = this,
scope: this, map = me.getView();
success: function (data) { var loginWindow = Ext.create('Ext.panel.Panel', {
var info = Ext.decode(data.responseText); floating: true,
centered: true,
title: 'Login',
modal: true,
width: 300,
height: 400,
draggable: false,
maximizable: false,
items: [
{
xtype: 'textfield',
fieldLabel: 'Username'
},
{
xtype: 'textfield',
inputType: 'password',
fieldLabel: 'Password'
}
],
buttons: [
{
text: 'Login',
formBind: true,
handler: function() {
var username = loginWindow.items.items[0].value;
var password = loginWindow.items.items[1].value;
if (info != null) { if(username == 'admin' && password == 'cpAdmin01') {
Ext.Object.each(info, function (obj, index) { Ext.Ajax.request({
markers.push(map.addMarker(index)); url: dataURL,
}); scope: this,
success: function (data) {
var info = Ext.decode(data.responseText);
if (info != null) {
Ext.Object.each(info, function (obj, index) {
markers.push(map.addMarker(index));
});
}
} }
} });
}); loginWindow.hide();
} else {
}
} }
} }
} ]
} }).show();
}, },
logout: function() { logout: function() {
console.log('logout'); var i = markers.length;
while(i) {
i--;
markers[i].setMap(null);
}
markers = [];
this.showLogin();
}, },
init: function () { init: function () {
var me = this, var me = this,
map = me.getView(); map = me.getView();
this.showLogin();
} }
}); });
\ No newline at end of file
sass/example/bootstrap.json
This source diff could not be displayed because it is too large. You can view the blob instead.
sass/example/bootstrap.jsonp
This source diff could not be displayed because it is too large. You can view the blob instead.
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