From 2aff73e029c1f4e181a05e53183e310f4a75cc3b Mon Sep 17 00:00:00 2001
From: Erik Lindsay <erik.lindsay@uconn.edu>
Date: Mon, 24 Apr 2017 13:51:44 -0400
Subject: [PATCH] style and details enhancements

---
 Wello/www/css/main.css                     |  66 +++++----
 Wello/www/css/well-card.css                |   9 +-
 Wello/www/details-content.php              |   2 +-
 Wello/www/details.php                      |  17 ++-
 Wello/www/img/add.svg                      |  10 +-
 Wello/www/img/back.svg                     |  13 +-
 Wello/www/img/close.svg                    |  11 +-
 Wello/www/img/edit.svg                     |  14 +-
 Wello/www/img/gps.svg                      |  15 ++-
 Wello/www/img/list.svg                     |  13 ++
 Wello/www/img/map.svg                      |  14 +-
 Wello/www/img/menu.svg                     |  10 +-
 Wello/www/img/problem.svg                  |  13 +-
 Wello/www/img/search.svg                   |  14 +-
 Wello/www/img/{well.png => well-black.png} | Bin
 Wello/www/img/well-default.png             | Bin 0 -> 16689 bytes
 Wello/www/img/well-list.png                | Bin 0 -> 833 bytes
 Wello/www/map.php                          |  13 +-
 Wello/www/wells-list.php                   | 147 +++++++++------------
 19 files changed, 221 insertions(+), 160 deletions(-)
 create mode 100644 Wello/www/img/list.svg
 rename Wello/www/img/{well.png => well-black.png} (100%)
 create mode 100644 Wello/www/img/well-default.png
 create mode 100644 Wello/www/img/well-list.png

diff --git a/Wello/www/css/main.css b/Wello/www/css/main.css
index 2fbd39b..63aa9d5 100644
--- a/Wello/www/css/main.css
+++ b/Wello/www/css/main.css
@@ -1,3 +1,5 @@
+@import url('https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i');
+
 /*! HTML5 Boilerplate v5.3.0 | MIT License | https://html5boilerplate.com/ */
 /*
  * What follows is the result of much research on cross-browser styling.
@@ -10,7 +12,8 @@
 html {
   color: #222;
   font-size: 1em;
-  line-height: 1.4; }
+  line-height: 1.4; 
+}
 
 /*
  * Remove text-shadow in selection highlight:
@@ -84,6 +87,9 @@ textarea {
   box-sizing: border-box;
   font-family: "roboto";
 }
+body{
+width: 100vw;
+}
 main.intro{
     margin: 0;
     padding: 0;
@@ -132,6 +138,7 @@ nav h1{
     margin: 0 0;
 	font-size: 1.5rem;
 	margin-left: 1.25rem;
+	color: white;
 }
 h1.title{
   display: none;
@@ -164,6 +171,11 @@ div.slide-menu{
   box-shadow: 5px 0px 8px rgba(0, 0, 0, 0.35);
 }
 
+nav img{
+	max-width: 3rem;
+	width: 100%;
+}
+
 div.main-bttns{
     display: flex;
     align-items: center;
@@ -192,6 +204,15 @@ div.close-menu{
 h3{
   margin: 0;
   font-size: 1.25rem;
+	font-weight: 600;
+}
+h4{
+	font-weight: 400;
+	font-size: 1.1rem;
+	margin-bottom: 0;
+}
+p{
+	font-weight: 300;
 }
 a.settings{
  position: absolute;
@@ -273,29 +294,6 @@ button, a {
     button.gps img {
       width: 100%; }
 
-
-/*
-#map {
-  width: 100vw !important;
-  height: 100vh !important;
-  height: calc(100vh - 8.1rem); 
-}
-*/
-/*
-#map {
-        position: relative;
-        padding-bottom: 75%; // This is the aspect ratio
-        height: 0;
-        overflow: hidden;
-    }
-    #map iframe {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100% !important;
-        height: 100% !important;
-    }
-*/
 .google-maps {
         position: relative;
 	
@@ -311,24 +309,16 @@ button, a {
         height: 100% !important;
     }
 main{
-/*    margin-top: 4.1rem;*/
 	margin-top: 0;
 }
 
-/*
-main.map {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	flex-direction: column;
-}
-*/
 
 main.details {
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
     align-items: flex-start;
+	width: 100%;
 }
 nav.form a{
     text-decoration: none;
@@ -361,6 +351,10 @@ h2{
   border-bottom: 1px solid black;
 }
 
+h3{
+	font-weight: 500;
+}
+
 label {
   display: block;
   font-weight: 500;
@@ -459,9 +453,11 @@ div.group{
 main.search{
 	margin-top: 4.2rem;
 }
-
+main.details{
+	margin-top: 53px;
+}
 main.list{
-  margin-top: 66px;
+  margin-top: 64px;
   margin-bottom: 66px;
 }
 
diff --git a/Wello/www/css/well-card.css b/Wello/www/css/well-card.css
index 3516958..cf66c0f 100644
--- a/Wello/www/css/well-card.css
+++ b/Wello/www/css/well-card.css
@@ -8,15 +8,18 @@ div.well-card h2{
     border-bottom: none;
     margin: 0;
     font-size: 1rem;
+	color: black;
 }
 div.well-card p{
+	font-size: 1rem;
     border-bottom: none;
     margin-top: .25rem;
+	color: black;
 }
 div.well-card {
     border-bottom: 2px solid #4d4d4d;
     max-width: 41rem;
-	width: calc(100% - 16px);
+	width: 100%;
 	box-sizing: border-box;
 /*	display: block;*/
 /*	margin-left: 0;*/
@@ -24,7 +27,7 @@ div.well-card {
 }
 
 div.well-card .well-img{
-    background-image: url(https://s-media-cache-ak0.pinimg.com/originals/33/c2/c4/33c2c4cf367ecee38a162d362a31fd68.jpg);
+    background-image: url("../img/well-default.png");
     background-size: cover;
     background-position: center;
     float: left;
@@ -33,7 +36,7 @@ div.well-card .well-img{
 }
 
 a.search-result{
-	color: inherit;
+	color: black;
 }
 div.pending{
 	position: relative;
diff --git a/Wello/www/details-content.php b/Wello/www/details-content.php
index 306e55b..ef85173 100644
--- a/Wello/www/details-content.php
+++ b/Wello/www/details-content.php
@@ -1,6 +1,6 @@
 
 <div class="group">
-            <img src="https://s-media-cache-ak0.pinimg.com/originals/33/c2/c4/33c2c4cf367ecee38a162d362a31fd68.jpg"/>
+            <img src="img/well-default.png"/>
         <ul class="inputs" id="report-metadata">
             <li>
                 <h3>Date well completed</h3>
diff --git a/Wello/www/details.php b/Wello/www/details.php
index 9b0b895..f842fea 100644
--- a/Wello/www/details.php
+++ b/Wello/www/details.php
@@ -56,6 +56,19 @@ $query = "SELECT
 if ($result = $mysqli->query($query)) {
     $row = $result->fetch_assoc();
 }
+
+foreach ($row as $key => $value) {
+    if (is_null($value)) {
+         $row[$key] = "-";
+    } elseif ($value == ""){
+		$row[$key] = "-";
+	} elseif ($value == "1"){
+		$row[$key] = "yes";
+	} elseif ($value == "0"){
+		$row[$key] = "no";
+	}
+}
+
 ?>
 <!doctype html>
 <html class="no-js" lang="">
@@ -81,9 +94,9 @@ if ($result = $mysqli->query($query)) {
     <!-- Add your site or application content here -->
 
     <nav class="top-nav">
-        <button><a href="map.php"><img alt="back" src="img/back.svg" ></a></button> <h1>Details</h1>
+        <a href="map.php"><img alt="back" src="img/back.svg" ></a> <h1>Details</h1>
         <?php
-        echo'<button><a href="form.php?Well_ID='.$Well_ID.'"><img alt="edit" src="img/edit.svg" ></a></button>';
+        echo'<a href="form.php?Well_ID='.$Well_ID.'"><img alt="edit" src="img/edit.svg" ></a>';
         ?>
     </nav>
 <main class="details">
diff --git a/Wello/www/img/add.svg b/Wello/www/img/add.svg
index e6adf3e..fb83e2d 100644
--- a/Wello/www/img/add.svg
+++ b/Wello/www/img/add.svg
@@ -1 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M38 26H26v12h-4V26H10v-4h12V10h4v12h12v4z"/></svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M38,26H26v12h-4V26H10v-4h12V10h4v12h12V26z"/>
+</svg>
diff --git a/Wello/www/img/back.svg b/Wello/www/img/back.svg
index f41f60f..8fae69c 100644
--- a/Wello/www/img/back.svg
+++ b/Wello/www/img/back.svg
@@ -1,4 +1,11 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48">
-    <path d="M0 0h48v48h-48z" fill="none"/>
-    <path d="M40 22h-24.34l11.17-11.17-2.83-2.83-16 16 16 16 2.83-2.83-11.17-11.17h24.34v-4z"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M0,0h48v48H0V0z"/>
+<path class="st1" d="M40,22H15.7l11.2-11.2L24,8L8,24l16,16l2.8-2.8L15.7,26H40C40,26,40,22,40,22z"/>
 </svg>
diff --git a/Wello/www/img/close.svg b/Wello/www/img/close.svg
index 40b5e39..d88a43d 100644
--- a/Wello/www/img/close.svg
+++ b/Wello/www/img/close.svg
@@ -1 +1,10 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M38 12.83L35.17 10 24 21.17 12.83 10 10 12.83 21.17 24 10 35.17 12.83 38 24 26.83 35.17 38 38 35.17 26.83 24z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M38,12.8L35.2,10L24,21.2L12.8,10L10,12.8L21.2,24L10,35.2l2.8,2.8L24,26.8L35.2,38l2.8-2.8L26.8,24L38,12.8z"
+	/>
+</svg>
diff --git a/Wello/www/img/edit.svg b/Wello/www/img/edit.svg
index 887efc6..f9680c2 100644
--- a/Wello/www/img/edit.svg
+++ b/Wello/www/img/edit.svg
@@ -1,4 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48">
-    <path d="M6 34.5v7.5h7.5l22.13-22.13-7.5-7.5-22.13 22.13zm35.41-20.41c.78-.78.78-2.05 0-2.83l-4.67-4.67c-.78-.78-2.05-.78-2.83 0l-3.66 3.66 7.5 7.5 3.66-3.66z"/>
-    <path d="M0 0h48v48h-48z" fill="none"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:none;}
+</style>
+<path class="st0" d="M6,34.5V42h7.5l22.1-22.1l-7.5-7.5C28.1,12.4,6,34.5,6,34.5z M41.4,14.1c0.8-0.8,0.8-2.1,0-2.8l-4.7-4.7
+	c-0.8-0.8-2-0.8-2.8,0l-3.7,3.7l7.5,7.5C37.7,17.8,41.4,14.1,41.4,14.1z"/>
+<path class="st1" d="M0,0h48v48H0V0z"/>
 </svg>
diff --git a/Wello/www/img/gps.svg b/Wello/www/img/gps.svg
index 92991a7..4f8545b 100644
--- a/Wello/www/img/gps.svg
+++ b/Wello/www/img/gps.svg
@@ -1,4 +1,13 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48">
-    <path d="M0 0h48v48h-48z" fill="none"/>
-    <path d="M24 16c-4.42 0-8 3.58-8 8s3.58 8 8 8 8-3.58 8-8-3.58-8-8-8zm17.88 6c-.92-8.34-7.54-14.96-15.88-15.88v-4.12h-4v4.12c-8.34.92-14.96 7.54-15.88 15.88h-4.12v4h4.12c.92 8.34 7.54 14.96 15.88 15.88v4.12h4v-4.12c8.34-.92 14.96-7.54 15.88-15.88h4.12v-4h-4.12zm-17.88 16c-7.73 0-14-6.27-14-14s6.27-14 14-14 14 6.27 14 14-6.27 14-14 14z"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M0,0h48v48H0V0z"/>
+<path class="st1" d="M24,16c-4.4,0-8,3.6-8,8s3.6,8,8,8s8-3.6,8-8S28.4,16,24,16z M41.9,22C41,13.7,34.3,7,26,6.1V2h-4v4.1
+	C13.7,7,7,13.7,6.1,22H2v4h4.1C7,34.3,13.7,41,22,41.9V46h4v-4.1C34.3,41,41,34.3,41.9,26H46v-4H41.9z M24,38c-7.7,0-14-6.3-14-14
+	s6.3-14,14-14s14,6.3,14,14S31.7,38,24,38z"/>
 </svg>
diff --git a/Wello/www/img/list.svg b/Wello/www/img/list.svg
new file mode 100644
index 0000000..90a0b07
--- /dev/null
+++ b/Wello/www/img/list.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:none;}
+</style>
+<path class="st0" d="M8,21c-1.7,0-3,1.3-3,3s1.3,3,3,3s3-1.3,3-3S9.7,21,8,21z M8,9c-1.7,0-3,1.3-3,3s1.3,3,3,3s3-1.3,3-3S9.7,9,8,9
+	z M8,33.3c-1.5,0-2.7,1.2-2.7,2.7s1.2,2.7,2.7,2.7s2.7-1.2,2.7-2.7S9.5,33.3,8,33.3z M14,38h28v-4H14V38z M14,26h28v-4H14V26z
+	 M14,10v4h28v-4H14z"/>
+<path class="st1" d="M0,0h48v48H0V0z"/>
+</svg>
diff --git a/Wello/www/img/map.svg b/Wello/www/img/map.svg
index 13a1825..056cdfe 100644
--- a/Wello/www/img/map.svg
+++ b/Wello/www/img/map.svg
@@ -1,4 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48">
-    <path d="M41 6c-.11 0-.21.01-.31.05l-10.69 4.15-12-4.2-11.27 3.8c-.42.14-.73.5-.73.96v30.24c0 .55.45 1 1 1 .11 0 .21-.01.31-.05l10.69-4.15 12 4.2 11.28-3.79c.42-.15.72-.51.72-.97v-30.24c0-.55-.45-1-1-1zm-11 32l-12-4.21v-23.79l12 4.21v23.79z"/>
-    <path d="M0 0h48v48h-48z" fill="none"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:none;}
+</style>
+<path class="st0" d="M41,6c-0.1,0-0.2,0-0.3,0.1L30,10.2L18,6L6.7,9.8C6.3,9.9,6,10.3,6,10.8V41c0,0.5,0.4,1,1,1c0.1,0,0.2,0,0.3,0
+	L18,37.8L30,42l11.3-3.8c0.4-0.2,0.7-0.5,0.7-1V7C42,6.4,41.5,6,41,6z M30,38l-12-4.2V10l12,4.2V38z"/>
+<path class="st1" d="M0,0h48v48H0V0z"/>
 </svg>
diff --git a/Wello/www/img/menu.svg b/Wello/www/img/menu.svg
index 1e89193..6730912 100644
--- a/Wello/www/img/menu.svg
+++ b/Wello/www/img/menu.svg
@@ -1 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M6 36h36v-4H6v4zm0-10h36v-4H6v4zm0-14v4h36v-4H6z"/></svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M6,36h36v-4H6V36z M6,26h36v-4H6V26z M6,12v4h36v-4H6z"/>
+</svg>
diff --git a/Wello/www/img/problem.svg b/Wello/www/img/problem.svg
index 94b628d..86cbe9f 100644
--- a/Wello/www/img/problem.svg
+++ b/Wello/www/img/problem.svg
@@ -1,4 +1,11 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48">
-    <path d="M0 0h48v48h-48z" fill="none"/>
-    <path d="M2 42h44l-22-38-22 38zm24-6h-4v-4h4v4zm0-8h-4v-8h4v8z"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M0,0h48v48H0V0z"/>
+<path class="st1" d="M2,42h44L24,4L2,42z M26,36h-4v-4h4V36z M26,28h-4v-8h4V28z"/>
 </svg>
diff --git a/Wello/www/img/search.svg b/Wello/www/img/search.svg
index f71a497..2340de6 100644
--- a/Wello/www/img/search.svg
+++ b/Wello/www/img/search.svg
@@ -1,4 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48">
-    <path d="M31 28h-1.59l-.55-.55c1.96-2.27 3.14-5.22 3.14-8.45 0-7.18-5.82-13-13-13s-13 5.82-13 13 5.82 13 13 13c3.23 0 6.18-1.18 8.45-3.13l.55.55v1.58l10 9.98 2.98-2.98-9.98-10zm-12 0c-4.97 0-9-4.03-9-9s4.03-9 9-9 9 4.03 9 9-4.03 9-9 9z"/>
-    <path d="M0 0h48v48h-48z" fill="none"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:none;}
+</style>
+<path class="st0" d="M31,28h-1.6l-0.5-0.5c2-2.3,3.1-5.2,3.1-8.5c0-7.2-5.8-13-13-13S6,11.8,6,19s5.8,13,13,13
+	c3.2,0,6.2-1.2,8.5-3.1l0.5,0.5V31l10,10l3-3L31,28z M19,28c-5,0-9-4-9-9s4-9,9-9s9,4,9,9S24,28,19,28z"/>
+<path class="st1" d="M0,0h48v48H0V0z"/>
 </svg>
diff --git a/Wello/www/img/well.png b/Wello/www/img/well-black.png
similarity index 100%
rename from Wello/www/img/well.png
rename to Wello/www/img/well-black.png
diff --git a/Wello/www/img/well-default.png b/Wello/www/img/well-default.png
new file mode 100644
index 0000000000000000000000000000000000000000..26724874b3a19973f26b94d0d3ac319534f9ab0c
GIT binary patch
literal 16689
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
bY)ZKKdwJcKEMo_fTy}2P(Ma8D_V@n*ruV>F

literal 0
HcmV?d00001

diff --git a/Wello/www/img/well-list.png b/Wello/www/img/well-list.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b89ff9eb483174f8e94ea4e34417b0d9df8af70
GIT binary patch
literal 833
zcmV-H1HSx;P)<h;3K|Lk000e1NJLTq001Qb001Tk1^@s6Lkd!@00001b5ch_0Itp)
z=>Px%`$<GWR9Fe^m%nQiQ4q&(llTMiM<EGV8Wq7x5Czd#h^Rya8$tX7>_kaQt+cn(
z#zqi~g;;AuMG*xnMHDTJmPQogui&qEe!iPG$Gf-h?skv6HN_1~X5M$^&3t!uZ{H@V
zM5J1+?gYMxF7v`)@IRn^9ws+IzoPG*kEw}b-_dude3QR8SCb^UZ9r2Cp?>rp+HHAF
zgB39{;Z-YV4>}S{?l3k?y`wE_!n_Zi?DmMf`p@zGM<nGKPHGqE?w0I3m#~Rahr@C;
zQZUwoIF9y*NnKu_r1w(4M~xKVc67fVEXm(YpF@5xpVSzE0Y6xxKgP5cTfdYPz!rdm
z2L1=Tm7b&4*CwSY)tFkaWIN7q(mSPBfTooB1(Zxk?R1J9kRxUrP#qB_%W+n@MHQ>q
zAGekfRz&>cMf=oq2sQjO{x?*zQGXI9rQk~W0+8eAnbfOPeqeW?Q*J$nE&5~71^KU;
z^{gMDOHj#a^nB`ZhH@Ux4e&=-F1D#aa@KsTVl(8-2qU%+Bf@q8f?LT2_Fu9jYSel;
zY}V>qPVB0~hW2C79^Kk)wmGL=6Xf~z6bk!gK0|{2nWe_A&zHQSN#D<#Y<VGT!=sil
zPZM|?4aPxzN4<!L8l#0sxiYsJm&-(+av`5GXbYenQg^8NyG30KKQyO^ZHLrL8obKc
z<WbJNy0pTixE;T!aJQ~XeDM+ZSv=GnElkRln`~Y-jcTI)Ns(jAd`j#+rT;X1@sAk8
zHK~i}Y6AkRSHT2Rl?^4V7xtS!GI+}lv(t_Ool7Qqv8^M%$N*<m=q#Ff@p*YV!gQ{N
zvKGMKH{|8%7<;RY=Wvdpb}KbKpTtkrnX3V7SJcPOJ=M@J*`}vHr$kEkeGpwJa#^gO
zEEG15$FwG;hjlM%5B(_q5tmSgxk8g0u90qI_QZhX3A9Yn_gkIV!|j9qL+<0<@-zKn
zq`K8ScikSTyrb$(syC^;6KIf^`I3k|Q`gx1ra^&D!&4Nz9v1xvWbf&-L_xaD00000
LNkvXXu0mjftHzCT

literal 0
HcmV?d00001

diff --git a/Wello/www/map.php b/Wello/www/map.php
index f3dc091..2edd102 100644
--- a/Wello/www/map.php
+++ b/Wello/www/map.php
@@ -34,20 +34,9 @@
 
     <nav class="top-nav">
         <div class="main-bttns">
-        <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>
         <a href="search.php"><img src="img/search.svg" alt="menu" /></a>
         </div>
-        
-        <div class="close-menu closed" id="close-menu" onclick="document.getElementById('menu').classList.toggle('closed'); document.getElementById('close-menu').classList.toggle('closed')"></div>
-        <div class="slide-menu closed" id="menu">
-            
-                        
-            <button>Terrain</button>
-            <button>Satilite</button>
-            
-        
-        </div>
     </nav>
 
     <main class="map">
@@ -67,7 +56,7 @@
 
     <nav class="bottom-nav">
         <a href="map.php"><img src="img/map.svg" alt="menu" /></a>
-        <a href="wells-list.php"><img src="img/well.png" alt="menu" /></a>
+        <a href="wells-list.php"><img src="img/list.svg" alt="menu" /></a>
     </nav>
 
     <nav class="fabs">
diff --git a/Wello/www/wells-list.php b/Wello/www/wells-list.php
index d807e17..45cf6c3 100644
--- a/Wello/www/wells-list.php
+++ b/Wello/www/wells-list.php
@@ -13,55 +13,39 @@ $query = "SELECT CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddre
             LIMIT 10";
 
 ?>
-
-<!doctype html>
-<html class="no-js" lang="">
-
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title></title>
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="apple-touch-icon" href="apple-touch-icon.png">
-    <!-- Place favicon.ico in the root directory -->
-    <link rel="stylesheet" href="css/normalize.css">
-    <link rel="stylesheet" href="css/main.css">
-    <link rel="stylesheet" href="css/well-card.css">
-    <link rel="stylesheet" href="css/map-desktop.css">
-    <link rel="stylesheet" href="css/desktop.css">
-    
-    <script src="js/vendor/modernizr-2.8.3.min.js"></script>
-</head>
-
-
-
-
-
-
-<body>
-    <!--[if lt IE 8]>
+	<!doctype html>
+	<html class="no-js" lang="">
+
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="x-ua-compatible" content="ie=edge">
+		<title></title>
+		<meta name="description" content="">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="apple-touch-icon" href="apple-touch-icon.png">
+		<!-- Place favicon.ico in the root directory -->
+		<link rel="stylesheet" href="css/normalize.css">
+		<link rel="stylesheet" href="css/main.css">
+		<link rel="stylesheet" href="css/well-card.css">
+		<link rel="stylesheet" href="css/map-desktop.css">
+		<link rel="stylesheet" href="css/desktop.css">
+		<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">
-		<div class="main-bttns">
-        <button style="visibility:hidden" onclick="document.getElementById('menu').classList.toggle('closed'); document.getElementById('close-menu').classList.toggle('closed')"><img src="img/menu.svg" alt="menu" /></button><h1>Nearby Wells</h1>
-        <a href="search.php"><img src="img/search.svg" alt="menu" /></a>
-        </div>
-            
-        </div>
-    </nav>
-
-    <main class="list">
-		<h1 class="title">Nearby Wells</h1>
-    <?php
+		<!-- Add your site or application content here -->
+		<nav class="top-nav">
+			<div class="main-bttns">
+				<h1>Nearby Wells</h1>
+				<a href="search.php"> <img src="img/search.svg" alt="menu"> </a>
+			</div>
+		</nav>
+		<main class="list">
+			<h1 class="title">Nearby Wells</h1>
+			<?php
         if ($result = $mysqli->query($query)) {
 
             /* fetch associative array */
@@ -82,42 +66,33 @@ $query = "SELECT CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddre
             /* free result set */
             $result->free();
         }
-    ?>
-    </main>
-
-    <nav class="bottom-nav">
-        <a href="map.php"><img src="img/map.svg" alt="menu" /></a>
-        <a href="wells-list.php"><img src="img/well.png" alt="menu" /></a>
-    </nav>
-
-
-
-
-
-
-
-    <script src="https://code.jquery.com/jquery-1.12.0.min.js"></script>
-    <script>
-        window.jQuery || document.write('<script src="js/vendor/jquery-1.12.0.min.js"><\/script>')
-    </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');
-    </script>
-</body>
-
-</html>
+    ?> </main>
+		<nav class="bottom-nav">
+			<a href="map.php"><img src="img/map.svg" alt="menu" /></a>
+			<a href="wells-list.php"><img src="img/list.svg" alt="menu" /></a>
+		</nav>
+		<script src="https://code.jquery.com/jquery-1.12.0.min.js"></script>
+		<script>
+			window.jQuery || document.write('<script src="js/vendor/jquery-1.12.0.min.js"><\/script>')
+		</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');
+		</script>
+	</body>
+
+	</html>
\ No newline at end of file