Merge remote-tracking branch 'origin/master'

etl12003 · Apr 22, 2017 · 5089ce8 · 5089ce8
2 parents 8150cad + 513d1ab
commit 5089ce8
Show file tree

Hide file tree

Showing 58 changed files with 61 additions and 5,612 deletions.
diff --git a/Wello/www/form.php b/Wello/www/form.php
@@ -18,21 +18,7 @@
     <script src="js/vendor/modernizr-2.8.3.min.js"></script>
 </head>
 
-
-
-
-
-
 <body>
-    <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-    <!-- Add your site or application content here -->
-
-
-
-
-
 
     <nav class="top-nav">
         <button><a href="map.php">Cancel</a></button>
@@ -45,7 +31,7 @@
             <img src="img/add-img-icon.png"/>
         </label>
         <input type="file" id="well-picture" accept="image/*">
-</div>
+        </div>
 		<div class="group">
         <ul class="inputs" id="report-metadata">
             <li><label for="well-completion-date">Date well completed</label>

diff --git a/Wello/www/map.html b/Wello/www/map.html
@@ -27,10 +27,6 @@
     <!-- Add your site or application content here -->
 
 
-
-
-
-
     <nav class="top-nav">
         <button onclick="document.getElementById('menu').classList.toggle('closed'); document.getElementById('close-menu').classList.toggle('closed')"><img src="img/menu.svg" alt="menu" /></button> <h1>Well Report App</h1>
         <button><a href="search.html"><img src="img/search.svg" alt="menu" /></a></button>

diff --git a/Wello/www/map.php b/Wello/www/map.php
@@ -1,5 +1,3 @@
-
-
 <!DOCTYPE html>
 <html class="no-js" lang="">
 
@@ -58,30 +56,9 @@
     </nav>
 
     <main class="map">
-<!--        <div style=""> -->
-<!--
-            <div id="map">
-                <iframe
-                  width="600"
-                  height="450"
-                  frameborder="0" style="border:0"
-                  src="https://www.google.com/maps/embed/v1/place?key=AIzaSyBmQZToyeMOBTd6KlJRFHzv-5sj7u_AidY
-                    &q=41.8077,-72.2540" allowfullscreen>
-                </iframe>
-
-            </div>
--->
-<!--        </div>-->
 
-		<div class="google-maps">
-			<iframe src="https://www.google.com/maps/embed?pb=!1m14!1m12!1m3!1d7098.94326104394!2d78.0430654485247!3d27.172909818538997!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!5e0!3m2!1sen!2s!4v1385710909804" width="600" height="450" frameborder="0" style="border:0"></iframe>
+		<div id="map" class="google-maps">
 		</div>
-
-<!--
-        <script async defer
-        src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCNSoPsxLd0LbvQaH9R6npO7jj-jKAXyQ4&callback=initMap">
-        </script>
--->
 
         <div class="well-preview well-card clearfix">
             <div class="well-img"></div>
@@ -122,21 +99,27 @@
     </script>
     <script src="js/plugins.js"></script>
     <script src="js/main.js"></script>
-    <!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
+
+
     <script>
-        (function (b, o, i, l, e, r) {
-            b.GoogleAnalyticsObject = l;
-            b[l] || (b[l] = function () {
-                (b[l].q = b[l].q || []).push(arguments)
-            });
-            b[l].l = +new Date;
-            e = o.createElement(i);
-            r = o.getElementsByTagName(i)[0];
-            e.src = 'https://www.google-analytics.com/analytics.js';
-            r.parentNode.insertBefore(e, r)
-        }(window, document, 'script', 'ga'));
-        ga('create', 'UA-XXXXX-X', 'auto');
-        ga('send', 'pageview');
+
+      function initMap() {
+        var myLatLng = {lat: -25.363, lng: 131.044};
+
+        var map = new google.maps.Map(document.getElementById('map'), {
+          zoom: 4,
+          center: myLatLng
+        });
+
+        var marker = new google.maps.Marker({
+          position: myLatLng,
+          map: map,
+          title: 'Hello World!'
+        });
+      }
+    </script>
+    <script async defer
+    src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCNSoPsxLd0LbvQaH9R6npO7jj-jKAXyQ4&callback=initMap">
     </script>
 </body>
 

diff --git a/Wello/www/multiplemarkers.php b/Wello/www/multiplemarkers.php
@@ -1,28 +1,28 @@
 
 
-// first we will need to work on getting the current location using the google maps API
+<!-- first we will need to work on getting the current location using the google maps API-->
 
-/// we can get the current location by using the functions form the geolocation.html
+<!-- we can get the current location by using the functions form the geolocation.html-->
 
 
-// now we use the geolocation to find the list of nearby locations
+<!--now we use the geolocation to find the list of nearby locations-->
 
-//https://developers.google.com/maps/documentation/javascript/store-locator?csw=1 is what we are using for reference
+<!--https://developers.google.com/maps/documentation/javascript/store-locator?csw=1 is what we are using for reference-->
 
 <html>
     <body>
         <script src = "http://maps.google.com/maps/api/js?sensor=false"></script>
-        <script src = "http://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.10.1.min.js"> < /scipt>
+        <script src = "http://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.10.1.min.js"> </scipt>
     <div id = "map" style = "width: 500pxl height: 400px; "> </div>
     <script>
 
-        // this will allow us to get the geolocation for where the user is
+//         this will allow us to get the geolocation for where the user is
     function getLocation(){
         if (navigator.geolocation){
             navigator.geolocation.getCurrentPostion(savePostion, postionError, {timeout:10000});
         }
         else{
-            //geolocation is not supported by the browser
+//            geolocation is not supported by the browser
         }
 
     }
@@ -37,15 +37,17 @@ function savePosition(position){
         $_post("geolocation.php", {lat: postion.coords.latitude, lng: position.coords.longitude});
     }
 
-        // once you get the geolocation: we proceed to getting a list of elements from my mysql database which we will use to find the array of  location
+//         once you get the geolocation: we proceed to getting a list of elements from my mysql database which we will use to find the array of  location
     </script>
 
-    var currentlocation = getLoaction(); // this is where the current location will be stored
+    var currentlocation = getLoaction();
+<!--        this is where the current location will be stored-->
 
         <script>
-        // this is where we shall put the functions that will make our array for us
-            // we will need to connect the database to this.. which is am not sure of how to do...
-        select id, (3959* acos(cos(radians(37))))* cos(radians(lat)) * cos(radians(lng) - radians(-122)) + sin(radians(37))* sin(radians(lat)))) AS distance from currentlocation HAVING distance <25  ORDER BY distance LIMIT 0, 20; // this statement gets us the closest 20 locations within the radius fo 25 miles to the coordinate
+//      this is where we shall put the functions that will make our array for us
+//             we will need to connect the database to this.. which is am not sure of how to do...
+        select id, (3959* acos(cos(radians(37))))* cos(radians(lat)) * cos(radians(lng) - radians(-122)) + sin(radians(37))* sin(radians(lat)))) AS distance from currentlocation HAVING distance <25  ORDER BY distance LIMIT 0, 20;
+//             this statement gets us the closest 20 locations within the radius fo 25 miles to the coordinate
 
 
 

diff --git a/html-ONLY-site/.editorconfig b/html-ONLY-site/.editorconfig
diff --git a/html-ONLY-site/.gitattributes b/html-ONLY-site/.gitattributes
diff --git a/html-ONLY-site/.gitignore b/html-ONLY-site/.gitignore