Merge pull request #37 from mud-turtles-2014/dashboard_view

michellechu77 · michellechu77 · commit 02fe374c6585 · 2014-10-19T23:35:34.000-04:00
Remove duplicate stylesheet links
diff --git a/app/assets/javascripts/trip.js b/app/assets/javascripts/trip.js
@@ -5,7 +5,7 @@ $(document).ready(function(){
     $('#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 +19,7 @@ $(document).ready(function(){
   // })
 
 $('body').on('click','.location',function(e){
-  // $(this).geocomplete();
+  $(this).geocomplete();
 });
 
 $('#expenses_grid').on('click','#add-expense', function(e){
@@ -30,7 +30,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'),
diff --git a/app/assets/javascripts/wishlist.js b/app/assets/javascripts/wishlist.js
@@ -1,4 +1,3 @@
-
 $(document).ready(function(){
   $('td#add').hide();
   $('tr').hover(
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -2,19 +2,9 @@
 <html>
 <head>
   <title>GoBug</title>
-    %= stylesheet_link_tag    'application', media: 'all' %>
+    <%= stylesheet_link_tag    'application', media: 'all' %>
     <%= stylesheet_link_tag 'dashboard', media: 'all' %>
-    <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-    <script src="//code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
-    <script src="/jquery.geocomplete.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
-    <script src="http://maps.googleapis.com/maps/api/js?sensor=false&libraries=places"></script>
-    <%= javascript_include_tag 'application' %>
 
-
-    <%= stylesheet_link_tag    'application', media: 'all' %>
     <script src="http://maps.googleapis.com/maps/api/js?sensor=false&libraries=places"></script>
     <%= javascript_include_tag 'application' %>
     <script src="/jquery.geocomplete.js"></script>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`$(document).ready(function(){`
`3`	`2`	`$('td#add').hide();`
`4`	`3`	`$('tr').hover(`