From 30fc458a63e2b242dd87bc2daa9ee79c3a421893 Mon Sep 17 00:00:00 2001
From: Erik Lindsay <erik.lindsay@uconn.edu>
Date: Sun, 5 Mar 2017 11:50:27 -0500
Subject: [PATCH] things changed

---
 html-ONLY-site/css/main.css      | 42 ++++++++++++--
 html-ONLY-site/css/well-card.css |  5 +-
 html-ONLY-site/details.html      | 54 +++++++++---------
 html-ONLY-site/form.html         | 24 ++++----
 html-ONLY-site/index.html        | 21 ++++++-
 html-ONLY-site/js/main.js        |  8 +--
 html-ONLY-site/problems.html     | 97 --------------------------------
 html-ONLY-site/wells-list.html   |  1 -
 8 files changed, 102 insertions(+), 150 deletions(-)
 delete mode 100644 html-ONLY-site/problems.html

diff --git a/html-ONLY-site/css/main.css b/html-ONLY-site/css/main.css
index bbd7be5..57624a9 100644
--- a/html-ONLY-site/css/main.css
+++ b/html-ONLY-site/css/main.css
@@ -108,13 +108,20 @@ div.slide-menu{
   display: flex;
   flex-direction: column;
   padding: 1rem;
-  padding-top: 5rem;
+  //padding-top: 5rem;
   box-shadow: 5px 0px 8px rgba(0, 0, 0, 0.35);
 }
 div.slide-menu button{
-  position: fixed;
-  top: 0;
-  left: 0;
+ margin: 1rem 0;
+    text-align: left;
+    font-weight: 600;
+    font-size: 1.2rem;
+}
+div.slide-menu p{
+    //margin-top: rem;
+}
+div.slide-menu a{
+    //margin-top: 0rem;
 }
 div.close-menu{
     position: fixed;
@@ -130,6 +137,23 @@ a.settings{
  position: absolute;
   bottom: 2rem;
 }
+
+div.well-preview{
+    position: fixed;
+    top: 4.7rem;
+    width: 95vw;
+    background-color: white;
+    border: 2px solid black;
+    margin: .5rem;
+    border-radius: 3px;
+}
+div.well-preview a{
+    position: absolute;
+    right: 2rem;
+    font-weight: 600;
+    text-decoration: none;
+    color: #65b2ff;
+}
 div.slide-menu a{
 margin-bottom: 2rem;
   text-decoration: none;
@@ -182,14 +206,17 @@ button {
 main{
     margin-top: 4.1rem;
 }
-form {
+form, main.details {
     display: flex;
     flex-direction: column;
 
 }
-form ul, h2{
+form ul, h2, main.details ul{
     margin: 1rem
 }
+main.details li, main.details p{
+    margin: 0rem
+}
 
 label[for=well-picture] {
     display: flex;
@@ -239,6 +266,7 @@ input[type=number].med-num{
 
 textarea{
     width: 100%;
+    height: 10rem;
 }
 
 li input[type=number] {
@@ -280,6 +308,8 @@ input[type=search]{
   font-size: 1.2rem;
   border-radius: 5px;
 }
+main.details{
+}
 
 /* ==========================================================================
    Helper classes
diff --git a/html-ONLY-site/css/well-card.css b/html-ONLY-site/css/well-card.css
index 3e6ab58..e74d63a 100644
--- a/html-ONLY-site/css/well-card.css
+++ b/html-ONLY-site/css/well-card.css
@@ -8,7 +8,10 @@ div.well-card h2{
     border-bottom: none;
     margin: 0;
 }
-
+div.well-card p{
+    border-bottom: none;
+    margin-top: .25rem;
+}
 div.well-card {
     border-bottom: 2px solid #4d4d4d;
 }
diff --git a/html-ONLY-site/details.html b/html-ONLY-site/details.html
index 1d5faf9..7ff3e5b 100644
--- a/html-ONLY-site/details.html
+++ b/html-ONLY-site/details.html
@@ -35,62 +35,60 @@
         <button><a href="form.html"><img alt="edit" src="img/edit.svg" ></a></button>
     </nav>
 
-    <main>
-        <h3 for="well-picture">
+    <main class="details">
             <img src="img/add-img-icon.png"/>
-        </h3>
-        <input type="file" id="well-picture" accept="image/*">
 
         <ul class="inputs" id="report-metadata">
-            <li><h3 for="well-completion-date">Date well completed</h3>
-                <p type="date" id="well-completion-date">date</p>
+            <li><h3>Date well completed</h3>
+                <p id="well-completion-date">date</p>
             </li>
 
             <li>
-                <h3 for="report-completion-date">Date of report</h3>
-                <p type="date" id="report-completion-date">date</p>
+                <h3>Date of report</h3>
+                <p  id="report-completion-date">date</p>
             </li>
 
             <li>
-                <h3 for="permit-number">Permit number</h3>
-                <p type="number" min="1" id="permit-number" class="long-num">
+                <h3>Permit number</h3>
+                <p id="permit-number" class="long-num">364746</p>
             </li>
 
             <li>
-                <h3 for="registrant-number">Registrant number</h3>
-                <p type="number" min="1" id="registrant-number" class="long-num">
+                <h3>Registrant number</h3>
+                <p id="registrant-number" class="long-num">65146</p>
             </li>
 
             <li>
-                <h3 for="state-well-number">State well number</h3>
-                <p type="number" min="1" id="state-well-number" class="long-num">
+                <h3>State well number</h3>
+                <p id="state-well-number" class="long-num">380975</p>
             </li>
 
             <li>
-                <h3 for="other-number">Other number</h3>
-                <p type="number" min="1" id="other-number" class="long-num">
+                <h3>Other number</h3>
+                <p id="other-number" class="long-num">8960</p>
             </li>
         </ul>
 
 
         <h2>Owner Info</h2>
         <ul class="inputs" id="owner-info">
-            <li><h3 for="name">Name</h3>
-            <p type="text" id="name"></li>
+            <li><h3>Name</h3>
+                <p id="name">Joe</p>
+            </li>
 
             <li>
-                <h3 for="address">Address</h3>
-                <p type="text" id="address">
+                <h3>Address</h3>
+                <p id="address">98 Street rd</p>
             </li>
 
             <li>
-                <h3 for="town">Town</h3>
-                <p type="text" id="town">
+                <h3>Town</h3>
+                <p id="town">Storrs</p>
             </li>
 
             <li>
-                <h3 for="zip-code">Zip code</h3>
-                <p type="number" min="1" id="zip-code" class="med-num">
+                <h3 >Zip code</h3>
+                <p id="zip-code" class="med-num">584758</p>
             </li>
         </ul>
 
@@ -98,13 +96,13 @@ <h2>Well location</h2>
         <ul class="inputs" id="owner-info">
 
             <li>
-                <h3 for="address">Address</h3>
-                <p type="text" id="address">
+                <h3>Address</h3>
+                <p type="text" id="address">4 Street rd</p>
             </li>
 
             <li>
-                <h3 for="town">Town</h3>
-                <p type="text" id="town">
+                <h3>Town</h3>
+                <p type="text" id="town">Storrs</p>
             </li>
 
             <li>
diff --git a/html-ONLY-site/form.html b/html-ONLY-site/form.html
index 21b730f..eecd16a 100644
--- a/html-ONLY-site/form.html
+++ b/html-ONLY-site/form.html
@@ -117,9 +117,12 @@ <h2>Well location</h2>
             </li>
 
             <li id="get-gps-local">
-                <label for="gps-coordinates">GPS coordinates</label>
-                <input type="text" id="gps-coordinates">
-                <button onclick="getLocation()"><img alt="get location" src="img/gps.svg"></button>
+                <label for="gps-coordinates">GPS coordinates <button onclick="getLocation()"><img alt="get location" src="img/gps.svg"></button></label>
+                <label for="gps-coordinates">Latitude</label>
+                <input type="text" id="gps-coordinates-latitude">
+                <label for="gps-coordinates">Longitude</label>
+                <input type="text" id="gps-coordinates-longitude">
+                
             </li>
 
             <li>
@@ -208,6 +211,11 @@ <h2>Yield Test</h2>
                 <label for="yield-gpm">Yield</label>
                 <input type="number" min="1" id="yeld-gpm"> gallons per minute
             </li>
+            
+            <li>
+                <label for="yield-test-notes">Yield test notes</label>
+                <textarea id="yield-test-notes"></textarea>
+            </li>
 
         </ul>
 
@@ -277,15 +285,11 @@ <h2>Screen Details</h2>
 
         </ul>
 
-        <h2>Depth From Land To Surface</h2>
-        <ul class="inputs" id="depth-from-surface">
+        <h2>Other Notes</h2>
+        <ul class="inputs" id="notes">
 
             <li>
-                <input type="number" min="1"> feet
-                <input type="text">
-                <input type="number" min="1"> feet
-                <input type="text">
-                <input type="number" min="1"> feet
+                <textarea id="notes"></textarea>
             </li>
 
         </ul>
diff --git a/html-ONLY-site/index.html b/html-ONLY-site/index.html
index 8220c7b..ab09fa9 100644
--- a/html-ONLY-site/index.html
+++ b/html-ONLY-site/index.html
@@ -11,6 +11,7 @@
     <!-- 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">
     <script src="js/vendor/modernizr-2.8.3.min.js"></script>
 </head>
 
@@ -36,10 +37,16 @@
         
         <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">
-            <p>Currntly signed in as:
-                <h3>my.name@ct.gov</h3>
+            
+            <p>Currntly signed in as: <br>
+                
             </p>
+            <h3>my.name@ct.gov</h3>
             <a href="#">Logout</a>
+            
+            <button>Terrain</button>
+            <button>Satilite</button>
+            
             <a class="settings" href="#">Settings</a>
         
         </div>
@@ -52,13 +59,21 @@ <h3>my.name@ct.gov</h3>
         <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>
+            <div>
+                <h2>Well Name</h2>
+                <p>short well description</p>
+                <a href="details.html">DETAILS</a>
+            </div>
+        </div>
 
     </main>
 
     <nav class="bottom-nav">
         <button><a href="index.html"><img src="img/map.svg" alt="menu" /></a></button>
         <button><a href="wells-list.html"><img src="img/well.png" alt="menu" /></a></button>
-        <button><a href="problems.html"><img src="img/problem.svg" alt="menu" /></a></button>
     </nav>
 
     <nav class="fabs">
diff --git a/html-ONLY-site/js/main.js b/html-ONLY-site/js/main.js
index 97898c5..986d0d9 100644
--- a/html-ONLY-site/js/main.js
+++ b/html-ONLY-site/js/main.js
@@ -1,11 +1,11 @@
 function initMap() {
-        var uluru = {lat: -25.363, lng: 131.044};
+        var location = {lat: 41.812013, lng: -72.249019};
         var map = new google.maps.Map(document.getElementById('map'), {
-          zoom: 4,
-          center: uluru
+          zoom: 16,
+          center: location
         });
         var marker = new google.maps.Marker({
-          position: uluru,
+          position: location,
           map: map
         });
       }
diff --git a/html-ONLY-site/problems.html b/html-ONLY-site/problems.html
deleted file mode 100644
index 8f3559f..0000000
--- a/html-ONLY-site/problems.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!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">
-    
-    <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 onclick="document.getElementById('menu').classList.toggle('closed'); document.getElementById('close-menu').classList.toggle('closed')"><img src="img/menu.svg" alt="menu" /></button>
-        <button><a href="search.html"><img src="img/search.svg" alt="menu" /></a></button>
-        
-        <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">
-            <p>Currntly signed in as:
-                <h3>my.name@ct.gov</h3>
-            </p>
-            <a href="#">Logout</a>
-            <a class="settings" href="#">Settings</a>
-        
-        </div>
-    </nav>
-
-    <main>
-
-        <div class="well-card clearfix">
-            <div>
-                <h2>Problem Name</h2>
-                <p>problem description</p>
-            </div>
-        </div>
-
-    </main>
-
-    <nav class="bottom-nav">
-        <button><a href="index.html"><img src="img/map.svg" alt="menu" /></a></button>
-        <button><a href="wells-list.html"><img src="img/well.png" alt="menu" /></a></button>
-        <button><a href="problems.html"><img src="img/problem.svg" alt="menu" /></a></button>
-    </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>
diff --git a/html-ONLY-site/wells-list.html b/html-ONLY-site/wells-list.html
index ca0b862..07d5568 100644
--- a/html-ONLY-site/wells-list.html
+++ b/html-ONLY-site/wells-list.html
@@ -64,7 +64,6 @@ <h2>Well Name</h2>
     <nav class="bottom-nav">
         <button><a href="index.html"><img src="img/map.svg" alt="menu" /></a></button>
         <button><a href="wells-list.html"><img src="img/well.png" alt="menu" /></a></button>
-        <button><a href="problems.html"><img src="img/problem.svg" alt="menu" /></a></button>
     </nav>