diff --git a/Wello/platforms/browser/cordova/build b/Wello/platforms/browser/cordova/build old mode 100644 new mode 100755 diff --git a/Wello/platforms/browser/cordova/clean b/Wello/platforms/browser/cordova/clean old mode 100644 new mode 100755 diff --git a/Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/content-disposition/index.js b/Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/content-disposition/index.js new file mode 100644 index 0000000..4a352dc --- /dev/null +++ b/Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/content-disposition/index.js @@ -0,0 +1,445 @@ +/*! + * content-disposition + * Copyright(c) 2014 Douglas Christopher Wilson + * MIT Licensed + */ + +'use strict' + +/** + * Module exports. + */ + +module.exports = contentDisposition +module.exports.parse = parse + +/** + * Module dependencies. + */ + +var basename = require('path').basename + +/** + * RegExp to match non attr-char, *after* encodeURIComponent (i.e. not including "%") + */ + +var encodeUriAttrCharRegExp = /[\x00-\x20"'\(\)*,\/:;<=>?@\[\\\]\{\}\x7f]/g + +/** + * RegExp to match percent encoding escape. + */ + +var hexEscapeRegExp = /%[0-9A-Fa-f]{2}/ +var hexEscapeReplaceRegExp = /%([0-9A-Fa-f]{2})/g + +/** + * RegExp to match non-latin1 characters. + */ + +var nonLatin1RegExp = /[^\x20-\x7e\xa0-\xff]/g + +/** + * RegExp to match quoted-pair in RFC 2616 + * + * quoted-pair = "\" CHAR + * CHAR = + */ + +var qescRegExp = /\\([\u0000-\u007f])/g; + +/** + * RegExp to match chars that must be quoted-pair in RFC 2616 + */ + +var quoteRegExp = /([\\"])/g + +/** + * RegExp for various RFC 2616 grammar + * + * parameter = token "=" ( token | quoted-string ) + * token = 1* + * separators = "(" | ")" | "<" | ">" | "@" + * | "," | ";" | ":" | "\" | <"> + * | "/" | "[" | "]" | "?" | "=" + * | "{" | "}" | SP | HT + * quoted-string = ( <"> *(qdtext | quoted-pair ) <"> ) + * qdtext = > + * quoted-pair = "\" CHAR + * CHAR = + * TEXT = + * LWS = [CRLF] 1*( SP | HT ) + * CRLF = CR LF + * CR = + * LF = + * SP = + * HT = + * CTL = + * OCTET = + */ + +var paramRegExp = /; *([!#$%&'\*\+\-\.0-9A-Z\^_`a-z\|~]+) *= *("(?:[ !\x23-\x5b\x5d-\x7e\x80-\xff]|\\[\x20-\x7e])*"|[!#$%&'\*\+\-\.0-9A-Z\^_`a-z\|~]+) */g +var textRegExp = /^[\x20-\x7e\x80-\xff]+$/ +var tokenRegExp = /^[!#$%&'\*\+\-\.0-9A-Z\^_`a-z\|~]+$/ + +/** + * RegExp for various RFC 5987 grammar + * + * ext-value = charset "'" [ language ] "'" value-chars + * charset = "UTF-8" / "ISO-8859-1" / mime-charset + * mime-charset = 1*mime-charsetc + * mime-charsetc = ALPHA / DIGIT + * / "!" / "#" / "$" / "%" / "&" + * / "+" / "-" / "^" / "_" / "`" + * / "{" / "}" / "~" + * language = ( 2*3ALPHA [ extlang ] ) + * / 4ALPHA + * / 5*8ALPHA + * extlang = *3( "-" 3ALPHA ) + * value-chars = *( pct-encoded / attr-char ) + * pct-encoded = "%" HEXDIG HEXDIG + * attr-char = ALPHA / DIGIT + * / "!" / "#" / "$" / "&" / "+" / "-" / "." + * / "^" / "_" / "`" / "|" / "~" + */ + +var extValueRegExp = /^([A-Za-z0-9!#$%&+\-^_`{}~]+)'(?:[A-Za-z]{2,3}(?:-[A-Za-z]{3}){0,3}|[A-Za-z]{4,8}|)'((?:%[0-9A-Fa-f]{2}|[A-Za-z0-9!#$&+\-\.^_`|~])+)$/ + +/** + * RegExp for various RFC 6266 grammar + * + * disposition-type = "inline" | "attachment" | disp-ext-type + * disp-ext-type = token + * disposition-parm = filename-parm | disp-ext-parm + * filename-parm = "filename" "=" value + * | "filename*" "=" ext-value + * disp-ext-parm = token "=" value + * | ext-token "=" ext-value + * ext-token = + */ + +var dispositionTypeRegExp = /^([!#$%&'\*\+\-\.0-9A-Z\^_`a-z\|~]+) *(?:$|;)/ + +/** + * Create an attachment Content-Disposition header. + * + * @param {string} [filename] + * @param {object} [options] + * @param {string} [options.type=attachment] + * @param {string|boolean} [options.fallback=true] + * @return {string} + * @api public + */ + +function contentDisposition(filename, options) { + var opts = options || {} + + // get type + var type = opts.type || 'attachment' + + // get parameters + var params = createparams(filename, opts.fallback) + + // format into string + return format(new ContentDisposition(type, params)) +} + +/** + * Create parameters object from filename and fallback. + * + * @param {string} [filename] + * @param {string|boolean} [fallback=true] + * @return {object} + * @api private + */ + +function createparams(filename, fallback) { + if (filename === undefined) { + return + } + + var params = {} + + if (typeof filename !== 'string') { + throw new TypeError('filename must be a string') + } + + // fallback defaults to true + if (fallback === undefined) { + fallback = true + } + + if (typeof fallback !== 'string' && typeof fallback !== 'boolean') { + throw new TypeError('fallback must be a string or boolean') + } + + if (typeof fallback === 'string' && nonLatin1RegExp.test(fallback)) { + throw new TypeError('fallback must be ISO-8859-1 string') + } + + // restrict to file base name + var name = basename(filename) + + // determine if name is suitable for quoted string + var isQuotedString = textRegExp.test(name) + + // generate fallback name + var fallbackName = typeof fallback !== 'string' + ? fallback && getlatin1(name) + : basename(fallback) + var hasFallback = typeof fallbackName === 'string' && fallbackName !== name + + // set extended filename parameter + if (hasFallback || !isQuotedString || hexEscapeRegExp.test(name)) { + params['filename*'] = name + } + + // set filename parameter + if (isQuotedString || hasFallback) { + params.filename = hasFallback + ? fallbackName + : name + } + + return params +} + +/** + * Format object to Content-Disposition header. + * + * @param {object} obj + * @param {string} obj.type + * @param {object} [obj.parameters] + * @return {string} + * @api private + */ + +function format(obj) { + var parameters = obj.parameters + var type = obj.type + + if (!type || typeof type !== 'string' || !tokenRegExp.test(type)) { + throw new TypeError('invalid type') + } + + // start with normalized type + var string = String(type).toLowerCase() + + // append parameters + if (parameters && typeof parameters === 'object') { + var param + var params = Object.keys(parameters).sort() + + for (var i = 0; i < params.length; i++) { + param = params[i] + + var val = param.substr(-1) === '*' + ? ustring(parameters[param]) + : qstring(parameters[param]) + + string += '; ' + param + '=' + val + } + } + + return string +} + +/** + * Decode a RFC 6987 field value (gracefully). + * + * @param {string} str + * @return {string} + * @api private + */ + +function decodefield(str) { + var match = extValueRegExp.exec(str) + + if (!match) { + throw new TypeError('invalid extended field value') + } + + var charset = match[1].toLowerCase() + var encoded = match[2] + var value + + // to binary string + var binary = encoded.replace(hexEscapeReplaceRegExp, pdecode) + + switch (charset) { + case 'iso-8859-1': + value = getlatin1(binary) + break + case 'utf-8': + value = new Buffer(binary, 'binary').toString('utf8') + break + default: + throw new TypeError('unsupported charset in extended field') + } + + return value +} + +/** + * Get ISO-8859-1 version of string. + * + * @param {string} val + * @return {string} + * @api private + */ + +function getlatin1(val) { + // simple Unicode -> ISO-8859-1 transformation + return String(val).replace(nonLatin1RegExp, '?') +} + +/** + * Parse Content-Disposition header string. + * + * @param {string} string + * @return {object} + * @api private + */ + +function parse(string) { + if (!string || typeof string !== 'string') { + throw new TypeError('argument string is required') + } + + var match = dispositionTypeRegExp.exec(string) + + if (!match) { + throw new TypeError('invalid type format') + } + + // normalize type + var index = match[0].length + var type = match[1].toLowerCase() + + var key + var names = [] + var params = {} + var value + + // calculate index to start at + index = paramRegExp.lastIndex = match[0].substr(-1) === ';' + ? index - 1 + : index + + // match parameters + while (match = paramRegExp.exec(string)) { + if (match.index !== index) { + throw new TypeError('invalid parameter format') + } + + index += match[0].length + key = match[1].toLowerCase() + value = match[2] + + if (names.indexOf(key) !== -1) { + throw new TypeError('invalid duplicate parameter') + } + + names.push(key) + + if (key.indexOf('*') + 1 === key.length) { + // decode extended value + key = key.slice(0, -1) + value = decodefield(value) + + // overwrite existing value + params[key] = value + continue + } + + if (typeof params[key] === 'string') { + continue + } + + if (value[0] === '"') { + // remove quotes and escapes + value = value + .substr(1, value.length - 2) + .replace(qescRegExp, '$1') + } + + params[key] = value + } + + if (index !== -1 && index !== string.length) { + throw new TypeError('invalid parameter format') + } + + return new ContentDisposition(type, params) +} + +/** + * Percent decode a single character. + * + * @param {string} str + * @param {string} hex + * @return {string} + * @api private + */ + +function pdecode(str, hex) { + return String.fromCharCode(parseInt(hex, 16)) +} + +/** + * Percent encode a single character. + * + * @param {string} char + * @return {string} + * @api private + */ + +function pencode(char) { + var hex = String(char) + .charCodeAt(0) + .toString(16) + .toUpperCase() + return hex.length === 1 + ? '%0' + hex + : '%' + hex +} + +/** + * Quote a string for HTTP. + * + * @param {string} val + * @return {string} + * @api private + */ + +function qstring(val) { + var str = String(val) + + return '"' + str.replace(quoteRegExp, '\\$1') + '"' +} + +/** + * Encode a Unicode string for HTTP (RFC 5987). + * + * @param {string} val + * @return {string} + * @api private + */ + +function ustring(val) { + var str = String(val) + + // percent encode as UTF-8 + var encoded = encodeURIComponent(str) + .replace(encodeUriAttrCharRegExp, pencode) + + return 'UTF-8\'\'' + encoded +} + +/** + * Class for parsed Content-Disposition header for v8 optimization + */ + +function ContentDisposition(type, parameters) { + this.type = type + this.parameters = parameters +} diff --git a/Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/cookie/index.js b/Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/cookie/index.js new file mode 100644 index 0000000..b705b2c --- /dev/null +++ b/Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/cookie/index.js @@ -0,0 +1,156 @@ +/*! + * cookie + * Copyright(c) 2012-2014 Roman Shtylman + * Copyright(c) 2015 Douglas Christopher Wilson + * MIT Licensed + */ + +/** + * Module exports. + * @public + */ + +exports.parse = parse; +exports.serialize = serialize; + +/** + * Module variables. + * @private + */ + +var decode = decodeURIComponent; +var encode = encodeURIComponent; + +/** + * RegExp to match field-content in RFC 7230 sec 3.2 + * + * field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ] + * field-vchar = VCHAR / obs-text + * obs-text = %x80-FF + */ + +var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/; + +/** + * Parse a cookie header. + * + * Parse the given cookie header string into an object + * The object has the various cookies as keys(names) => values + * + * @param {string} str + * @param {object} [options] + * @return {object} + * @public + */ + +function parse(str, options) { + if (typeof str !== 'string') { + throw new TypeError('argument str must be a string'); + } + + var obj = {} + var opt = options || {}; + var pairs = str.split(/; */); + var dec = opt.decode || decode; + + pairs.forEach(function(pair) { + var eq_idx = pair.indexOf('=') + + // skip things that don't look like key=value + if (eq_idx < 0) { + return; + } + + var key = pair.substr(0, eq_idx).trim() + var val = pair.substr(++eq_idx, pair.length).trim(); + + // quoted values + if ('"' == val[0]) { + val = val.slice(1, -1); + } + + // only assign once + if (undefined == obj[key]) { + obj[key] = tryDecode(val, dec); + } + }); + + return obj; +} + +/** + * Serialize data into a cookie header. + * + * Serialize the a name value pair into a cookie string suitable for + * http headers. An optional options object specified cookie parameters. + * + * serialize('foo', 'bar', { httpOnly: true }) + * => "foo=bar; httpOnly" + * + * @param {string} name + * @param {string} val + * @param {object} [options] + * @return {string} + * @public + */ + +function serialize(name, val, options) { + var opt = options || {}; + var enc = opt.encode || encode; + + if (!fieldContentRegExp.test(name)) { + throw new TypeError('argument name is invalid'); + } + + var value = enc(val); + + if (value && !fieldContentRegExp.test(value)) { + throw new TypeError('argument val is invalid'); + } + + var pairs = [name + '=' + value]; + + if (null != opt.maxAge) { + var maxAge = opt.maxAge - 0; + if (isNaN(maxAge)) throw new Error('maxAge should be a Number'); + pairs.push('Max-Age=' + maxAge); + } + + if (opt.domain) { + if (!fieldContentRegExp.test(opt.domain)) { + throw new TypeError('option domain is invalid'); + } + + pairs.push('Domain=' + opt.domain); + } + + if (opt.path) { + if (!fieldContentRegExp.test(opt.path)) { + throw new TypeError('option path is invalid'); + } + + pairs.push('Path=' + opt.path); + } + + if (opt.expires) pairs.push('Expires=' + opt.expires.toUTCString()); + if (opt.httpOnly) pairs.push('HttpOnly'); + if (opt.secure) pairs.push('Secure'); + + return pairs.join('; '); +} + +/** + * Try decoding a string using a decoding function. + * + * @param {string} str + * @param {function} decode + * @private + */ + +function tryDecode(str, decode) { + try { + return decode(str); + } catch (e) { + return str; + } +} diff --git a/Wello/platforms/browser/cordova/run b/Wello/platforms/browser/cordova/run old mode 100644 new mode 100755 diff --git a/Wello/platforms/browser/cordova/version b/Wello/platforms/browser/cordova/version old mode 100644 new mode 100755 diff --git a/html-ONLY-site/css/desktop.css b/html-ONLY-site/css/desktop.css new file mode 100644 index 0000000..146eeaa --- /dev/null +++ b/html-ONLY-site/css/desktop.css @@ -0,0 +1,47 @@ +@media only screen and (min-width: 40.75em) { + div.well-card { + border: 2px solid #4d4d4d; + margin: 1.5rem; + width: 41rem; + } + + main.list { + display: flex; + flex-direction: column; +/* justify-content: center;*/ + align-items: center; + } +} + +@media only screen and (min-width: 45em) { + div.well-card { + border: 2px solid #4d4d4d; + margin: 1.5rem; + width: 41rem; + } + main.search{ + display: flex; + justify-content: center; + } + + main.search a{ + color: inherit; + width: 50%; + } + + +} + +@media only screen and (min-width: 25em) { + main.details{ + max-width: 25rem; + margin-left: auto; + margin-right: auto; + margin-top: 8rem; + } + #add-well{ + display: flex; + flex-direction: column; + align-items: center; + } +} diff --git a/html-ONLY-site/css/main.css b/html-ONLY-site/css/main.css index b7ee4d8..9bfe93a 100644 --- a/html-ONLY-site/css/main.css +++ b/html-ONLY-site/css/main.css @@ -84,36 +84,48 @@ textarea { box-sizing: border-box; font-family: "roboto"; } - main.intro{ - position: fixed; - margin-top: 0; - padding: 3rem; + margin: 0; + padding: 0; + width: 100vw; + height: 100vh; background-color: #65b2ff; + display: flex; + justify-content: center; + align-items: center; +} +div.intro{ + margin-top: 1rem; + margin: 1rem 1rem 1rem 1rem; + padding: 3rem; height: 100vh; top: 0; display: flex; flex-direction: column; justify-content: space-around; text-align: center; + max-width: 35rem; + max-height: 40rem; } -main.intro h1{ - font-size: 2.75rem; +.intro h1{ + font-size: 2.3rem; color: #000633; } -main.intro p{ +.intro p{ text-align: left; height: 40vh; - color: white + color: white; + line-height: 1.45rem; } -main.intro a{ +.intro a{ font-size: 2rem; color: white; text-decoration: none; padding: 1rem; background-color: #000633; border-radius: 10px; + width: 100%; } nav h1{ flex-grow: 1; @@ -145,9 +157,15 @@ div.slide-menu{ display: flex; flex-direction: column; padding: 1rem; - //padding-top: 5rem; box-shadow: 5px 0px 8px rgba(0, 0, 0, 0.35); } + +div.main-bttns{ + display: flex; + align-items: center; + flex-direction: row; + width: 100%; +} div.slide-menu button{ margin: 1rem 0; text-align: left; @@ -155,10 +173,10 @@ div.slide-menu button{ font-size: 1.2rem; } div.slide-menu p{ - //margin-top: rem; +/* margin-top: rem;*/ } div.slide-menu a{ - //margin-top: 0rem; +/* margin-top: 0rem;*/ } div.close-menu{ position: fixed; @@ -246,11 +264,17 @@ button { main{ margin-top: 4.1rem; } +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 + align-items: flex-start; } form{ @@ -350,14 +374,27 @@ input[type=search]{ margin: .5rem; background: rgba(255, 255, 255, 0.19); border: none; - //border-bottom: 2px rgb(255, 255, 255) solid; +/* //border-bottom: 2px rgb(255, 255, 255) solid;*/ color: white; font-weight: 600; font-size: 1.2rem; border-radius: 5px; + max-width: 40rem; } -main.details{ +nav.search{ + justify-content: center; } +div.desk-details { + display: none; +} + + +div.group{ + width: 100%; + max-width: 26rem; +} + + /* ========================================================================== Helper classes diff --git a/html-ONLY-site/css/map-desktop.css b/html-ONLY-site/css/map-desktop.css new file mode 100644 index 0000000..85ffd4c --- /dev/null +++ b/html-ONLY-site/css/map-desktop.css @@ -0,0 +1,65 @@ +@media only screen and (min-width: 65em) { + /* Style adjustments for viewports that meet the condition */ + nav.top-nav{ + width: 5rem; + } + nav.top-nav div.main-bttns{ + flex-direction: column; + } + nav.top-nav h1{ + display: none; + } + nav .slide-menu{ + } + + nav.bottom-nav{ + width: 5rem; + flex-direction: column; + height: calc(100vh - 8rem); + margin-top: 5rem; + justify-content: flex-start; + padding-top: 4rem; + } + nav.bottom-nav button{ + margin-bottom: 3rem; + } + + main.map div.well-card{ + margin-left: 0; + margin-right: 0; + top: auto; + bottom: 1rem; + left: auto; + right: auto; + display: none; + } + + div.desk-details{ + display: block; + position: fixed; + right: 0; + top: 0; + width: 23rem; + height: 100vh; + overflow-y: scroll; + border-left: solid black 2px; + } + div.desk-details ul{ + margin: 1rem + } + div.desk-details li, div.desk-details p{ + margin: 0rem + } + nav.fabs{ + left: 6rem; + bottom: 1rem; + } + main.details{ + margin-top: 0rem; + } + a.go-to{ + float: right; + margin: 1rem; + + } +} diff --git a/html-ONLY-site/css/well-card.css b/html-ONLY-site/css/well-card.css index e74d63a..d9bb251 100644 --- a/html-ONLY-site/css/well-card.css +++ b/html-ONLY-site/css/well-card.css @@ -14,6 +14,11 @@ div.well-card p{ } div.well-card { border-bottom: 2px solid #4d4d4d; + max-width: 41rem; + width: 100%; +/* display: block;*/ +/* margin-left: 0;*/ +/* margin-right: 0;*/ } div.well-card .well-img{ @@ -23,4 +28,12 @@ div.well-card .well-img{ float: left; width: 35%; height: 8rem; -} \ No newline at end of file +} + +a.search-result{ + color: inherit; +} + +@media only screen and (min-width: 65em) { + +} diff --git a/html-ONLY-site/details.html b/html-ONLY-site/details.html deleted file mode 100644 index 6803427..0000000 --- a/html-ONLY-site/details.html +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
    -

  • Date well completed

    -

    10/2/09

    -
    • - -
  • -

    Date of report

    -

    2/10/10

    -
    • - -
  • -

    Permit number

    -

    246724

    -
    • - -
  • -

    Registrant number

    -

    13

    -
    • - -
  • -

    State well number

    -

    n/a

    -
    • - -
  • -

    Other number

    -

    n/a

    -
    • -
- - -

Owner Info

-
    -

  • Name

    -

    University of Connecticut

    -
    • - -
  • -

    Address

    -

    321 Main st

    -
    • - -
  • -

    Town

    -

    Storrs

    -
    • - -
  • -

    Zip code

    -

    06235

    -
    • -
- -

Well location

-
    - -
  • -

    Address

    -

    Agronomy rd

    -
    • - -
  • -

    Town

    -

    Mansfield

    -
    • - -
  • -

    Zip code

    -

    06235

    -
    • - -
  • -

    Lot number

    -

    n/a

    -
    • - -
  • -

    GPS coordinates

    -

    Latitude

    -

    41.794161

    -

    Longitude

    -

    -72.230273

    - -
    • - -
  • -

    Location relative to three permanent landmarks

    -

    13ft from light post, 16ft from water drain, 28ft from large rock

    -
    • - -
  • -

    Use

    -

    Farm

    -
    • - -
  • -

    Drilling equipment

    -

    Compressed Air Percussion

    -
    • - -
- -

Casing Details

-
    -
  • -

    Length

    -

    100 feet

    -
    • -
  • -

    Diameter

    -

    6 inches

    -
    • - -
  • -

    Weight per foot

    -

    17 lbs/feet

    -
    • - -
  • -

    Threaded/Welded

    -

    Threaded

    -
    • - -
  • -

    Drive shoe

    -

    yes

    -
    • - -
  • -

    Was casing grouted

    -

    yes

    -
    • -
- -

Yield Test

-
    -
  • -

    Method

    -

    Compressed Air

    -
    • -
  • -

    Test duration

    -

    8 hours

    -
    • - -
  • -

    Yield

    -

    18 gallons per minute

    -
    • - -
  • -

    Yield test notes

    -

    Yield test was verry successful, and yielded lots of drinkable water.

    -
    • - -
- -

Water Level

-
    -
  • -

    From land surface

    -

    44 feet

    -
    • - -
  • -

    During yield test

    -

    90 feet

    -
    • - -
  • -

    Depth of complete well

    -

    620 feet

    -
    • - -
- -

Screen Details

-
    -
  • -

    Make

    -

    n/a

    -
    • - -
  • -

    Length open to aquifier

    -

    n/a

    -
    • - -
  • -

    Slot size

    -

    n/a

    -
    • - -
  • -

    Diameter

    -

    n/a

    -
    • - -
  • -

    Gravel

    -

    n/a

    -
    • - -
  • -

    Diameter including gravel pack

    -

    n/a

    -
    • - -
  • -

    Gravel size

    -

    n/a

    -
    • - -
  • -

    Gravel pack location

    -

    n/a

    - to -

    n/a

    -
    • - -
- -

Other Notes

-
    - -
  • -

    0 - 2 | topsoil
    2 - 54 | Fine compact sands with small stones
    54 - 73 | wet cay

    -
    • - -
- -

-

- - - - - - - - - - - diff --git a/html-ONLY-site/form.html b/html-ONLY-site/form.html index c357a4f..4ec1de9 100644 --- a/html-ONLY-site/form.html +++ b/html-ONLY-site/form.html @@ -11,6 +11,7 @@ + @@ -31,16 +32,18 @@ -
+ +
- +
+
    • @@ -70,7 +73,8 @@
- +
+

Owner Info

    @@ -92,7 +96,8 @@

    Owner Info

- +
+

Well location

    @@ -160,7 +165,8 @@

    Well location

- +
+

Casing Details

  • @@ -194,7 +200,8 @@

    Casing Details

    no
- +
+

Yield Test

  • @@ -221,7 +228,8 @@

    Yield Test

- +
+

Water Level

  • @@ -240,7 +248,8 @@

    Water Level

- +
+

Screen Details

  • @@ -287,7 +296,8 @@

    Screen Details

- +
+

Other Notes

    @@ -298,6 +308,7 @@

    Other Notes

+
diff --git a/html-ONLY-site/index.html b/html-ONLY-site/index.html index e6c41ea..dd7027f 100644 --- a/html-ONLY-site/index.html +++ b/html-ONLY-site/index.html @@ -22,12 +22,12 @@ -
- +
+

Connecticut
Well Report App

Use this app to pull up data on any well in Connecticut on site and see it's details. Also, fill out and submit well report forms within the app.

- Continue - + Continue +
diff --git a/html-ONLY-site/map.php b/html-ONLY-site/map.php index 58afa82..6f9870d 100644 --- a/html-ONLY-site/map.php +++ b/html-ONLY-site/map.php @@ -1,27 +1,12 @@ -connect_error) { - die("Connection failed: " . $conn->connect_error); -} -echo "Connected successfully"; - -?> - - + - + WRA | Map @@ -29,6 +14,7 @@ + @@ -49,8 +35,10 @@ -
+
@@ -87,11 +75,18 @@ +
+ go to > + +
+