Merge branch 'refs/heads/master' into Issue_1503_AngularJS

include/controllers/default/crunchbutton/view/index.php

@@ -12,6 +12,7 @@ class Controller_view extends Cana_Controller {
 		}
 		if (file_exists(c::config()->dirs->view.'default/crunchbutton/'.$file.'.phtml')) {
 			c::view()->layout('layout/blank');
+			c::view()->export = true;
 			c::view()->display($file, ['display' => true, 'filter' => false]);
 		}
 		exit;

include/views/default/crunchbutton/frontend/location.phtml

@@ -15,7 +15,7 @@
 		<table class="button-letseat-table" cellpadding="0" cellspacing="0">
 			<tr>
 				<td style="width: 100%;">
-					<input type="text" class="location-address" ng-enter="letsEat()" ng-model="location.form.address" placeholder="Enter your zip code or full address" autofocus>
+					<input type="text" class="location-address" ng-enter="letsEat()" ng-model="location.form.address" placeholder="Enter your zip code or full address"<?=$this->export ? '' : ' autofocus'?>>
 				</td>
 				<td>
 					<div class="location-detect">

include/views/default/crunchbutton/layout/html.body.phtml

@@ -8,10 +8,12 @@
 <div class="snap-drawers" ng-controller="SideMenuCtrl">
 	<div class="snap-drawer snap-drawer-left">
 		<div>
+			<div class="pushabutton-getfood"></div>
 			<ul>
 				<li><a href="javascript:;" ng-instant="navigation.link('/food-delivery')">Restaurants</a></li>
 				<li><a href="javascript:;" ng-instant="navigation.link('/location')">Change Location</a></li>
 				<li><a ng-show="navigation.account.user" href="javascript:;" ng-instant="navigation.link('/orders')">Order History</a></li>
+				<li><a ng-show="navigation.account.user" href="javascript:;" ng-instant="navigation.link('/orders')">Logout</a></li>
 				<li><a href="javascript:;" ng-click="navigation.link('/help')">Help</a></li>
 				<li><a href="javascript:;" ng-click="navigation.link('/legal')">Legal</a></li>
 				<? if (c::env() == 'beta' || c::env() == 'local') : ?>
@@ -37,7 +39,7 @@
 				
 				<div class="pacman-loading pacman-left"></div>
 
-				<div class="logo"><a href="javascript:;" ng-instant="navigation.link('/')"><div class="logo-img"></div></a></div>
+				<div class="logo"><a href="javascript:;" ng-instant="navigation.menu()"><div class="logo-img"></div></a></div>
 
 				<div title="Back" ng-show="navigation.buttons.back" class="nav-back" ng-instant="back()"></div>
 				<div title="Change location" ng-show="navigation.buttons.location" class="location-icon {{ navigation.page == 'home' && 'config-icon-desktop-hide' || '' }}" ng-instant="navigation.link('/location')"></div>

include/views/default/crunchbutton/layout/html.top.phtml

@@ -46,7 +46,7 @@ var _gmtServer = '<?=$utc_str?>';
 <? foreach (new DirectoryIterator(c::config()->dirs->view.'default/crunchbutton/frontend') as $fileInfo) : ?>
 	<? if (!$fileInfo->isDot()) : ?>
 		<script type="text/ng-template" id="assets/view/<?=$fileInfo->getBasename('.phtml')?>.html">
-			<?=file_get_contents($fileInfo->getPathname())?>
+			<?=$this->render('frontend/'.$fileInfo->getBasename('.phtml'))?>
 		</script>
 	<? endif ; ?>
 <? endforeach; ?>

www/assets/css/styles.revised.css

@@ -463,6 +463,7 @@ html {
 	left: 0;
 	width: auto;
 	height: auto;
+	overflow: hidden;
 }
 
 .snap-drawer {
@@ -515,6 +516,7 @@ html {
 		height: auto;
 		z-index: 2;
 		overflow: auto;
+		overflow-x:hidden;
 		-webkit-overflow-scrolling: touch;
 		-webkit-transform: translate3d(0, 0, 0);
 		   -moz-transform: translate3d(0, 0, 0);
@@ -532,6 +534,15 @@ html {
 		margin-top: -12px;
 		margin-right: 10px;
 	}
+	.pushabutton-getfood {
+		background: url(../images/pushabutton-getfood.png) no-repeat;
+		background-size: 163px;
+		height: 163px;
+		width: 163px;
+		margin: 0 auto;
+		margin-top: 25px;
+		margin-bottom: 25px;
+	}
 }