diff --git a/Wello/www/details-content.php b/Wello/www/details-content.php index 20901ca..8162e01 100644 --- a/Wello/www/details-content.php +++ b/Wello/www/details-content.php @@ -94,11 +94,6 @@ ?> -
  • -

    Zip code

    -

    STILLTODO

    -
  • -
  • Lot number

    @@ -206,10 +201,7 @@

    >>>>>> origin/master + echo $row['Drive_Shoe']; ?>

    @@ -235,7 +227,6 @@

    diff --git a/Wello/www/details.php b/Wello/www/details.php index 8efb2f6..212c531 100644 --- a/Wello/www/details.php +++ b/Wello/www/details.php @@ -1,9 +1,9 @@ query($query)) { $row = $result->fetch_assoc(); foreach ($row as &$value) { @@ -84,17 +121,20 @@
  • - +
  • - +
  • - +
  • @@ -103,22 +143,13 @@

    Owner Info

    @@ -127,22 +158,25 @@
  • - +
  • - +
  • - +
  • - +
  • @@ -151,41 +185,57 @@

    - + - +
  • - +
  • - +
  • - - +
  • @@ -195,33 +245,42 @@
    @@ -231,24 +290,36 @@
  • - hours + hours
  • - gallons per minute + gallons per minute
  • - +
  • @@ -258,17 +329,29 @@ @@ -278,45 +361,75 @@ @@ -326,7 +439,11 @@ diff --git a/Wello/www/js/main.js b/Wello/www/js/main.js index 294ca82..6069cba 100644 --- a/Wello/www/js/main.js +++ b/Wello/www/js/main.js @@ -24,3 +24,20 @@ function showPosition(position) { //x.innerHTML = "Latitude: " + position.coords.latitude + //"
    Longitude: " + position.coords.longitude; } + +//function getLoc() { +// if (navigator.geolocation) { +// navigator.geolocation.getCurrentPosition(showPos); +// } else { +// x.innerHTML = "Geolocation is not supported by this browser."; +// } +//} +// +//function showPos(position) { +// var cur[]; +// cur[0] = position.coords.latitude; +// cur [1] = position.coords.longitude; +// return cur; +// //x.innerHTML = "Latitude: " + position.coords.latitude + +// //"
    Longitude: " + position.coords.longitude; +//} \ No newline at end of file diff --git a/Wello/www/map.php b/Wello/www/map.php index 1353b84..4b31432 100644 --- a/Wello/www/map.php +++ b/Wello/www/map.php @@ -100,7 +100,7 @@ function initMap() { var map = new google.maps.Map(document.getElementById('map'), { center: new google.maps.LatLng(41.79947, -72.37209), - zoom: 12 + zoom: 15 }); var infoWindow = new google.maps.InfoWindow; @@ -118,13 +118,21 @@ function initMap() { var infowincontent = document.createElement('div'); var strong = document.createElement('strong'); - strong.textContent = name + strong.textContent = address infowincontent.appendChild(strong); infowincontent.appendChild(document.createElement('br')); + var text = document.createElement('text'); - text.textContent = address + text.textContent = name infowincontent.appendChild(text); + infowincontent.appendChild(document.createElement('br')); + + var clicker = document.createElement('a'); + var clickerText = document.createTextNode("go to details..."); + clicker.setAttribute('href',"http://wellreportapp.uconn.edu/details.php?Well_ID="+id); + clicker.appendChild(clickerText); + infowincontent.appendChild(clicker); var marker = new google.maps.Marker({ map: map, position: point diff --git a/Wello/www/mapERIK.php b/Wello/www/mapERIK.php new file mode 100644 index 0000000..717992e --- /dev/null +++ b/Wello/www/mapERIK.php @@ -0,0 +1,199 @@ + + + + + + + WRA | Map + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    +
    +
    +

    Well Name

    +

    short well description

    + DETAILS +
    +
    + +
    + go to > + +
    + +
    + + + + + + + + + + + + + + + + + diff --git a/test.html b/test.html new file mode 100644 index 0000000..b1bae78 --- /dev/null +++ b/test.html @@ -0,0 +1,180 @@ + + + + + + + WRA | Map + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    +
    +
    +

    Well Name

    +

    short well description

    + DETAILS +
    +
    + +
    + go to > + +
    + +
    + + + + + + + + + + + + + + + + +