diff --git a/include/library/Crunchbutton/Community.php b/include/library/Crunchbutton/Community.php index 2b7637f30..39a5011b1 100644 --- a/include/library/Crunchbutton/Community.php +++ b/include/library/Crunchbutton/Community.php @@ -1,6 +1,9 @@ _restaurants)) { $this->_restaurants = Restaurant::q(' diff --git a/include/views/default/crunchbutton/layout/html.phtml b/include/views/default/crunchbutton/layout/html.phtml index 15298bac8..bc825f7c9 100755 --- a/include/views/default/crunchbutton/layout/html.phtml +++ b/include/views/default/crunchbutton/layout/html.phtml @@ -18,9 +18,29 @@ */ ?> + + + + + diff --git a/www/assets/css/style.css b/www/assets/css/style.css index d2a29f2e0..33bcfd53d 100644 --- a/www/assets/css/style.css +++ b/www/assets/css/style.css @@ -868,6 +868,14 @@ and (max-width : 768px) { .restaurant-item-title:first-child { margin-top: 10px; } + .cart-summary { + height: 30px; + background: red; + position: fixed; + width: 100%; + left: 0; + margin-top: -9px; + } } @media only screen @@ -950,8 +958,6 @@ and (min-width : 1024px) { position: absolute; margin-top: -4px; } - - } diff --git a/www/assets/js/app.js b/www/assets/js/app.js index 2114a0fe7..98a43f286 100644 --- a/www/assets/js/app.js +++ b/www/assets/js/app.js @@ -46,7 +46,9 @@ if (typeof(Ti) != 'undefined') { var triggerCache = arguments[2] ? true : false; $.getJSON(url,function(json) { if (triggerCache) { - $('body').triggerHandler('cache-item-loaded-' + arguments[2]); + setTimeout(function() { + $('body').triggerHandler('cache-item-loaded-' + arguments[2]); + },10); } complete(json); }); @@ -102,12 +104,17 @@ App.loadPaymentinfo = function() { } App.loadCommunity = function(id) { + if (id == 'brown' || id == 'santa-monica') { + $('.main-content-item').show(); + $('.main-content-item').html('coming soon'); + return; + } App.cache('Community',id, function() { App.community = App.cached['Community'][id]; console.log(App.community, id); if (!App.community.id_community) { $('.main-content-item').show(); - $('.main-content-item').html('invalid community'); + $('.main-content-item').html('just a sec...'); setTimeout(function() { App.page.community('yale'); @@ -180,6 +187,7 @@ App.page.restaurant = function(id) { document.title = App.restaurant.name; $('.main-content-item').html( + '
' + '