diff --git a/include/library/Crunchbutton/App.php b/include/library/Crunchbutton/App.php index 6447791ab..a76e9a597 100755 --- a/include/library/Crunchbutton/App.php +++ b/include/library/Crunchbutton/App.php @@ -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; } diff --git a/include/views/default/cockpit2/frontend/general/general-login.phtml b/include/views/default/cockpit2/frontend/general/general-login.phtml index a6967fc4e..6314ec373 100644 --- a/include/views/default/cockpit2/frontend/general/general-login.phtml +++ b/include/views/default/cockpit2/frontend/general/general-login.phtml @@ -9,7 +9,7 @@
Username: - + export) : ?>autofocus="autofocus" autocorrect="off" autocapitalize="off">
diff --git a/include/views/default/cockpit2/layout/html.bottom.phtml b/include/views/default/cockpit2/layout/html.bottom.phtml index 4e6a8a3b8..7e4a90e1b 100644 --- a/include/views/default/cockpit2/layout/html.bottom.phtml +++ b/include/views/default/cockpit2/layout/html.bottom.phtml @@ -1,6 +1,6 @@ - +
 
diff --git a/www/assets/cockpit/images/back-location.svg b/www/assets/cockpit/images/back-location.svg new file mode 100644 index 000000000..01f4ef2d5 --- /dev/null +++ b/www/assets/cockpit/images/back-location.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + diff --git a/www/assets/cockpit/images/menu-location.svg b/www/assets/cockpit/images/menu-location.svg new file mode 100644 index 000000000..c8e68becd --- /dev/null +++ b/www/assets/cockpit/images/menu-location.svg @@ -0,0 +1,39 @@ + + + + + + + + + + diff --git a/www/assets/cockpit/js/service.location.js b/www/assets/cockpit/js/service.location.js index 2cdd47afe..055cfe1c8 100644 --- a/www/assets/cockpit/js/service.location.js +++ b/www/assets/cockpit/js/service.location.js @@ -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; }); diff --git a/www/assets/cockpit/scss/cockpit.scss b/www/assets/cockpit/scss/cockpit.scss index 5030a3e92..ecf2ecfa2 100644 --- a/www/assets/cockpit/scss/cockpit.scss +++ b/www/assets/cockpit/scss/cockpit.scss @@ -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;