Skip to content
Browse files

revert this

  • Loading branch information...
1 parent d234f87 commit 83caff43cffc01ef0d20ebb16ec2f7fe8aafaafe @kimballfrank kimballfrank committed Nov 3, 2012
Showing with 264 additions and 127 deletions.
  1. +42 −0 webapp/public/css/kitchenly.css
  2. +24 −18 webapp/public/scripts/onload.js
  3. +102 −65 webapp/views/index.jade
  4. +96 −44 webapp/views/search.jade
View
42 webapp/public/css/kitchenly.css
@@ -258,6 +258,8 @@ a:hover.social-link {
box-sizing: border-box;
}
+
+
#calendar-picker th.buttons {
}
@@ -306,4 +308,44 @@ a:hover.social-link {
color: #fff;
text-decoration: none;
background: #44A1E1;
+}
+
+#calendar-picker th.day-of-week {
+ height: 24px;
+ line-height: 24px;
+ font-size: 12px;
+}
+
+#date-picker .popover {
+ width: 230px;
+ padding: 0px;
+}
+#date-picker .popover-title {
+ display: none;
+}
+
+#date-picker .popover .popover-inner, #date-picker .popover .popover-content {
+ padding: 0px;
+ margin: 0px;
+}
+
+#calendar-picker td.muted {
+ background: #ccc;
+}
+
+#calendar-picker td.muted a {
+ color: #928E88;
+}
+
+a.day {
+ display: block;
+ font-size: 14px;
+}
+
+a:hover.day {
+ text-decoration: none;
+ display: block;
+ background: #44A1E1;
+ color: #fff;
+
}
View
42 webapp/public/scripts/onload.js
@@ -1,22 +1,28 @@
$(document).ready(function() {
- $('#calendar-picker').hide();
-
- $('#date-time').focusin( function(){
- $('#calendar-picker').show();
- });
-
-// $('#date-time').focusout( function(){
-// $('#calendar-picker').hide();
-// });
-
-// $('.typeahead').typeahead({
-// source: function (query, process) {
-// return $.get('http://gd.geobytes.com/AutoCompleteCity?callback=?&q=',{query: query}, function (data) {
-// return process(data.options);
-// });
-// }
-// });
-
+
+ var calHTML = $('#calendar-picker-contain').html();
+ $('#calendar-picker-contain').remove();
+
+ $('#date-time').popover({
+ html: true,
+ content: calHTML
+ });
+
+ $('#date-time').blur( function(){
+ $('#date-time').popover('hide');
+ });
+
+
+ $('#guest-number-picker .dropdown-menu li a').click( function(){
+ $('#guest-number-picker .dropdown-menu li a').removeClass('active');
+ $(this).addClass('active');
+ $('#guest-number-picker .dropdown-toggle span.num').html($(this).html());
+ });
+
+
+
+
+// list of cities for typeahead feature
var cityList = ['Baltimore, MD', 'Boston, MA', 'New York, NY', 'Tampa Bay, FL', 'Chicago', 'Cleveland, OH', 'Detroit, MI', 'Kansas City, MO', 'Los Angeles, CA', 'Oakland, CA', 'Seattle, WA', 'Houston, TX ', 'Provo, UT', 'Salt Lake City, UT', 'Ogden, UT', 'Orem, UT', 'Sandy, UT', 'West Jordan, UT', 'Saint George, UT'].sort();
$('#location').typeahead({source: cityList, items:5});
});
View
167 webapp/views/index.jade
@@ -26,12 +26,13 @@ div.page-contain.container
span.add-on
span.ss-icon.ss-standard location
div#date-picker.input-append.pull-left
- input(type="input", placeholder="When do you want to eat?")#date-time.span4
+ input(type="input", rel="popover", data-placement="bottom", placeholder="When do you want to eat?")#date-time.span4
span.add-on
span.ss-icon.ss-standard date
div#guest-number-picker.btn-group.pull-left
- button.btn.dropdown-toggle.btn-large(data-toggle="dropdown") 1 Guest
+ button.btn.dropdown-toggle.btn-large(data-toggle="dropdown")
+ span.num 1 Guest
span.ss-icon.ss-standard.pull-right users
ul.dropdown-menu
li
@@ -53,67 +54,103 @@ div.page-contain.container
button.btn.btn-primary.btn-large.pull-left(type="submit") Search for Dinner
- div#calendar-picker.hide
- table.table-bordered.table-striped.table-collapsed
- thead
- tr
- th.buttons(colspan="7")
- div.btn-group
- a.btn
- i.icon-chevron-left
- a.btn.center-btn November 2012
- a.btn
- i.icon-chevron-right
- tr
- th Sun
- th Mon
- th Tue
- th Wed
- th Thu
- th Fri
- th Sat
-
- tbody
- tr
- td.muted 29
- td.muted 30
- td.muted 31
- td 1
- td 2
- td 3
- td 4
+ div#calendar-picker-contain
+ div#calendar-picker
+ table.table-bordered.table-striped.table-collapsed
+ thead
+ tr
+ th.buttons(colspan="7")
+ div.btn-group
+ a.btn
+ i.icon-chevron-left
+ a.btn.center-btn November 2012
+ a.btn
+ i.icon-chevron-right
+ tr
+ th.day-of-week Sun
+ th.day-of-week Mon
+ th.day-of-week Tue
+ th.day-of-week Wed
+ th.day-of-week Thu
+ th.day-of-week Fri
+ th.day-of-week Sat
- tr
- td 5
- td 6
- td 7
- td 8
- td 9
- td 10
- td 11
-
- tr
- td 12
- td 13
- td 14
- td 15
- td 16
- td 17
- td 18
-
- tr
- td 19
- td 20
- td 21
- td 22
- td 23
- td 24
- td 25
- tr
- td 26
- td 27
- td 28
- td 29
- td.muted 1
- td.muted 2
- td.muted 3
+ tbody
+ tr
+ td.muted
+ a.day(href='#') 29
+ td.muted
+ a.day(href='#') 30
+ td.muted
+ a.day(href='#') 31
+ td
+ a.day(href='#') 1
+ td
+ a.day(href='#') 2
+ td
+ a.day(href='#') 3
+ td
+ a.day(href='#') 4
+
+ tr
+ td
+ a.day(href='#') 5
+ td
+ a.day(href='#') 6
+ td
+ a.day(href='#') 7
+ td
+ a.day(href='#') 8
+ td
+ a.day(href='#') 9
+ td
+ a.day(href='#') 10
+ td
+ a.day(href='#') 11
+
+ tr
+ td
+ a.day(href='#') 12
+ td
+ a.day(href='#') 13
+ td
+ a.day(href='#') 14
+ td
+ a.day(href='#') 15
+ td
+ a.day(href='#') 16
+ td
+ a.day(href='#') 17
+ td
+ a.day(href='#') 18
+
+ tr
+ td
+ a.day(href='#') 19
+ td
+ a.day(href='#') 20
+ td
+ a.day(href='#') 21
+ td
+ a.day(href='#') 22
+ td
+ a.day(href='#') 23
+ td
+ a.day(href='#') 24
+ td
+ a.day(href='#') 25
+ tr
+ td
+ a.day(href='#') 26
+ td
+ a.day(href='#') 27
+ td
+ a.day(href='#') 28
+ td
+ a.day(href='#') 29
+ td.muted
+ a.day(href='#') 1
+ td.muted
+ a.day(href='#') 2
+ td.muted
+ a.day(href='#') 3
View
140 webapp/views/search.jade
@@ -53,47 +53,99 @@ div.page-contain.container
div.result-grid.container
div.row.result-row
- each user, index in users
- div.span3.result-box
- - if (typeof(user.venues) !== 'undefined' && user.venues.length > 0)
- img.result-main-img(src="#{user.venues[0].photo_url}")
- h4.result-title
- a(href="#result-modal-#{index}", data-toggle="modal") #{user.venues[0].name}
- span.price-range.pull-right //#{user.venues[0].price}
- div.venue
- i.icon-map-marker.icon-white
- - if (typeof(user.venues) !== 'undefined' && user.venues.length > 0 && user.venues[0].location)
- span #{user.venues[0].location.city}, #{user.venues[0].location.state}
-
- div.result-meta
- div.host-bio
- img.host-user-img.pull-left(src="#{user.photo_url}")
- div.host-name #{user.name.first_name} #{user.name.last_name}
- div.host-rating
- i.icon-star.icon-white
- i.icon-star.icon-white
- i.icon-star.icon-white
- i.icon-star.icon-white
-
- div.modal.hide(id="result-modal-#{index}")
- div.modal-header
- button.close(type="button", data-dismiss="modal") ×
- h3 #{user.venues[0].name}
- div.location
- i.icon-map-marker
- span.city-name #{user.venues[0].location.city}, #{user.venues[0].location.state}
-
- div.modal-body
- div.meta
- div.host-bio
-
- img.host-user-img-big.pull-left(src="#{user.photo_url}")
- div.host-name #{user.name.first_name} #{user.name.last_name}
- div.host-rating
- i.icon-star
- i.icon-star
- i.icon-star
- i.icon-star
-
- div.modal-footer
- a.btn.btn-primary.btn-large(href="#") Book It!
+ div.span3.result-box
+ img.result-main-img(src="http://placehold.it/140x140")
+ h4.result-title
+ a(href="#result-modal-1", data-toggle="modal") Dinner Title
+ span.price-range.pull-right$$$
+ div.venue
+ i.icon-map-marker.icon-white
+ span Park City
+
+ div.result-meta
+ div.host-bio
+ img.host-user-img.pull-left(src="img/melissa.png")
+ div.host-name Melissa Pearl Jones
+ div.host-rating
+ i.icon-star.icon-white
+ i.icon-star.icon-white
+ i.icon-star.icon-white
+ i.icon-star.icon-white
+
+ div.span3.result-box
+
+ img.result-main-img(src="http://placehold.it/140x140")
+ h4.result-title
+ a(href="#result-modal-1", data-toggle="modal") Dinner Title
+ span.price-range.pull-right $$$
+ div.venue
+ i.icon-map-marker.icon-white
+ span Park City
+
+ div.result-meta
+ div.host-bio
+ img.host-user-img(src="http://placehold.it/23x23") Bilbo Baggins
+ span.rating
+ i.icon-star.icon-white
+ i.icon-star.icon-white
+ i.icon-star.icon-white
+ i.icon-star.icon-white
+
+ div.span3.result-box
+
+ img.result-main-img(src="img/lasagna.jpg")
+ h4.result-title
+ a(href="#result-modal-1", data-toggle="modal") Dinner Title
+ span.price-range.pull-right $$$
+ div.venue
+ i.icon-map-marker.icon-white
+ span Park City
+
+ div.result-meta
+ div.host-bio
+ img.host-user-img(src="http://placehold.it/23x23") Bilbo Baggins
+ span.rating
+ i.icon-star.icon-white
+ i.icon-star.icon-white
+ i.icon-star.icon-white
+ i.icon-star.icon-white
+
+ div.span3.result-box
+ img.result-main-img(src="http://placehold.it/140x140")
+ h4.result-title
+ a(href="#result-modal-1", data-toggle="modal") Dinner Title
+ span.price-range.pull-right $$$
+ div.venue
+ i.icon-map-marker.icon-white
+ span Park City
+
+ div.result-meta
+ div.host-bio
+ img.host-user-img(src="http://placehold.it/23x23") Bilbo Baggins
+ span.rating
+ i.icon-star.icon-white
+ i.icon-star.icon-white
+ i.icon-star.icon-white
+ i.icon-star.icon-white
+
+ div#result-modal-1.modal.hide
+ div.modal-header
+ button.close(type="button", data-dismiss="modal")×
+ h3 Dinner Title
+ div.location
+ i.icon-map-marker
+ span.city-name Park City
+
+ div.modal-body
+ div.meta
+ div.host-bio
+ img.host-user-img-big.pull-left(src="img/melissa.png")
+ div.host-name Melissa Pearl Jones
+ div.host-rating
+ i.icon-star
+ i.icon-star
+ i.icon-star
+ i.icon-star
+
+ div.modal-footer
+ a.btn.btn-primary.btn-large(href="#") Book It!

0 comments on commit 83caff4

Please sign in to comment.
Something went wrong with that request. Please try again.