Merge pull request #39 from mud-turtles-2014/sarah

Sarah

Author: thehumantaurch

app/assets/images/air.png

@@ -0,0 +1,9 @@
+$(document).ready(function(event){
+  $('.splash-search input[type=text]').keypress(function(event){
+    if (event.which == 13) {
+      evenet.preventDefault();
+      $('form').submit();
+      console.log("hi");
+    }
+  })
+})

app/assets/images/dwelling.png

@@ -1,11 +1,20 @@
 $(document).ready(function(){
+
+
+  $("#menu-toggle").click(function(e) {
+      e.preventDefault();
+      console.log("hello")
+      $("#wrapper").toggleClass("active");
+  });
+
   $('#expense_form').hide();
 
   $('#trip_form').on('click', 'input[type=submit]', function(event){
     $('#trip_form').hide();
     $('#expense_form').show();
   });
-  // $('input#expense_location_id').geocomplete();
+
+  $('input#expense_location_id').geocomplete();
 
   $('form').on('click','.add_fields', function(event){
     event.preventDefault();
@@ -19,7 +28,7 @@ $(document).ready(function(){
   // })
 
 $('body').on('click','.location',function(e){
-  // $(this).geocomplete();
+  $(this).geocomplete();
 });
 
 $('#expenses_grid').on('click','#add-expense', function(e){
@@ -30,7 +39,6 @@ $('#expenses_grid').on('click','#add-expense', function(e){
 });
 
 $('#expenses_grid').on('submit','#new_expense',function(e){
-
   e.preventDefault();
   $.ajax ({
     url: $(e.target).attr('action'),
@@ -40,15 +48,17 @@ $('#expenses_grid').on('submit','#new_expense',function(e){
     $('#expenses_grid').append(data);
     clearInputs();
   });
-
-});
 });
 
 clearInputs = function(){
   $("input[name='expense[usd_cost]'").val("");
   $("input[name='expense[location_id]'").val("");
   $("input[name='expense[cost]'").val("");
   $("input[name='expense[category_id]'").val("");
+  };
+});
+
+
+
 
-};
 

app/assets/images/home.png

@@ -1,4 +1,3 @@
-
 $(document).ready(function(){
   $('td#add').hide();
   $('tr').hover(