Some fixes for cockpit native
This commit is contained in:
arzynik
parent
19385398aa
commit
2bcd3fec75
@ -270,6 +270,7 @@ class Crunchbutton_App extends Cana_App {
|
||||
// debug shit
|
||||
if ($_REQUEST['_bundle']) {
|
||||
$config->bundle = true;
|
||||
$config->viewExport = true;
|
||||
}
|
||||
|
||||
$this
|
||||
@ -425,6 +426,10 @@ class Crunchbutton_App extends Cana_App {
|
||||
|
||||
parent::buildView($params);
|
||||
|
||||
if ($this->config()->viewExport) {
|
||||
$this->view()->export = true;
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<form ng-submit="login()">
|
||||
<div class="input-wrap">
|
||||
<span class="label">Username:</span>
|
||||
<span class="field"><input type="text" name="username" ng-model="username" autofocus="autofocus" autocorrect="off" autocapitalize="off"></span>
|
||||
<span class="field"><input type="text" name="username" ng-model="username" <? if (!$this->export) : ?>autofocus="autofocus"<? endif ; ?> autocorrect="off" autocapitalize="off"></span>
|
||||
</div>
|
||||
|
||||
<div class="input-wrap">
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
</head>
|
||||
|
||||
<body class="bg no-init">
|
||||
<body class="bg no-init" bgcolor="#202228">
|
||||
<div class="loader-wrap">
|
||||
<div class="loader-frame"><div class="loader"> </div></div>
|
||||
</div>
|
||||
|
||||
65
www/assets/cockpit/images/back-location.svg
Normal file
65
www/assets/cockpit/images/back-location.svg
Normal file
@ -0,0 +1,65 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="184.467 334.988 253.605 142.329" enable-background="new 184.467 334.988 253.605 142.329" xml:space="preserve">
|
||||
<g id="gyNqUs_1_">
|
||||
<g>
|
||||
<g>
|
||||
<path opacity="0.14" enable-background="new " d="M333.996,475.998c-23.496,0.003-47.024-0.742-70.476,0.271
|
||||
c-15.068,0.651-26.288-5.396-36.671-14.927c-15.568-14.289-28.36-30.847-39.968-48.408c-1.807-2.732-1.918-4.909-0.128-7.724
|
||||
c14.075-22.123,29.553-43.122,48.745-61.143c5.684-5.337,12.693-8.017,20.475-8.026c52.99-0.066,105.98-0.073,158.97-0.004
|
||||
c11.513,0.015,21.876,9.998,21.958,21.68c0.226,32.159,0.227,64.322,0.004,96.481c-0.085,12.116-10.466,21.723-22.924,21.769
|
||||
C387.319,476.062,360.658,475.996,333.996,475.998z M264.849,398.965c-0.466-0.014-0.933-0.024-1.398-0.039
|
||||
c0.053-3.32-0.088-6.658,0.21-9.956c0.327-3.614-1.539-3.966-4.461-3.971c-2.828-0.005-4.181,0.521-4.129,3.796
|
||||
c0.179,11.461,0.041,22.927,0.108,34.391c0.008,1.312-0.844,3.42,1.332,3.666c1.798,0.204,4.301,1.225,5.415-0.94
|
||||
c1.377-2.678,2.303-1.05,3.687-0.22c6.714,4.028,13.747,1.457,16.52-5.88c1.528-4.044,1.259-8.194,0.766-12.305
|
||||
C281.685,397.418,273.565,393.631,264.849,398.965z M385.11,426.339c-3.396-4.601-6.592-9.198-10.089-13.554
|
||||
c-1.734-2.16-1.521-3.57,0.336-5.441c3.088-3.113,5.94-6.461,8.963-9.787c-11.166-3.637-13.695,6.803-20.306,11.527
|
||||
c0-7.062-0.166-13.643,0.071-20.208c0.114-3.157-0.95-4.06-3.971-3.866c-2.479,0.159-4.425-0.123-4.36,3.521
|
||||
c0.212,11.812,0.103,23.629,0.061,35.444c-0.008,1.906,0.269,2.982,2.643,3.116c3.878,0.218,6.535-0.195,5.608-5.15
|
||||
c-0.471-2.508-0.349-5.453,2.689-6.141c2.596-0.587,3.203,2.436,4.126,4.05C374.019,425.336,377.803,428.941,385.11,426.339z
|
||||
M316.748,415.29c-0.01,0-0.021,0-0.028,0c0-2.663,0.12-5.331-0.022-7.986c-0.367-6.753-2.909-9.352-9.573-10.607
|
||||
c-3.57-0.673-6.99-0.141-10.302,0.847c-1.414,0.421-4.646,0.014-3.346,3.441c0.918,2.422,2.039,4.086,5.123,2.573
|
||||
c2.092-1.025,4.502-1.104,6.839-0.661c1.989,0.378,2.698,1.811,2.69,3.646c-0.008,2.146-1.752,1.526-2.935,1.685
|
||||
c-2.636,0.354-5.349,0.366-7.909,1.006c-3.922,0.977-7.072,2.989-7.338,7.635c-0.21,3.667,0.302,7.168,3.805,9.117
|
||||
c4.242,2.36,8.592,2.104,12.733-0.504c1.359-0.857,2.576-3.166,3.892,0.225c0.872,2.247,3.222,1.357,4.885,1.188
|
||||
c2.259-0.23,1.385-2.293,1.449-3.616C316.839,420.619,316.748,417.953,316.748,415.29z M324.395,412.417
|
||||
c0.138,11.912,9.421,18.331,20.333,14.294c3.473-1.285,3.604-3.854,2.876-6.369c-0.907-3.142-2.974-0.373-4.353-0.123
|
||||
c-3.595,0.65-7.187,1.371-9.142-2.634c-1.918-3.931-1.927-8.219,0.432-11.943c2.178-3.441,5.737-2.929,8.982-1.642
|
||||
c3.403,1.352,3.381-1.432,4.249-3.19c1.097-2.222-0.421-2.878-2.098-3.478C334.009,393.167,324.252,400.077,324.395,412.417z"/>
|
||||
<path fill="#FFFFFF" d="M264.849,398.965c8.716-5.334,16.836-1.547,18.047,8.543c0.493,4.109,0.762,8.261-0.766,12.305
|
||||
c-2.773,7.337-9.805,9.908-16.52,5.88c-1.383-0.83-2.309-2.458-3.687,0.22c-1.114,2.165-3.617,1.146-5.415,0.94
|
||||
c-2.175-0.246-1.324-2.354-1.332-3.665c-0.067-11.465,0.071-22.931-0.108-34.392c-0.051-3.275,1.301-3.801,4.129-3.796
|
||||
c2.922,0.005,4.788,0.357,4.461,3.971c-0.298,3.298-0.157,6.636-0.21,9.956c0.047,0.387,0.094,0.771,0.142,1.156
|
||||
C264.011,399.71,264.43,399.338,264.849,398.965z M275.128,412.111c-0.315-1.686-0.499-3.161-0.877-4.587
|
||||
c-0.763-2.886-2.542-4.725-5.69-4.37c-2.834,0.317-4.269,2.215-4.638,5.005c-0.373,2.814-0.37,5.637,0.24,8.389
|
||||
c0.555,2.505,2.304,4.063,4.899,4.184c2.41,0.11,4.091-1.269,4.851-3.503C274.492,415.527,274.757,413.721,275.128,412.111z"/>
|
||||
<path fill="#FFFFFF" d="M385.11,426.339c-7.309,2.604-11.093-1.003-14.229-6.487c-0.923-1.614-1.53-4.637-4.126-4.05
|
||||
c-3.038,0.688-3.16,3.633-2.689,6.141c0.927,4.955-1.73,5.368-5.608,5.15c-2.374-0.134-2.649-1.21-2.643-3.116
|
||||
c0.042-11.814,0.151-23.633-0.061-35.444c-0.063-3.644,1.882-3.363,4.36-3.521c3.021-0.193,4.085,0.709,3.971,3.866
|
||||
c-0.237,6.565-0.071,13.145-0.071,20.208c6.609-4.726,9.14-15.164,20.306-11.527c-3.021,3.326-5.875,6.674-8.963,9.787
|
||||
c-1.855,1.871-2.07,3.281-0.337,5.441C378.52,417.141,381.714,421.738,385.11,426.339z"/>
|
||||
<path fill="#FFFFFF" d="M316.748,415.29c0,2.663,0.091,5.329-0.039,7.985c-0.064,1.323,0.81,3.386-1.449,3.616
|
||||
c-1.663,0.171-4.013,1.061-4.885-1.188c-1.314-3.391-2.531-1.082-3.892-0.226c-4.142,2.608-8.491,2.865-12.733,0.505
|
||||
c-3.503-1.949-4.016-5.45-3.805-9.117c0.266-4.646,3.416-6.658,7.338-7.635c2.561-0.64,5.273-0.652,7.909-1.006
|
||||
c1.182-0.157,2.927,0.462,2.935-1.685c0.008-1.836-0.701-3.27-2.69-3.646c-2.337-0.442-4.747-0.363-6.839,0.662
|
||||
c-3.084,1.513-4.205-0.151-5.123-2.573c-1.3-3.429,1.932-3.021,3.346-3.441c3.312-0.987,6.732-1.521,10.302-0.847
|
||||
c6.664,1.256,9.206,3.854,9.573,10.607c0.144,2.655,0.022,5.323,0.022,7.986C316.729,415.29,316.738,415.29,316.748,415.29z
|
||||
M304.402,413.35c-2.107,0.409-5.719,0.359-5.988,4.688c-0.16,2.57,1.7,3.334,3.969,3.248c3.792-0.146,5.73-2.107,5.866-5.926
|
||||
C308.327,413.144,307.028,412.961,304.402,413.35z"/>
|
||||
<path fill="#FFFFFF" d="M324.395,412.417c-0.143-12.34,9.614-19.25,21.281-15.085c1.677,0.6,3.193,1.256,2.098,3.478
|
||||
c-0.868,1.76-0.846,4.542-4.249,3.19c-3.245-1.287-6.806-1.801-8.982,1.642c-2.357,3.726-2.35,8.014-0.432,11.943
|
||||
c1.955,4.005,5.547,3.284,9.142,2.634c1.379-0.25,3.444-3.019,4.354,0.123c0.729,2.515,0.596,5.084-2.877,6.369
|
||||
C333.814,430.748,324.531,424.329,324.395,412.417z"/>
|
||||
<path opacity="0.14" enable-background="new " d="M264.849,398.965c-0.419,0.373-0.838,0.745-1.257,1.117
|
||||
c-0.047-0.385-0.094-0.771-0.142-1.156C263.917,398.939,264.383,398.951,264.849,398.965z"/>
|
||||
<path opacity="0.14" enable-background="new " d="M275.128,412.111c-0.371,1.608-0.636,3.416-1.215,5.116
|
||||
c-0.76,2.234-2.441,3.613-4.851,3.503c-2.595-0.119-4.344-1.679-4.899-4.184c-0.609-2.752-0.612-5.573-0.24-8.389
|
||||
c0.369-2.79,1.803-4.688,4.638-5.005c3.148-0.354,4.927,1.484,5.69,4.37C274.629,408.95,274.813,410.427,275.128,412.111z"/>
|
||||
<path opacity="0.14" enable-background="new " d="M304.402,413.35c2.626-0.389,3.925-0.206,3.847,2.011
|
||||
c-0.136,3.817-2.074,5.78-5.866,5.926c-2.269,0.086-4.128-0.678-3.969-3.248C298.683,413.709,302.295,413.759,304.402,413.35z"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 6.4 KiB |
39
www/assets/cockpit/images/menu-location.svg
Normal file
39
www/assets/cockpit/images/menu-location.svg
Normal file
@ -0,0 +1,39 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="87.3px" height="56px" viewBox="0 0 87.3 56" style="enable-background:new 0 0 87.3 56;" xml:space="preserve">
|
||||
<path style="opacity:0.14;" d="M87.3,46c0,5.5-4.5,10-10,10H10C4.5,56,0,51.5,0,46V10C0,4.5,4.5,0,10,0h67.3c5.5,0,10,4.5,10,10V46z
|
||||
"/>
|
||||
<path style="fill:#FFFFFF;" d="M66,14.5c0,1.9-1.6,3.5-3.5,3.5H24.6c-1.9,0-3.5-1.6-3.5-3.5l0,0c0-1.9,1.6-3.5,3.5-3.5h37.9
|
||||
C64.4,11,66,12.6,66,14.5L66,14.5z"/>
|
||||
<path style="fill:#FFFFFF;" d="M66,28.5c0,1.9-1.6,3.5-3.5,3.5H24.6c-1.9,0-3.5-1.6-3.5-3.5l0,0c0-1.9,1.6-3.5,3.5-3.5h37.9
|
||||
C64.4,25,66,26.6,66,28.5L66,28.5z"/>
|
||||
<path style="fill:#FFFFFF;" d="M66,42.5c0,1.9-1.6,3.5-3.5,3.5H24.6c-1.9,0-3.5-1.6-3.5-3.5l0,0c0-1.9,1.6-3.5,3.5-3.5h37.9
|
||||
C64.4,39,66,40.6,66,42.5L66,42.5z"/>
|
||||
<g id="vOC7jN_1_" style="display:none;">
|
||||
|
||||
<image style="display:inline;overflow:visible;" width="101" height="74" id="vOC7jN_2_" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA
|
||||
EAMCAwYAAAJOAAADKgAABI3/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX
|
||||
Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa
|
||||
JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIAEoAZQMBIgACEQEDEQH/
|
||||
xACbAAACAwEBAAAAAAAAAAAAAAAAAQIDBAUGAQEBAQEAAAAAAAAAAAAAAAABAAIDEAABAwMDBAMB
|
||||
AAAAAAAAAAAAARECAwQFEBIWICITBiFBFTARAAECAgcFCAIDAAAAAAAAAAEAAhEDECExkRLSNHGB
|
||||
MpIzQdGi4hOTowQwUUBCghIAAQQDAQAAAAAAAAAAAAAAACARITEQMFAy/9oADAMBAAIRAxEAAADc
|
||||
o0c+mpZRzpWaMallQajKFreTQ1gioUW0230+X2XKNCTOtAXO53W5GaV2e8dAiqqbadal6Hzmxz31
|
||||
xSO0uKFs4OrLhd1F43iJpqto2S9f44T3x4Er3x4AL1Xlk8LuqvzqwZapQ+nOJIKJIzRcgYuUjUbE
|
||||
7TGT/9oACAECAAEFAE6nEEY7TtFZ3HEEVB4m6JJUdx9EVjeh5EJSdR9FcVz5PnX/2gAIAQMAAQUA
|
||||
XrUXqUXoRBhdGGEQRBuj4EYRj4P/2gAIAQEAAQUAcfoccccccRRyUkii1Zqu+Rvmb5izmb5m+Rvm
|
||||
b5iVJoU57kcrL2OOW2Bvrmjxi/OL5A4vkDi2QL7B3tjRcct10rL2vpZ+yVLe35WcsOWnLjJ+w1L6
|
||||
20t9Ky9rjlj65bV7Ti+POLY84rjziuOMv6/b2VnpQPqsvaOW+YyNtS5BlzkGXOQ5c5DmC6yt/eQ0
|
||||
oH1WXtccxFjjKmP/ADsefnY8/Nxx+bjj2Kzx1GwEKGk03RHHH6UEKMVRNFjFTxwPHA8cDxwPHA8U
|
||||
DxQEpQEpwQT+iCaf/9oACAECAgY/ANE5hElFEJo8js2r/9oACAEDAgY/AOH/AP/aAAgBAQEGPwD8
|
||||
sT2K2GxcRvXEb1xG9cRvXEb1xG9cRvXEb1beo30DbS2c0sY14i0PJiR+6mldSTzOyLqSeZ2RdSTz
|
||||
OyLqSeZ2RevNLHywQHFhJhGyOICl26gbaWSHyBM9MBrXB2GoVCrCVpfk8i0nyeRaT5PItJ8nkR+s
|
||||
2SJTHEF5xYiYGIFje2l26gbaZU6dMfjmtD4MIAAcIgVtK6k7mbkXUnczci6k7mbkXUnczcid9mRM
|
||||
ecBGJr4GIccNUAP3S7dQNtIlSZxbLbY0hrocwK1HgZlWo8DMq1HgZlWo8DMqEv7M4vYDHDBrRH/I
|
||||
FJ3UDbTJeJMua5zQZjnNDzj/ALCuPatLJ9tvctLJ9tvctLJ9tvctLJ9tvci9kqXJnhzfSwANLq6x
|
||||
BttVJ3UQFv44ntprCsVisVisVisViqH8D//Z" transform="matrix(1 0 0 1 -5 -10)">
|
||||
</image>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.8 KiB |
@ -64,7 +64,7 @@ NGApp.factory('LocationService', function($http, $resource, $rootScope) {
|
||||
track();
|
||||
|
||||
}, function() {
|
||||
alert('Your location services are off, or you declined location permissions. Please enable this.');
|
||||
//alert('Your location services are off, or you declined location permissions. Please enable this.');
|
||||
}, { enableHighAccuracy: true });
|
||||
}
|
||||
};
|
||||
@ -124,16 +124,15 @@ NGApp.factory('LocationService', function($http, $resource, $rootScope) {
|
||||
};
|
||||
|
||||
var interval = setInterval(track, 60000);
|
||||
|
||||
$rootScope.$on('userAuth', function(e, data) {
|
||||
// start watching if there is a user and their docs are filled out
|
||||
if (data.id_admin) {
|
||||
watch();
|
||||
}
|
||||
|
||||
var starToWatch = true;
|
||||
|
||||
if( $rootScope && $rootScope.account && $rootScope.account.restaurant ){
|
||||
starToWatch = false;
|
||||
}
|
||||
|
||||
if( starToWatch ){
|
||||
watch();
|
||||
}
|
||||
// stop watching if else
|
||||
});
|
||||
|
||||
return service;
|
||||
});
|
||||
|
||||
@ -36,7 +36,10 @@ body {
|
||||
body, input, textarea, button {
|
||||
font-family: "Open Sans", "Droid Sans", "Helvetica", "Arial", sans-serif;
|
||||
}
|
||||
body, .bg {
|
||||
body {
|
||||
background: $navColor;
|
||||
}
|
||||
.bg {
|
||||
background: $background;
|
||||
}
|
||||
|
||||
@ -91,7 +94,8 @@ html {
|
||||
}
|
||||
|
||||
* {
|
||||
-webkit-tap-highlight-color: rgba(205,69,29,.5);
|
||||
/*-webkit-tap-highlight-color: rgba(205,69,29,.5);*/
|
||||
-webkit-tap-highlight-color:rgba(0,0,0,0);
|
||||
}
|
||||
|
||||
@media screen and (min-width: 1025px) {
|
||||
@ -100,7 +104,6 @@ html {
|
||||
}
|
||||
.nav .content,
|
||||
.content-padding {
|
||||
/*max-width: 767px;*/
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
@ -151,7 +154,7 @@ html {
|
||||
}
|
||||
|
||||
.menu {
|
||||
background: url(../../images/micro/menu-location.svg) center center no-repeat;
|
||||
background: url(../images/menu-location.svg) center center no-repeat;
|
||||
background-size: 100%;
|
||||
width: 44px;
|
||||
height: 28px;
|
||||
@ -169,7 +172,7 @@ html {
|
||||
z-index : 0;
|
||||
cursor: pointer;
|
||||
margin: 8px 0 0 6px;
|
||||
background: url(../../images/micro/back-location.svg) center center no-repeat;
|
||||
background: url(../images/back-location.svg) center center no-repeat;
|
||||
background-size: 100%;
|
||||
width: 50px;
|
||||
height: 28px;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user