Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@etl12003
etl12003 committed Mar 29, 2017
2 parents 02c894d + e5a55f7 commit 305252e
Show file tree
Hide file tree
Showing 13 changed files with 232 additions and 331 deletions.
6 changes: 3 additions & 3 deletions html-ONLY-site/css/desktop.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
display: flex;
justify-content: center;
}

main.search a{
color: inherit;
width: 50%;
}


}

Expand All @@ -44,4 +44,4 @@
flex-direction: column;
align-items: center;
}
}
}
12 changes: 6 additions & 6 deletions html-ONLY-site/css/map-desktop.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@media only screen and (min-width: 65em) {
/* Style adjustments for viewports that meet the condition */
/* Style adjustments for viewports that meet the condition */
nav.top-nav{
width: 5rem;
}
Expand All @@ -10,8 +10,8 @@
display: none;
}
nav .slide-menu{
}
}

nav.bottom-nav{
width: 5rem;
flex-direction: column;
Expand All @@ -33,7 +33,7 @@
right: auto;
display: none;
}

div.desk-details{
display: block;
position: fixed;
Expand All @@ -60,6 +60,6 @@
a.go-to{
float: right;
margin: 1rem;

}
}
}
4 changes: 2 additions & 2 deletions html-ONLY-site/css/well-card.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ a.search-result{
}

@media only screen and (min-width: 65em) {
}

}
119 changes: 70 additions & 49 deletions html-ONLY-site/details-content.php
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,74 @@

<div class="group">
<img src="https://s-media-cache-ak0.pinimg.com/originals/33/c2/c4/33c2c4cf367ecee38a162d362a31fd68.jpg"/>
<ul class="inputs" id="report-metadata">
<li><h3>Date well completed</h3>
<p id="well-completion-date">10/2/09</p>
<li>
<h3>Date well completed</h3>
<?php
//Should add ternary operator for nulls and blanks
$W_Completion_Date = date("m/d/Y", strtotime($row['Date_Well_Completed']));
echo'<p id="well-completion-date">'.$W_Completion_Date.'</p>';
?>
</li>

<li>
<h3>Date of report</h3>
<p id="report-completion-date">2/10/10</p>
<?php
//Should add ternary operator for nulls and blanks
$R_Completion_Date = date("m/d/Y", strtotime($row['Date_of_Report']));
echo'<p id="report-completion-date">'.$R_Completion_Date.'</p>';
?>
</li>

<li>
<h3>Permit number</h3>
<p id="permit-number" class="long-num">246724</p>
<?php
echo'<p id="permit-number" class="long-num">'.$Well_ID.'</p>';
?>
</li>

<li>
<h3>Registrant number</h3>
<p id="registrant-number" class="long-num">13</p>
<p id="registrant-number" class="long-num">STILLTODO</p>
</li>

<li>
<h3>State well number</h3>
<p id="state-well-number" class="long-num">n/a</p>
<?php
//Should add ternary operator for nulls and blanks
echo'<p id="state-well-number" class="long-num">'.$row['State_Well_No'].'</p>';
?>
</li>

<li>
<h3>Other number</h3>
<p id="other-number" class="long-num">n/a</p>
<?php
//Should add ternary operator for nulls and blanks
echo'<p id="other-number" class="long-num">'.$row['Other_No'].'</p>';
?>
</li>
</ul>
</div>
<div class="group">
<h2>Owner Info</h2>
<ul class="inputs" id="owner-info">
<li><h3>Name</h3>
<p id="name">University of Connecticut</p>
<p id="name">STILLTODO</p>
</li>

<li>
<h3>Address</h3>
<p id="address">321 Main st </p>
<p id="address">STILLTODO</p>
</li>

<li>
<h3>Town</h3>
<p id="town">Storrs</p>
<p id="town">STILLTODO</p>
</li>

<li>
<h3 >Zip code</h3>
<p id="zip-code" class="med-num">06235</p>
<p id="zip-code" class="med-num">STILLTODO</p>
</li>
</ul>
</div>
Expand All @@ -62,46 +78,52 @@

<li>
<h3>Address</h3>
<p id="address">Agronomy rd</p>
<?php
//Should add ternary operator for nulls and blanks
echo'<p id="address">'.$row['WellAddress'].'</p>';
?>
</li>

<li>
<h3>Town</h3>
<p id="town">Mansfield</p>
<?php
//Should add ternary operator for nulls and blanks
echo'<p id="town">'.$row['Well_Town'].'</p>';
?>
</li>

<li>
<h3>Zip code</h3>
<p id="zip-code" class="med-num">06235</p>
<p id="zip-code" class="med-num">STILLTODO</p>
</li>

<li>
<h3>Lot number</h3>
<p id="lot-number" class="med-num">n/a</p>
<p id="lot-number" class="med-num">STILLTODO</p>
</li>

<li id="get-gps-local">
<h3>GPS coordinates </h3>
<h4>Latitude</h4>
<p id="gps-coordinates-latitude">41.794161</p>
<p id="gps-coordinates-latitude">STILLTODO</p>
<h4 for="gps-coordinates">Longitude</h4>
<p id="gps-coordinates-longitude">-72.230273</p>
<p id="gps-coordinates-longitude">STILLTODO</p>

</li>

<li>
<h3 >Location relative to three permanent landmarks</h3>
<p id="relative-location">13ft from light post, 16ft from water drain, 28ft from large rock</p>
<p id="relative-location">STILLTODO</p>
</li>

<li>
<h3>Use</h3>
<p id="other-use-case" >Farm</p>
<p id="other-use-case">STILLTODO</p>
</li>

<li>
<h3>Drilling equipment</h3>
<p id="other-equipment" >Compressed Air Percussion</p>
<p id="other-equipment">STILLTODO</p>
</li>

</ul>
Expand All @@ -112,31 +134,31 @@
<ul class="inputs" id="casing-details">
<li>
<h3>Length</h3>
<p id="length">100 feet</p>
<p id="length">STILLTODO</p>
</li>
<li>
<h3>Diameter</h3>
<p id="diameter">6 inches</p>
<p id="diameter">STILLTODO</p>
</li>

<li>
<h3>Weight per foot</h3>
<p id="weight">17 lbs/feet</p>
<p id="weight">STILLTODO</p>
</li>

<li>
<h3>Threaded/Welded</h3>
<p> Threaded</p>
<p>STILLTODO</p>
</li>

<li>
<h3>Drive shoe</h3>
<p>yes</p>
<h3>Drive Shoe?</h3>
<p>STILLTODO</p>
</li>

<li>
<h3>Was casing grouted</h3>
<p>yes</p>
<h3>Casing Grouted?</h3>
<p>STILLTODO</p>
</li>
</ul>
</div>
Expand All @@ -145,21 +167,21 @@
<ul class="inputs" id="yield-test">
<li>
<h3>Method</h3>
<p id="method">Compressed Air</p>
<p id="method">STILLTODO</p>
</li>
<li>
<h3>Test duration</h3>
<p id="yield-hours">8 hours</p>
<p id="yield-hours">STILLTODO</p>
</li>

<li>
<h3>Yield</h3>
<p id="yeld-gpm">18 gallons per minute</p>
<p id="yeld-gpm">STILLTODO</p>
</li>

<li>
<h3>Yield test notes</h3>
<p id="yield-test-notes">Yield test was verry successful, and yielded lots of drinkable water.</p>
<p id="yield-test-notes">STILLTODO</p>
</li>

</ul>
Expand All @@ -169,17 +191,17 @@
<ul class="inputs" id="yield-test">
<li>
<h3>From land surface</h3>
<p id="water-from-surface">44 feet</p>
<p id="water-from-surface">STILLTODO</p>
</li>

<li>
<h3>During yield test</h3>
<p id="water-level-during-yield-test">90 feet</p>
<p id="water-level-during-yield-test">STILLTODO</p>
</li>

<li>
<h3>Depth of complete well</h3>
<p id="water-from-surface">620 feet</p>
<p id="water-from-surface">STILLTODO</p>
</li>

</ul>
Expand All @@ -189,44 +211,44 @@
<ul class="inputs" id="screen-details">
<li>
<h3>Make</h3>
<p type="text" id="make">n/a</p>
<p type="text" id="make">STILLTODO</p>
</li>

<li>
<h3>Length open to aquifier</h3>
<p id="length-open-to-aquifier">n/a</p>
<p id="length-open-to-aquifier">STILLTODO</p>
</li>

<li>
<h3>Slot size</h3>
<p id="slot-size">n/a</p>
<p id="slot-size">STILLTODO</p>
</li>

<li>
<h3>Diameter</h3>
<p id="diameter">n/a</p>
<p id="diameter">STILLTODO</p>
</li>

<li>
<h3>Gravel</h3>
<p>n/a</p>
<p>STILLTODO</p>
</li>

<li>
<h3>Diameter including gravel pack</h3>
<p id="diameter-including-gravel-pack">n/a</p>
<p id="diameter-including-gravel-pack">STILLTODO</p>
</li>

<li>
<h3>Gravel size</h3>
<p id="gravel-size">n/a</p>
<p id="gravel-size">STILLTODO</p>
</li>

<li>
<h3>Gravel pack location</h3>
<p id="gravel-pack-location-from">n/a</p>
<p id="gravel-pack-location-from">STILLTODO</p>
to
<p id="gravel-pack-location-to">n/a</p>
<p id="gravel-pack-location-to">STILLTODO</p>
</li>

</ul>
Expand All @@ -236,10 +258,9 @@
<ul class="inputs" id="notes">

<li>
<p id="notes">0 - 2 | topsoil <br> 2 - 54 | Fine compact sands with small stones <br> 54 - 73 | wet cay</p>
<p id="notes">STILLTODO</p>
</li>

</ul>
</div>
<p type="submit" value="Submit">
Loading

0 comments on commit 305252e

Please sign in to comment.