diff --git a/.gitignore b/.gitignore index 3200237..7e32919 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ eagle.app.sym .idea/ CMakeLists.txt cmake-build-debug/ + +*.map diff --git a/build_web.sh b/build_web.sh index 71953b6..734fd12 100755 --- a/build_web.sh +++ b/build_web.sh @@ -2,7 +2,17 @@ echo "-- Preparing WWW files --" -mkdir -p html -yuicompressor html_orig/style.css > html/style.css -yuicompressor html_orig/script.js > html/script.js -minify --type=html html_orig/term.html -o html/term.tpl +# Join scripts +DD=html_orig/jssrc +cat $DD/chibi.js \ + $DD/utils.js \ + $DD/appcommon.js \ + $DD/term.js \ + $DD/wifi.js > html/js/app.js + +# No need to compress CSS and JS now, we run YUI on it later +cp html_orig/css/app.css html/css/app.css +cp html_orig/term.html html/term.tpl +cp html_orig/wifi.html html/wifi.tpl +cp html_orig/img/loader.gif html/img/loader.gif +cp html_orig/favicon.ico html/favicon.ico diff --git a/html/css/app.css b/html/css/app.css new file mode 100644 index 0000000..11d0084 --- /dev/null +++ b/html/css/app.css @@ -0,0 +1,588 @@ +/* normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS and IE text size adjust after device orientation change, + * without disabling user zoom. + */ +*, *:before, *:after { + box-sizing: border-box; } + +html { + font-family: sans-serif; + /* 1 */ + -ms-text-size-adjust: 100%; + /* 2 */ + -webkit-text-size-adjust: 100%; + /* 2 */ } + +/** + * Remove default margin. + */ +body { + margin: 0; } + +/* HTML5 display definitions + ========================================================================== */ +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ +figure, +nav + { + display: block; } + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ +canvas, +progress + { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. + */ +[hidden] + { + display: none; } + +/* Links + ========================================================================== */ +/** + * Remove the gray background color from active links in IE 10. + */ +a { + background-color: transparent; } + +/** + * Improve readability of focused elements when they are also in an + * active/hover state. + */ +a:active, +a:hover { + outline: 0; } + +/* Text-level semantics + ========================================================================== */ +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ +b + { + font-weight: bold; } + +/** + * Address styling not present in Safari and Chrome. + */ +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ +h1 { + font-size: 2em; + margin: 0.67em 0; } + +h2 { + font-size: 2em; + margin: 0.67em 0; } + +/** + * Address styling not present in IE 8/9. + */ +/** + * Address inconsistent and variable font size in all browsers. + */ +small { + font-size: 80%; } + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; } + +sup { + top: -0.5em; } + +sub { + bottom: -0.25em; } + +/* Embedded content + ========================================================================== */ +/** + * Remove border when inside `a` element in IE 8/9/10. + */ +img { + border: 0; } + +/** + * Correct overflow not hidden in IE 9/10/11. + */ +svg:not(:root) { + overflow: hidden; } + +/* Grouping content + ========================================================================== */ +/** + * Address margin not present in IE 8/9 and Safari. + */ +/** + * Address differences between Firefox and other browsers. + */ +hr { + box-sizing: content-box; + height: 0; } + +/** + * Contain overflow in all browsers. + */ +pre { + overflow: auto; } + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ +code, +pre + { + font-family: monospace; + font-size: 1em; } + +/* Forms + ========================================================================== */ +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ +button, +input, +select, +textarea { + color: inherit; + /* 1 */ + font: inherit; + /* 2 */ + margin: 0; + /* 3 */ } + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ +button { + overflow: visible; } + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ +button, +select { + text-transform: none; } + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ +button, +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + /* 2 */ + cursor: pointer; + /* 3 */ } + +/** + * Re-set default cursor for disabled elements. + */ +button[disabled], +html input[disabled] { + cursor: default; } + +/** + * Remove inner padding and border in Firefox 4+. + */ +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; } + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ +input { + line-height: normal; } + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; + /* 1 */ + padding: 0; + /* 2 */ } + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome. + */ +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ +/** + * Define consistent border, margin, and padding. + */ +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ +legend { + border: 0; + /* 1 */ + padding: 0; + /* 2 */ } + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ +textarea { + overflow: auto; } + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ +/* Tables + ========================================================================== */ +/** + * Remove most spacing between table cells. + */ +table { + border-collapse: collapse; + border-spacing: 0; } + +td, +th { + padding: 0; } + +html { + box-sizing: border-box; } + +*, *::after, *::before { + box-sizing: inherit; } + +.hidden { + display: none !important; } + +[onclick] { + cursor: pointer; } + +html { + font-family: Arial, sans-serif; + color: #D0D0D0; + background: #131315; } + +html, body { + border: 0 none; + margin: 0; + padding: 0; + text-decoration: none; + width: 100%; + height: 100%; + overflow: hidden; } + +a, a:visited, a:link { + cursor: pointer; + color: #5abfff; + text-decoration: none; } + +a:hover { + color: #5abfff; + text-decoration: underline; } + +.Box { + display: block; + max-width: 900px; + margin-top: 1rem; + padding: 0.61805rem 1rem; + border-radius: 3px; + background-color: rgba(255, 255, 255, 0.07); } + @media screen and (max-width: 544px) { + .Box { + margin-top: 0.61805rem; + padding: 0.23608rem 0.38198rem; } } + +body { + position: relative; + padding: 1rem; + overflow-y: auto; } + @media screen and (max-width: 544px) { + body { + padding: 0.61805rem; } } + body > * { + margin-left: auto; + margin-right: auto; } + body h1 { + text-align: center; + font-size: 2.02729em; + margin-top: 0; + margin-bottom: 1rem; } + @media screen and (max-width: 544px) { + body h1 { + font-size: 1.42383em; + margin-bottom: 0.61805rem; } } + @media screen and (min-width: 545px) and (max-width: 1000px) { + body h1 { + font-size: 1.80203em; } } + body td, body th { + padding: 0.38198rem; + white-space: nowrap; } + @media screen and (max-width: 544px) { + body td, body th { + padding: 0.23608rem; } } + body tbody th { + text-align: right; + width: 130px; + color: white; } + @media screen and (max-width: 544px) { + body tbody th { + width: auto; } } + body tbody td input[type="text"], body tbody td input[type="number"] { + width: 10em; } + @media screen and (max-width: 544px) { + body tbody td input[type="text"], body tbody td input[type="number"] { + width: 8em; } } + +#loader { + position: absolute; + right: 1.618rem; + top: 1.618rem; + transition: opacity .2s; + opacity: 0; } + @media screen and (max-width: 544px) { + #loader { + top: 1rem; + right: 1rem; } } + #loader.show { + opacity: 1; } + +button, input[type=submit] { + text-align: center; + cursor: pointer; + display: inline-block; + border-radius: 2px; + padding: 0 0.6em; + border: 0 none; + outline: 0 none !important; + line-height: 1.8em; + font-size: 1.1em; + margin-bottom: 3px; + min-width: 5em; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + text-shadow: 1.5px 1.5px 2px rgba(0, 0, 0, 0.6); + background-color: #3983cd; + box-shadow: 0 3px 0 #265f98; + text-decoration: none !important; } + button:active, input[type=submit]:active { + position: relative; + top: 2px; } + button.narrow, input[type=submit].narrow { + min-width: initial; } + button, button:link, button:visited, input[type=submit], input[type=submit]:link, input[type=submit]:visited { + color: #FEFEFE; } + button:hover, button:active, button.active, button.selected, input[type=submit]:hover, input[type=submit]:active, input[type=submit].active, input[type=submit].selected { + background-color: #2076C6; + color: #FEFEFE; } + button:hover, button.selected, button.active, input[type=submit]:hover, input[type=submit].selected, input[type=submit].active { + box-shadow: 0 3px 0 #154c80; } + button:active, input[type=submit]:active { + box-shadow: 0 1px 0 #154c80; } + +button, input[type=submit] { + text-align: center; + cursor: pointer; + display: inline-block; + border-radius: 2px; + padding: 0 0.6em; + border: 0 none; + outline: 0 none !important; + line-height: 1.8em; + font-size: 1.1em; + margin-bottom: 3px; + min-width: 5em; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + text-shadow: 1.5px 1.5px 2px rgba(0, 0, 0, 0.6); + background-color: #3983cd; + box-shadow: 0 3px 0 #265f98; + text-decoration: none !important; } + button:active, input[type=submit]:active { + position: relative; + top: 2px; } + button.narrow, input[type=submit].narrow { + min-width: initial; } + button, button:link, button:visited, input[type=submit], input[type=submit]:link, input[type=submit]:visited { + color: #FEFEFE; } + button:hover, button:active, button.active, button.selected, input[type=submit]:hover, input[type=submit]:active, input[type=submit].active, input[type=submit].selected { + background-color: #2076C6; + color: #FEFEFE; } + button:hover, button.selected, button.active, input[type=submit]:hover, input[type=submit].selected, input[type=submit].active { + box-shadow: 0 3px 0 #154c80; } + button:active, input[type=submit]:active { + box-shadow: 0 1px 0 #154c80; } + +input[type="number"], input[type="password"], input[type="text"], textarea, select { + border: 0 none; + border-bottom: 2px solid #214e7a; + background-color: #303030; + color: white; + padding: 6px; + line-height: 1em; + outline: 0 none !important; + -moz-outline: 0 none !important; + font-weight: normal; } + input[type="number"]:focus, input[type="number"]:hover, input[type="password"]:focus, input[type="password"]:hover, input[type="text"]:focus, input[type="text"]:hover, textarea:focus, textarea:hover, select:focus, select:hover { + border-bottom-color: #2972ba; } + +#ap-list { + column-count: 3; + column-gap: 0; + margin: 0 -0.23608rem; } + @media screen and (min-width: 545px) and (max-width: 1000px) { + #ap-list { + column-count: 2; } } + @media screen and (max-width: 544px) { + #ap-list { + column-count: 1; } } + +#ap-loader { + background: rgba(255, 255, 255, 0.1); + border-radius: 5px; + padding: 0.38198rem; + margin-bottom: 0.38198rem; } + +#ap-box { + padding-bottom: 0.38198rem; } + +.AP { + break-inside: avoid-column; + max-width: 500px; + padding: 0.23608rem; } + .AP.selected .inner { + background: #42a6f9 !important; + cursor: default; + top: 0 !important; } + .AP .inner { + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + position: relative; + border-radius: 3px; + color: #222; + background: #afafaf; + transition: background-color 0.5s; + display: flex; } + .AP .inner:active { + left: 0; + top: 1px; } + .AP .inner:hover { + background: white; } + .AP .inner > * { + padding: 0.61805rem; + white-space: nowrap; + word-wrap: normal; } + .AP .inner .rssi { + min-width: 2.5rem; + flex: 0 0 15%; + text-align: right; } + .AP .inner .rssi:after { + padding-left: 0.09018rem; + content: '%'; + font-size: 0.88889em; } + .AP .inner .essid { + flex: 1 1 70%; + min-width: 0; + text-overflow: ellipsis; + overflow: hidden; + font-weight: bold; } + .AP .inner .auth { + flex: 0 0 15%; } + +.page-term #screen { + font-family: monospace; + font-size: 16pt; + white-space: nowrap; + background: #111213; + padding: 6px; + display: inline-block; + border: 2px solid #3983CD; } + .page-term #screen span { + white-space: pre; + cursor: pointer; } + .page-term #screen span:hover { + outline: 1px solid rgba(255, 255, 255, 0.5); } +.page-term #buttons { + margin-top: 10px; + white-space: nowrap; } + .page-term #buttons button { + margin: 0 3px; + padding: 10px 0; + width: 18%; + max-width: 65px; + min-width: initial; + cursor: pointer; + font-weight: bold; } + +#termwrap { + text-align: center; } + +/*# sourceMappingURL=app.css.map */ diff --git a/html/favicon.ico b/html/favicon.ico new file mode 100644 index 0000000..6916039 Binary files /dev/null and b/html/favicon.ico differ diff --git a/html/img/loader.gif b/html/img/loader.gif new file mode 100755 index 0000000..dfb5362 Binary files /dev/null and b/html/img/loader.gif differ diff --git a/html/js/app.js b/html/js/app.js new file mode 100644 index 0000000..995bde5 --- /dev/null +++ b/html/js/app.js @@ -0,0 +1,1258 @@ +/*!chibi 3.0.7, Copyright 2012-2016 Kyle Barrow, released under MIT license */ + +// MODIFIED VERSION. +(function () { + 'use strict'; + + var readyfn = [], + loadedfn = [], + domready = false, + pageloaded = false, + d = document, + w = window; + + // Fire any function calls on ready event + function fireReady() { + var i; + domready = true; + for (i = 0; i < readyfn.length; i += 1) { + readyfn[i](); + } + readyfn = []; + } + + // Fire any function calls on loaded event + function fireLoaded() { + var i; + pageloaded = true; + // For browsers with no DOM loaded support + if (!domready) { + fireReady(); + } + for (i = 0; i < loadedfn.length; i += 1) { + loadedfn[i](); + } + loadedfn = []; + } + + // Check DOM ready, page loaded + if (d.addEventListener) { + // Standards + d.addEventListener('DOMContentLoaded', fireReady, false); + w.addEventListener('load', fireLoaded, false); + } else if (d.attachEvent) { + // IE + d.attachEvent('onreadystatechange', fireReady); + // IE < 9 + w.attachEvent('onload', fireLoaded); + } else { + // Anything else + w.onload = fireLoaded; + } + + // Utility functions + + // Loop through node array + function nodeLoop(fn, nodes) { + var i; + // Good idea to walk up the DOM + for (i = nodes.length - 1; i >= 0; i -= 1) { + fn(nodes[i]); + } + } + + // Convert to camel case + function cssCamel(property) { + return property.replace(/-\w/g, function (result) { + return result.charAt(1).toUpperCase(); + }); + } + + // Get computed style + function computeStyle(elm, property) { + // IE, everything else or null + return (elm.currentStyle) ? elm.currentStyle[cssCamel(property)] : (w.getComputedStyle) ? w.getComputedStyle(elm, null).getPropertyValue(property) : null; + + } + + // Returns URI encoded query string pair + function queryPair(name, value) { + return encodeURIComponent(name).replace(/%20/g, '+') + '=' + encodeURIComponent(value).replace(/%20/g, '+'); + } + + // Set CSS, important to wrap in try to prevent error thown on unsupported property + function setCss(elm, property, value) { + try { + elm.style[cssCamel(property)] = value; + } catch (e) { + } + } + + // Show CSS + function showCss(elm) { + elm.style.display = ''; + // For elements still hidden by style block + if (computeStyle(elm, 'display') === 'none') { + elm.style.display = 'block'; + } + } + + // Serialize form & JSON values + function serializeData(nodes) { + var querystring = '', subelm, i, j; + if (nodes.constructor === Object) { // Serialize JSON data + for (subelm in nodes) { + if (nodes.hasOwnProperty(subelm)) { + if (nodes[subelm].constructor === Array) { + for (i = 0; i < nodes[subelm].length; i += 1) { + querystring += '&' + queryPair(subelm, nodes[subelm][i]); + } + } else { + querystring += '&' + queryPair(subelm, nodes[subelm]); + } + } + } + } else { // Serialize node data + nodeLoop(function (elm) { + if (elm.nodeName === 'FORM') { + for (i = 0; i < elm.elements.length; i += 1) { + subelm = elm.elements[i]; + + if (!subelm.disabled) { + switch (subelm.type) { + // Ignore buttons, unsupported XHR 1 form fields + case 'button': + case 'image': + case 'file': + case 'submit': + case 'reset': + break; + + case 'select-one': + if (subelm.length > 0) { + querystring += '&' + queryPair(subelm.name, subelm.value); + } + break; + + case 'select-multiple': + for (j = 0; j < subelm.length; j += 1) { + if (subelm[j].selected) { + querystring += '&' + queryPair(subelm.name, subelm[j].value); + } + } + break; + + case 'checkbox': + case 'radio': + if (subelm.checked) { + querystring += '&' + queryPair(subelm.name, subelm.value); + } + break; + + // Everything else including shinny new HTML5 input types + default: + querystring += '&' + queryPair(subelm.name, subelm.value); + } + } + } + } + }, nodes); + } + // Tidy up first & + return (querystring.length > 0) ? querystring.substring(1) : ''; + } + + // Class helper + function classHelper(classes, action, nodes) { + var classarray, search, i, replace, has = false; + if (classes) { + // Trim any whitespace + classarray = classes.split(/\s+/); + nodeLoop(function (elm) { + for (i = 0; i < classarray.length; i += 1) { + search = new RegExp('\\b' + classarray[i] + '\\b', 'g'); + replace = new RegExp(' *' + classarray[i] + '\\b', 'g'); + if (action === 'remove') { + elm.className = elm.className.replace(search, ''); + } else if (action === 'toggle') { + elm.className = (elm.className.match(search)) ? elm.className.replace(replace, '') : elm.className + ' ' + classarray[i]; + } else if (action === 'has') { + if (elm.className.match(search)) { + has = true; + break; + } + } + } + }, nodes); + } + return has; + } + + // HTML insertion helper + function insertHtml(value, position, nodes) { + var tmpnodes, tmpnode; + if (value) { + nodeLoop(function (elm) { + // No insertAdjacentHTML support for FF < 8 and IE doesn't allow insertAdjacentHTML table manipulation, so use this instead + // Convert string to node. We can't innerHTML on a document fragment + tmpnodes = d.createElement('div'); + tmpnodes.innerHTML = value; + while ((tmpnode = tmpnodes.lastChild) !== null) { + // Catch error in unlikely case elm has been removed + try { + if (position === 'before') { + elm.parentNode.insertBefore(tmpnode, elm); + } else if (position === 'after') { + elm.parentNode.insertBefore(tmpnode, elm.nextSibling); + } else if (position === 'append') { + elm.appendChild(tmpnode); + } else if (position === 'prepend') { + elm.insertBefore(tmpnode, elm.firstChild); + } + } catch (e) { + break; + } + } + }, nodes); + } + } + + // Get nodes and return chibi + function chibi(selector) { + var cb, nodes = [], json = false, nodelist, i; + + if (selector) { + + // Element node, would prefer to use (selector instanceof HTMLElement) but no IE support + if (selector.nodeType && selector.nodeType === 1) { + nodes = [selector]; // return element as node list + } else if (typeof selector === 'object') { + // JSON, document object or node list, would prefer to use (selector instanceof NodeList) but no IE support + json = (typeof selector.length !== 'number'); + nodes = selector; + } else if (typeof selector === 'string') { + nodelist = d.querySelectorAll(selector); + + // Convert node list to array so results have full access to array methods + // Array.prototype.slice.call not supported in IE < 9 and often slower than loop anyway + for (i = 0; i < nodelist.length; i += 1) { + nodes[i] = nodelist[i]; + } + } + } + + // Only attach nodes if not JSON + cb = json ? {} : nodes; + + // Public functions + + // Executes a function on nodes + cb.each = function (fn) { + if (typeof fn === 'function') { + nodeLoop(function (elm) { + // <= IE 8 loses scope so need to apply + return fn.apply(elm, arguments); + }, nodes); + } + return cb; + }; + // Find first + cb.first = function () { + return chibi(nodes.shift()); + }; + // Find last + cb.last = function () { + return chibi(nodes.pop()); + }; + // Find odd + cb.odd = function () { + var odds = [], i; + for (i = 0; i < nodes.length; i += 2) { + odds.push(nodes[i]); + } + return chibi(odds); + }; + // Find even + cb.even = function () { + var evens = [], i; + for (i = 1; i < nodes.length; i += 2) { + evens.push(nodes[i]); + } + return chibi(evens); + }; + // Hide node + cb.hide = function () { + nodeLoop(function (elm) { + elm.style.display = 'none'; + }, nodes); + return cb; + }; + // Show node + cb.show = function () { + nodeLoop(function (elm) { + showCss(elm); + }, nodes); + return cb; + }; + // Toggle node display + cb.toggle = function (state) { + if (typeof state != 'undefined') { // ADDED + if (state) + cb.show(); + else + cb.hide(); + } else { + nodeLoop(function (elm) { + // computeStyle instead of style.display == 'none' catches elements that are hidden via style block + if (computeStyle(elm, 'display') === 'none') { + showCss(elm); + } else { + elm.style.display = 'none'; + } + + }, nodes); + } + return cb; + }; + // Remove node + cb.remove = function () { + nodeLoop(function (elm) { + // Catch error in unlikely case elm has been removed + try { + elm.parentNode.removeChild(elm); + } catch (e) { + } + }, nodes); + return chibi(); + }; + // Get/Set CSS + cb.css = function (property, value) { + if (property) { + if (value || value === '') { + nodeLoop(function (elm) { + setCss(elm, property, value); + }, nodes); + return cb; + } + if (nodes[0]) { + if (nodes[0].style[cssCamel(property)]) { + return nodes[0].style[cssCamel(property)]; + } + if (computeStyle(nodes[0], property)) { + return computeStyle(nodes[0], property); + } + } + } + }; + // Get class(es) + cb.getClass = function () { + if (nodes[0] && nodes[0].className.length > 0) { + // Weak IE trim support + return nodes[0].className.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '').replace(/\s+/, ' '); + } + }; + // Set (replaces) classes + cb.setClass = function (classes) { + if (classes || classes === '') { + nodeLoop(function (elm) { + elm.className = classes; + }, nodes); + } + return cb; + }; + // Add class + cb.addClass = function (classes) { + if (classes) { + nodeLoop(function (elm) { + elm.className += ' ' + classes; + }, nodes); + } + return cb; + }; + // Remove class + cb.removeClass = function (classes) { + classHelper(classes, 'remove', nodes); + return cb; + }; + // Toggle class + cb.toggleClass = function (classes) { + classHelper(classes, 'toggle', nodes); + return cb; + }; + // Has class + cb.hasClass = function (classes) { + return classHelper(classes, 'has', nodes); + }; + // Get/set HTML + cb.html = function (value) { + if (value || value === '') { + nodeLoop(function (elm) { + elm.innerHTML = value; + }, nodes); + return cb; + } + if (nodes[0]) { + return nodes[0].innerHTML; + } + }; + // Insert HTML before selector + cb.htmlBefore = function (value) { + insertHtml(value, 'before', nodes); + return cb; + }; + // Insert HTML after selector + cb.htmlAfter = function (value) { + insertHtml(value, 'after', nodes); + return cb; + }; + // Insert HTML after selector innerHTML + cb.htmlAppend = function (value) { + insertHtml(value, 'append', nodes); + return cb; + }; + // Insert HTML before selector innerHTML + cb.htmlPrepend = function (value) { + insertHtml(value, 'prepend', nodes); + return cb; + }; + // Get/Set HTML attributes + cb.attr = function (property, value) { + if (property) { + property = property.toLowerCase(); + // IE < 9 doesn't allow style or class via get/setAttribute so switch. cssText returns prettier CSS anyway + if (typeof value !== 'undefined') {//FIXED BUG HERE + nodeLoop(function (elm) { + if (property === 'style') { + elm.style.cssText = value; + } else if (property === 'class') { + elm.className = value; + } else { + elm.setAttribute(property, value); + } + }, nodes); + return cb; + } + if (nodes[0]) { + if (property === 'style') { + if (nodes[0].style.cssText) { + return nodes[0].style.cssText; + } + } else if (property === 'class') { + if (nodes[0].className) { + return nodes[0].className; + } + } else { + if (nodes[0].getAttribute(property)) { + return nodes[0].getAttribute(property); + } + } + } + } + }; + // Get/Set HTML data property + cb.data = function (key, value) { + if (key) { + return cb.attr('data-' + key, value); + } + }; + // Get/Set form element values + cb.val = function (value) { + var values, i, j; + if (typeof value != 'undefined') { // FIXED A BUG HERE + nodeLoop(function (elm) { + switch (elm.nodeName) { + case 'SELECT': + if (typeof value === 'string' || typeof value === 'number') { + value = [value]; + } + for (i = 0; i < elm.length; i += 1) { + // Multiple select + for (j = 0; j < value.length; j += 1) { + elm[i].selected = ''; + if (elm[i].value === value[j]) { + elm[i].selected = 'selected'; + break; + } + } + } + break; + case 'INPUT': + case 'TEXTAREA': + case 'BUTTON': + elm.value = value; + break; + } + }, nodes); + + return cb; + } + if (nodes[0]) { + switch (nodes[0].nodeName) { + case 'SELECT': + values = []; + for (i = 0; i < nodes[0].length; i += 1) { + if (nodes[0][i].selected) { + values.push(nodes[0][i].value); + } + } + return (values.length > 1) ? values : values[0]; + case 'INPUT': + case 'TEXTAREA': + case 'BUTTON': + return nodes[0].value; + } + } + }; + // Return matching checked checkbox or radios + cb.checked = function (check) { + if (typeof check === 'boolean') { + nodeLoop(function (elm) { + if (elm.nodeName === 'INPUT' && (elm.type === 'checkbox' || elm.type === 'radio')) { + elm.checked = check; + } + }, nodes); + return cb; + } + if (nodes[0] && nodes[0].nodeName === 'INPUT' && (nodes[0].type === 'checkbox' || nodes[0].type === 'radio')) { + return (!!nodes[0].checked); + } + }; + // Add event handler + cb.on = function (event, fn) { + if (selector === w || selector === d) { + nodes = [selector]; + } + nodeLoop(function (elm) { + if (d.addEventListener) { + elm.addEventListener(event, fn, false); + } else if (d.attachEvent) { + // <= IE 8 loses scope so need to apply, we add this to object so we can detach later (can't detach anonymous functions) + elm[event + fn] = function () { + return fn.apply(elm, arguments); + }; + elm.attachEvent('on' + event, elm[event + fn]); + } + }, nodes); + return cb; + }; + // Remove event handler + cb.off = function (event, fn) { + if (selector === w || selector === d) { + nodes = [selector]; + } + nodeLoop(function (elm) { + if (d.addEventListener) { + elm.removeEventListener(event, fn, false); + } else if (d.attachEvent) { + elm.detachEvent('on' + event, elm[event + fn]); + // Tidy up + elm[event + fn] = null; + } + }, nodes); + return cb; + }; + return cb; + } + + // Basic XHR + chibi.ajax = function (options) { // if options is a number, it's timeout in ms + var opts = extend({ + method: 'GET', + nocache: true, + timeout: 5000, + loader: true, + callback: null + }, options); + opts.method = opts.method.toUpperCase(); + + var loaderFn = opts.loader ? chibi._loader : function(){}; + var url = opts.url; + var method = opts.method; + var query = null; + + if (opts.data) { + query = serializeData(opts.data); + } + + console.log(opts); + console.log(query); + + if (query && (method === 'GET')) { + url += (url.indexOf('?') === -1) ? '?' + query : '&' + query; + query = null; + } + + var xhr = new XMLHttpRequest(); + + // prevent caching + if (opts.nocache) { + var ts = (+(new Date())).toString(36); + url += ((url.indexOf('?') === -1) ? '?' : '&') + '_=' + ts; + } + + loaderFn(true); + + xhr.open(method, url, true); + xhr.timeout = opts.timeout; + + // Abort after given timeout + var abortTmeo = setTimeout(function () { + console.error("XHR timed out."); + xhr.abort(); + loaderFn(false); + }, opts.timeout + 10); + + xhr.onreadystatechange = function () { + if (xhr.readyState === 4) { + loaderFn(false); + + opts.callback && opts.callback(xhr.responseText, xhr.status); + + clearTimeout(abortTmeo); + } + }; + + xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); + if (method === 'POST') { + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); + } + + xhr.send(query); + return xhr; + }; + + chibi._loader = function(){}; + + // Alias to cb.ajax(url, 'get', callback) + chibi.get = function (url, callback, opts) { + opts = opts || {}; + opts.url = url; + opts.callback = callback; + opts.method = 'GET'; + return chibi.ajax(opts); + }; + + // Alias to cb.ajax(url, 'post', callback) + chibi.post = function (url, callback, opts) { + opts = opts || {}; + opts.url = url; + opts.callback = callback; + opts.method = 'POST'; + return chibi.ajax(opts); + }; + + // Fire on DOM ready + chibi.ready = function (fn) { + if (fn) { + if (domready) { + fn(); + return chibi; + } else { + readyfn.push(fn); + } + } + }; + + // Fire on page loaded + chibi.loaded = function (fn) { + if (fn) { + if (pageloaded) { + fn(); + return chibi; + } else { + loadedfn.push(fn); + } + } + }; + + var entityMap = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + "'": ''', + '/': '/', + '`': '`', + '=': '=' + }; + + chibi.htmlEscape = function(string) { + return String(string).replace(/[&<>"'`=\/]/g, function (s) { + return entityMap[s]; + }); + }; + + // Set Chibi's global namespace here ($) + w.$ = chibi; +}()); +/** Make a node */ +function mk(e) {return document.createElement(e)} + +/** Find one by query */ +function qq(s) {return document.querySelector(s)} + +/** Find all by query */ +function qa(s) {return document.querySelectorAll(s)} + +/** Convert any to bool safely */ +function bool(x) { + return (x === 1 || x === '1' || x === true || x === 'true'); +} + +function intval(x) { + return parseInt(x); +} + +/** Extend an objects with options */ +function extend(defaults, options) { + var target = {}; + + Object.keys(defaults).forEach(function(k){ + target[k] = defaults[k]; + }); + + Object.keys(options).forEach(function(k){ + target[k] = options[k]; + }); + + return target; +} + +/** Escape string for use as literal in RegExp */ +function rgxe(str) { + return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"); +} + +function numfmt(x, places) { + var pow = Math.pow(10, places); + return Math.round(x*pow) / pow; +} + +function estimateLoadTime(fs, n) { + return (1000/fs)*n+1500; +} + +function msNow() { + return +(new Date); +} + +function msElapsed(start) { + return msNow() - start; +} + +Math.log10 = Math.log10 || function(x) { + return Math.log(x) / Math.LN10; +}; + +/** + * Perform a substitution in the given string. + * + * Arguments - array or list of replacements. + * Arguments numeric keys will replace {0}, {1} etc. + * Named keys also work, ie. {foo: "bar"} -> replaces {foo} with bar. + * + * Braces are added to keys if missing. + * + * @returns {String} result + */ +String.prototype.format = function () { + var out = this; + var repl = arguments; + + if (arguments.length == 1 && (Array.isArray(arguments[0]) || typeof arguments[0] == 'object')) { + repl = arguments[0]; + } + + for (var ph in repl) { + if (repl.hasOwnProperty(ph)) { + var ph_orig = ph; + + if (!ph.match(/^\{.*\}$/)) { + ph = '{' + ph + '}'; + } + + // replace all occurrences + var pattern = new RegExp(rgxe(ph), "g"); + out = out.replace(pattern, repl[ph_orig]); + } + } + + return out; +}; + +/** Global generic init */ +$.ready(function () { + // loader dots... + setInterval(function () { + $('.anim-dots').each(function (x) { + var $x = $(x); + var dots = $x.html() + '.'; + if (dots.length == 5) dots = '.'; + $x.html(dots); + }); + }, 1000); + + $('input[type=number]').on('mousewheel', function(e) { + var val = +$(this).val(); + if (isNaN(val)) val = 1; + + var step = +($(this).attr('step') || 1); + var min = +$(this).attr('min'); + var max = +$(this).attr('max'); + if(e.wheelDelta > 0) { + val += step; + } else { + val -= step; + } + + if (typeof min != 'undefined') val = Math.max(val, +min); + if (typeof max != 'undefined') val = Math.min(val, +max); + $(this).val(val); + + if ("createEvent" in document) { + var evt = document.createEvent("HTMLEvents"); + evt.initEvent("change", false, true); + $(this)[0].dispatchEvent(evt); + } else { + $(this)[0].fireEvent("onchange"); + } + + e.preventDefault(); + }); +}); + +$._loader = function(vis) { + console.log("loader fn", vis); + if(vis) + $('#loader').addClass('show'); + else + $('#loader').removeClass('show'); +}; +(function() { + /** + * Terminal module + */ + var Term = (function () { + var W, H; + var cursor = {a: false, x: 0, y: 0, suppress: false, hidden: false}; + var screen = []; + + /** Colors table */ + var CLR = [// dark gray #2E3436 + // 0 black, 1 red, 2 green, 3 yellow + // 4 blue, 5 mag, 6 cyan, 7 white + '#111213','#CC0000','#4E9A06','#C4A000', + '#3465A4','#75507B','#06989A','#D3D7CF', + // BRIGHT + // 8 black, 9 red, 10 green, 11 yellow + // 12 blue, 13 mag, 14 cyan, 15 white + '#555753','#EF2929','#8AE234','#FCE94F', + '#729FCF','#AD7FA8','#34E2E2','#EEEEEC' + ]; + + /** Clear screen */ + function cls() { + screen.forEach(function(cell, i) { + cell.t = ' '; + cell.fg = 7; + cell.bg = 0; + blit(cell); + }); + } + + /** Set text and color at XY */ + function cellAt(y, x) { + return screen[y*W+x]; + } + + /** Get cell under cursor */ + function cursorCell() { + return cellAt(cursor.y, cursor.x); + } + + /** Enable or disable cursor visibility */ + function cursorEnable(enable) { + cursor.hidden = !enable; + cursor.a &= enable; + blit(cursorCell(), cursor.a); + } + + /** Safely move cursor */ + function cursorSet(y, x) { + // Hide and prevent from showing up during the move + cursor.suppress = true; + blit(cursorCell(), false); + + cursor.x = x; + cursor.y = y; + + // Show again + cursor.suppress = false; + blit(cursorCell(), cursor.a); + } + + /** Update cell on display. inv = invert (for cursor) */ + function blit(cell, inv) { + var e = cell.e, fg, bg; + // Colors + fg = inv ? cell.bg : cell.fg; + bg = inv ? cell.fg : cell.bg; + // Update + e.innerText = (cell.t+' ')[0]; + e.style.color = colorHex(fg); + e.style.backgroundColor = colorHex(bg); + e.style.fontWeight = fg > 7 ? 'bold' : 'normal'; + } + + /** Show entire screen */ + function blitAll() { + screen.forEach(function(cell, i) { + /* Invert if under cursor & cursor active */ + var inv = cursor.a && (i == cursor.y*W+cursor.x); + blit(cell, inv); + }); + } + + /** Load screen content from a 'binary' sequence */ + function load(obj) { + cursor.x = obj.x; + cursor.y = obj.y; + cursor.hidden = !obj.cv; + + // full re-init if size changed + if (obj.w != W || obj.h != H) { + Term.init(obj); + return; + } + + // Simple compression - hexFG hexBG 'ASCII' (r/s/t/u NUM{1,2,3,4})? + // comma instead of both colors = same as before + + var i = 0, ci = 0, str = obj.screen; + var fg = 7, bg = 0; + while(i < str.length && ci 0) { + var rep = parseInt(str.substr(i+1,repchars)); + i = i + repchars + 1; + for (; rep>0 && ci 15) c = 0; + return CLR[c]; + } + + /** Init the terminal */ + function init(obj) { + W = obj.w; + H = obj.h; + + /* Build screen & show */ + var e, cell, scr = qq('#screen'); + + // Empty the screen node + while (scr.firstChild) scr.removeChild(scr.firstChild); + + screen = []; + + for(var i = 0; i < W*H; i++) { + e = mk('span'); + + (function() { + var x = i % W; + var y = Math.floor(i / W); + e.addEventListener('click', function () { + Input.onTap(y, x); + }); + })(); + + /* End of line */ + if ((i > 0) && (i % W == 0)) { + scr.appendChild(mk('br')); + } + /* The cell */ + scr.appendChild(e); + + cell = {t: ' ', fg: 7, bg: 0, e: e}; + screen.push(cell); + blit(cell); + } + + /* Cursor blinking */ + setInterval(function() { + cursor.a = !cursor.a; + if (cursor.hidden) { + cursor.a = false; + } + + if (!cursor.suppress) { + blit(cursorCell(), cursor.a); + } + }, 500); + + load(obj); + } + + // publish + return { + init: init, + load: load + }; + })(); + + /** Handle connections */ + var Conn = (function() { + var ws; + + function onOpen(evt) { + console.log("CONNECTED"); + } + + function onClose(evt) { + console.error("SOCKET CLOSED"); + } + + function onMessage(evt) { + try { + console.log("RX: ", evt.data); + // Assume all our messages are screen updates + Term.load(JSON.parse(evt.data)); + } catch(e) { + console.error(e); + } + } + + function onError(evt) { + console.error(evt.data); + } + + function doSend(message) { + console.log("TX: ", message); + if (ws.readyState != 1) { + console.error("Socket not ready"); + return; + } + if (typeof message != "string") { + message = JSON.stringify(message); + } + ws.send(message); + } + + function init() { + ws = new WebSocket("ws://"+_root+"/ws/update.cgi"); + ws.onopen = onOpen; + ws.onclose = onClose; + ws.onmessage = onMessage; + ws.onerror = onError; + + console.log("Opening socket."); + } + + return { + ws: null, + init: init, + send: doSend + }; + })(); + + // + // Keyboard (& mouse) input + // + var Input = (function() { + function sendStrMsg(str) { + Conn.send("STR:"+str); + } + + function sendPosMsg(y, x) { + Conn.send("TAP:"+y+','+x); + } + + function sendBtnMsg(n) { + Conn.send("BTN:"+n); + } + + function init() { + window.addEventListener('keypress', function(e) { + var code = +e.which; + if (code >= 32 && code < 127) { + var ch = String.fromCharCode(code); + //console.log("Typed ", ch, "code", code, e); + sendStrMsg(ch); + } + }); + + window.addEventListener('keydown', function(e) { + var code = e.keyCode; + //console.log("Down ", code, e); + switch(code) { + case 8: sendStrMsg('\x08'); break; + case 13: sendStrMsg('\x0d\x0a'); break; + case 27: sendStrMsg('\x1b'); break; // this allows to directly enter control sequences + case 37: sendStrMsg('\x1b[D'); break; + case 38: sendStrMsg('\x1b[A'); break; + case 39: sendStrMsg('\x1b[C'); break; + case 40: sendStrMsg('\x1b[B'); break; + } + }); + + qa('#buttons button').forEach(function(s) { + s.addEventListener('click', function() { + sendBtnMsg(+this.dataset['n']); + }); + }); + } + + return { + init: init, + onTap: sendPosMsg + }; + })(); + + + window.termInit = function (obj) { + Term.init(obj); + Conn.init(); + Input.init(); + } +})(); +/** Wifi page */ +(function () { + var authStr = ['Open', 'WEP', 'WPA', 'WPA2', 'WPA/WPA2']; + var curSSID; + + /** Update display for received response */ + function onScan(resp, status) { + if (status != 200) { + // bad response + rescan(5000); // wait 5sm then retry + return; + } + + resp = JSON.parse(resp); + + var done = !bool(resp.result.inProgress) && (resp.result.APs.length > 0); + rescan(done ? 15000 : 1000); + if (!done) return; // no redraw yet + + // clear the AP list + var $list = $('#ap-list'); + // remove old APs + $('.AP').remove(); + + $list.toggle(done); + $('#ap-loader').toggle(!done); + + // scan done + resp.result.APs.sort(function (a, b) { + return b.rssi - a.rssi; + }).forEach(function (ap) { + ap.enc = intval(ap.enc); + + if (ap.enc > 4) return; // hide unsupported auths + + var item = document.createElement('div'); + + var $item = $(item) + .data('ssid', ap.essid) + .data('pwd', ap.enc != 0) + .addClass('AP'); + + // mark current SSID + if (ap.essid == curSSID) { + $item.addClass('selected'); + } + + var inner = document.createElement('div'); + $(inner).addClass('inner') + .htmlAppend('
{0}
'.format(ap.rssi_perc)) + .htmlAppend('
{0}
'.format($.htmlEscape(ap.essid))) + .htmlAppend('
{0}
'.format(authStr[ap.enc])); + + $item.on('click', function () { + var $th = $(this); + + var ssid = $th.data('ssid'); + var pass = ''; + + if ($th.data('pwd')) { + // this AP needs a password + pass = prompt("Password for \""+ssid+"\":"); + if (pass === null) { + return; + } + } + + $.post('http://'+_root+'/wifi/connect', null, { + data: { + essid: ssid, + passwd: pass + } + }); + }); + + + item.appendChild(inner); + $list[0].appendChild(item); + }); + } + + /** Ask the CGI what APs are visible (async) */ + function scanAPs() { + $.get('http://'+_root+'/wifi/scan', onScan); + } + + function rescan(time) { + setTimeout(scanAPs, time); + } + + /** Set up the WiFi page */ + window.wifiInit = function (obj) { + //var ap_json = { + // "result": { + // "inProgress": "0", + // "APs": [ + // {"essid": "Chlivek", "bssid": "88:f7:c7:52:b3:99", "rssi": "204", "enc": "4", "channel": "1"}, + // {"essid": "TyNikdy", "bssid": "5c:f4:ab:0d:f1:1b", "rssi": "164", "enc": "3", "channel": "1"}, + // ] + // } + //}; + + curSSID = obj.curSSID; + + scanAPs(); + }; +})(); diff --git a/html/script.js b/html/script.js deleted file mode 100644 index 0206f06..0000000 --- a/html/script.js +++ /dev/null @@ -1 +0,0 @@ -function mk(a){return document.createElement(a)}function q1(a){return document.querySelector(a)}function qa(a){return document.querySelectorAll(a)}(function(){var a,j;var k={a:false,x:0,y:0,suppress:false,hidden:false};var m=[];var f=["#111213","#CC0000","#4E9A06","#C4A000","#3465A4","#75507B","#06989A","#D3D7CF","#555753","#EF2929","#8AE234","#FCE94F","#729FCF","#AD7FA8","#34E2E2","#EEEEEC"];function n(){m.forEach(function(p,q){p.t=" ";p.fg=7;p.bg=0;c(p)})}function b(q,p){return m[q*a+p]}function h(){return b(k.y,k.x)}function o(p){k.hidden=!p;k.a&=p;c(h(),k.a)}function e(q,p){k.suppress=true;c(h(),false);k.x=p;k.y=q;k.suppress=false;c(h(),k.a)}function c(q,p){var t=q.e,r,s;r=p?q.bg:q.fg;s=p?q.fg:q.bg;t.innerText=(q.t+" ")[0];t.style.color=d(r);t.style.backgroundColor=d(s);t.style.fontWeight=r>7?"bold":"normal"}function g(){m.forEach(function(q,r){var p=k.a&&(r==k.y*a+k.x);c(q,p)})}function i(s){k.x=s.x;k.y=s.y;if(s.w!=a||s.h!=j){Term.init(s);return}var u=0,A=0,w=s.screen;var p=7,v=0;while(u0){var x=parseInt(w.substr(u+1,q));u=u+q+1;for(;x>0&&A15){p=0}return f[p]}function l(t){a=t.w;j=t.h;var s,p,r=q1("#screen");while(r.firstChild){r.removeChild(r.firstChild)}m=[];for(var q=0;q0)&&(q%a==0)){r.appendChild(mk("br"))}r.appendChild(s);p={t:" ",fg:7,bg:0,e:s};m.push(p);c(p)}setInterval(function(){k.a=!k.a;if(k.hidden){k.a=false}if(!k.suppress){c(h(),k.a)}},500);i(t)}window.Term={init:l,load:i,setCursor:e,enableCursor:o,clear:n}})();(function(){var g="ws://"+window.location.host+"/ws/update.cgi";var d;function c(i){console.log("CONNECTED")}function b(i){console.error("SOCKET CLOSED")}function f(i){try{console.log("RX: ",i.data);Term.load(JSON.parse(i.data))}catch(j){console.error(j)}}function e(i){console.error(i.data)}function a(i){console.log("TX: ",i);if(d.readyState!=1){console.error("Socket not ready");return}if(typeof i!="string"){i=JSON.stringify(i)}d.send(i)}function h(){d=new WebSocket(g);d.onopen=c;d.onclose=b;d.onmessage=f;d.onerror=e;console.log("Opening socket.")}window.Conn={ws:null,init:h,send:a}})();(function(){function a(e){Conn.send("STR:"+e)}function b(f,e){Conn.send("TAP:"+f+","+e)}function d(e){Conn.send("BTN:"+e)}function c(){window.addEventListener("keypress",function(h){var g=+h.which;if(g>=32&&g<127){var f=String.fromCharCode(g);a(f)}});window.addEventListener("keydown",function(g){var f=g.keyCode;switch(f){case 8:a("\x08");break;case 13:a("\x0d\x0a");break;case 27:a("\x1b");break;case 37:a("\x1b[D");break;case 38:a("\x1b[A");break;case 39:a("\x1b[C");break;case 40:a("\x1b[B");break}});qa("#buttons button").forEach(function(e){e.addEventListener("click",function(){d(+this.dataset.n)})})}window.Kinp={init:c,onTap:b}})();function init(a){Term.init(a);Conn.init();Kinp.init()}; \ No newline at end of file diff --git a/html/style.css b/html/style.css deleted file mode 100644 index 0047914..0000000 --- a/html/style.css +++ /dev/null @@ -1 +0,0 @@ -html,body{background:#48505f;color:#eee;font-family:monospace;font-size:16pt;text-align:center}header{font-weight:bold;font-size:14pt;padding:6px;display:block}#screen{white-space:nowrap;background:#111213;border-radius:3px;padding:6px;box-shadow:inset 0 0 5px black;display:inline-block}#screen span{white-space:pre;cursor:pointer}#screen span:hover{outline:1px solid rgba(255,255,255,0.5)}#buttons{margin-top:10px;white-space:nowrap}button{margin:0 3px;padding:10px 0;width:18%;max-width:65px;cursor:pointer;font-weight:bold} \ No newline at end of file diff --git a/html/term.tpl b/html/term.tpl index ccbf41a..6a2f909 100644 --- a/html/term.tpl +++ b/html/term.tpl @@ -1 +1,33 @@ -ESP8266 Remote Terminal
ESP8266 Remote Terminal
\ No newline at end of file + + + + + ESP8266 Remote Terminal + + + + + + + +

ESP8266 Remote Terminal

+ +
+
+ +
+ +
+
+ + + + + diff --git a/html/wifi.tpl b/html/wifi.tpl new file mode 100644 index 0000000..60a4669 --- /dev/null +++ b/html/wifi.tpl @@ -0,0 +1,60 @@ + + + + + + + WiFi Settings - ESP8266 Remote Terminal + + + + + + +Loading… + +

WiFi settings

+ +
+ + + + + + + + + + + + + + + + + +
WiFi mode:%WiFiMode%
%WiFiapwarn%
+
+   + +
+
+
+   + +
+
+
+ +
+

Select AP to join

+
Scanning.
+ +
+ + + + diff --git a/html_orig/css/app.css b/html_orig/css/app.css new file mode 100644 index 0000000..11d0084 --- /dev/null +++ b/html_orig/css/app.css @@ -0,0 +1,588 @@ +/* normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS and IE text size adjust after device orientation change, + * without disabling user zoom. + */ +*, *:before, *:after { + box-sizing: border-box; } + +html { + font-family: sans-serif; + /* 1 */ + -ms-text-size-adjust: 100%; + /* 2 */ + -webkit-text-size-adjust: 100%; + /* 2 */ } + +/** + * Remove default margin. + */ +body { + margin: 0; } + +/* HTML5 display definitions + ========================================================================== */ +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ +figure, +nav + { + display: block; } + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ +canvas, +progress + { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. + */ +[hidden] + { + display: none; } + +/* Links + ========================================================================== */ +/** + * Remove the gray background color from active links in IE 10. + */ +a { + background-color: transparent; } + +/** + * Improve readability of focused elements when they are also in an + * active/hover state. + */ +a:active, +a:hover { + outline: 0; } + +/* Text-level semantics + ========================================================================== */ +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ +b + { + font-weight: bold; } + +/** + * Address styling not present in Safari and Chrome. + */ +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ +h1 { + font-size: 2em; + margin: 0.67em 0; } + +h2 { + font-size: 2em; + margin: 0.67em 0; } + +/** + * Address styling not present in IE 8/9. + */ +/** + * Address inconsistent and variable font size in all browsers. + */ +small { + font-size: 80%; } + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; } + +sup { + top: -0.5em; } + +sub { + bottom: -0.25em; } + +/* Embedded content + ========================================================================== */ +/** + * Remove border when inside `a` element in IE 8/9/10. + */ +img { + border: 0; } + +/** + * Correct overflow not hidden in IE 9/10/11. + */ +svg:not(:root) { + overflow: hidden; } + +/* Grouping content + ========================================================================== */ +/** + * Address margin not present in IE 8/9 and Safari. + */ +/** + * Address differences between Firefox and other browsers. + */ +hr { + box-sizing: content-box; + height: 0; } + +/** + * Contain overflow in all browsers. + */ +pre { + overflow: auto; } + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ +code, +pre + { + font-family: monospace; + font-size: 1em; } + +/* Forms + ========================================================================== */ +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ +button, +input, +select, +textarea { + color: inherit; + /* 1 */ + font: inherit; + /* 2 */ + margin: 0; + /* 3 */ } + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ +button { + overflow: visible; } + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ +button, +select { + text-transform: none; } + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ +button, +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + /* 2 */ + cursor: pointer; + /* 3 */ } + +/** + * Re-set default cursor for disabled elements. + */ +button[disabled], +html input[disabled] { + cursor: default; } + +/** + * Remove inner padding and border in Firefox 4+. + */ +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; } + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ +input { + line-height: normal; } + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; + /* 1 */ + padding: 0; + /* 2 */ } + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome. + */ +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ +/** + * Define consistent border, margin, and padding. + */ +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ +legend { + border: 0; + /* 1 */ + padding: 0; + /* 2 */ } + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ +textarea { + overflow: auto; } + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ +/* Tables + ========================================================================== */ +/** + * Remove most spacing between table cells. + */ +table { + border-collapse: collapse; + border-spacing: 0; } + +td, +th { + padding: 0; } + +html { + box-sizing: border-box; } + +*, *::after, *::before { + box-sizing: inherit; } + +.hidden { + display: none !important; } + +[onclick] { + cursor: pointer; } + +html { + font-family: Arial, sans-serif; + color: #D0D0D0; + background: #131315; } + +html, body { + border: 0 none; + margin: 0; + padding: 0; + text-decoration: none; + width: 100%; + height: 100%; + overflow: hidden; } + +a, a:visited, a:link { + cursor: pointer; + color: #5abfff; + text-decoration: none; } + +a:hover { + color: #5abfff; + text-decoration: underline; } + +.Box { + display: block; + max-width: 900px; + margin-top: 1rem; + padding: 0.61805rem 1rem; + border-radius: 3px; + background-color: rgba(255, 255, 255, 0.07); } + @media screen and (max-width: 544px) { + .Box { + margin-top: 0.61805rem; + padding: 0.23608rem 0.38198rem; } } + +body { + position: relative; + padding: 1rem; + overflow-y: auto; } + @media screen and (max-width: 544px) { + body { + padding: 0.61805rem; } } + body > * { + margin-left: auto; + margin-right: auto; } + body h1 { + text-align: center; + font-size: 2.02729em; + margin-top: 0; + margin-bottom: 1rem; } + @media screen and (max-width: 544px) { + body h1 { + font-size: 1.42383em; + margin-bottom: 0.61805rem; } } + @media screen and (min-width: 545px) and (max-width: 1000px) { + body h1 { + font-size: 1.80203em; } } + body td, body th { + padding: 0.38198rem; + white-space: nowrap; } + @media screen and (max-width: 544px) { + body td, body th { + padding: 0.23608rem; } } + body tbody th { + text-align: right; + width: 130px; + color: white; } + @media screen and (max-width: 544px) { + body tbody th { + width: auto; } } + body tbody td input[type="text"], body tbody td input[type="number"] { + width: 10em; } + @media screen and (max-width: 544px) { + body tbody td input[type="text"], body tbody td input[type="number"] { + width: 8em; } } + +#loader { + position: absolute; + right: 1.618rem; + top: 1.618rem; + transition: opacity .2s; + opacity: 0; } + @media screen and (max-width: 544px) { + #loader { + top: 1rem; + right: 1rem; } } + #loader.show { + opacity: 1; } + +button, input[type=submit] { + text-align: center; + cursor: pointer; + display: inline-block; + border-radius: 2px; + padding: 0 0.6em; + border: 0 none; + outline: 0 none !important; + line-height: 1.8em; + font-size: 1.1em; + margin-bottom: 3px; + min-width: 5em; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + text-shadow: 1.5px 1.5px 2px rgba(0, 0, 0, 0.6); + background-color: #3983cd; + box-shadow: 0 3px 0 #265f98; + text-decoration: none !important; } + button:active, input[type=submit]:active { + position: relative; + top: 2px; } + button.narrow, input[type=submit].narrow { + min-width: initial; } + button, button:link, button:visited, input[type=submit], input[type=submit]:link, input[type=submit]:visited { + color: #FEFEFE; } + button:hover, button:active, button.active, button.selected, input[type=submit]:hover, input[type=submit]:active, input[type=submit].active, input[type=submit].selected { + background-color: #2076C6; + color: #FEFEFE; } + button:hover, button.selected, button.active, input[type=submit]:hover, input[type=submit].selected, input[type=submit].active { + box-shadow: 0 3px 0 #154c80; } + button:active, input[type=submit]:active { + box-shadow: 0 1px 0 #154c80; } + +button, input[type=submit] { + text-align: center; + cursor: pointer; + display: inline-block; + border-radius: 2px; + padding: 0 0.6em; + border: 0 none; + outline: 0 none !important; + line-height: 1.8em; + font-size: 1.1em; + margin-bottom: 3px; + min-width: 5em; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + text-shadow: 1.5px 1.5px 2px rgba(0, 0, 0, 0.6); + background-color: #3983cd; + box-shadow: 0 3px 0 #265f98; + text-decoration: none !important; } + button:active, input[type=submit]:active { + position: relative; + top: 2px; } + button.narrow, input[type=submit].narrow { + min-width: initial; } + button, button:link, button:visited, input[type=submit], input[type=submit]:link, input[type=submit]:visited { + color: #FEFEFE; } + button:hover, button:active, button.active, button.selected, input[type=submit]:hover, input[type=submit]:active, input[type=submit].active, input[type=submit].selected { + background-color: #2076C6; + color: #FEFEFE; } + button:hover, button.selected, button.active, input[type=submit]:hover, input[type=submit].selected, input[type=submit].active { + box-shadow: 0 3px 0 #154c80; } + button:active, input[type=submit]:active { + box-shadow: 0 1px 0 #154c80; } + +input[type="number"], input[type="password"], input[type="text"], textarea, select { + border: 0 none; + border-bottom: 2px solid #214e7a; + background-color: #303030; + color: white; + padding: 6px; + line-height: 1em; + outline: 0 none !important; + -moz-outline: 0 none !important; + font-weight: normal; } + input[type="number"]:focus, input[type="number"]:hover, input[type="password"]:focus, input[type="password"]:hover, input[type="text"]:focus, input[type="text"]:hover, textarea:focus, textarea:hover, select:focus, select:hover { + border-bottom-color: #2972ba; } + +#ap-list { + column-count: 3; + column-gap: 0; + margin: 0 -0.23608rem; } + @media screen and (min-width: 545px) and (max-width: 1000px) { + #ap-list { + column-count: 2; } } + @media screen and (max-width: 544px) { + #ap-list { + column-count: 1; } } + +#ap-loader { + background: rgba(255, 255, 255, 0.1); + border-radius: 5px; + padding: 0.38198rem; + margin-bottom: 0.38198rem; } + +#ap-box { + padding-bottom: 0.38198rem; } + +.AP { + break-inside: avoid-column; + max-width: 500px; + padding: 0.23608rem; } + .AP.selected .inner { + background: #42a6f9 !important; + cursor: default; + top: 0 !important; } + .AP .inner { + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + position: relative; + border-radius: 3px; + color: #222; + background: #afafaf; + transition: background-color 0.5s; + display: flex; } + .AP .inner:active { + left: 0; + top: 1px; } + .AP .inner:hover { + background: white; } + .AP .inner > * { + padding: 0.61805rem; + white-space: nowrap; + word-wrap: normal; } + .AP .inner .rssi { + min-width: 2.5rem; + flex: 0 0 15%; + text-align: right; } + .AP .inner .rssi:after { + padding-left: 0.09018rem; + content: '%'; + font-size: 0.88889em; } + .AP .inner .essid { + flex: 1 1 70%; + min-width: 0; + text-overflow: ellipsis; + overflow: hidden; + font-weight: bold; } + .AP .inner .auth { + flex: 0 0 15%; } + +.page-term #screen { + font-family: monospace; + font-size: 16pt; + white-space: nowrap; + background: #111213; + padding: 6px; + display: inline-block; + border: 2px solid #3983CD; } + .page-term #screen span { + white-space: pre; + cursor: pointer; } + .page-term #screen span:hover { + outline: 1px solid rgba(255, 255, 255, 0.5); } +.page-term #buttons { + margin-top: 10px; + white-space: nowrap; } + .page-term #buttons button { + margin: 0 3px; + padding: 10px 0; + width: 18%; + max-width: 65px; + min-width: initial; + cursor: pointer; + font-weight: bold; } + +#termwrap { + text-align: center; } + +/*# sourceMappingURL=app.css.map */ diff --git a/html_orig/favicon.ico b/html_orig/favicon.ico new file mode 100644 index 0000000..6916039 Binary files /dev/null and b/html_orig/favicon.ico differ diff --git a/html_orig/img/cvut.svg b/html_orig/img/cvut.svg new file mode 100755 index 0000000..dc015d3 --- /dev/null +++ b/html_orig/img/cvut.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/html_orig/img/loader.gif b/html_orig/img/loader.gif new file mode 100755 index 0000000..dfb5362 Binary files /dev/null and b/html_orig/img/loader.gif differ diff --git a/html_orig/js/app.js b/html_orig/js/app.js new file mode 100644 index 0000000..73c3ee2 --- /dev/null +++ b/html_orig/js/app.js @@ -0,0 +1,1256 @@ +/*!chibi 3.0.7, Copyright 2012-2016 Kyle Barrow, released under MIT license */ + +// MODIFIED VERSION. +(function () { + 'use strict'; + + var readyfn = [], + loadedfn = [], + domready = false, + pageloaded = false, + d = document, + w = window; + + // Fire any function calls on ready event + function fireReady() { + var i; + domready = true; + for (i = 0; i < readyfn.length; i += 1) { + readyfn[i](); + } + readyfn = []; + } + + // Fire any function calls on loaded event + function fireLoaded() { + var i; + pageloaded = true; + // For browsers with no DOM loaded support + if (!domready) { + fireReady(); + } + for (i = 0; i < loadedfn.length; i += 1) { + loadedfn[i](); + } + loadedfn = []; + } + + // Check DOM ready, page loaded + if (d.addEventListener) { + // Standards + d.addEventListener('DOMContentLoaded', fireReady, false); + w.addEventListener('load', fireLoaded, false); + } else if (d.attachEvent) { + // IE + d.attachEvent('onreadystatechange', fireReady); + // IE < 9 + w.attachEvent('onload', fireLoaded); + } else { + // Anything else + w.onload = fireLoaded; + } + + // Utility functions + + // Loop through node array + function nodeLoop(fn, nodes) { + var i; + // Good idea to walk up the DOM + for (i = nodes.length - 1; i >= 0; i -= 1) { + fn(nodes[i]); + } + } + + // Convert to camel case + function cssCamel(property) { + return property.replace(/-\w/g, function (result) { + return result.charAt(1).toUpperCase(); + }); + } + + // Get computed style + function computeStyle(elm, property) { + // IE, everything else or null + return (elm.currentStyle) ? elm.currentStyle[cssCamel(property)] : (w.getComputedStyle) ? w.getComputedStyle(elm, null).getPropertyValue(property) : null; + + } + + // Returns URI encoded query string pair + function queryPair(name, value) { + return encodeURIComponent(name).replace(/%20/g, '+') + '=' + encodeURIComponent(value).replace(/%20/g, '+'); + } + + // Set CSS, important to wrap in try to prevent error thown on unsupported property + function setCss(elm, property, value) { + try { + elm.style[cssCamel(property)] = value; + } catch (e) { + } + } + + // Show CSS + function showCss(elm) { + elm.style.display = ''; + // For elements still hidden by style block + if (computeStyle(elm, 'display') === 'none') { + elm.style.display = 'block'; + } + } + + // Serialize form & JSON values + function serializeData(nodes) { + var querystring = '', subelm, i, j; + if (nodes.constructor === Object) { // Serialize JSON data + for (subelm in nodes) { + if (nodes.hasOwnProperty(subelm)) { + if (nodes[subelm].constructor === Array) { + for (i = 0; i < nodes[subelm].length; i += 1) { + querystring += '&' + queryPair(subelm, nodes[subelm][i]); + } + } else { + querystring += '&' + queryPair(subelm, nodes[subelm]); + } + } + } + } else { // Serialize node data + nodeLoop(function (elm) { + if (elm.nodeName === 'FORM') { + for (i = 0; i < elm.elements.length; i += 1) { + subelm = elm.elements[i]; + + if (!subelm.disabled) { + switch (subelm.type) { + // Ignore buttons, unsupported XHR 1 form fields + case 'button': + case 'image': + case 'file': + case 'submit': + case 'reset': + break; + + case 'select-one': + if (subelm.length > 0) { + querystring += '&' + queryPair(subelm.name, subelm.value); + } + break; + + case 'select-multiple': + for (j = 0; j < subelm.length; j += 1) { + if (subelm[j].selected) { + querystring += '&' + queryPair(subelm.name, subelm[j].value); + } + } + break; + + case 'checkbox': + case 'radio': + if (subelm.checked) { + querystring += '&' + queryPair(subelm.name, subelm.value); + } + break; + + // Everything else including shinny new HTML5 input types + default: + querystring += '&' + queryPair(subelm.name, subelm.value); + } + } + } + } + }, nodes); + } + // Tidy up first & + return (querystring.length > 0) ? querystring.substring(1) : ''; + } + + // Class helper + function classHelper(classes, action, nodes) { + var classarray, search, i, replace, has = false; + if (classes) { + // Trim any whitespace + classarray = classes.split(/\s+/); + nodeLoop(function (elm) { + for (i = 0; i < classarray.length; i += 1) { + search = new RegExp('\\b' + classarray[i] + '\\b', 'g'); + replace = new RegExp(' *' + classarray[i] + '\\b', 'g'); + if (action === 'remove') { + elm.className = elm.className.replace(search, ''); + } else if (action === 'toggle') { + elm.className = (elm.className.match(search)) ? elm.className.replace(replace, '') : elm.className + ' ' + classarray[i]; + } else if (action === 'has') { + if (elm.className.match(search)) { + has = true; + break; + } + } + } + }, nodes); + } + return has; + } + + // HTML insertion helper + function insertHtml(value, position, nodes) { + var tmpnodes, tmpnode; + if (value) { + nodeLoop(function (elm) { + // No insertAdjacentHTML support for FF < 8 and IE doesn't allow insertAdjacentHTML table manipulation, so use this instead + // Convert string to node. We can't innerHTML on a document fragment + tmpnodes = d.createElement('div'); + tmpnodes.innerHTML = value; + while ((tmpnode = tmpnodes.lastChild) !== null) { + // Catch error in unlikely case elm has been removed + try { + if (position === 'before') { + elm.parentNode.insertBefore(tmpnode, elm); + } else if (position === 'after') { + elm.parentNode.insertBefore(tmpnode, elm.nextSibling); + } else if (position === 'append') { + elm.appendChild(tmpnode); + } else if (position === 'prepend') { + elm.insertBefore(tmpnode, elm.firstChild); + } + } catch (e) { + break; + } + } + }, nodes); + } + } + + // Get nodes and return chibi + function chibi(selector) { + var cb, nodes = [], json = false, nodelist, i; + + if (selector) { + + // Element node, would prefer to use (selector instanceof HTMLElement) but no IE support + if (selector.nodeType && selector.nodeType === 1) { + nodes = [selector]; // return element as node list + } else if (typeof selector === 'object') { + // JSON, document object or node list, would prefer to use (selector instanceof NodeList) but no IE support + json = (typeof selector.length !== 'number'); + nodes = selector; + } else if (typeof selector === 'string') { + nodelist = d.querySelectorAll(selector); + + // Convert node list to array so results have full access to array methods + // Array.prototype.slice.call not supported in IE < 9 and often slower than loop anyway + for (i = 0; i < nodelist.length; i += 1) { + nodes[i] = nodelist[i]; + } + } + } + + // Only attach nodes if not JSON + cb = json ? {} : nodes; + + // Public functions + + // Executes a function on nodes + cb.each = function (fn) { + if (typeof fn === 'function') { + nodeLoop(function (elm) { + // <= IE 8 loses scope so need to apply + return fn.apply(elm, arguments); + }, nodes); + } + return cb; + }; + // Find first + cb.first = function () { + return chibi(nodes.shift()); + }; + // Find last + cb.last = function () { + return chibi(nodes.pop()); + }; + // Find odd + cb.odd = function () { + var odds = [], i; + for (i = 0; i < nodes.length; i += 2) { + odds.push(nodes[i]); + } + return chibi(odds); + }; + // Find even + cb.even = function () { + var evens = [], i; + for (i = 1; i < nodes.length; i += 2) { + evens.push(nodes[i]); + } + return chibi(evens); + }; + // Hide node + cb.hide = function () { + nodeLoop(function (elm) { + elm.style.display = 'none'; + }, nodes); + return cb; + }; + // Show node + cb.show = function () { + nodeLoop(function (elm) { + showCss(elm); + }, nodes); + return cb; + }; + // Toggle node display + cb.toggle = function (state) { + if (typeof state != 'undefined') { // ADDED + if (state) + cb.show(); + else + cb.hide(); + } else { + nodeLoop(function (elm) { + // computeStyle instead of style.display == 'none' catches elements that are hidden via style block + if (computeStyle(elm, 'display') === 'none') { + showCss(elm); + } else { + elm.style.display = 'none'; + } + + }, nodes); + } + return cb; + }; + // Remove node + cb.remove = function () { + nodeLoop(function (elm) { + // Catch error in unlikely case elm has been removed + try { + elm.parentNode.removeChild(elm); + } catch (e) { + } + }, nodes); + return chibi(); + }; + // Get/Set CSS + cb.css = function (property, value) { + if (property) { + if (value || value === '') { + nodeLoop(function (elm) { + setCss(elm, property, value); + }, nodes); + return cb; + } + if (nodes[0]) { + if (nodes[0].style[cssCamel(property)]) { + return nodes[0].style[cssCamel(property)]; + } + if (computeStyle(nodes[0], property)) { + return computeStyle(nodes[0], property); + } + } + } + }; + // Get class(es) + cb.getClass = function () { + if (nodes[0] && nodes[0].className.length > 0) { + // Weak IE trim support + return nodes[0].className.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '').replace(/\s+/, ' '); + } + }; + // Set (replaces) classes + cb.setClass = function (classes) { + if (classes || classes === '') { + nodeLoop(function (elm) { + elm.className = classes; + }, nodes); + } + return cb; + }; + // Add class + cb.addClass = function (classes) { + if (classes) { + nodeLoop(function (elm) { + elm.className += ' ' + classes; + }, nodes); + } + return cb; + }; + // Remove class + cb.removeClass = function (classes) { + classHelper(classes, 'remove', nodes); + return cb; + }; + // Toggle class + cb.toggleClass = function (classes) { + classHelper(classes, 'toggle', nodes); + return cb; + }; + // Has class + cb.hasClass = function (classes) { + return classHelper(classes, 'has', nodes); + }; + // Get/set HTML + cb.html = function (value) { + if (value || value === '') { + nodeLoop(function (elm) { + elm.innerHTML = value; + }, nodes); + return cb; + } + if (nodes[0]) { + return nodes[0].innerHTML; + } + }; + // Insert HTML before selector + cb.htmlBefore = function (value) { + insertHtml(value, 'before', nodes); + return cb; + }; + // Insert HTML after selector + cb.htmlAfter = function (value) { + insertHtml(value, 'after', nodes); + return cb; + }; + // Insert HTML after selector innerHTML + cb.htmlAppend = function (value) { + insertHtml(value, 'append', nodes); + return cb; + }; + // Insert HTML before selector innerHTML + cb.htmlPrepend = function (value) { + insertHtml(value, 'prepend', nodes); + return cb; + }; + // Get/Set HTML attributes + cb.attr = function (property, value) { + if (property) { + property = property.toLowerCase(); + // IE < 9 doesn't allow style or class via get/setAttribute so switch. cssText returns prettier CSS anyway + if (typeof value !== 'undefined') {//FIXED BUG HERE + nodeLoop(function (elm) { + if (property === 'style') { + elm.style.cssText = value; + } else if (property === 'class') { + elm.className = value; + } else { + elm.setAttribute(property, value); + } + }, nodes); + return cb; + } + if (nodes[0]) { + if (property === 'style') { + if (nodes[0].style.cssText) { + return nodes[0].style.cssText; + } + } else if (property === 'class') { + if (nodes[0].className) { + return nodes[0].className; + } + } else { + if (nodes[0].getAttribute(property)) { + return nodes[0].getAttribute(property); + } + } + } + } + }; + // Get/Set HTML data property + cb.data = function (key, value) { + if (key) { + return cb.attr('data-' + key, value); + } + }; + // Get/Set form element values + cb.val = function (value) { + var values, i, j; + if (typeof value != 'undefined') { // FIXED A BUG HERE + nodeLoop(function (elm) { + switch (elm.nodeName) { + case 'SELECT': + if (typeof value === 'string' || typeof value === 'number') { + value = [value]; + } + for (i = 0; i < elm.length; i += 1) { + // Multiple select + for (j = 0; j < value.length; j += 1) { + elm[i].selected = ''; + if (elm[i].value === value[j]) { + elm[i].selected = 'selected'; + break; + } + } + } + break; + case 'INPUT': + case 'TEXTAREA': + case 'BUTTON': + elm.value = value; + break; + } + }, nodes); + + return cb; + } + if (nodes[0]) { + switch (nodes[0].nodeName) { + case 'SELECT': + values = []; + for (i = 0; i < nodes[0].length; i += 1) { + if (nodes[0][i].selected) { + values.push(nodes[0][i].value); + } + } + return (values.length > 1) ? values : values[0]; + case 'INPUT': + case 'TEXTAREA': + case 'BUTTON': + return nodes[0].value; + } + } + }; + // Return matching checked checkbox or radios + cb.checked = function (check) { + if (typeof check === 'boolean') { + nodeLoop(function (elm) { + if (elm.nodeName === 'INPUT' && (elm.type === 'checkbox' || elm.type === 'radio')) { + elm.checked = check; + } + }, nodes); + return cb; + } + if (nodes[0] && nodes[0].nodeName === 'INPUT' && (nodes[0].type === 'checkbox' || nodes[0].type === 'radio')) { + return (!!nodes[0].checked); + } + }; + // Add event handler + cb.on = function (event, fn) { + if (selector === w || selector === d) { + nodes = [selector]; + } + nodeLoop(function (elm) { + if (d.addEventListener) { + elm.addEventListener(event, fn, false); + } else if (d.attachEvent) { + // <= IE 8 loses scope so need to apply, we add this to object so we can detach later (can't detach anonymous functions) + elm[event + fn] = function () { + return fn.apply(elm, arguments); + }; + elm.attachEvent('on' + event, elm[event + fn]); + } + }, nodes); + return cb; + }; + // Remove event handler + cb.off = function (event, fn) { + if (selector === w || selector === d) { + nodes = [selector]; + } + nodeLoop(function (elm) { + if (d.addEventListener) { + elm.removeEventListener(event, fn, false); + } else if (d.attachEvent) { + elm.detachEvent('on' + event, elm[event + fn]); + // Tidy up + elm[event + fn] = null; + } + }, nodes); + return cb; + }; + return cb; + } + + // Basic XHR + chibi.ajax = function (options) { // if options is a number, it's timeout in ms + var opts = extend({ + method: 'GET', + nocache: true, + timeout: 5000, + loader: true, + callback: null + }, options); + opts.method = opts.method.toUpperCase(); + + var loaderFn = opts.loader ? chibi._loader : function(){}; + var url = opts.url; + var method = opts.method; + var query = null; + + if (opts.data) { + query = serializeData(opts.data); + } + + console.log(opts); + console.log(query); + + if (query && (method === 'GET')) { + url += (url.indexOf('?') === -1) ? '?' + query : '&' + query; + query = null; + } + + var xhr = new XMLHttpRequest(); + + // prevent caching + if (opts.nocache) { + var ts = (+(new Date())).toString(36); + url += ((url.indexOf('?') === -1) ? '?' : '&') + '_=' + ts; + } + + loaderFn(true); + + xhr.open(method, url, true); + xhr.timeout = opts.timeout; + + // Abort after given timeout + var abortTmeo = setTimeout(function () { + console.error("XHR timed out."); + xhr.abort(); + loaderFn(false); + }, opts.timeout + 10); + + xhr.onreadystatechange = function () { + if (xhr.readyState === 4) { + loaderFn(false); + + opts.callback && opts.callback(xhr.responseText, xhr.status); + + clearTimeout(abortTmeo); + } + }; + + xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); + if (method === 'POST') { + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); + } + + xhr.send(query); + return xhr; + }; + + chibi._loader = function(){}; + + // Alias to cb.ajax(url, 'get', callback) + chibi.get = function (url, callback, opts) { + opts = opts || {}; + opts.url = url; + opts.callback = callback; + opts.method = 'GET'; + return chibi.ajax(opts); + }; + + // Alias to cb.ajax(url, 'post', callback) + chibi.post = function (url, callback, opts) { + opts = opts || {}; + opts.url = url; + opts.callback = callback; + opts.method = 'POST'; + return chibi.ajax(opts); + }; + + // Fire on DOM ready + chibi.ready = function (fn) { + if (fn) { + if (domready) { + fn(); + return chibi; + } else { + readyfn.push(fn); + } + } + }; + + // Fire on page loaded + chibi.loaded = function (fn) { + if (fn) { + if (pageloaded) { + fn(); + return chibi; + } else { + loadedfn.push(fn); + } + } + }; + + var entityMap = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + "'": ''', + '/': '/', + '`': '`', + '=': '=' + }; + + chibi.htmlEscape = function(string) { + return String(string).replace(/[&<>"'`=\/]/g, function (s) { + return entityMap[s]; + }); + }; + + // Set Chibi's global namespace here ($) + w.$ = chibi; +}()); +/** Make a node */ +function mk(e) {return document.createElement(e)} + +/** Find one by query */ +function qq(s) {return document.querySelector(s)} + +/** Find all by query */ +function qa(s) {return document.querySelectorAll(s)} + +/** Convert any to bool safely */ +function bool(x) { + return (x === 1 || x === '1' || x === true || x === 'true'); +} + +function intval(x) { + return parseInt(x); +} + +/** Extend an objects with options */ +function extend(defaults, options) { + var target = {}; + + Object.keys(defaults).forEach(function(k){ + target[k] = defaults[k]; + }); + + Object.keys(options).forEach(function(k){ + target[k] = options[k]; + }); + + return target; +} + +/** Escape string for use as literal in RegExp */ +function rgxe(str) { + return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"); +} + +function numfmt(x, places) { + var pow = Math.pow(10, places); + return Math.round(x*pow) / pow; +} + +function estimateLoadTime(fs, n) { + return (1000/fs)*n+1500; +} + +function msNow() { + return +(new Date); +} + +function msElapsed(start) { + return msNow() - start; +} + +Math.log10 = Math.log10 || function(x) { + return Math.log(x) / Math.LN10; +}; + +/** + * Perform a substitution in the given string. + * + * Arguments - array or list of replacements. + * Arguments numeric keys will replace {0}, {1} etc. + * Named keys also work, ie. {foo: "bar"} -> replaces {foo} with bar. + * + * Braces are added to keys if missing. + * + * @returns {String} result + */ +String.prototype.format = function () { + var out = this; + var repl = arguments; + + if (arguments.length == 1 && (Array.isArray(arguments[0]) || typeof arguments[0] == 'object')) { + repl = arguments[0]; + } + + for (var ph in repl) { + if (repl.hasOwnProperty(ph)) { + var ph_orig = ph; + + if (!ph.match(/^\{.*\}$/)) { + ph = '{' + ph + '}'; + } + + // replace all occurrences + var pattern = new RegExp(rgxe(ph), "g"); + out = out.replace(pattern, repl[ph_orig]); + } + } + + return out; +}; + +/** Global generic init */ +$.ready(function () { + // loader dots... + setInterval(function () { + $('.anim-dots').each(function (x) { + var $x = $(x); + var dots = $x.html() + '.'; + if (dots.length == 5) dots = '.'; + $x.html(dots); + }); + }, 1000); + + $('input[type=number]').on('mousewheel', function(e) { + var val = +$(this).val(); + if (isNaN(val)) val = 1; + + var step = +($(this).attr('step') || 1); + var min = +$(this).attr('min'); + var max = +$(this).attr('max'); + if(e.wheelDelta > 0) { + val += step; + } else { + val -= step; + } + + if (typeof min != 'undefined') val = Math.max(val, +min); + if (typeof max != 'undefined') val = Math.min(val, +max); + $(this).val(val); + + if ("createEvent" in document) { + var evt = document.createEvent("HTMLEvents"); + evt.initEvent("change", false, true); + $(this)[0].dispatchEvent(evt); + } else { + $(this)[0].fireEvent("onchange"); + } + + e.preventDefault(); + }); +}); + +$._loader = function(vis) { + console.log("loader fn", vis); + if(vis) + $('#loader').addClass('show'); + else + $('#loader').removeClass('show'); +}; +(function() { + /** + * Terminal module + */ + var Term = (function () { + var W, H; + var cursor = {a: false, x: 0, y: 0, suppress: false, hidden: false}; + var screen = []; + + /** Colors table */ + var CLR = [// dark gray #2E3436 + // 0 black, 1 red, 2 green, 3 yellow + // 4 blue, 5 mag, 6 cyan, 7 white + '#111213','#CC0000','#4E9A06','#C4A000', + '#3465A4','#75507B','#06989A','#D3D7CF', + // BRIGHT + // 8 black, 9 red, 10 green, 11 yellow + // 12 blue, 13 mag, 14 cyan, 15 white + '#555753','#EF2929','#8AE234','#FCE94F', + '#729FCF','#AD7FA8','#34E2E2','#EEEEEC' + ]; + + /** Clear screen */ + function cls() { + screen.forEach(function(cell, i) { + cell.t = ' '; + cell.fg = 7; + cell.bg = 0; + blit(cell); + }); + } + + /** Set text and color at XY */ + function cellAt(y, x) { + return screen[y*W+x]; + } + + /** Get cell under cursor */ + function cursorCell() { + return cellAt(cursor.y, cursor.x); + } + + /** Enable or disable cursor visibility */ + function cursorEnable(enable) { + cursor.hidden = !enable; + cursor.a &= enable; + blit(cursorCell(), cursor.a); + } + + /** Safely move cursor */ + function cursorSet(y, x) { + // Hide and prevent from showing up during the move + cursor.suppress = true; + blit(cursorCell(), false); + + cursor.x = x; + cursor.y = y; + + // Show again + cursor.suppress = false; + blit(cursorCell(), cursor.a); + } + + /** Update cell on display. inv = invert (for cursor) */ + function blit(cell, inv) { + var e = cell.e, fg, bg; + // Colors + fg = inv ? cell.bg : cell.fg; + bg = inv ? cell.fg : cell.bg; + // Update + e.innerText = (cell.t+' ')[0]; + e.style.color = colorHex(fg); + e.style.backgroundColor = colorHex(bg); + e.style.fontWeight = fg > 7 ? 'bold' : 'normal'; + } + + /** Show entire screen */ + function blitAll() { + screen.forEach(function(cell, i) { + /* Invert if under cursor & cursor active */ + var inv = cursor.a && (i == cursor.y*W+cursor.x); + blit(cell, inv); + }); + } + + /** Load screen content from a 'binary' sequence */ + function load(obj) { + cursor.x = obj.x; + cursor.y = obj.y; + cursor.hidden = !obj.cv; + + // full re-init if size changed + if (obj.w != W || obj.h != H) { + Term.init(obj); + return; + } + + // Simple compression - hexFG hexBG 'ASCII' (r/s/t/u NUM{1,2,3,4})? + // comma instead of both colors = same as before + + var i = 0, ci = 0, str = obj.screen; + var fg = 7, bg = 0; + while(i < str.length && ci 0) { + var rep = parseInt(str.substr(i+1,repchars)); + i = i + repchars + 1; + for (; rep>0 && ci 15) c = 0; + return CLR[c]; + } + + /** Init the terminal */ + function init(obj) { + W = obj.w; + H = obj.h; + + /* Build screen & show */ + var e, cell, scr = qq('#screen'); + + // Empty the screen node + while (scr.firstChild) scr.removeChild(scr.firstChild); + + screen = []; + + for(var i = 0; i < W*H; i++) { + e = mk('span'); + + (function() { + var x = i % W; + var y = Math.floor(i / W); + e.addEventListener('click', function () { + Input.onTap(y, x); + }); + })(); + + /* End of line */ + if ((i > 0) && (i % W == 0)) { + scr.appendChild(mk('br')); + } + /* The cell */ + scr.appendChild(e); + + cell = {t: ' ', fg: 7, bg: 0, e: e}; + screen.push(cell); + blit(cell); + } + + /* Cursor blinking */ + setInterval(function() { + cursor.a = !cursor.a; + if (cursor.hidden) { + cursor.a = false; + } + + if (!cursor.suppress) { + blit(cursorCell(), cursor.a); + } + }, 500); + + load(obj); + } + + // publish + return { + init: init, + load: load + }; + })(); + + /** Handle connections */ + var Conn = (function() { + var ws; + + function onOpen(evt) { + console.log("CONNECTED"); + } + + function onClose(evt) { + console.error("SOCKET CLOSED"); + } + + function onMessage(evt) { + try { + console.log("RX: ", evt.data); + // Assume all our messages are screen updates + Term.load(JSON.parse(evt.data)); + } catch(e) { + console.error(e); + } + } + + function onError(evt) { + console.error(evt.data); + } + + function doSend(message) { + console.log("TX: ", message); + if (ws.readyState != 1) { + console.error("Socket not ready"); + return; + } + if (typeof message != "string") { + message = JSON.stringify(message); + } + ws.send(message); + } + + function init() { + ws = new WebSocket("ws://"+_root+"/ws/update.cgi"); + ws.onopen = onOpen; + ws.onclose = onClose; + ws.onmessage = onMessage; + ws.onerror = onError; + + console.log("Opening socket."); + } + + return { + ws: null, + init: init, + send: doSend + }; + })(); + + // + // Keyboard (& mouse) input + // + var Input = (function() { + function sendStrMsg(str) { + Conn.send("STR:"+str); + } + + function sendPosMsg(y, x) { + Conn.send("TAP:"+y+','+x); + } + + function sendBtnMsg(n) { + Conn.send("BTN:"+n); + } + + function init() { + window.addEventListener('keypress', function(e) { + var code = +e.which; + if (code >= 32 && code < 127) { + var ch = String.fromCharCode(code); + //console.log("Typed ", ch, "code", code, e); + sendStrMsg(ch); + } + }); + + window.addEventListener('keydown', function(e) { + var code = e.keyCode; + //console.log("Down ", code, e); + switch(code) { + case 8: sendStrMsg('\x08'); break; + case 13: sendStrMsg('\x0d\x0a'); break; + case 27: sendStrMsg('\x1b'); break; // this allows to directly enter control sequences + case 37: sendStrMsg('\x1b[D'); break; + case 38: sendStrMsg('\x1b[A'); break; + case 39: sendStrMsg('\x1b[C'); break; + case 40: sendStrMsg('\x1b[B'); break; + } + }); + + qa('#buttons button').forEach(function(s) { + s.addEventListener('click', function() { + sendBtnMsg(+this.dataset['n']); + }); + }); + } + + return { + init: init, + onTap: sendPosMsg + }; + })(); + + + window.termInit = function (obj) { + Term.init(obj); + Conn.init(); + Input.init(); + } +})(); +/** Wifi page */ +(function () { + var authStr = ['Open', 'WEP', 'WPA', 'WPA2', 'WPA/WPA2']; + var curSSID; + + /** Update display for received response */ + function onScan(resp, status) { + if (status != 200) { + // bad response + rescan(5000); // wait 5sm then retry + return; + } + + resp = JSON.parse(resp); + + var done = !bool(resp.result.inProgress) && (resp.result.APs.length > 0); + rescan(done ? 15000 : 1000); + if (!done) return; // no redraw yet + + // clear the AP list + var $list = $('#ap-list'); + // remove old APs + $('.AP').remove(); + + $list.toggle(done); + $('#ap-loader').toggle(!done); + + // scan done + resp.result.APs.sort(function (a, b) { + return b.rssi - a.rssi; + }).forEach(function (ap) { + ap.enc = intval(ap.enc); + + if (ap.enc > 4) return; // hide unsupported auths + + var item = document.createElement('div'); + + var $item = $(item) + .data('ssid', ap.essid) + .data('pwd', ap.enc != 0) + .addClass('AP'); + + // mark current SSID + if (ap.essid == curSSID) { + $item.addClass('selected'); + } + + var inner = document.createElement('div'); + $(inner).addClass('inner') + .htmlAppend('
{0}
'.format(ap.rssi_perc)) + .htmlAppend('
{0}
'.format($.htmlEscape(ap.essid))) + .htmlAppend('
{0}
'.format(authStr[ap.enc])); + + $item.on('click', function () { + var $th = $(this); + + var ssid = $th.data('ssid'); + var pass = ''; + + if ($th.data('pwd')) { + // this AP needs a password + var pass = prompt("Password for \""+ssid+"\":"); + if (pass === null) { + return; + } + } + + $.post('http://'+_root+'/wifi/connect', null, { + essid: ssid, + passwd: pass + }); + }); + + + item.appendChild(inner); + $list[0].appendChild(item); + }); + } + + /** Ask the CGI what APs are visible (async) */ + function scanAPs() { + $.get('http://'+_root+'/wifi/scan', onScan); + } + + function rescan(time) { + setTimeout(scanAPs, time); + } + + /** Set up the WiFi page */ + window.wifiInit = function (obj) { + //var ap_json = { + // "result": { + // "inProgress": "0", + // "APs": [ + // {"essid": "Chlivek", "bssid": "88:f7:c7:52:b3:99", "rssi": "204", "enc": "4", "channel": "1"}, + // {"essid": "TyNikdy", "bssid": "5c:f4:ab:0d:f1:1b", "rssi": "164", "enc": "3", "channel": "1"}, + // ] + // } + //}; + + curSSID = obj.curSSID; + + scanAPs(); + }; +})(); diff --git a/html_orig/jssrc/appcommon.js b/html_orig/jssrc/appcommon.js new file mode 100644 index 0000000..8f30aa5 --- /dev/null +++ b/html_orig/jssrc/appcommon.js @@ -0,0 +1,48 @@ +/** Global generic init */ +$.ready(function () { + // loader dots... + setInterval(function () { + $('.anim-dots').each(function (x) { + var $x = $(x); + var dots = $x.html() + '.'; + if (dots.length == 5) dots = '.'; + $x.html(dots); + }); + }, 1000); + + $('input[type=number]').on('mousewheel', function(e) { + var val = +$(this).val(); + if (isNaN(val)) val = 1; + + var step = +($(this).attr('step') || 1); + var min = +$(this).attr('min'); + var max = +$(this).attr('max'); + if(e.wheelDelta > 0) { + val += step; + } else { + val -= step; + } + + if (typeof min != 'undefined') val = Math.max(val, +min); + if (typeof max != 'undefined') val = Math.min(val, +max); + $(this).val(val); + + if ("createEvent" in document) { + var evt = document.createEvent("HTMLEvents"); + evt.initEvent("change", false, true); + $(this)[0].dispatchEvent(evt); + } else { + $(this)[0].fireEvent("onchange"); + } + + e.preventDefault(); + }); +}); + +$._loader = function(vis) { + console.log("loader fn", vis); + if(vis) + $('#loader').addClass('show'); + else + $('#loader').removeClass('show'); +}; diff --git a/html_orig/jssrc/chibi.js b/html_orig/jssrc/chibi.js new file mode 100755 index 0000000..6709282 --- /dev/null +++ b/html_orig/jssrc/chibi.js @@ -0,0 +1,684 @@ +/*!chibi 3.0.7, Copyright 2012-2016 Kyle Barrow, released under MIT license */ + +// MODIFIED VERSION. +(function () { + 'use strict'; + + var readyfn = [], + loadedfn = [], + domready = false, + pageloaded = false, + d = document, + w = window; + + // Fire any function calls on ready event + function fireReady() { + var i; + domready = true; + for (i = 0; i < readyfn.length; i += 1) { + readyfn[i](); + } + readyfn = []; + } + + // Fire any function calls on loaded event + function fireLoaded() { + var i; + pageloaded = true; + // For browsers with no DOM loaded support + if (!domready) { + fireReady(); + } + for (i = 0; i < loadedfn.length; i += 1) { + loadedfn[i](); + } + loadedfn = []; + } + + // Check DOM ready, page loaded + if (d.addEventListener) { + // Standards + d.addEventListener('DOMContentLoaded', fireReady, false); + w.addEventListener('load', fireLoaded, false); + } else if (d.attachEvent) { + // IE + d.attachEvent('onreadystatechange', fireReady); + // IE < 9 + w.attachEvent('onload', fireLoaded); + } else { + // Anything else + w.onload = fireLoaded; + } + + // Utility functions + + // Loop through node array + function nodeLoop(fn, nodes) { + var i; + // Good idea to walk up the DOM + for (i = nodes.length - 1; i >= 0; i -= 1) { + fn(nodes[i]); + } + } + + // Convert to camel case + function cssCamel(property) { + return property.replace(/-\w/g, function (result) { + return result.charAt(1).toUpperCase(); + }); + } + + // Get computed style + function computeStyle(elm, property) { + // IE, everything else or null + return (elm.currentStyle) ? elm.currentStyle[cssCamel(property)] : (w.getComputedStyle) ? w.getComputedStyle(elm, null).getPropertyValue(property) : null; + + } + + // Returns URI encoded query string pair + function queryPair(name, value) { + return encodeURIComponent(name).replace(/%20/g, '+') + '=' + encodeURIComponent(value).replace(/%20/g, '+'); + } + + // Set CSS, important to wrap in try to prevent error thown on unsupported property + function setCss(elm, property, value) { + try { + elm.style[cssCamel(property)] = value; + } catch (e) { + } + } + + // Show CSS + function showCss(elm) { + elm.style.display = ''; + // For elements still hidden by style block + if (computeStyle(elm, 'display') === 'none') { + elm.style.display = 'block'; + } + } + + // Serialize form & JSON values + function serializeData(nodes) { + var querystring = '', subelm, i, j; + if (nodes.constructor === Object) { // Serialize JSON data + for (subelm in nodes) { + if (nodes.hasOwnProperty(subelm)) { + if (nodes[subelm].constructor === Array) { + for (i = 0; i < nodes[subelm].length; i += 1) { + querystring += '&' + queryPair(subelm, nodes[subelm][i]); + } + } else { + querystring += '&' + queryPair(subelm, nodes[subelm]); + } + } + } + } else { // Serialize node data + nodeLoop(function (elm) { + if (elm.nodeName === 'FORM') { + for (i = 0; i < elm.elements.length; i += 1) { + subelm = elm.elements[i]; + + if (!subelm.disabled) { + switch (subelm.type) { + // Ignore buttons, unsupported XHR 1 form fields + case 'button': + case 'image': + case 'file': + case 'submit': + case 'reset': + break; + + case 'select-one': + if (subelm.length > 0) { + querystring += '&' + queryPair(subelm.name, subelm.value); + } + break; + + case 'select-multiple': + for (j = 0; j < subelm.length; j += 1) { + if (subelm[j].selected) { + querystring += '&' + queryPair(subelm.name, subelm[j].value); + } + } + break; + + case 'checkbox': + case 'radio': + if (subelm.checked) { + querystring += '&' + queryPair(subelm.name, subelm.value); + } + break; + + // Everything else including shinny new HTML5 input types + default: + querystring += '&' + queryPair(subelm.name, subelm.value); + } + } + } + } + }, nodes); + } + // Tidy up first & + return (querystring.length > 0) ? querystring.substring(1) : ''; + } + + // Class helper + function classHelper(classes, action, nodes) { + var classarray, search, i, replace, has = false; + if (classes) { + // Trim any whitespace + classarray = classes.split(/\s+/); + nodeLoop(function (elm) { + for (i = 0; i < classarray.length; i += 1) { + search = new RegExp('\\b' + classarray[i] + '\\b', 'g'); + replace = new RegExp(' *' + classarray[i] + '\\b', 'g'); + if (action === 'remove') { + elm.className = elm.className.replace(search, ''); + } else if (action === 'toggle') { + elm.className = (elm.className.match(search)) ? elm.className.replace(replace, '') : elm.className + ' ' + classarray[i]; + } else if (action === 'has') { + if (elm.className.match(search)) { + has = true; + break; + } + } + } + }, nodes); + } + return has; + } + + // HTML insertion helper + function insertHtml(value, position, nodes) { + var tmpnodes, tmpnode; + if (value) { + nodeLoop(function (elm) { + // No insertAdjacentHTML support for FF < 8 and IE doesn't allow insertAdjacentHTML table manipulation, so use this instead + // Convert string to node. We can't innerHTML on a document fragment + tmpnodes = d.createElement('div'); + tmpnodes.innerHTML = value; + while ((tmpnode = tmpnodes.lastChild) !== null) { + // Catch error in unlikely case elm has been removed + try { + if (position === 'before') { + elm.parentNode.insertBefore(tmpnode, elm); + } else if (position === 'after') { + elm.parentNode.insertBefore(tmpnode, elm.nextSibling); + } else if (position === 'append') { + elm.appendChild(tmpnode); + } else if (position === 'prepend') { + elm.insertBefore(tmpnode, elm.firstChild); + } + } catch (e) { + break; + } + } + }, nodes); + } + } + + // Get nodes and return chibi + function chibi(selector) { + var cb, nodes = [], json = false, nodelist, i; + + if (selector) { + + // Element node, would prefer to use (selector instanceof HTMLElement) but no IE support + if (selector.nodeType && selector.nodeType === 1) { + nodes = [selector]; // return element as node list + } else if (typeof selector === 'object') { + // JSON, document object or node list, would prefer to use (selector instanceof NodeList) but no IE support + json = (typeof selector.length !== 'number'); + nodes = selector; + } else if (typeof selector === 'string') { + nodelist = d.querySelectorAll(selector); + + // Convert node list to array so results have full access to array methods + // Array.prototype.slice.call not supported in IE < 9 and often slower than loop anyway + for (i = 0; i < nodelist.length; i += 1) { + nodes[i] = nodelist[i]; + } + } + } + + // Only attach nodes if not JSON + cb = json ? {} : nodes; + + // Public functions + + // Executes a function on nodes + cb.each = function (fn) { + if (typeof fn === 'function') { + nodeLoop(function (elm) { + // <= IE 8 loses scope so need to apply + return fn.apply(elm, arguments); + }, nodes); + } + return cb; + }; + // Find first + cb.first = function () { + return chibi(nodes.shift()); + }; + // Find last + cb.last = function () { + return chibi(nodes.pop()); + }; + // Find odd + cb.odd = function () { + var odds = [], i; + for (i = 0; i < nodes.length; i += 2) { + odds.push(nodes[i]); + } + return chibi(odds); + }; + // Find even + cb.even = function () { + var evens = [], i; + for (i = 1; i < nodes.length; i += 2) { + evens.push(nodes[i]); + } + return chibi(evens); + }; + // Hide node + cb.hide = function () { + nodeLoop(function (elm) { + elm.style.display = 'none'; + }, nodes); + return cb; + }; + // Show node + cb.show = function () { + nodeLoop(function (elm) { + showCss(elm); + }, nodes); + return cb; + }; + // Toggle node display + cb.toggle = function (state) { + if (typeof state != 'undefined') { // ADDED + if (state) + cb.show(); + else + cb.hide(); + } else { + nodeLoop(function (elm) { + // computeStyle instead of style.display == 'none' catches elements that are hidden via style block + if (computeStyle(elm, 'display') === 'none') { + showCss(elm); + } else { + elm.style.display = 'none'; + } + + }, nodes); + } + return cb; + }; + // Remove node + cb.remove = function () { + nodeLoop(function (elm) { + // Catch error in unlikely case elm has been removed + try { + elm.parentNode.removeChild(elm); + } catch (e) { + } + }, nodes); + return chibi(); + }; + // Get/Set CSS + cb.css = function (property, value) { + if (property) { + if (value || value === '') { + nodeLoop(function (elm) { + setCss(elm, property, value); + }, nodes); + return cb; + } + if (nodes[0]) { + if (nodes[0].style[cssCamel(property)]) { + return nodes[0].style[cssCamel(property)]; + } + if (computeStyle(nodes[0], property)) { + return computeStyle(nodes[0], property); + } + } + } + }; + // Get class(es) + cb.getClass = function () { + if (nodes[0] && nodes[0].className.length > 0) { + // Weak IE trim support + return nodes[0].className.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '').replace(/\s+/, ' '); + } + }; + // Set (replaces) classes + cb.setClass = function (classes) { + if (classes || classes === '') { + nodeLoop(function (elm) { + elm.className = classes; + }, nodes); + } + return cb; + }; + // Add class + cb.addClass = function (classes) { + if (classes) { + nodeLoop(function (elm) { + elm.className += ' ' + classes; + }, nodes); + } + return cb; + }; + // Remove class + cb.removeClass = function (classes) { + classHelper(classes, 'remove', nodes); + return cb; + }; + // Toggle class + cb.toggleClass = function (classes) { + classHelper(classes, 'toggle', nodes); + return cb; + }; + // Has class + cb.hasClass = function (classes) { + return classHelper(classes, 'has', nodes); + }; + // Get/set HTML + cb.html = function (value) { + if (value || value === '') { + nodeLoop(function (elm) { + elm.innerHTML = value; + }, nodes); + return cb; + } + if (nodes[0]) { + return nodes[0].innerHTML; + } + }; + // Insert HTML before selector + cb.htmlBefore = function (value) { + insertHtml(value, 'before', nodes); + return cb; + }; + // Insert HTML after selector + cb.htmlAfter = function (value) { + insertHtml(value, 'after', nodes); + return cb; + }; + // Insert HTML after selector innerHTML + cb.htmlAppend = function (value) { + insertHtml(value, 'append', nodes); + return cb; + }; + // Insert HTML before selector innerHTML + cb.htmlPrepend = function (value) { + insertHtml(value, 'prepend', nodes); + return cb; + }; + // Get/Set HTML attributes + cb.attr = function (property, value) { + if (property) { + property = property.toLowerCase(); + // IE < 9 doesn't allow style or class via get/setAttribute so switch. cssText returns prettier CSS anyway + if (typeof value !== 'undefined') {//FIXED BUG HERE + nodeLoop(function (elm) { + if (property === 'style') { + elm.style.cssText = value; + } else if (property === 'class') { + elm.className = value; + } else { + elm.setAttribute(property, value); + } + }, nodes); + return cb; + } + if (nodes[0]) { + if (property === 'style') { + if (nodes[0].style.cssText) { + return nodes[0].style.cssText; + } + } else if (property === 'class') { + if (nodes[0].className) { + return nodes[0].className; + } + } else { + if (nodes[0].getAttribute(property)) { + return nodes[0].getAttribute(property); + } + } + } + } + }; + // Get/Set HTML data property + cb.data = function (key, value) { + if (key) { + return cb.attr('data-' + key, value); + } + }; + // Get/Set form element values + cb.val = function (value) { + var values, i, j; + if (typeof value != 'undefined') { // FIXED A BUG HERE + nodeLoop(function (elm) { + switch (elm.nodeName) { + case 'SELECT': + if (typeof value === 'string' || typeof value === 'number') { + value = [value]; + } + for (i = 0; i < elm.length; i += 1) { + // Multiple select + for (j = 0; j < value.length; j += 1) { + elm[i].selected = ''; + if (elm[i].value === value[j]) { + elm[i].selected = 'selected'; + break; + } + } + } + break; + case 'INPUT': + case 'TEXTAREA': + case 'BUTTON': + elm.value = value; + break; + } + }, nodes); + + return cb; + } + if (nodes[0]) { + switch (nodes[0].nodeName) { + case 'SELECT': + values = []; + for (i = 0; i < nodes[0].length; i += 1) { + if (nodes[0][i].selected) { + values.push(nodes[0][i].value); + } + } + return (values.length > 1) ? values : values[0]; + case 'INPUT': + case 'TEXTAREA': + case 'BUTTON': + return nodes[0].value; + } + } + }; + // Return matching checked checkbox or radios + cb.checked = function (check) { + if (typeof check === 'boolean') { + nodeLoop(function (elm) { + if (elm.nodeName === 'INPUT' && (elm.type === 'checkbox' || elm.type === 'radio')) { + elm.checked = check; + } + }, nodes); + return cb; + } + if (nodes[0] && nodes[0].nodeName === 'INPUT' && (nodes[0].type === 'checkbox' || nodes[0].type === 'radio')) { + return (!!nodes[0].checked); + } + }; + // Add event handler + cb.on = function (event, fn) { + if (selector === w || selector === d) { + nodes = [selector]; + } + nodeLoop(function (elm) { + if (d.addEventListener) { + elm.addEventListener(event, fn, false); + } else if (d.attachEvent) { + // <= IE 8 loses scope so need to apply, we add this to object so we can detach later (can't detach anonymous functions) + elm[event + fn] = function () { + return fn.apply(elm, arguments); + }; + elm.attachEvent('on' + event, elm[event + fn]); + } + }, nodes); + return cb; + }; + // Remove event handler + cb.off = function (event, fn) { + if (selector === w || selector === d) { + nodes = [selector]; + } + nodeLoop(function (elm) { + if (d.addEventListener) { + elm.removeEventListener(event, fn, false); + } else if (d.attachEvent) { + elm.detachEvent('on' + event, elm[event + fn]); + // Tidy up + elm[event + fn] = null; + } + }, nodes); + return cb; + }; + return cb; + } + + // Basic XHR + chibi.ajax = function (options) { // if options is a number, it's timeout in ms + var opts = extend({ + method: 'GET', + nocache: true, + timeout: 5000, + loader: true, + callback: null + }, options); + opts.method = opts.method.toUpperCase(); + + var loaderFn = opts.loader ? chibi._loader : function(){}; + var url = opts.url; + var method = opts.method; + var query = null; + + if (opts.data) { + query = serializeData(opts.data); + } + + if (query && (method === 'GET')) { + url += (url.indexOf('?') === -1) ? '?' + query : '&' + query; + query = null; + } + + var xhr = new XMLHttpRequest(); + + // prevent caching + if (opts.nocache) { + var ts = (+(new Date())).toString(36); + url += ((url.indexOf('?') === -1) ? '?' : '&') + '_=' + ts; + } + + loaderFn(true); + + xhr.open(method, url, true); + xhr.timeout = opts.timeout; + + // Abort after given timeout + var abortTmeo = setTimeout(function () { + console.error("XHR timed out."); + xhr.abort(); + loaderFn(false); + }, opts.timeout + 10); + + xhr.onreadystatechange = function () { + if (xhr.readyState === 4) { + loaderFn(false); + + opts.callback && opts.callback(xhr.responseText, xhr.status); + + clearTimeout(abortTmeo); + } + }; + + xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); + if (method === 'POST') { + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); + } + + xhr.send(query); + return xhr; + }; + + chibi._loader = function(){}; + + // Alias to cb.ajax(url, 'get', callback) + chibi.get = function (url, callback, opts) { + opts = opts || {}; + opts.url = url; + opts.callback = callback; + opts.method = 'GET'; + return chibi.ajax(opts); + }; + + // Alias to cb.ajax(url, 'post', callback) + chibi.post = function (url, callback, opts) { + opts = opts || {}; + opts.url = url; + opts.callback = callback; + opts.method = 'POST'; + return chibi.ajax(opts); + }; + + // Fire on DOM ready + chibi.ready = function (fn) { + if (fn) { + if (domready) { + fn(); + return chibi; + } else { + readyfn.push(fn); + } + } + }; + + // Fire on page loaded + chibi.loaded = function (fn) { + if (fn) { + if (pageloaded) { + fn(); + return chibi; + } else { + loadedfn.push(fn); + } + } + }; + + var entityMap = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + "'": ''', + '/': '/', + '`': '`', + '=': '=' + }; + + chibi.htmlEscape = function(string) { + return String(string).replace(/[&<>"'`=\/]/g, function (s) { + return entityMap[s]; + }); + }; + + // Set Chibi's global namespace here ($) + w.$ = chibi; +}()); diff --git a/html_orig/jssrc/term.js b/html_orig/jssrc/term.js new file mode 100644 index 0000000..9d73eb8 --- /dev/null +++ b/html_orig/jssrc/term.js @@ -0,0 +1,321 @@ +(function() { + /** + * Terminal module + */ + var Term = (function () { + var W, H; + var cursor = {a: false, x: 0, y: 0, suppress: false, hidden: false}; + var screen = []; + + /** Colors table */ + var CLR = [// dark gray #2E3436 + // 0 black, 1 red, 2 green, 3 yellow + // 4 blue, 5 mag, 6 cyan, 7 white + '#111213','#CC0000','#4E9A06','#C4A000', + '#3465A4','#75507B','#06989A','#D3D7CF', + // BRIGHT + // 8 black, 9 red, 10 green, 11 yellow + // 12 blue, 13 mag, 14 cyan, 15 white + '#555753','#EF2929','#8AE234','#FCE94F', + '#729FCF','#AD7FA8','#34E2E2','#EEEEEC' + ]; + + /** Clear screen */ + function cls() { + screen.forEach(function(cell, i) { + cell.t = ' '; + cell.fg = 7; + cell.bg = 0; + blit(cell); + }); + } + + /** Set text and color at XY */ + function cellAt(y, x) { + return screen[y*W+x]; + } + + /** Get cell under cursor */ + function cursorCell() { + return cellAt(cursor.y, cursor.x); + } + + /** Enable or disable cursor visibility */ + function cursorEnable(enable) { + cursor.hidden = !enable; + cursor.a &= enable; + blit(cursorCell(), cursor.a); + } + + /** Safely move cursor */ + function cursorSet(y, x) { + // Hide and prevent from showing up during the move + cursor.suppress = true; + blit(cursorCell(), false); + + cursor.x = x; + cursor.y = y; + + // Show again + cursor.suppress = false; + blit(cursorCell(), cursor.a); + } + + /** Update cell on display. inv = invert (for cursor) */ + function blit(cell, inv) { + var e = cell.e, fg, bg; + // Colors + fg = inv ? cell.bg : cell.fg; + bg = inv ? cell.fg : cell.bg; + // Update + e.innerText = (cell.t+' ')[0]; + e.style.color = colorHex(fg); + e.style.backgroundColor = colorHex(bg); + e.style.fontWeight = fg > 7 ? 'bold' : 'normal'; + } + + /** Show entire screen */ + function blitAll() { + screen.forEach(function(cell, i) { + /* Invert if under cursor & cursor active */ + var inv = cursor.a && (i == cursor.y*W+cursor.x); + blit(cell, inv); + }); + } + + /** Load screen content from a 'binary' sequence */ + function load(obj) { + cursor.x = obj.x; + cursor.y = obj.y; + cursor.hidden = !obj.cv; + + // full re-init if size changed + if (obj.w != W || obj.h != H) { + Term.init(obj); + return; + } + + // Simple compression - hexFG hexBG 'ASCII' (r/s/t/u NUM{1,2,3,4})? + // comma instead of both colors = same as before + + var i = 0, ci = 0, str = obj.screen; + var fg = 7, bg = 0; + while(i < str.length && ci 0) { + var rep = parseInt(str.substr(i+1,repchars)); + i = i + repchars + 1; + for (; rep>0 && ci 15) c = 0; + return CLR[c]; + } + + /** Init the terminal */ + function init(obj) { + W = obj.w; + H = obj.h; + + /* Build screen & show */ + var e, cell, scr = qq('#screen'); + + // Empty the screen node + while (scr.firstChild) scr.removeChild(scr.firstChild); + + screen = []; + + for(var i = 0; i < W*H; i++) { + e = mk('span'); + + (function() { + var x = i % W; + var y = Math.floor(i / W); + e.addEventListener('click', function () { + Input.onTap(y, x); + }); + })(); + + /* End of line */ + if ((i > 0) && (i % W == 0)) { + scr.appendChild(mk('br')); + } + /* The cell */ + scr.appendChild(e); + + cell = {t: ' ', fg: 7, bg: 0, e: e}; + screen.push(cell); + blit(cell); + } + + /* Cursor blinking */ + setInterval(function() { + cursor.a = !cursor.a; + if (cursor.hidden) { + cursor.a = false; + } + + if (!cursor.suppress) { + blit(cursorCell(), cursor.a); + } + }, 500); + + load(obj); + } + + // publish + return { + init: init, + load: load + }; + })(); + + /** Handle connections */ + var Conn = (function() { + var ws; + + function onOpen(evt) { + console.log("CONNECTED"); + } + + function onClose(evt) { + console.error("SOCKET CLOSED"); + } + + function onMessage(evt) { + try { + console.log("RX: ", evt.data); + // Assume all our messages are screen updates + Term.load(JSON.parse(evt.data)); + } catch(e) { + console.error(e); + } + } + + function onError(evt) { + console.error(evt.data); + } + + function doSend(message) { + console.log("TX: ", message); + if (ws.readyState != 1) { + console.error("Socket not ready"); + return; + } + if (typeof message != "string") { + message = JSON.stringify(message); + } + ws.send(message); + } + + function init() { + ws = new WebSocket("ws://"+_root+"/ws/update.cgi"); + ws.onopen = onOpen; + ws.onclose = onClose; + ws.onmessage = onMessage; + ws.onerror = onError; + + console.log("Opening socket."); + } + + return { + ws: null, + init: init, + send: doSend + }; + })(); + + // + // Keyboard (& mouse) input + // + var Input = (function() { + function sendStrMsg(str) { + Conn.send("STR:"+str); + } + + function sendPosMsg(y, x) { + Conn.send("TAP:"+y+','+x); + } + + function sendBtnMsg(n) { + Conn.send("BTN:"+n); + } + + function init() { + window.addEventListener('keypress', function(e) { + var code = +e.which; + if (code >= 32 && code < 127) { + var ch = String.fromCharCode(code); + //console.log("Typed ", ch, "code", code, e); + sendStrMsg(ch); + } + }); + + window.addEventListener('keydown', function(e) { + var code = e.keyCode; + //console.log("Down ", code, e); + switch(code) { + case 8: sendStrMsg('\x08'); break; + case 13: sendStrMsg('\x0d\x0a'); break; + case 27: sendStrMsg('\x1b'); break; // this allows to directly enter control sequences + case 37: sendStrMsg('\x1b[D'); break; + case 38: sendStrMsg('\x1b[A'); break; + case 39: sendStrMsg('\x1b[C'); break; + case 40: sendStrMsg('\x1b[B'); break; + } + }); + + qa('#buttons button').forEach(function(s) { + s.addEventListener('click', function() { + sendBtnMsg(+this.dataset['n']); + }); + }); + } + + return { + init: init, + onTap: sendPosMsg + }; + })(); + + + window.termInit = function (obj) { + Term.init(obj); + Conn.init(); + Input.init(); + } +})(); diff --git a/html_orig/jssrc/utils.js b/html_orig/jssrc/utils.js new file mode 100755 index 0000000..4a7fd0b --- /dev/null +++ b/html_orig/jssrc/utils.js @@ -0,0 +1,95 @@ +/** Make a node */ +function mk(e) {return document.createElement(e)} + +/** Find one by query */ +function qq(s) {return document.querySelector(s)} + +/** Find all by query */ +function qa(s) {return document.querySelectorAll(s)} + +/** Convert any to bool safely */ +function bool(x) { + return (x === 1 || x === '1' || x === true || x === 'true'); +} + +function intval(x) { + return parseInt(x); +} + +/** Extend an objects with options */ +function extend(defaults, options) { + var target = {}; + + Object.keys(defaults).forEach(function(k){ + target[k] = defaults[k]; + }); + + Object.keys(options).forEach(function(k){ + target[k] = options[k]; + }); + + return target; +} + +/** Escape string for use as literal in RegExp */ +function rgxe(str) { + return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"); +} + +function numfmt(x, places) { + var pow = Math.pow(10, places); + return Math.round(x*pow) / pow; +} + +function estimateLoadTime(fs, n) { + return (1000/fs)*n+1500; +} + +function msNow() { + return +(new Date); +} + +function msElapsed(start) { + return msNow() - start; +} + +Math.log10 = Math.log10 || function(x) { + return Math.log(x) / Math.LN10; +}; + +/** + * Perform a substitution in the given string. + * + * Arguments - array or list of replacements. + * Arguments numeric keys will replace {0}, {1} etc. + * Named keys also work, ie. {foo: "bar"} -> replaces {foo} with bar. + * + * Braces are added to keys if missing. + * + * @returns {String} result + */ +String.prototype.format = function () { + var out = this; + var repl = arguments; + + if (arguments.length == 1 && (Array.isArray(arguments[0]) || typeof arguments[0] == 'object')) { + repl = arguments[0]; + } + + for (var ph in repl) { + if (repl.hasOwnProperty(ph)) { + var ph_orig = ph; + + if (!ph.match(/^\{.*\}$/)) { + ph = '{' + ph + '}'; + } + + // replace all occurrences + var pattern = new RegExp(rgxe(ph), "g"); + out = out.replace(pattern, repl[ph_orig]); + } + } + + return out; +}; + diff --git a/html_orig/jssrc/wifi.js b/html_orig/jssrc/wifi.js new file mode 100644 index 0000000..0095da5 --- /dev/null +++ b/html_orig/jssrc/wifi.js @@ -0,0 +1,107 @@ +/** Wifi page */ +(function () { + var authStr = ['Open', 'WEP', 'WPA', 'WPA2', 'WPA/WPA2']; + var curSSID; + + /** Update display for received response */ + function onScan(resp, status) { + if (status != 200) { + // bad response + rescan(5000); // wait 5sm then retry + return; + } + + resp = JSON.parse(resp); + + var done = !bool(resp.result.inProgress) && (resp.result.APs.length > 0); + rescan(done ? 15000 : 1000); + if (!done) return; // no redraw yet + + // clear the AP list + var $list = $('#ap-list'); + // remove old APs + $('.AP').remove(); + + $list.toggle(done); + $('#ap-loader').toggle(!done); + + // scan done + resp.result.APs.sort(function (a, b) { + return b.rssi - a.rssi; + }).forEach(function (ap) { + ap.enc = intval(ap.enc); + + if (ap.enc > 4) return; // hide unsupported auths + + var item = document.createElement('div'); + + var $item = $(item) + .data('ssid', ap.essid) + .data('pwd', ap.enc != 0) + .addClass('AP'); + + // mark current SSID + if (ap.essid == curSSID) { + $item.addClass('selected'); + } + + var inner = document.createElement('div'); + $(inner).addClass('inner') + .htmlAppend('
{0}
'.format(ap.rssi_perc)) + .htmlAppend('
{0}
'.format($.htmlEscape(ap.essid))) + .htmlAppend('
{0}
'.format(authStr[ap.enc])); + + $item.on('click', function () { + var $th = $(this); + + var ssid = $th.data('ssid'); + var pass = ''; + + if ($th.data('pwd')) { + // this AP needs a password + pass = prompt("Password for \""+ssid+"\":"); + if (pass === null) { + return; + } + } + + $.post('http://'+_root+'/wifi/connect', null, { + data: { + essid: ssid, + passwd: pass + } + }); + }); + + + item.appendChild(inner); + $list[0].appendChild(item); + }); + } + + /** Ask the CGI what APs are visible (async) */ + function scanAPs() { + $.get('http://'+_root+'/wifi/scan', onScan); + } + + function rescan(time) { + setTimeout(scanAPs, time); + } + + /** Set up the WiFi page */ + window.wifiInit = function (obj) { + //var ap_json = { + // "result": { + // "inProgress": "0", + // "APs": [ + // {"essid": "Chlivek", "bssid": "88:f7:c7:52:b3:99", "rssi": "204", "enc": "4", "channel": "1"}, + // {"essid": "TyNikdy", "bssid": "5c:f4:ab:0d:f1:1b", "rssi": "164", "enc": "3", "channel": "1"}, + // ] + // } + //}; + + curSSID = obj.curSSID; + + scanAPs(); + }; +})(); diff --git a/html_orig/packjs.sh b/html_orig/packjs.sh new file mode 100755 index 0000000..91f0d7c --- /dev/null +++ b/html_orig/packjs.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +cat jssrc/chibi.js \ + jssrc/utils.js \ + jssrc/appcommon.js \ + jssrc/term.js \ + jssrc/wifi.js > js/app.js diff --git a/html_orig/sass/_grid-settings.scss b/html_orig/sass/_grid-settings.scss new file mode 100755 index 0000000..c0e6506 --- /dev/null +++ b/html_orig/sass/_grid-settings.scss @@ -0,0 +1,17 @@ + +// Customize Neat grid + +@import "lib/neat/neat-helpers"; + +// optionally change gri settings + +// Define breakpoints +$phone: new-breakpoint(max-width 544px); +$tablet: new-breakpoint(min-width 545px max-width 1000px); +$normal: new-breakpoint(min-width 1001px max-width 1376px); +$large: new-breakpoint(min-width 1377px); + +$tablet-max: new-breakpoint(max-width 1000px); +$normal-max: new-breakpoint(max-width 1376px); +$tablet-min: new-breakpoint(min-width 545px); +$normal-min: new-breakpoint(min-width 1001px); diff --git a/html_orig/sass/_layout.scss b/html_orig/sass/_layout.scss new file mode 100644 index 0000000..a7ba371 --- /dev/null +++ b/html_orig/sass/_layout.scss @@ -0,0 +1,146 @@ +html { + font-family: Arial, sans-serif; + color: #D0D0D0; + background: #131315; +} + +html, body { + @include naked(); + width: 100%; + height: 100%; + overflow: hidden; +} + +a, a:visited, a:link { + cursor: pointer; + color: #5abfff; + text-decoration: none; +} + +a:hover { + color: #5abfff; + text-decoration: underline; +} + +.Box { + display: block; + max-width: 900px; + + margin-top: dist(0); + padding: dist(-1) dist(0); + + @include media($phone) { + margin-top: dist(-1); + padding: dist(-3) dist(-2); + } + // + //h1 + & { + // margin-top: 0; + //} + // + //h2 { + // margin-top: 0; + //} + + border-radius: 3px; + background-color: rgba(white, .07); + + //&.wide { + // width: initial; + // max-width: initial; + //} + // + //&.medium { + // max-width: 1200px; + //} + // + //.Valfield { + // display: inline-block; + // min-width: 10em; + //} +} + +body { + position: relative; + + padding: dist(0); + @include media($phone) { + padding: dist(-1); + } + + overflow-y: auto; + + & > * { + margin-left: auto; + margin-right: auto; + } + + h1 { + text-align: center; + font-size: fsize(6); + margin-top: 0; + margin-bottom: dist(0); + + @include media($phone) { + font-size: fsize(3); + margin-bottom: dist(-1); + } + + @include media($tablet) { + font-size: fsize(5); + } + } + + //h2 { + // font-size: fsize(3); + // margin-bottom: dist(-1); + //} + + td, th { + padding: dist(-2); + white-space: nowrap; + + @include media($phone) { + padding: dist(-3); + } + } + + tbody th { + text-align: right; + width: $form-label-w; + color: $c-form-label-fg; + + @include media($phone) { + width: auto; + } + } + + tbody td { + input[type="text"], input[type="number"] { + width: 10em; + + @include media($phone) { + width: 8em; + } + } + } +} + +// Loader wheel in top right corner +#loader { + position: absolute; + right: dist(1); + top: dist(1); + + transition: opacity .2s; + opacity: 0; + + @include media($phone) { + top: dist(0); + right: dist(0); + } + + &.show { + opacity:1; + } +} diff --git a/html_orig/sass/_normalize.scss b/html_orig/sass/_normalize.scss new file mode 100755 index 0000000..ad1ad9c --- /dev/null +++ b/html_orig/sass/_normalize.scss @@ -0,0 +1,439 @@ +/* normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ + +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS and IE text size adjust after device orientation change, + * without disabling user zoom. + */ + +*, *:before, *:after { + box-sizing: border-box; +} + + +html { + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/** + * Remove default margin. + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ + +//article, +//aside, +//details, +//figcaption, +figure, +//footer, +//header, +//hgroup, +//main, +//menu, +nav +//section, +//summary +{ + display: block; +} + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ + +//audio, +canvas, +progress +//video +{ + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ +// +//audio:not([controls]) { +// display: none; +// height: 0; +//} + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. + */ + +[hidden] +//template +{ + display: none; +} + +/* Links + ========================================================================== */ + +/** + * Remove the gray background color from active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * Improve readability of focused elements when they are also in an + * active/hover state. + */ + +a:active, +a:hover { + outline: 0; +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ + +//abbr[title] { +// border-bottom: 1px dotted; +//} + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ + +b +//strong +{ + font-weight: bold; +} + +/** + * Address styling not present in Safari and Chrome. + */ +// +//dfn { +// font-style: italic; +//} + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +h2 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Address styling not present in IE 8/9. + */ +// +//mark { +// background: #ff0; +// color: #000; +//} + +/** + * Address inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove border when inside `a` element in IE 8/9/10. + */ + +img { + border: 0; +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ + +/** + * Address margin not present in IE 8/9 and Safari. + */ + +//figure { +// margin: 1em 40px; +//} + +/** + * Address differences between Firefox and other browsers. + */ + +hr { + box-sizing: content-box; + height: 0; +} + +/** + * Contain overflow in all browsers. + */ + +pre { + overflow: auto; +} + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ + +code, +//kbd, +pre +//samp +{ + font-family: monospace; + font-size: 1em; +} + +/* Forms + ========================================================================== */ + +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ + +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ + +button, +input, +//optgroup, +select, +textarea { + color: inherit; /* 1 */ + font: inherit; /* 2 */ + margin: 0; /* 3 */ +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ + +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ + +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ + +button, +//html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ +} + +/** + * Re-set default cursor for disabled elements. + */ + +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +input { + line-height: normal; +} + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ + +//input[type="number"]::-webkit-inner-spin-button, +//input[type="number"]::-webkit-outer-spin-button { +// height: auto; +//} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome. + */ +// +//input[type="search"] { +// -webkit-appearance: textfield; /* 1 */ +// box-sizing: content-box; /* 2 */ +//} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ +// +//input[type="search"]::-webkit-search-cancel-button, +//input[type="search"]::-webkit-search-decoration { +// -webkit-appearance: none; +//} + +/** + * Define consistent border, margin, and padding. + */ +// +//fieldset { +// border: 1px solid #c0c0c0; +// margin: 0 2px; +// padding: 0.35em 0.625em 0.75em; +//} + +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ + +textarea { + overflow: auto; +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ +// +//optgroup { +// font-weight: bold; +//} + +/* Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} diff --git a/html_orig/sass/_utils.scss b/html_orig/sass/_utils.scss new file mode 100755 index 0000000..7c7301a --- /dev/null +++ b/html_orig/sass/_utils.scss @@ -0,0 +1,55 @@ +// Add a highlight for debugging +@mixin highlight($color) { + outline: 1px solid $color; + background: rgba($color, .05); + box-shadow: 0 0 2px 2px rgba($color, .2), inset 0 0 2px 2px rgba($color, .2); +} + +// Ellipsis, but for block elements +@mixin block-ellipsis($width: 100%) { + display: block; + max-width: $width; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + word-wrap: normal; +} + +// No margins, padding, borders +@mixin naked() { + border: 0 none; + margin: 0; + padding: 0; + text-decoration: none; +} + +@mixin translate($x, $y) { + @include transform(translate($x, $y)); +} + +// Disallow wrapping +@mixin nowrap() { + white-space: nowrap; + word-wrap: normal; +} + +@mixin click-through() { + pointer-events: none; +} + +// Disallow text selection +@mixin noselect() { + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +// Allow text selection +@mixin can-select() { + -webkit-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + user-select: text; + cursor: text; +} diff --git a/html_orig/sass/app.scss b/html_orig/sass/app.scss new file mode 100755 index 0000000..7a33230 --- /dev/null +++ b/html_orig/sass/app.scss @@ -0,0 +1,40 @@ +@import "normalize"; +@import "lib/bourbon/bourbon"; + +@import "grid-settings"; +@import "lib/neat/neat"; + +@import "utils"; + +$form-label-w: 130px; +$form-label-gap: 8px; +$form-field-w: 250px; + +$c-form-label-fg: white; +$c-form-field-bg: #303030; +$c-form-field-fg: white; +$c-form-highlight: #214e7a; +$c-form-highlight-a: #2972ba; + +@function dist($x) { + @return modular-scale($x, 1rem, $golden); +} + +@function fsize($x) { + @return modular-scale($x, 1em, $major-second); +} + +.hidden { + display: none !important; +} + +[onclick] { + cursor: pointer; +} + +@import "layout"; +@import "form/index"; + +// import all our pages +@import "pages/wifi"; +@import "pages/term"; diff --git a/html_orig/sass/form/_buttons.scss b/html_orig/sass/form/_buttons.scss new file mode 100755 index 0000000..5f9681d --- /dev/null +++ b/html_orig/sass/form/_buttons.scss @@ -0,0 +1,49 @@ +@import "fancy_button_mixins"; + +$btn-gray-f: #DDDDDD; +$btn-gray-b: #505050; +$btn-gray-l: #343434; // line + +$btn-green-f: #FEFEFE; +$btn-green-b: #2ca94b; +$btn-green-fa: #FEFEFE; +$btn-green-ba: #28ba5c; + +$btn-red-f: #FEFEFE; +$btn-red-b: #D04E51; +$btn-red-fa: #FEFEFE; +$btn-red-ba: #d4403f; + +$btn-blue-f: #FEFEFE; +$btn-blue-b: #3983cd; +$btn-blue-fa: #FEFEFE; +$btn-blue-ba: #2076C6; + +$btn-orange-f: #FEFEFE; +$btn-orange-b: #dd8751; +$btn-orange-fa: #FEFEFE; +$btn-orange-ba: #C6733F; + +button, input[type=submit] { + @include fancy-btn-base(); + + &.narrow { + min-width: initial; + } + + text-shadow: 1.5px 1.5px 2px rgba(black, 0.6); + + @include fancy-btn-colors($btn-blue-f, $btn-blue-b, $btn-blue-fa, $btn-blue-ba); +} + +//input[type="submit"], .btn-green { +// @include fancy-btn-colors($btn-green-f, $btn-green-b, $btn-green-fa, $btn-green-ba); +//} + +//.btn-red { +// @include fancy-btn-colors($btn-red-f, $btn-red-b, $btn-red-fa, $btn-red-ba); +//} + +//.btn-blue { +// @include fancy-btn-colors($btn-blue-f, $btn-blue-b, $btn-blue-fa, $btn-blue-ba); +//} diff --git a/html_orig/sass/form/_fancy_button_mixins.scss b/html_orig/sass/form/_fancy_button_mixins.scss new file mode 100755 index 0000000..0ddb476 --- /dev/null +++ b/html_orig/sass/form/_fancy_button_mixins.scss @@ -0,0 +1,58 @@ + +// Button styling +@mixin fancy-btn-base() { + text-align: center; + cursor: pointer; + display: inline-block; + border-radius: 2px; + padding: 0 0.6em; + border: 0 none; + outline: 0 none !important; + line-height: 1.8em; + font-size: 1.1em; + margin-bottom: 3px; + min-width: 5em; + + @include noselect(); + + //&[class^="icon-"]::before, &[class*=" icon-"]::before { + // margin-left:0; + //} + + &:active { + position: relative; + top: 2px; + } + + //&, &:active, &:hover, &:visited { + // text-decoration: none; + //} +} + +@mixin fancy-btn-colors-full($text_p, $back_p, $side_p, $text_a, $back_a, $side_a) { + background-color: $back_p; + box-shadow: 0 3px 0 $side_p; + text-decoration: none !important; + + &, &:link, &:visited { + color: $text_p; + } + + &:hover, &:active, &.active, &.selected { + background-color: $back_a; + color: $text_a; + } + + &:hover, &.selected, &.active { + box-shadow: 0 3px 0 $side_a; + } + + // thinner shadow + &:active { + box-shadow: 0 1px 0 $side_a; + } +} + +@mixin fancy-btn-colors($text_p, $back_p, $text_a, $back_a) { + @include fancy-btn-colors-full($text_p, $back_p, darken($back_p, 14), $text_a, $back_a, darken($back_a, 16)); +} diff --git a/html_orig/sass/form/_form_elements.scss b/html_orig/sass/form/_form_elements.scss new file mode 100755 index 0000000..cbc8ef2 --- /dev/null +++ b/html_orig/sass/form/_form_elements.scss @@ -0,0 +1,29 @@ +@import "buttons"; + +#{$all-text-inputs}, select { + border: 0 none; + border-bottom: 2px solid $c-form-highlight; + background-color: $c-form-field-bg; + color: $c-form-field-fg; + padding: 6px; + line-height: 1em; + outline: 0 none !important; + -moz-outline: 0 none !important; + font-weight: normal; + + &:focus, &:hover { + border-bottom-color: $c-form-highlight-a; + } +} + +//#{$all-text-inputs} { +// @include can-select(); +//} + +//textarea { +// font-family: monospace; +// line-height: 1.2em; +// display: block; // fixes weird bottom margin +//} + +//@import "select"; diff --git a/html_orig/sass/form/_form_layout.scss b/html_orig/sass/form/_form_layout.scss new file mode 100755 index 0000000..73320ab --- /dev/null +++ b/html_orig/sass/form/_form_layout.scss @@ -0,0 +1,169 @@ +// Unified Form wrapper +form { @include naked(); } + +#{$all-text-inputs}, select, label.select-wrap { + width: $form-field-w; +} + +form .Row { + vertical-align: middle; + margin: 14px auto; + text-align: left; + + display: flex; + flex-direction: row; + + &:first-child { + margin-top: 0; + } + + &:last-child { + margin-bottom: 0; + } + + .spacer { + width: $form-label-w; + + @include media($phone) { + display: none; + } + } + + &.buttons { + input, .button { + margin-right: dist(-1); + } + } + + &.centered { + justify-content: center; + } + + &.message { + font-size: 1em; + //margin-left: $label-gap + $w-labels; + text-shadow: 1px 1px 3px black; + text-align: center; + + &.error { + color: crimson; + } + + &.ok { + color: #0fe851; + } + } + + &.separator { + padding-top: 14px; + border-top: 2px solid rgba(255, 255, 255, 0.1); + } + + textarea { + display: inline-block; + vertical-align: top; + min-height: 10rem; + flex-grow: 1; + + resize: vertical; + } + + label { + font-weight: bold; + color: $c-form-label-fg; + display: inline-block; + width: $form-label-w; + text-align: right; + text-shadow: 1px 1px 3px black; + + padding: $form-label-gap; + align-self: flex-start; + + @include noselect; + } + + .checkbox-wrap { + display: inline-block; + width: $form-label-w; + padding: $form-label-gap; + text-align: right; + align-self: flex-start; + + input[type=checkbox] { + margin: auto; + width: auto; + height: auto; + } + + & + label { + width: $form-field-w; + padding-left: 0; + text-align: left; + cursor: pointer; + } + } + + // special phone style + @include media($phone) { + flex-direction: column; + + &.buttons, &.centered { + flex-direction: row; + } + + &.buttons { + justify-content: center; + + // remove margin on lats button + :last-child { + margin-right:0; + } + } + + label { + padding-left: 0; + text-align: left; + width: auto; + } + + .checkbox-wrap { + order: 1; + text-align: left; + padding-bottom: 0; + + border-radius: .4px; + width: auto; + + & + label { + width: auto; + } + } + + #{$all-text-inputs}, textarea { + width: 100%; + } + } +} + +// red asterisk +form span.required { + color: red; +} + +.RadioGroup { + display: inline-block; + line-height: 1.5em; + vertical-align: middle; + + label { + width: auto; + text-align: left; + cursor: pointer; + font-weight: normal; + } + + input[type="radio"] { + vertical-align: middle; + margin: 0 0 0 5px; + } +} diff --git a/html_orig/sass/form/_index.scss b/html_orig/sass/form/_index.scss new file mode 100755 index 0000000..21d1ede --- /dev/null +++ b/html_orig/sass/form/_index.scss @@ -0,0 +1,5 @@ +@import 'fancy_button_mixins'; +@import 'buttons'; +@import 'form_elements'; +//@import 'form_layout'; +//@import 'select'; diff --git a/html_orig/sass/form/_select.scss b/html_orig/sass/form/_select.scss new file mode 100755 index 0000000..52bc498 --- /dev/null +++ b/html_orig/sass/form/_select.scss @@ -0,0 +1,52 @@ + +// target chrome only +@media screen and (-webkit-min-device-pixel-ratio: 0) { + select { padding-right: 18px } +} + +select { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + + cursor: pointer; + line-height: 1.2em; + //padding: 3.5px; + + padding-right: 1em; + + // hack for firefox to disable dotted outline + &:-moz-focusring { + color: transparent; + text-shadow: 0 0 0 $c-form-field-fg; + } + + option { + background: $c-form-field-bg; + } +} + +label.select-wrap { + position: relative; + display: inline !important; + margin: 0 !important; + padding: 0 !important; + width: auto !important; + + &:after { + content: '<>'; /* will be rotated */ + font-family: "Consolas", monospace; + font-weight: bold; + color: $c-form-highlight-a; + + top: 50%; + @include transform(translate(0, -50%) rotate(90deg)); + + right: 2px; + + position:absolute; + z-index: 100; + + pointer-events: none; + } +} diff --git a/html_orig/sass/lib/bourbon/_bourbon-deprecated-upcoming.scss b/html_orig/sass/lib/bourbon/_bourbon-deprecated-upcoming.scss new file mode 100755 index 0000000..e6d1b8c --- /dev/null +++ b/html_orig/sass/lib/bourbon/_bourbon-deprecated-upcoming.scss @@ -0,0 +1,411 @@ +// The following features have been deprecated and will be removed in the next MAJOR version release + +@mixin inline-block { + display: inline-block; + + @warn "The inline-block mixin is deprecated and will be removed in the next major version release"; +} + +@mixin button ($style: simple, $base-color: #4294f0, $text-size: inherit, $padding: 7px 18px) { + + @if type-of($style) == string and type-of($base-color) == color { + @include buttonstyle($style, $base-color, $text-size, $padding); + } + + @if type-of($style) == string and type-of($base-color) == number { + $padding: $text-size; + $text-size: $base-color; + $base-color: #4294f0; + + @if $padding == inherit { + $padding: 7px 18px; + } + + @include buttonstyle($style, $base-color, $text-size, $padding); + } + + @if type-of($style) == color and type-of($base-color) == color { + $base-color: $style; + $style: simple; + @include buttonstyle($style, $base-color, $text-size, $padding); + } + + @if type-of($style) == color and type-of($base-color) == number { + $padding: $text-size; + $text-size: $base-color; + $base-color: $style; + $style: simple; + + @if $padding == inherit { + $padding: 7px 18px; + } + + @include buttonstyle($style, $base-color, $text-size, $padding); + } + + @if type-of($style) == number { + $padding: $base-color; + $text-size: $style; + $base-color: #4294f0; + $style: simple; + + @if $padding == #4294f0 { + $padding: 7px 18px; + } + + @include buttonstyle($style, $base-color, $text-size, $padding); + } + + &:disabled { + cursor: not-allowed; + opacity: 0.5; + } + + @warn "The button mixin is deprecated and will be removed in the next major version release"; +} + +// Selector Style Button +@mixin buttonstyle($type, $b-color, $t-size, $pad) { + // Grayscale button + @if $type == simple and $b-color == grayscale($b-color) { + @include simple($b-color, true, $t-size, $pad); + } + + @if $type == shiny and $b-color == grayscale($b-color) { + @include shiny($b-color, true, $t-size, $pad); + } + + @if $type == pill and $b-color == grayscale($b-color) { + @include pill($b-color, true, $t-size, $pad); + } + + @if $type == flat and $b-color == grayscale($b-color) { + @include flat($b-color, true, $t-size, $pad); + } + + // Colored button + @if $type == simple { + @include simple($b-color, false, $t-size, $pad); + } + + @else if $type == shiny { + @include shiny($b-color, false, $t-size, $pad); + } + + @else if $type == pill { + @include pill($b-color, false, $t-size, $pad); + } + + @else if $type == flat { + @include flat($b-color, false, $t-size, $pad); + } +} + +// Simple Button +@mixin simple($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) { + $color: hsl(0, 0, 100%); + $border: adjust-color($base-color, $saturation: 9%, $lightness: -14%); + $inset-shadow: adjust-color($base-color, $saturation: -8%, $lightness: 15%); + $stop-gradient: adjust-color($base-color, $saturation: 9%, $lightness: -11%); + $text-shadow: adjust-color($base-color, $saturation: 15%, $lightness: -18%); + + @if is-light($base-color) { + $color: hsl(0, 0, 20%); + $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%); + } + + @if $grayscale == true { + $border: grayscale($border); + $inset-shadow: grayscale($inset-shadow); + $stop-gradient: grayscale($stop-gradient); + $text-shadow: grayscale($text-shadow); + } + + border: 1px solid $border; + border-radius: 3px; + box-shadow: inset 0 1px 0 0 $inset-shadow; + color: $color; + display: inline-block; + font-size: $textsize; + font-weight: bold; + @include linear-gradient ($base-color, $stop-gradient); + padding: $padding; + text-decoration: none; + text-shadow: 0 1px 0 $text-shadow; + background-clip: padding-box; + + &:hover:not(:disabled) { + $base-color-hover: adjust-color($base-color, $saturation: -4%, $lightness: -5%); + $inset-shadow-hover: adjust-color($base-color, $saturation: -7%, $lightness: 5%); + $stop-gradient-hover: adjust-color($base-color, $saturation: 8%, $lightness: -14%); + + @if $grayscale == true { + $base-color-hover: grayscale($base-color-hover); + $inset-shadow-hover: grayscale($inset-shadow-hover); + $stop-gradient-hover: grayscale($stop-gradient-hover); + } + + @include linear-gradient ($base-color-hover, $stop-gradient-hover); + + box-shadow: inset 0 1px 0 0 $inset-shadow-hover; + cursor: pointer; + } + + &:active:not(:disabled), + &:focus:not(:disabled) { + $border-active: adjust-color($base-color, $saturation: 9%, $lightness: -14%); + $inset-shadow-active: adjust-color($base-color, $saturation: 7%, $lightness: -17%); + + @if $grayscale == true { + $border-active: grayscale($border-active); + $inset-shadow-active: grayscale($inset-shadow-active); + } + + border: 1px solid $border-active; + box-shadow: inset 0 0 8px 4px $inset-shadow-active, inset 0 0 8px 4px $inset-shadow-active; + } +} + +// Shiny Button +@mixin shiny($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) { + $color: hsl(0, 0, 100%); + $border: adjust-color($base-color, $red: -117, $green: -111, $blue: -81); + $border-bottom: adjust-color($base-color, $red: -126, $green: -127, $blue: -122); + $fourth-stop: adjust-color($base-color, $red: -79, $green: -70, $blue: -46); + $inset-shadow: adjust-color($base-color, $red: 37, $green: 29, $blue: 12); + $second-stop: adjust-color($base-color, $red: -56, $green: -50, $blue: -33); + $text-shadow: adjust-color($base-color, $red: -140, $green: -141, $blue: -114); + $third-stop: adjust-color($base-color, $red: -86, $green: -75, $blue: -48); + + @if is-light($base-color) { + $color: hsl(0, 0, 20%); + $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%); + } + + @if $grayscale == true { + $border: grayscale($border); + $border-bottom: grayscale($border-bottom); + $fourth-stop: grayscale($fourth-stop); + $inset-shadow: grayscale($inset-shadow); + $second-stop: grayscale($second-stop); + $text-shadow: grayscale($text-shadow); + $third-stop: grayscale($third-stop); + } + + @include linear-gradient(top, $base-color 0%, $second-stop 50%, $third-stop 50%, $fourth-stop 100%); + + border: 1px solid $border; + border-bottom: 1px solid $border-bottom; + border-radius: 5px; + box-shadow: inset 0 1px 0 0 $inset-shadow; + color: $color; + display: inline-block; + font-size: $textsize; + font-weight: bold; + padding: $padding; + text-align: center; + text-decoration: none; + text-shadow: 0 -1px 1px $text-shadow; + + &:hover:not(:disabled) { + $first-stop-hover: adjust-color($base-color, $red: -13, $green: -15, $blue: -18); + $second-stop-hover: adjust-color($base-color, $red: -66, $green: -62, $blue: -51); + $third-stop-hover: adjust-color($base-color, $red: -93, $green: -85, $blue: -66); + $fourth-stop-hover: adjust-color($base-color, $red: -86, $green: -80, $blue: -63); + + @if $grayscale == true { + $first-stop-hover: grayscale($first-stop-hover); + $second-stop-hover: grayscale($second-stop-hover); + $third-stop-hover: grayscale($third-stop-hover); + $fourth-stop-hover: grayscale($fourth-stop-hover); + } + + @include linear-gradient(top, $first-stop-hover 0%, + $second-stop-hover 50%, + $third-stop-hover 50%, + $fourth-stop-hover 100%); + cursor: pointer; + } + + &:active:not(:disabled), + &:focus:not(:disabled) { + $inset-shadow-active: adjust-color($base-color, $red: -111, $green: -116, $blue: -122); + + @if $grayscale == true { + $inset-shadow-active: grayscale($inset-shadow-active); + } + + box-shadow: inset 0 0 20px 0 $inset-shadow-active; + } +} + +// Pill Button +@mixin pill($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) { + $color: hsl(0, 0, 100%); + $border-bottom: adjust-color($base-color, $hue: 8, $saturation: -11%, $lightness: -26%); + $border-sides: adjust-color($base-color, $hue: 4, $saturation: -21%, $lightness: -21%); + $border-top: adjust-color($base-color, $hue: -1, $saturation: -30%, $lightness: -15%); + $inset-shadow: adjust-color($base-color, $hue: -1, $saturation: -1%, $lightness: 7%); + $stop-gradient: adjust-color($base-color, $hue: 8, $saturation: 14%, $lightness: -10%); + $text-shadow: adjust-color($base-color, $hue: 5, $saturation: -19%, $lightness: -15%); + + @if is-light($base-color) { + $color: hsl(0, 0, 20%); + $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%); + } + + @if $grayscale == true { + $border-bottom: grayscale($border-bottom); + $border-sides: grayscale($border-sides); + $border-top: grayscale($border-top); + $inset-shadow: grayscale($inset-shadow); + $stop-gradient: grayscale($stop-gradient); + $text-shadow: grayscale($text-shadow); + } + + border: 1px solid $border-top; + border-color: $border-top $border-sides $border-bottom; + border-radius: 16px; + box-shadow: inset 0 1px 0 0 $inset-shadow; + color: $color; + display: inline-block; + font-size: $textsize; + font-weight: normal; + line-height: 1; + @include linear-gradient ($base-color, $stop-gradient); + padding: $padding; + text-align: center; + text-decoration: none; + text-shadow: 0 -1px 1px $text-shadow; + background-clip: padding-box; + + &:hover:not(:disabled) { + $base-color-hover: adjust-color($base-color, $lightness: -4.5%); + $border-bottom: adjust-color($base-color, $hue: 8, $saturation: 13.5%, $lightness: -32%); + $border-sides: adjust-color($base-color, $hue: 4, $saturation: -2%, $lightness: -27%); + $border-top: adjust-color($base-color, $hue: -1, $saturation: -17%, $lightness: -21%); + $inset-shadow-hover: adjust-color($base-color, $saturation: -1%, $lightness: 3%); + $stop-gradient-hover: adjust-color($base-color, $hue: 8, $saturation: -4%, $lightness: -15.5%); + $text-shadow-hover: adjust-color($base-color, $hue: 5, $saturation: -5%, $lightness: -22%); + + @if $grayscale == true { + $base-color-hover: grayscale($base-color-hover); + $border-bottom: grayscale($border-bottom); + $border-sides: grayscale($border-sides); + $border-top: grayscale($border-top); + $inset-shadow-hover: grayscale($inset-shadow-hover); + $stop-gradient-hover: grayscale($stop-gradient-hover); + $text-shadow-hover: grayscale($text-shadow-hover); + } + + @include linear-gradient ($base-color-hover, $stop-gradient-hover); + + background-clip: padding-box; + border: 1px solid $border-top; + border-color: $border-top $border-sides $border-bottom; + box-shadow: inset 0 1px 0 0 $inset-shadow-hover; + cursor: pointer; + text-shadow: 0 -1px 1px $text-shadow-hover; + } + + &:active:not(:disabled), + &:focus:not(:disabled) { + $active-color: adjust-color($base-color, $hue: 4, $saturation: -12%, $lightness: -10%); + $border-active: adjust-color($base-color, $hue: 6, $saturation: -2.5%, $lightness: -30%); + $border-bottom-active: adjust-color($base-color, $hue: 11, $saturation: 6%, $lightness: -31%); + $inset-shadow-active: adjust-color($base-color, $hue: 9, $saturation: 2%, $lightness: -21.5%); + $text-shadow-active: adjust-color($base-color, $hue: 5, $saturation: -12%, $lightness: -21.5%); + + @if $grayscale == true { + $active-color: grayscale($active-color); + $border-active: grayscale($border-active); + $border-bottom-active: grayscale($border-bottom-active); + $inset-shadow-active: grayscale($inset-shadow-active); + $text-shadow-active: grayscale($text-shadow-active); + } + + background: $active-color; + border: 1px solid $border-active; + border-bottom: 1px solid $border-bottom-active; + box-shadow: inset 0 0 6px 3px $inset-shadow-active; + text-shadow: 0 -1px 1px $text-shadow-active; + } +} + +// Flat Button +@mixin flat($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) { + $color: hsl(0, 0, 100%); + + @if is-light($base-color) { + $color: hsl(0, 0, 20%); + } + + background-color: $base-color; + border-radius: 3px; + border: 0; + color: $color; + display: inline-block; + font-size: $textsize; + font-weight: bold; + padding: $padding; + text-decoration: none; + background-clip: padding-box; + + &:hover:not(:disabled){ + $base-color-hover: adjust-color($base-color, $saturation: 4%, $lightness: 5%); + + @if $grayscale == true { + $base-color-hover: grayscale($base-color-hover); + } + + background-color: $base-color-hover; + cursor: pointer; + } + + &:active:not(:disabled), + &:focus:not(:disabled) { + $base-color-active: adjust-color($base-color, $saturation: -4%, $lightness: -5%); + + @if $grayscale == true { + $base-color-active: grayscale($base-color-active); + } + + background-color: $base-color-active; + cursor: pointer; + } +} + +// Flexible grid +@function flex-grid($columns, $container-columns: $fg-max-columns) { + $width: $columns * $fg-column + ($columns - 1) * $fg-gutter; + $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter; + @return percentage($width / $container-width); + + @warn "The flex-grid function is deprecated and will be removed in the next major version release"; +} + +// Flexible gutter +@function flex-gutter($container-columns: $fg-max-columns, $gutter: $fg-gutter) { + $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter; + @return percentage($gutter / $container-width); + + @warn "The flex-gutter function is deprecated and will be removed in the next major version release"; +} + +@function grid-width($n) { + @return $n * $gw-column + ($n - 1) * $gw-gutter; + + @warn "The grid-width function is deprecated and will be removed in the next major version release"; +} + +@function golden-ratio($value, $increment) { + @return modular-scale($increment, $value, $ratio: $golden); + + @warn "The golden-ratio function is deprecated and will be removed in the next major version release. Please use the modular-scale function, instead."; +} + +@mixin box-sizing($box) { + @include prefixer(box-sizing, $box, webkit moz spec); + + @warn "The box-sizing mixin is deprecated and will be removed in the next major version release. This property can now be used un-prefixed."; +} diff --git a/html_orig/sass/lib/bourbon/_bourbon.scss b/html_orig/sass/lib/bourbon/_bourbon.scss new file mode 100755 index 0000000..509fcc1 --- /dev/null +++ b/html_orig/sass/lib/bourbon/_bourbon.scss @@ -0,0 +1,87 @@ +// Bourbon 4.2.6 +// http://bourbon.io +// Copyright 2011-2015 thoughtbot, inc. +// MIT License + +@import "settings/prefixer"; +@import "settings/px-to-em"; +@import "settings/asset-pipeline"; + +@import "functions/assign-inputs"; +@import "functions/contains"; +@import "functions/contains-falsy"; +@import "functions/is-length"; +@import "functions/is-light"; +@import "functions/is-number"; +@import "functions/is-size"; +@import "functions/px-to-em"; +@import "functions/px-to-rem"; +@import "functions/shade"; +@import "functions/strip-units"; +@import "functions/tint"; +@import "functions/transition-property-name"; +@import "functions/unpack"; +@import "functions/modular-scale"; + +@import "helpers/convert-units"; +@import "helpers/directional-values"; +@import "helpers/font-source-declaration"; +@import "helpers/gradient-positions-parser"; +@import "helpers/linear-angle-parser"; +@import "helpers/linear-gradient-parser"; +@import "helpers/linear-positions-parser"; +@import "helpers/linear-side-corner-parser"; +@import "helpers/radial-arg-parser"; +@import "helpers/radial-positions-parser"; +@import "helpers/radial-gradient-parser"; +@import "helpers/render-gradients"; +@import "helpers/shape-size-stripper"; +@import "helpers/str-to-num"; + +@import "css3/animation"; +@import "css3/appearance"; +@import "css3/backface-visibility"; +@import "css3/background"; +@import "css3/background-image"; +@import "css3/border-image"; +@import "css3/calc"; +@import "css3/columns"; +@import "css3/filter"; +@import "css3/flex-box"; +@import "css3/font-face"; +@import "css3/font-feature-settings"; +@import "css3/hidpi-media-query"; +@import "css3/hyphens"; +@import "css3/image-rendering"; +@import "css3/keyframes"; +@import "css3/linear-gradient"; +@import "css3/perspective"; +@import "css3/placeholder"; +@import "css3/radial-gradient"; +@import "css3/selection"; +@import "css3/text-decoration"; +@import "css3/transform"; +@import "css3/transition"; +@import "css3/user-select"; + +@import "addons/border-color"; +@import "addons/border-radius"; +@import "addons/border-style"; +@import "addons/border-width"; +@import "addons/buttons"; +@import "addons/clearfix"; +@import "addons/ellipsis"; +@import "addons/font-stacks"; +@import "addons/hide-text"; +@import "addons/margin"; +@import "addons/padding"; +@import "addons/position"; +@import "addons/prefixer"; +@import "addons/retina-image"; +@import "addons/size"; +@import "addons/text-inputs"; +@import "addons/timing-functions"; +@import "addons/triangle"; +@import "addons/word-wrap"; + +@import "bourbon-deprecated-upcoming"; diff --git a/html_orig/sass/lib/bourbon/addons/_border-color.scss b/html_orig/sass/lib/bourbon/addons/_border-color.scss new file mode 100755 index 0000000..6f6ab36 --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_border-color.scss @@ -0,0 +1,26 @@ +@charset "UTF-8"; + +/// Provides a quick method for targeting `border-color` on specific sides of a box. Use a `null` value to “skip” a side. +/// +/// @param {Arglist} $vals +/// List of arguments +/// +/// @example scss - Usage +/// .element { +/// @include border-color(#a60b55 #76cd9c null #e8ae1a); +/// } +/// +/// @example css - CSS Output +/// .element { +/// border-left-color: #e8ae1a; +/// border-right-color: #76cd9c; +/// border-top-color: #a60b55; +/// } +/// +/// @require {mixin} directional-property +/// +/// @output `border-color` + +@mixin border-color($vals...) { + @include directional-property(border, color, $vals...); +} diff --git a/html_orig/sass/lib/bourbon/addons/_border-radius.scss b/html_orig/sass/lib/bourbon/addons/_border-radius.scss new file mode 100755 index 0000000..1f65863 --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_border-radius.scss @@ -0,0 +1,48 @@ +@charset "UTF-8"; + +/// Provides a quick method for targeting `border-radius` on both corners on the side of a box. +/// +/// @param {Number} $radii +/// List of arguments +/// +/// @example scss - Usage +/// .element-one { +/// @include border-top-radius(5px); +/// } +/// +/// .element-two { +/// @include border-left-radius(3px); +/// } +/// +/// @example css - CSS Output +/// .element-one { +/// border-top-left-radius: 5px; +/// border-top-right-radius: 5px; +/// } +/// +/// .element-two { +/// border-bottom-left-radius: 3px; +/// border-top-left-radius: 3px; +/// } +/// +/// @output `border-radius` + +@mixin border-top-radius($radii) { + border-top-left-radius: $radii; + border-top-right-radius: $radii; +} + +@mixin border-right-radius($radii) { + border-bottom-right-radius: $radii; + border-top-right-radius: $radii; +} + +@mixin border-bottom-radius($radii) { + border-bottom-left-radius: $radii; + border-bottom-right-radius: $radii; +} + +@mixin border-left-radius($radii) { + border-bottom-left-radius: $radii; + border-top-left-radius: $radii; +} diff --git a/html_orig/sass/lib/bourbon/addons/_border-style.scss b/html_orig/sass/lib/bourbon/addons/_border-style.scss new file mode 100755 index 0000000..d86ee79 --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_border-style.scss @@ -0,0 +1,25 @@ +@charset "UTF-8"; + +/// Provides a quick method for targeting `border-style` on specific sides of a box. Use a `null` value to “skip” a side. +/// +/// @param {Arglist} $vals +/// List of arguments +/// +/// @example scss - Usage +/// .element { +/// @include border-style(dashed null solid); +/// } +/// +/// @example css - CSS Output +/// .element { +/// border-bottom-style: solid; +/// border-top-style: dashed; +/// } +/// +/// @require {mixin} directional-property +/// +/// @output `border-style` + +@mixin border-style($vals...) { + @include directional-property(border, style, $vals...); +} diff --git a/html_orig/sass/lib/bourbon/addons/_border-width.scss b/html_orig/sass/lib/bourbon/addons/_border-width.scss new file mode 100755 index 0000000..0ea2d4b --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_border-width.scss @@ -0,0 +1,25 @@ +@charset "UTF-8"; + +/// Provides a quick method for targeting `border-width` on specific sides of a box. Use a `null` value to “skip” a side. +/// +/// @param {Arglist} $vals +/// List of arguments +/// +/// @example scss - Usage +/// .element { +/// @include border-width(1em null 20px); +/// } +/// +/// @example css - CSS Output +/// .element { +/// border-bottom-width: 20px; +/// border-top-width: 1em; +/// } +/// +/// @require {mixin} directional-property +/// +/// @output `border-width` + +@mixin border-width($vals...) { + @include directional-property(border, width, $vals...); +} diff --git a/html_orig/sass/lib/bourbon/addons/_buttons.scss b/html_orig/sass/lib/bourbon/addons/_buttons.scss new file mode 100755 index 0000000..debeabc --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_buttons.scss @@ -0,0 +1,64 @@ +@charset "UTF-8"; + +/// Generates variables for all buttons. Please note that you must use interpolation on the variable: `#{$all-buttons}`. +/// +/// @example scss - Usage +/// #{$all-buttons} { +/// background-color: #f00; +/// } +/// +/// #{$all-buttons-focus}, +/// #{$all-buttons-hover} { +/// background-color: #0f0; +/// } +/// +/// #{$all-buttons-active} { +/// background-color: #00f; +/// } +/// +/// @example css - CSS Output +/// button, +/// input[type="button"], +/// input[type="reset"], +/// input[type="submit"] { +/// background-color: #f00; +/// } +/// +/// button:focus, +/// input[type="button"]:focus, +/// input[type="reset"]:focus, +/// input[type="submit"]:focus, +/// button:hover, +/// input[type="button"]:hover, +/// input[type="reset"]:hover, +/// input[type="submit"]:hover { +/// background-color: #0f0; +/// } +/// +/// button:active, +/// input[type="button"]:active, +/// input[type="reset"]:active, +/// input[type="submit"]:active { +/// background-color: #00f; +/// } +/// +/// @require assign-inputs +/// +/// @type List +/// +/// @todo Remove double assigned variables (Lines 59–62) in v5.0.0 + +$buttons-list: 'button', + 'input[type="button"]', + 'input[type="reset"]', + 'input[type="submit"]'; + +$all-buttons: assign-inputs($buttons-list); +$all-buttons-active: assign-inputs($buttons-list, active); +$all-buttons-focus: assign-inputs($buttons-list, focus); +$all-buttons-hover: assign-inputs($buttons-list, hover); + +$all-button-inputs: $all-buttons; +$all-button-inputs-active: $all-buttons-active; +$all-button-inputs-focus: $all-buttons-focus; +$all-button-inputs-hover: $all-buttons-hover; diff --git a/html_orig/sass/lib/bourbon/addons/_clearfix.scss b/html_orig/sass/lib/bourbon/addons/_clearfix.scss new file mode 100755 index 0000000..11313d6 --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_clearfix.scss @@ -0,0 +1,25 @@ +@charset "UTF-8"; + +/// Provides an easy way to include a clearfix for containing floats. +/// +/// @link http://cssmojo.com/latest_new_clearfix_so_far/ +/// +/// @example scss - Usage +/// .element { +/// @include clearfix; +/// } +/// +/// @example css - CSS Output +/// .element::after { +/// clear: both; +/// content: ""; +/// display: table; +/// } + +@mixin clearfix { + &::after { + clear: both; + content: ""; + display: table; + } +} diff --git a/html_orig/sass/lib/bourbon/addons/_ellipsis.scss b/html_orig/sass/lib/bourbon/addons/_ellipsis.scss new file mode 100755 index 0000000..a367f65 --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_ellipsis.scss @@ -0,0 +1,30 @@ +@charset "UTF-8"; + +/// Truncates text and adds an ellipsis to represent overflow. +/// +/// @param {Number} $width [100%] +/// Max-width for the string to respect before being truncated +/// +/// @example scss - Usage +/// .element { +/// @include ellipsis; +/// } +/// +/// @example css - CSS Output +/// .element { +/// display: inline-block; +/// max-width: 100%; +/// overflow: hidden; +/// text-overflow: ellipsis; +/// white-space: nowrap; +/// word-wrap: normal; +/// } + +@mixin ellipsis($width: 100%) { + display: inline-block; + max-width: $width; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + word-wrap: normal; +} diff --git a/html_orig/sass/lib/bourbon/addons/_font-stacks.scss b/html_orig/sass/lib/bourbon/addons/_font-stacks.scss new file mode 100755 index 0000000..57128f4 --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_font-stacks.scss @@ -0,0 +1,31 @@ +@charset "UTF-8"; + +/// Georgia font stack. +/// +/// @type List + +$georgia: "Georgia", "Cambria", "Times New Roman", "Times", serif; + +/// Helvetica font stack. +/// +/// @type List + +$helvetica: "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif; + +/// Lucida Grande font stack. +/// +/// @type List + +$lucida-grande: "Lucida Grande", "Tahoma", "Verdana", "Arial", sans-serif; + +/// Monospace font stack. +/// +/// @type List + +$monospace: "Bitstream Vera Sans Mono", "Consolas", "Courier", monospace; + +/// Verdana font stack. +/// +/// @type List + +$verdana: "Verdana", "Geneva", sans-serif; diff --git a/html_orig/sass/lib/bourbon/addons/_hide-text.scss b/html_orig/sass/lib/bourbon/addons/_hide-text.scss new file mode 100755 index 0000000..4caf20e --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_hide-text.scss @@ -0,0 +1,27 @@ +/// Hides the text in an element, commonly used to show an image. Some elements will need block-level styles applied. +/// +/// @link http://zeldman.com/2012/03/01/replacing-the-9999px-hack-new-image-replacement +/// +/// @example scss - Usage +/// .element { +/// @include hide-text; +/// } +/// +/// @example css - CSS Output +/// .element { +/// overflow: hidden; +/// text-indent: 101%; +/// white-space: nowrap; +/// } +/// +/// @todo Remove height argument in v5.0.0 + +@mixin hide-text($height: null) { + overflow: hidden; + text-indent: 101%; + white-space: nowrap; + + @if $height { + @warn "The `hide-text` mixin has changed and no longer requires a height. The height argument will no longer be accepted in v5.0.0"; + } +} diff --git a/html_orig/sass/lib/bourbon/addons/_margin.scss b/html_orig/sass/lib/bourbon/addons/_margin.scss new file mode 100755 index 0000000..674f4e5 --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_margin.scss @@ -0,0 +1,26 @@ +@charset "UTF-8"; + +/// Provides a quick method for targeting `margin` on specific sides of a box. Use a `null` value to “skip” a side. +/// +/// @param {Arglist} $vals +/// List of arguments +/// +/// @example scss - Usage +/// .element { +/// @include margin(null 10px 3em 20vh); +/// } +/// +/// @example css - CSS Output +/// .element { +/// margin-bottom: 3em; +/// margin-left: 20vh; +/// margin-right: 10px; +/// } +/// +/// @require {mixin} directional-property +/// +/// @output `margin` + +@mixin margin($vals...) { + @include directional-property(margin, false, $vals...); +} diff --git a/html_orig/sass/lib/bourbon/addons/_padding.scss b/html_orig/sass/lib/bourbon/addons/_padding.scss new file mode 100755 index 0000000..40a5f00 --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_padding.scss @@ -0,0 +1,26 @@ +@charset "UTF-8"; + +/// Provides a quick method for targeting `padding` on specific sides of a box. Use a `null` value to “skip” a side. +/// +/// @param {Arglist} $vals +/// List of arguments +/// +/// @example scss - Usage +/// .element { +/// @include padding(12vh null 10px 5%); +/// } +/// +/// @example css - CSS Output +/// .element { +/// padding-bottom: 10px; +/// padding-left: 5%; +/// padding-top: 12vh; +/// } +/// +/// @require {mixin} directional-property +/// +/// @output `padding` + +@mixin padding($vals...) { + @include directional-property(padding, false, $vals...); +} diff --git a/html_orig/sass/lib/bourbon/addons/_position.scss b/html_orig/sass/lib/bourbon/addons/_position.scss new file mode 100755 index 0000000..e460f3f --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_position.scss @@ -0,0 +1,48 @@ +@charset "UTF-8"; + +/// Provides a quick method for setting an element’s position. Use a `null` value to “skip” a side. +/// +/// @param {Position} $position [relative] +/// A CSS position value +/// +/// @param {Arglist} $coordinates [null null null null] +/// List of values that correspond to the 4-value syntax for the edges of a box +/// +/// @example scss - Usage +/// .element { +/// @include position(absolute, 0 null null 10em); +/// } +/// +/// @example css - CSS Output +/// .element { +/// left: 10em; +/// position: absolute; +/// top: 0; +/// } +/// +/// @require {function} is-length +/// @require {function} unpack + +@mixin position($position: relative, $coordinates: null null null null) { + @if type-of($position) == list { + $coordinates: $position; + $position: relative; + } + + $coordinates: unpack($coordinates); + + $offsets: ( + top: nth($coordinates, 1), + right: nth($coordinates, 2), + bottom: nth($coordinates, 3), + left: nth($coordinates, 4) + ); + + position: $position; + + @each $offset, $value in $offsets { + @if is-length($value) { + #{$offset}: $value; + } + } +} diff --git a/html_orig/sass/lib/bourbon/addons/_prefixer.scss b/html_orig/sass/lib/bourbon/addons/_prefixer.scss new file mode 100755 index 0000000..2b6f731 --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_prefixer.scss @@ -0,0 +1,66 @@ +@charset "UTF-8"; + +/// A mixin for generating vendor prefixes on non-standardized properties. +/// +/// @param {String} $property +/// Property to prefix +/// +/// @param {*} $value +/// Value to use +/// +/// @param {List} $prefixes +/// Prefixes to define +/// +/// @example scss - Usage +/// .element { +/// @include prefixer(border-radius, 10px, webkit ms spec); +/// } +/// +/// @example css - CSS Output +/// .element { +/// -webkit-border-radius: 10px; +/// -moz-border-radius: 10px; +/// border-radius: 10px; +/// } +/// +/// @require {variable} $prefix-for-webkit +/// @require {variable} $prefix-for-mozilla +/// @require {variable} $prefix-for-microsoft +/// @require {variable} $prefix-for-opera +/// @require {variable} $prefix-for-spec + +@mixin prefixer($property, $value, $prefixes) { + @each $prefix in $prefixes { + @if $prefix == webkit { + @if $prefix-for-webkit { + -webkit-#{$property}: $value; + } + } @else if $prefix == moz { + @if $prefix-for-mozilla { + -moz-#{$property}: $value; + } + } @else if $prefix == ms { + @if $prefix-for-microsoft { + -ms-#{$property}: $value; + } + } @else if $prefix == o { + @if $prefix-for-opera { + -o-#{$property}: $value; + } + } @else if $prefix == spec { + @if $prefix-for-spec { + #{$property}: $value; + } + } @else { + @warn "Unrecognized prefix: #{$prefix}"; + } + } +} + +@mixin disable-prefix-for-all() { + $prefix-for-webkit: false !global; + $prefix-for-mozilla: false !global; + $prefix-for-microsoft: false !global; + $prefix-for-opera: false !global; + $prefix-for-spec: false !global; +} diff --git a/html_orig/sass/lib/bourbon/addons/_retina-image.scss b/html_orig/sass/lib/bourbon/addons/_retina-image.scss new file mode 100755 index 0000000..7febbd7 --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_retina-image.scss @@ -0,0 +1,25 @@ +@mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $retina-suffix: _2x, $asset-pipeline: $asset-pipeline) { + @if $asset-pipeline { + background-image: image-url("#{$filename}.#{$extension}"); + } @else { + background-image: url("#{$filename}.#{$extension}"); + } + + @include hidpi { + @if $asset-pipeline { + @if $retina-filename { + background-image: image-url("#{$retina-filename}.#{$extension}"); + } @else { + background-image: image-url("#{$filename}#{$retina-suffix}.#{$extension}"); + } + } @else { + @if $retina-filename { + background-image: url("#{$retina-filename}.#{$extension}"); + } @else { + background-image: url("#{$filename}#{$retina-suffix}.#{$extension}"); + } + } + + background-size: $background-size; + } +} diff --git a/html_orig/sass/lib/bourbon/addons/_size.scss b/html_orig/sass/lib/bourbon/addons/_size.scss new file mode 100755 index 0000000..a2992a3 --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_size.scss @@ -0,0 +1,51 @@ +@charset "UTF-8"; + +/// Sets the `width` and `height` of the element. +/// +/// @param {List} $size +/// A list of at most 2 size values. +/// +/// If there is only a single value in `$size` it is used for both width and height. All units are supported. +/// +/// @example scss - Usage +/// .first-element { +/// @include size(2em); +/// } +/// +/// .second-element { +/// @include size(auto 10em); +/// } +/// +/// @example css - CSS Output +/// .first-element { +/// width: 2em; +/// height: 2em; +/// } +/// +/// .second-element { +/// width: auto; +/// height: 10em; +/// } +/// +/// @todo Refactor in 5.0.0 to use a comma-separated argument + +@mixin size($value) { + $width: nth($value, 1); + $height: $width; + + @if length($value) > 1 { + $height: nth($value, 2); + } + + @if is-size($height) { + height: $height; + } @else { + @warn "`#{$height}` is not a valid length for the `$height` parameter in the `size` mixin."; + } + + @if is-size($width) { + width: $width; + } @else { + @warn "`#{$width}` is not a valid length for the `$width` parameter in the `size` mixin."; + } +} diff --git a/html_orig/sass/lib/bourbon/addons/_text-inputs.scss b/html_orig/sass/lib/bourbon/addons/_text-inputs.scss new file mode 100755 index 0000000..df0967f --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_text-inputs.scss @@ -0,0 +1,113 @@ +@charset "UTF-8"; + +/// Generates variables for all text-based inputs. Please note that you must use interpolation on the variable: `#{$all-text-inputs}`. +/// +/// @example scss - Usage +/// #{$all-text-inputs} { +/// border: 1px solid #f00; +/// } +/// +/// #{$all-text-inputs-focus}, +/// #{$all-text-inputs-hover} { +/// border: 1px solid #0f0; +/// } +/// +/// #{$all-text-inputs-active} { +/// border: 1px solid #00f; +/// } +/// +/// @example css - CSS Output +/// input[type="color"], +/// input[type="date"], +/// input[type="datetime"], +/// input[type="datetime-local"], +/// input[type="email"], +/// input[type="month"], +/// input[type="number"], +/// input[type="password"], +/// input[type="search"], +/// input[type="tel"], +/// input[type="text"], +/// input[type="time"], +/// input[type="url"], +/// input[type="week"], +/// textarea { +/// border: 1px solid #f00; +/// } +/// +/// input[type="color"]:focus, +/// input[type="date"]:focus, +/// input[type="datetime"]:focus, +/// input[type="datetime-local"]:focus, +/// input[type="email"]:focus, +/// input[type="month"]:focus, +/// input[type="number"]:focus, +/// input[type="password"]:focus, +/// input[type="search"]:focus, +/// input[type="tel"]:focus, +/// input[type="text"]:focus, +/// input[type="time"]:focus, +/// input[type="url"]:focus, +/// input[type="week"]:focus, +/// textarea:focus, +/// input[type="color"]:hover, +/// input[type="date"]:hover, +/// input[type="datetime"]:hover, +/// input[type="datetime-local"]:hover, +/// input[type="email"]:hover, +/// input[type="month"]:hover, +/// input[type="number"]:hover, +/// input[type="password"]:hover, +/// input[type="search"]:hover, +/// input[type="tel"]:hover, +/// input[type="text"]:hover, +/// input[type="time"]:hover, +/// input[type="url"]:hover, +/// input[type="week"]:hover, +/// textarea:hover { +/// border: 1px solid #0f0; +/// } +/// +/// input[type="color"]:active, +/// input[type="date"]:active, +/// input[type="datetime"]:active, +/// input[type="datetime-local"]:active, +/// input[type="email"]:active, +/// input[type="month"]:active, +/// input[type="number"]:active, +/// input[type="password"]:active, +/// input[type="search"]:active, +/// input[type="tel"]:active, +/// input[type="text"]:active, +/// input[type="time"]:active, +/// input[type="url"]:active, +/// input[type="week"]:active, +/// textarea:active { +/// border: 1px solid #00f; +/// } +/// +/// @require assign-inputs +/// +/// @type List + +$text-inputs-list: //'input[type="color"]', + //'input[type="date"]', + //'input[type="datetime"]', + //'input[type="datetime-local"]', + //'input[type="email"]', + //'input[type="month"]', + 'input[type="number"]', + 'input[type="password"]', + //'input[type="search"]', + //'input[type="tel"]', + 'input[type="text"]', + //'input[type="time"]', + //'input[type="url"]', + //'input[type="week"]', + //'input:not([type])', + 'textarea'; + +$all-text-inputs: assign-inputs($text-inputs-list); +$all-text-inputs-active: assign-inputs($text-inputs-list, active); +$all-text-inputs-focus: assign-inputs($text-inputs-list, focus); +$all-text-inputs-hover: assign-inputs($text-inputs-list, hover); diff --git a/html_orig/sass/lib/bourbon/addons/_timing-functions.scss b/html_orig/sass/lib/bourbon/addons/_timing-functions.scss new file mode 100755 index 0000000..20e5f1d --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_timing-functions.scss @@ -0,0 +1,34 @@ +@charset "UTF-8"; + +/// CSS cubic-bezier timing functions. Timing functions courtesy of jquery.easie (github.com/jaukia/easie) +/// +/// Timing functions are the same as demoed here: http://jqueryui.com/resources/demos/effect/easing.html +/// +/// @type cubic-bezier + +$ease-in-quad: cubic-bezier(0.550, 0.085, 0.680, 0.530); +$ease-in-cubic: cubic-bezier(0.550, 0.055, 0.675, 0.190); +$ease-in-quart: cubic-bezier(0.895, 0.030, 0.685, 0.220); +$ease-in-quint: cubic-bezier(0.755, 0.050, 0.855, 0.060); +$ease-in-sine: cubic-bezier(0.470, 0.000, 0.745, 0.715); +$ease-in-expo: cubic-bezier(0.950, 0.050, 0.795, 0.035); +$ease-in-circ: cubic-bezier(0.600, 0.040, 0.980, 0.335); +$ease-in-back: cubic-bezier(0.600, -0.280, 0.735, 0.045); + +$ease-out-quad: cubic-bezier(0.250, 0.460, 0.450, 0.940); +$ease-out-cubic: cubic-bezier(0.215, 0.610, 0.355, 1.000); +$ease-out-quart: cubic-bezier(0.165, 0.840, 0.440, 1.000); +$ease-out-quint: cubic-bezier(0.230, 1.000, 0.320, 1.000); +$ease-out-sine: cubic-bezier(0.390, 0.575, 0.565, 1.000); +$ease-out-expo: cubic-bezier(0.190, 1.000, 0.220, 1.000); +$ease-out-circ: cubic-bezier(0.075, 0.820, 0.165, 1.000); +$ease-out-back: cubic-bezier(0.175, 0.885, 0.320, 1.275); + +$ease-in-out-quad: cubic-bezier(0.455, 0.030, 0.515, 0.955); +$ease-in-out-cubic: cubic-bezier(0.645, 0.045, 0.355, 1.000); +$ease-in-out-quart: cubic-bezier(0.770, 0.000, 0.175, 1.000); +$ease-in-out-quint: cubic-bezier(0.860, 0.000, 0.070, 1.000); +$ease-in-out-sine: cubic-bezier(0.445, 0.050, 0.550, 0.950); +$ease-in-out-expo: cubic-bezier(1.000, 0.000, 0.000, 1.000); +$ease-in-out-circ: cubic-bezier(0.785, 0.135, 0.150, 0.860); +$ease-in-out-back: cubic-bezier(0.680, -0.550, 0.265, 1.550); diff --git a/html_orig/sass/lib/bourbon/addons/_triangle.scss b/html_orig/sass/lib/bourbon/addons/_triangle.scss new file mode 100755 index 0000000..8a1ed9c --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_triangle.scss @@ -0,0 +1,63 @@ +@mixin triangle($size, $color, $direction) { + $width: nth($size, 1); + $height: nth($size, length($size)); + $foreground-color: nth($color, 1); + $background-color: if(length($color) == 2, nth($color, 2), transparent); + height: 0; + width: 0; + + @if ($direction == up) or ($direction == down) or ($direction == right) or ($direction == left) { + $width: $width / 2; + $height: if(length($size) > 1, $height, $height/2); + + @if $direction == up { + border-bottom: $height solid $foreground-color; + border-left: $width solid $background-color; + border-right: $width solid $background-color; + } @else if $direction == right { + border-bottom: $width solid $background-color; + border-left: $height solid $foreground-color; + border-top: $width solid $background-color; + } @else if $direction == down { + border-left: $width solid $background-color; + border-right: $width solid $background-color; + border-top: $height solid $foreground-color; + } @else if $direction == left { + border-bottom: $width solid $background-color; + border-right: $height solid $foreground-color; + border-top: $width solid $background-color; + } + } @else if ($direction == up-right) or ($direction == up-left) { + border-top: $height solid $foreground-color; + + @if $direction == up-right { + border-left: $width solid $background-color; + } @else if $direction == up-left { + border-right: $width solid $background-color; + } + } @else if ($direction == down-right) or ($direction == down-left) { + border-bottom: $height solid $foreground-color; + + @if $direction == down-right { + border-left: $width solid $background-color; + } @else if $direction == down-left { + border-right: $width solid $background-color; + } + } @else if ($direction == inset-up) { + border-color: $background-color $background-color $foreground-color; + border-style: solid; + border-width: $height $width; + } @else if ($direction == inset-down) { + border-color: $foreground-color $background-color $background-color; + border-style: solid; + border-width: $height $width; + } @else if ($direction == inset-right) { + border-color: $background-color $background-color $background-color $foreground-color; + border-style: solid; + border-width: $width $height; + } @else if ($direction == inset-left) { + border-color: $background-color $foreground-color $background-color $background-color; + border-style: solid; + border-width: $width $height; + } +} diff --git a/html_orig/sass/lib/bourbon/addons/_word-wrap.scss b/html_orig/sass/lib/bourbon/addons/_word-wrap.scss new file mode 100755 index 0000000..64856a9 --- /dev/null +++ b/html_orig/sass/lib/bourbon/addons/_word-wrap.scss @@ -0,0 +1,29 @@ +@charset "UTF-8"; + +/// Provides an easy way to change the `word-wrap` property. +/// +/// @param {String} $wrap [break-word] +/// Value for the `word-break` property. +/// +/// @example scss - Usage +/// .wrapper { +/// @include word-wrap(break-word); +/// } +/// +/// @example css - CSS Output +/// .wrapper { +/// overflow-wrap: break-word; +/// word-break: break-all; +/// word-wrap: break-word; +/// } + +@mixin word-wrap($wrap: break-word) { + overflow-wrap: $wrap; + word-wrap: $wrap; + + @if $wrap == break-word { + word-break: break-all; + } @else { + word-break: $wrap; + } +} diff --git a/html_orig/sass/lib/bourbon/css3/_animation.scss b/html_orig/sass/lib/bourbon/css3/_animation.scss new file mode 100755 index 0000000..aac675f --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_animation.scss @@ -0,0 +1,43 @@ +// http://www.w3.org/TR/css3-animations/#the-animation-name-property- +// Each of these mixins support comma separated lists of values, which allows different transitions for individual properties to be described in a single style rule. Each value in the list corresponds to the value at that same position in the other properties. + +@mixin animation($animations...) { + @include prefixer(animation, $animations, webkit moz spec); +} + +@mixin animation-name($names...) { + @include prefixer(animation-name, $names, webkit moz spec); +} + +@mixin animation-duration($times...) { + @include prefixer(animation-duration, $times, webkit moz spec); +} + +@mixin animation-timing-function($motions...) { + // ease | linear | ease-in | ease-out | ease-in-out + @include prefixer(animation-timing-function, $motions, webkit moz spec); +} + +@mixin animation-iteration-count($values...) { + // infinite | + @include prefixer(animation-iteration-count, $values, webkit moz spec); +} + +@mixin animation-direction($directions...) { + // normal | alternate + @include prefixer(animation-direction, $directions, webkit moz spec); +} + +@mixin animation-play-state($states...) { + // running | paused + @include prefixer(animation-play-state, $states, webkit moz spec); +} + +@mixin animation-delay($times...) { + @include prefixer(animation-delay, $times, webkit moz spec); +} + +@mixin animation-fill-mode($modes...) { + // none | forwards | backwards | both + @include prefixer(animation-fill-mode, $modes, webkit moz spec); +} diff --git a/html_orig/sass/lib/bourbon/css3/_appearance.scss b/html_orig/sass/lib/bourbon/css3/_appearance.scss new file mode 100755 index 0000000..abddc02 --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_appearance.scss @@ -0,0 +1,3 @@ +@mixin appearance($value) { + @include prefixer(appearance, $value, webkit moz ms o spec); +} diff --git a/html_orig/sass/lib/bourbon/css3/_backface-visibility.scss b/html_orig/sass/lib/bourbon/css3/_backface-visibility.scss new file mode 100755 index 0000000..fc68e2d --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_backface-visibility.scss @@ -0,0 +1,3 @@ +@mixin backface-visibility($visibility) { + @include prefixer(backface-visibility, $visibility, webkit spec); +} diff --git a/html_orig/sass/lib/bourbon/css3/_background-image.scss b/html_orig/sass/lib/bourbon/css3/_background-image.scss new file mode 100755 index 0000000..6ed19ab --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_background-image.scss @@ -0,0 +1,42 @@ +//************************************************************************// +// Background-image property for adding multiple background images with +// gradients, or for stringing multiple gradients together. +//************************************************************************// + +@mixin background-image($images...) { + $webkit-images: (); + $spec-images: (); + + @each $image in $images { + $webkit-image: (); + $spec-image: (); + + @if (type-of($image) == string) { + $url-str: str-slice($image, 1, 3); + $gradient-type: str-slice($image, 1, 6); + + @if $url-str == "url" { + $webkit-image: $image; + $spec-image: $image; + } + + @else if $gradient-type == "linear" { + $gradients: _linear-gradient-parser($image); + $webkit-image: map-get($gradients, webkit-image); + $spec-image: map-get($gradients, spec-image); + } + + @else if $gradient-type == "radial" { + $gradients: _radial-gradient-parser($image); + $webkit-image: map-get($gradients, webkit-image); + $spec-image: map-get($gradients, spec-image); + } + } + + $webkit-images: append($webkit-images, $webkit-image, comma); + $spec-images: append($spec-images, $spec-image, comma); + } + + background-image: $webkit-images; + background-image: $spec-images; +} diff --git a/html_orig/sass/lib/bourbon/css3/_background.scss b/html_orig/sass/lib/bourbon/css3/_background.scss new file mode 100755 index 0000000..019db0e --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_background.scss @@ -0,0 +1,55 @@ +//************************************************************************// +// Background property for adding multiple backgrounds using shorthand +// notation. +//************************************************************************// + +@mixin background($backgrounds...) { + $webkit-backgrounds: (); + $spec-backgrounds: (); + + @each $background in $backgrounds { + $webkit-background: (); + $spec-background: (); + $background-type: type-of($background); + + @if $background-type == string or $background-type == list { + $background-str: if($background-type == list, nth($background, 1), $background); + + $url-str: str-slice($background-str, 1, 3); + $gradient-type: str-slice($background-str, 1, 6); + + @if $url-str == "url" { + $webkit-background: $background; + $spec-background: $background; + } + + @else if $gradient-type == "linear" { + $gradients: _linear-gradient-parser("#{$background}"); + $webkit-background: map-get($gradients, webkit-image); + $spec-background: map-get($gradients, spec-image); + } + + @else if $gradient-type == "radial" { + $gradients: _radial-gradient-parser("#{$background}"); + $webkit-background: map-get($gradients, webkit-image); + $spec-background: map-get($gradients, spec-image); + } + + @else { + $webkit-background: $background; + $spec-background: $background; + } + } + + @else { + $webkit-background: $background; + $spec-background: $background; + } + + $webkit-backgrounds: append($webkit-backgrounds, $webkit-background, comma); + $spec-backgrounds: append($spec-backgrounds, $spec-background, comma); + } + + background: $webkit-backgrounds; + background: $spec-backgrounds; +} diff --git a/html_orig/sass/lib/bourbon/css3/_border-image.scss b/html_orig/sass/lib/bourbon/css3/_border-image.scss new file mode 100755 index 0000000..cf568ce --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_border-image.scss @@ -0,0 +1,59 @@ +@mixin border-image($borders...) { + $webkit-borders: (); + $spec-borders: (); + + @each $border in $borders { + $webkit-border: (); + $spec-border: (); + $border-type: type-of($border); + + @if $border-type == string or list { + $border-str: if($border-type == list, nth($border, 1), $border); + + $url-str: str-slice($border-str, 1, 3); + $gradient-type: str-slice($border-str, 1, 6); + + @if $url-str == "url" { + $webkit-border: $border; + $spec-border: $border; + } + + @else if $gradient-type == "linear" { + $gradients: _linear-gradient-parser("#{$border}"); + $webkit-border: map-get($gradients, webkit-image); + $spec-border: map-get($gradients, spec-image); + } + + @else if $gradient-type == "radial" { + $gradients: _radial-gradient-parser("#{$border}"); + $webkit-border: map-get($gradients, webkit-image); + $spec-border: map-get($gradients, spec-image); + } + + @else { + $webkit-border: $border; + $spec-border: $border; + } + } + + @else { + $webkit-border: $border; + $spec-border: $border; + } + + $webkit-borders: append($webkit-borders, $webkit-border, comma); + $spec-borders: append($spec-borders, $spec-border, comma); + } + + -webkit-border-image: $webkit-borders; + border-image: $spec-borders; + border-style: solid; +} + +//Examples: +// @include border-image(url("image.png")); +// @include border-image(url("image.png") 20 stretch); +// @include border-image(linear-gradient(45deg, orange, yellow)); +// @include border-image(linear-gradient(45deg, orange, yellow) stretch); +// @include border-image(linear-gradient(45deg, orange, yellow) 20 30 40 50 stretch round); +// @include border-image(radial-gradient(top, cover, orange, yellow, orange)); diff --git a/html_orig/sass/lib/bourbon/css3/_calc.scss b/html_orig/sass/lib/bourbon/css3/_calc.scss new file mode 100755 index 0000000..0bfc738 --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_calc.scss @@ -0,0 +1,4 @@ +@mixin calc($property, $value) { + #{$property}: -webkit-calc(#{$value}); + #{$property}: calc(#{$value}); +} diff --git a/html_orig/sass/lib/bourbon/css3/_columns.scss b/html_orig/sass/lib/bourbon/css3/_columns.scss new file mode 100755 index 0000000..9611767 --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_columns.scss @@ -0,0 +1,47 @@ +@mixin columns($arg: auto) { + // || + @include prefixer(columns, $arg, webkit moz spec); +} + +@mixin column-count($int: auto) { + // auto || integer + @include prefixer(column-count, $int, webkit moz spec); +} + +@mixin column-gap($length: normal) { + // normal || length + @include prefixer(column-gap, $length, webkit moz spec); +} + +@mixin column-fill($arg: auto) { + // auto || length + @include prefixer(column-fill, $arg, webkit moz spec); +} + +@mixin column-rule($arg) { + // || || + @include prefixer(column-rule, $arg, webkit moz spec); +} + +@mixin column-rule-color($color) { + @include prefixer(column-rule-color, $color, webkit moz spec); +} + +@mixin column-rule-style($style: none) { + // none | hidden | dashed | dotted | double | groove | inset | inset | outset | ridge | solid + @include prefixer(column-rule-style, $style, webkit moz spec); +} + +@mixin column-rule-width ($width: none) { + @include prefixer(column-rule-width, $width, webkit moz spec); +} + +@mixin column-span($arg: none) { + // none || all + @include prefixer(column-span, $arg, webkit moz spec); +} + +@mixin column-width($length: auto) { + // auto || length + @include prefixer(column-width, $length, webkit moz spec); +} diff --git a/html_orig/sass/lib/bourbon/css3/_filter.scss b/html_orig/sass/lib/bourbon/css3/_filter.scss new file mode 100755 index 0000000..b8f8ffb --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_filter.scss @@ -0,0 +1,4 @@ +@mixin filter($function: none) { + // [ + @include prefixer(perspective, $depth, webkit moz spec); +} + +@mixin perspective-origin($value: 50% 50%) { + @include prefixer(perspective-origin, $value, webkit moz spec); +} diff --git a/html_orig/sass/lib/bourbon/css3/_placeholder.scss b/html_orig/sass/lib/bourbon/css3/_placeholder.scss new file mode 100755 index 0000000..5682fd0 --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_placeholder.scss @@ -0,0 +1,8 @@ +@mixin placeholder { + $placeholders: ":-webkit-input" ":-moz" "-moz" "-ms-input"; + @each $placeholder in $placeholders { + &:#{$placeholder}-placeholder { + @content; + } + } +} diff --git a/html_orig/sass/lib/bourbon/css3/_radial-gradient.scss b/html_orig/sass/lib/bourbon/css3/_radial-gradient.scss new file mode 100755 index 0000000..8da076e --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_radial-gradient.scss @@ -0,0 +1,39 @@ +// Requires Sass 3.1+ +@mixin radial-gradient($g1, $g2, + $g3: null, $g4: null, + $g5: null, $g6: null, + $g7: null, $g8: null, + $g9: null, $g10: null, + $pos: null, + $shape-size: null, + $fallback: null) { + + $data: _radial-arg-parser($g1, $g2, $pos, $shape-size); + $g1: nth($data, 1); + $g2: nth($data, 2); + $pos: nth($data, 3); + $shape-size: nth($data, 4); + + $full: $g1, $g2, $g3, $g4, $g5, $g6, $g7, $g8, $g9, $g10; + + // Strip deprecated cover/contain for spec + $shape-size-spec: _shape-size-stripper($shape-size); + + // Set $g1 as the default fallback color + $first-color: nth($full, 1); + $fallback-color: nth($first-color, 1); + + @if (type-of($fallback) == color) or ($fallback == "transparent") { + $fallback-color: $fallback; + } + + // Add Commas and spaces + $shape-size: if($shape-size, "#{$shape-size}, ", null); + $pos: if($pos, "#{$pos}, ", null); + $pos-spec: if($pos, "at #{$pos}", null); + $shape-size-spec: if(($shape-size-spec != " ") and ($pos == null), "#{$shape-size-spec}, ", "#{$shape-size-spec} "); + + background-color: $fallback-color; + background-image: -webkit-radial-gradient(unquote(#{$pos}#{$shape-size}#{$full})); + background-image: unquote("radial-gradient(#{$shape-size-spec}#{$pos-spec}#{$full})"); +} diff --git a/html_orig/sass/lib/bourbon/css3/_selection.scss b/html_orig/sass/lib/bourbon/css3/_selection.scss new file mode 100755 index 0000000..23303ab --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_selection.scss @@ -0,0 +1,42 @@ +@charset "UTF-8"; + +/// Outputs the spec and prefixed versions of the `::selection` pseudo-element. +/// +/// @param {Bool} $current-selector [false] +/// If set to `true`, it takes the current element into consideration. +/// +/// @example scss - Usage +/// .element { +/// @include selection(true) { +/// background-color: #ffbb52; +/// } +/// } +/// +/// @example css - CSS Output +/// .element::-moz-selection { +/// background-color: #ffbb52; +/// } +/// +/// .element::selection { +/// background-color: #ffbb52; +/// } + +@mixin selection($current-selector: false) { + @if $current-selector { + &::-moz-selection { + @content; + } + + &::selection { + @content; + } + } @else { + ::-moz-selection { + @content; + } + + ::selection { + @content; + } + } +} diff --git a/html_orig/sass/lib/bourbon/css3/_text-decoration.scss b/html_orig/sass/lib/bourbon/css3/_text-decoration.scss new file mode 100755 index 0000000..9222746 --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_text-decoration.scss @@ -0,0 +1,19 @@ +@mixin text-decoration($value) { +// || || + @include prefixer(text-decoration, $value, moz); +} + +@mixin text-decoration-line($line: none) { +// none || underline || overline || line-through + @include prefixer(text-decoration-line, $line, moz); +} + +@mixin text-decoration-style($style: solid) { +// solid || double || dotted || dashed || wavy + @include prefixer(text-decoration-style, $style, moz webkit); +} + +@mixin text-decoration-color($color: currentColor) { +// currentColor || + @include prefixer(text-decoration-color, $color, moz); +} diff --git a/html_orig/sass/lib/bourbon/css3/_transform.scss b/html_orig/sass/lib/bourbon/css3/_transform.scss new file mode 100755 index 0000000..8ee6509 --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_transform.scss @@ -0,0 +1,15 @@ +@mixin transform($property: none) { + // none | + @include prefixer(transform, $property, webkit moz ms o spec); +} + +@mixin transform-origin($axes: 50%) { + // x-axis - left | center | right | length | % + // y-axis - top | center | bottom | length | % + // z-axis - length + @include prefixer(transform-origin, $axes, webkit moz ms o spec); +} + +@mixin transform-style($style: flat) { + @include prefixer(transform-style, $style, webkit moz ms o spec); +} diff --git a/html_orig/sass/lib/bourbon/css3/_transition.scss b/html_orig/sass/lib/bourbon/css3/_transition.scss new file mode 100755 index 0000000..3c785ed --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_transition.scss @@ -0,0 +1,71 @@ +// Shorthand mixin. Supports multiple parentheses-deliminated values for each variable. +// Example: @include transition (all 2s ease-in-out); +// @include transition (opacity 1s ease-in 2s, width 2s ease-out); +// @include transition-property (transform, opacity); + +@mixin transition($properties...) { + // Fix for vendor-prefix transform property + $needs-prefixes: false; + $webkit: (); + $moz: (); + $spec: (); + + // Create lists for vendor-prefixed transform + @each $list in $properties { + @if nth($list, 1) == "transform" { + $needs-prefixes: true; + $list1: -webkit-transform; + $list2: -moz-transform; + $list3: (); + + @each $var in $list { + $list3: join($list3, $var); + + @if $var != "transform" { + $list1: join($list1, $var); + $list2: join($list2, $var); + } + } + + $webkit: append($webkit, $list1); + $moz: append($moz, $list2); + $spec: append($spec, $list3); + } @else { + $webkit: append($webkit, $list, comma); + $moz: append($moz, $list, comma); + $spec: append($spec, $list, comma); + } + } + + @if $needs-prefixes { + -webkit-transition: $webkit; + -moz-transition: $moz; + transition: $spec; + } @else { + @if length($properties) >= 1 { + @include prefixer(transition, $properties, webkit moz spec); + } @else { + $properties: all 0.15s ease-out 0s; + @include prefixer(transition, $properties, webkit moz spec); + } + } +} + +@mixin transition-property($properties...) { + -webkit-transition-property: transition-property-names($properties, "webkit"); + -moz-transition-property: transition-property-names($properties, "moz"); + transition-property: transition-property-names($properties, false); +} + +@mixin transition-duration($times...) { + @include prefixer(transition-duration, $times, webkit moz spec); +} + +@mixin transition-timing-function($motions...) { + // ease | linear | ease-in | ease-out | ease-in-out | cubic-bezier() + @include prefixer(transition-timing-function, $motions, webkit moz spec); +} + +@mixin transition-delay($times...) { + @include prefixer(transition-delay, $times, webkit moz spec); +} diff --git a/html_orig/sass/lib/bourbon/css3/_user-select.scss b/html_orig/sass/lib/bourbon/css3/_user-select.scss new file mode 100755 index 0000000..d4e5551 --- /dev/null +++ b/html_orig/sass/lib/bourbon/css3/_user-select.scss @@ -0,0 +1,3 @@ +@mixin user-select($value: none) { + @include prefixer(user-select, $value, webkit moz ms spec); +} diff --git a/html_orig/sass/lib/bourbon/functions/_assign-inputs.scss b/html_orig/sass/lib/bourbon/functions/_assign-inputs.scss new file mode 100755 index 0000000..f8aba96 --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_assign-inputs.scss @@ -0,0 +1,11 @@ +@function assign-inputs($inputs, $pseudo: null) { + $list: (); + + @each $input in $inputs { + $input: unquote($input); + $input: if($pseudo, $input + ":" + $pseudo, $input); + $list: append($list, $input, comma); + } + + @return $list; +} diff --git a/html_orig/sass/lib/bourbon/functions/_contains-falsy.scss b/html_orig/sass/lib/bourbon/functions/_contains-falsy.scss new file mode 100755 index 0000000..c096fdb --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_contains-falsy.scss @@ -0,0 +1,20 @@ +@charset "UTF-8"; + +/// Checks if a list does not contains a value. +/// +/// @access private +/// +/// @param {List} $list +/// The list to check against. +/// +/// @return {Bool} + +@function contains-falsy($list) { + @each $item in $list { + @if not $item { + @return true; + } + } + + @return false; +} diff --git a/html_orig/sass/lib/bourbon/functions/_contains.scss b/html_orig/sass/lib/bourbon/functions/_contains.scss new file mode 100755 index 0000000..3dec27d --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_contains.scss @@ -0,0 +1,26 @@ +@charset "UTF-8"; + +/// Checks if a list contains a value(s). +/// +/// @access private +/// +/// @param {List} $list +/// The list to check against. +/// +/// @param {List} $values +/// A single value or list of values to check for. +/// +/// @example scss - Usage +/// contains($list, $value) +/// +/// @return {Bool} + +@function contains($list, $values...) { + @each $value in $values { + @if type-of(index($list, $value)) != "number" { + @return false; + } + } + + @return true; +} diff --git a/html_orig/sass/lib/bourbon/functions/_is-length.scss b/html_orig/sass/lib/bourbon/functions/_is-length.scss new file mode 100755 index 0000000..5826e78 --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_is-length.scss @@ -0,0 +1,11 @@ +@charset "UTF-8"; + +/// Checks for a valid CSS length. +/// +/// @param {String} $value + +@function is-length($value) { + @return type-of($value) != "null" and (str-slice($value + "", 1, 4) == "calc" + or index(auto inherit initial 0, $value) + or (type-of($value) == "number" and not(unitless($value)))); +} diff --git a/html_orig/sass/lib/bourbon/functions/_is-light.scss b/html_orig/sass/lib/bourbon/functions/_is-light.scss new file mode 100755 index 0000000..92d90ac --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_is-light.scss @@ -0,0 +1,21 @@ +@charset "UTF-8"; + +/// Programatically determines whether a color is light or dark. +/// +/// @link http://robots.thoughtbot.com/closer-look-color-lightness +/// +/// @param {Color (Hex)} $color +/// +/// @example scss - Usage +/// is-light($color) +/// +/// @return {Bool} + +@function is-light($hex-color) { + $-local-red: red(rgba($hex-color, 1)); + $-local-green: green(rgba($hex-color, 1)); + $-local-blue: blue(rgba($hex-color, 1)); + $-local-lightness: ($-local-red * 0.2126 + $-local-green * 0.7152 + $-local-blue * 0.0722) / 255; + + @return $-local-lightness > 0.6; +} diff --git a/html_orig/sass/lib/bourbon/functions/_is-number.scss b/html_orig/sass/lib/bourbon/functions/_is-number.scss new file mode 100755 index 0000000..a64e0bf --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_is-number.scss @@ -0,0 +1,11 @@ +@charset "UTF-8"; + +/// Checks for a valid number. +/// +/// @param {Number} $value +/// +/// @require {function} contains + +@function is-number($value) { + @return contains("0" "1" "2" "3" "4" "5" "6" "7" "8" "9" 0 1 2 3 4 5 6 7 8 9, $value); +} diff --git a/html_orig/sass/lib/bourbon/functions/_is-size.scss b/html_orig/sass/lib/bourbon/functions/_is-size.scss new file mode 100755 index 0000000..661789a --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_is-size.scss @@ -0,0 +1,13 @@ +@charset "UTF-8"; + +/// Checks for a valid CSS size. +/// +/// @param {String} $value +/// +/// @require {function} contains +/// @require {function} is-length + +@function is-size($value) { + @return is-length($value) + or contains("fill" "fit-content" "min-content" "max-content", $value); +} diff --git a/html_orig/sass/lib/bourbon/functions/_modular-scale.scss b/html_orig/sass/lib/bourbon/functions/_modular-scale.scss new file mode 100755 index 0000000..20fa388 --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_modular-scale.scss @@ -0,0 +1,69 @@ +// Scaling Variables +$golden: 1.618; +$minor-second: 1.067; +$major-second: 1.125; +$minor-third: 1.2; +$major-third: 1.25; +$perfect-fourth: 1.333; +$augmented-fourth: 1.414; +$perfect-fifth: 1.5; +$minor-sixth: 1.6; +$major-sixth: 1.667; +$minor-seventh: 1.778; +$major-seventh: 1.875; +$octave: 2; +$major-tenth: 2.5; +$major-eleventh: 2.667; +$major-twelfth: 3; +$double-octave: 4; + +$modular-scale-ratio: $perfect-fourth !default; +$modular-scale-base: em($em-base) !default; + +@function modular-scale($increment, $value: $modular-scale-base, $ratio: $modular-scale-ratio) { + $v1: nth($value, 1); + $v2: nth($value, length($value)); + $value: $v1; + + // scale $v2 to just above $v1 + @while $v2 > $v1 { + $v2: ($v2 / $ratio); // will be off-by-1 + } + @while $v2 < $v1 { + $v2: ($v2 * $ratio); // will fix off-by-1 + } + + // check AFTER scaling $v2 to prevent double-counting corner-case + $double-stranded: $v2 > $v1; + + @if $increment > 0 { + @for $i from 1 through $increment { + @if $double-stranded and ($v1 * $ratio) > $v2 { + $value: $v2; + $v2: ($v2 * $ratio); + } @else { + $v1: ($v1 * $ratio); + $value: $v1; + } + } + } + + @if $increment < 0 { + // adjust $v2 to just below $v1 + @if $double-stranded { + $v2: ($v2 / $ratio); + } + + @for $i from $increment through -1 { + @if $double-stranded and ($v1 / $ratio) < $v2 { + $value: $v2; + $v2: ($v2 / $ratio); + } @else { + $v1: ($v1 / $ratio); + $value: $v1; + } + } + } + + @return $value; +} diff --git a/html_orig/sass/lib/bourbon/functions/_px-to-em.scss b/html_orig/sass/lib/bourbon/functions/_px-to-em.scss new file mode 100755 index 0000000..ae81a44 --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_px-to-em.scss @@ -0,0 +1,13 @@ +// Convert pixels to ems +// eg. for a relational value of 12px write em(12) when the parent is 16px +// if the parent is another value say 24px write em(12, 24) + +@function em($pxval, $base: $em-base) { + @if not unitless($pxval) { + $pxval: strip-units($pxval); + } + @if not unitless($base) { + $base: strip-units($base); + } + @return ($pxval / $base) * 1em; +} diff --git a/html_orig/sass/lib/bourbon/functions/_px-to-rem.scss b/html_orig/sass/lib/bourbon/functions/_px-to-rem.scss new file mode 100755 index 0000000..0ac941e --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_px-to-rem.scss @@ -0,0 +1,15 @@ +// Convert pixels to rems +// eg. for a relational value of 12px write rem(12) +// Assumes $em-base is the font-size of + +@function rem($pxval) { + @if not unitless($pxval) { + $pxval: strip-units($pxval); + } + + $base: $em-base; + @if not unitless($base) { + $base: strip-units($base); + } + @return ($pxval / $base) * 1rem; +} diff --git a/html_orig/sass/lib/bourbon/functions/_shade.scss b/html_orig/sass/lib/bourbon/functions/_shade.scss new file mode 100755 index 0000000..8aaf2c6 --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_shade.scss @@ -0,0 +1,24 @@ +@charset "UTF-8"; + +/// Mixes a color with black. +/// +/// @param {Color} $color +/// +/// @param {Number (Percentage)} $percent +/// The amount of black to be mixed in. +/// +/// @example scss - Usage +/// .element { +/// background-color: shade(#ffbb52, 60%); +/// } +/// +/// @example css - CSS Output +/// .element { +/// background-color: #664a20; +/// } +/// +/// @return {Color} + +@function shade($color, $percent) { + @return mix(#000, $color, $percent); +} diff --git a/html_orig/sass/lib/bourbon/functions/_strip-units.scss b/html_orig/sass/lib/bourbon/functions/_strip-units.scss new file mode 100755 index 0000000..6c5f3e8 --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_strip-units.scss @@ -0,0 +1,17 @@ +@charset "UTF-8"; + +/// Strips the unit from a number. +/// +/// @param {Number (With Unit)} $value +/// +/// @example scss - Usage +/// $dimension: strip-units(10em); +/// +/// @example css - CSS Output +/// $dimension: 10; +/// +/// @return {Number (Unitless)} + +@function strip-units($value) { + @return ($value / ($value * 0 + 1)); +} diff --git a/html_orig/sass/lib/bourbon/functions/_tint.scss b/html_orig/sass/lib/bourbon/functions/_tint.scss new file mode 100755 index 0000000..2e33814 --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_tint.scss @@ -0,0 +1,24 @@ +@charset "UTF-8"; + +/// Mixes a color with white. +/// +/// @param {Color} $color +/// +/// @param {Number (Percentage)} $percent +/// The amount of white to be mixed in. +/// +/// @example scss - Usage +/// .element { +/// background-color: tint(#6ecaa6, 40%); +/// } +/// +/// @example css - CSS Output +/// .element { +/// background-color: #a8dfc9; +/// } +/// +/// @return {Color} + +@function tint($color, $percent) { + @return mix(#fff, $color, $percent); +} diff --git a/html_orig/sass/lib/bourbon/functions/_transition-property-name.scss b/html_orig/sass/lib/bourbon/functions/_transition-property-name.scss new file mode 100755 index 0000000..18348b9 --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_transition-property-name.scss @@ -0,0 +1,22 @@ +// Return vendor-prefixed property names if appropriate +// Example: transition-property-names((transform, color, background), moz) -> -moz-transform, color, background +//************************************************************************// +@function transition-property-names($props, $vendor: false) { + $new-props: (); + + @each $prop in $props { + $new-props: append($new-props, transition-property-name($prop, $vendor), comma); + } + + @return $new-props; +} + +@function transition-property-name($prop, $vendor: false) { + // put other properties that need to be prefixed here aswell + @if $vendor and $prop == transform { + @return unquote('-'+$vendor+'-'+$prop); + } + @else { + @return $prop; + } +} diff --git a/html_orig/sass/lib/bourbon/functions/_unpack.scss b/html_orig/sass/lib/bourbon/functions/_unpack.scss new file mode 100755 index 0000000..4367935 --- /dev/null +++ b/html_orig/sass/lib/bourbon/functions/_unpack.scss @@ -0,0 +1,27 @@ +@charset "UTF-8"; + +/// Converts shorthand to the 4-value syntax. +/// +/// @param {List} $shorthand +/// +/// @example scss - Usage +/// .element { +/// margin: unpack(1em 2em); +/// } +/// +/// @example css - CSS Output +/// .element { +/// margin: 1em 2em 1em 2em; +/// } + +@function unpack($shorthand) { + @if length($shorthand) == 1 { + @return nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1); + } @else if length($shorthand) == 2 { + @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 1) nth($shorthand, 2); + } @else if length($shorthand) == 3 { + @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 3) nth($shorthand, 2); + } @else { + @return $shorthand; + } +} diff --git a/html_orig/sass/lib/bourbon/helpers/_convert-units.scss b/html_orig/sass/lib/bourbon/helpers/_convert-units.scss new file mode 100755 index 0000000..e0a65a0 --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_convert-units.scss @@ -0,0 +1,21 @@ +//************************************************************************// +// Helper function for str-to-num fn. +// Source: http://sassmeister.com/gist/9647408 +//************************************************************************// +@function _convert-units($number, $unit) { + $strings: "px", "cm", "mm", "%", "ch", "pica", "in", "em", "rem", "pt", "pc", "ex", "vw", "vh", "vmin", "vmax", "deg", "rad", "grad", "turn"; + $units: 1px, 1cm, 1mm, 1%, 1ch, 1pica, 1in, 1em, 1rem, 1pt, 1pc, 1ex, 1vw, 1vh, 1vmin, 1vmax, 1deg, 1rad, 1grad, 1turn; + $index: index($strings, $unit); + + @if not $index { + @warn "Unknown unit `#{$unit}`."; + @return false; + } + + @if type-of($number) != "number" { + @warn "`#{$number} is not a number`"; + @return false; + } + + @return $number * nth($units, $index); +} diff --git a/html_orig/sass/lib/bourbon/helpers/_directional-values.scss b/html_orig/sass/lib/bourbon/helpers/_directional-values.scss new file mode 100755 index 0000000..6ee538d --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_directional-values.scss @@ -0,0 +1,96 @@ +@charset "UTF-8"; + +/// Directional-property mixins are shorthands for writing properties like the following +/// +/// @ignore You can also use `false` instead of `null`. +/// +/// @param {List} $vals +/// List of directional values +/// +/// @example scss - Usage +/// .element { +/// @include border-style(dotted null); +/// @include margin(null 0 10px); +/// } +/// +/// @example css - CSS Output +/// .element { +/// border-bottom-style: dotted; +/// border-top-style: dotted; +/// margin-bottom: 10px; +/// margin-left: 0; +/// margin-right: 0; +/// } +/// +/// @require {function} contains-falsy +/// +/// @return {List} + +@function collapse-directionals($vals) { + $output: null; + + $a: nth($vals, 1); + $b: if(length($vals) < 2, $a, nth($vals, 2)); + $c: if(length($vals) < 3, $a, nth($vals, 3)); + $d: if(length($vals) < 2, $a, nth($vals, if(length($vals) < 4, 2, 4))); + + @if $a == 0 { $a: 0; } + @if $b == 0 { $b: 0; } + @if $c == 0 { $c: 0; } + @if $d == 0 { $d: 0; } + + @if $a == $b and $a == $c and $a == $d { $output: $a; } + @else if $a == $c and $b == $d { $output: $a $b; } + @else if $b == $d { $output: $a $b $c; } + @else { $output: $a $b $c $d; } + + @return $output; +} + +/// Output directional properties, for instance `margin`. +/// +/// @access private +/// +/// @param {String} $pre +/// Prefix to use +/// @param {String} $suf +/// Suffix to use +/// @param {List} $vals +/// List of values +/// +/// @require {function} collapse-directionals +/// @require {function} contains-falsy + +@mixin directional-property($pre, $suf, $vals) { + // Property Names + $top: $pre + "-top" + if($suf, "-#{$suf}", ""); + $bottom: $pre + "-bottom" + if($suf, "-#{$suf}", ""); + $left: $pre + "-left" + if($suf, "-#{$suf}", ""); + $right: $pre + "-right" + if($suf, "-#{$suf}", ""); + $all: $pre + if($suf, "-#{$suf}", ""); + + $vals: collapse-directionals($vals); + + @if contains-falsy($vals) { + @if nth($vals, 1) { #{$top}: nth($vals, 1); } + + @if length($vals) == 1 { + @if nth($vals, 1) { #{$right}: nth($vals, 1); } + } @else { + @if nth($vals, 2) { #{$right}: nth($vals, 2); } + } + + @if length($vals) == 2 { + @if nth($vals, 1) { #{$bottom}: nth($vals, 1); } + @if nth($vals, 2) { #{$left}: nth($vals, 2); } + } @else if length($vals) == 3 { + @if nth($vals, 3) { #{$bottom}: nth($vals, 3); } + @if nth($vals, 2) { #{$left}: nth($vals, 2); } + } @else if length($vals) == 4 { + @if nth($vals, 3) { #{$bottom}: nth($vals, 3); } + @if nth($vals, 4) { #{$left}: nth($vals, 4); } + } + } @else { + #{$all}: $vals; + } +} diff --git a/html_orig/sass/lib/bourbon/helpers/_font-source-declaration.scss b/html_orig/sass/lib/bourbon/helpers/_font-source-declaration.scss new file mode 100755 index 0000000..7f17586 --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_font-source-declaration.scss @@ -0,0 +1,43 @@ +// Used for creating the source string for fonts using @font-face +// Reference: http://goo.gl/Ru1bKP + +@function font-url-prefixer($asset-pipeline) { + @if $asset-pipeline == true { + @return font-url; + } @else { + @return url; + } +} + +@function font-source-declaration( + $font-family, + $file-path, + $asset-pipeline, + $file-formats, + $font-url) { + + $src: (); + + $formats-map: ( + eot: "#{$file-path}.eot?#iefix" format("embedded-opentype"), + woff2: "#{$file-path}.woff2" format("woff2"), + woff: "#{$file-path}.woff" format("woff"), + ttf: "#{$file-path}.ttf" format("truetype"), + svg: "#{$file-path}.svg##{$font-family}" format("svg") + ); + + @each $key, $values in $formats-map { + @if contains($file-formats, $key) { + $file-path: nth($values, 1); + $font-format: nth($values, 2); + + @if $asset-pipeline == true { + $src: append($src, font-url($file-path) $font-format, comma); + } @else { + $src: append($src, url($file-path) $font-format, comma); + } + } + } + + @return $src; +} diff --git a/html_orig/sass/lib/bourbon/helpers/_gradient-positions-parser.scss b/html_orig/sass/lib/bourbon/helpers/_gradient-positions-parser.scss new file mode 100755 index 0000000..07d30b6 --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_gradient-positions-parser.scss @@ -0,0 +1,13 @@ +@function _gradient-positions-parser($gradient-type, $gradient-positions) { + @if $gradient-positions + and ($gradient-type == linear) + and (type-of($gradient-positions) != color) { + $gradient-positions: _linear-positions-parser($gradient-positions); + } + @else if $gradient-positions + and ($gradient-type == radial) + and (type-of($gradient-positions) != color) { + $gradient-positions: _radial-positions-parser($gradient-positions); + } + @return $gradient-positions; +} diff --git a/html_orig/sass/lib/bourbon/helpers/_linear-angle-parser.scss b/html_orig/sass/lib/bourbon/helpers/_linear-angle-parser.scss new file mode 100755 index 0000000..e0401ed --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_linear-angle-parser.scss @@ -0,0 +1,25 @@ +// Private function for linear-gradient-parser +@function _linear-angle-parser($image, $first-val, $prefix, $suffix) { + $offset: null; + $unit-short: str-slice($first-val, str-length($first-val) - 2, str-length($first-val)); + $unit-long: str-slice($first-val, str-length($first-val) - 3, str-length($first-val)); + + @if ($unit-long == "grad") or + ($unit-long == "turn") { + $offset: if($unit-long == "grad", -100grad * 3, -0.75turn); + } + + @else if ($unit-short == "deg") or + ($unit-short == "rad") { + $offset: if($unit-short == "deg", -90 * 3, 1.6rad); + } + + @if $offset { + $num: _str-to-num($first-val); + + @return ( + webkit-image: -webkit- + $prefix + ($offset - $num) + $suffix, + spec-image: $image + ); + } +} diff --git a/html_orig/sass/lib/bourbon/helpers/_linear-gradient-parser.scss b/html_orig/sass/lib/bourbon/helpers/_linear-gradient-parser.scss new file mode 100755 index 0000000..48a8f77 --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_linear-gradient-parser.scss @@ -0,0 +1,41 @@ +@function _linear-gradient-parser($image) { + $image: unquote($image); + $gradients: (); + $start: str-index($image, "("); + $end: str-index($image, ","); + $first-val: str-slice($image, $start + 1, $end - 1); + + $prefix: str-slice($image, 1, $start); + $suffix: str-slice($image, $end, str-length($image)); + + $has-multiple-vals: str-index($first-val, " "); + $has-single-position: unquote(_position-flipper($first-val) + ""); + $has-angle: is-number(str-slice($first-val, 1, 1)); + + @if $has-multiple-vals { + $gradients: _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals); + } + + @else if $has-single-position != "" { + $pos: unquote($has-single-position + ""); + + $gradients: ( + webkit-image: -webkit- + $image, + spec-image: $prefix + "to " + $pos + $suffix + ); + } + + @else if $has-angle { + // Rotate degree for webkit + $gradients: _linear-angle-parser($image, $first-val, $prefix, $suffix); + } + + @else { + $gradients: ( + webkit-image: -webkit- + $image, + spec-image: $image + ); + } + + @return $gradients; +} diff --git a/html_orig/sass/lib/bourbon/helpers/_linear-positions-parser.scss b/html_orig/sass/lib/bourbon/helpers/_linear-positions-parser.scss new file mode 100755 index 0000000..96d6a6d --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_linear-positions-parser.scss @@ -0,0 +1,61 @@ +@function _linear-positions-parser($pos) { + $type: type-of(nth($pos, 1)); + $spec: null; + $degree: null; + $side: null; + $corner: null; + $length: length($pos); + // Parse Side and corner positions + @if ($length > 1) { + @if nth($pos, 1) == "to" { // Newer syntax + $side: nth($pos, 2); + + @if $length == 2 { // eg. to top + // Swap for backwards compatibility + $degree: _position-flipper(nth($pos, 2)); + } + @else if $length == 3 { // eg. to top left + $corner: nth($pos, 3); + } + } + @else if $length == 2 { // Older syntax ("top left") + $side: _position-flipper(nth($pos, 1)); + $corner: _position-flipper(nth($pos, 2)); + } + + @if ("#{$side} #{$corner}" == "left top") or ("#{$side} #{$corner}" == "top left") { + $degree: _position-flipper(#{$side}) _position-flipper(#{$corner}); + } + @else if ("#{$side} #{$corner}" == "right top") or ("#{$side} #{$corner}" == "top right") { + $degree: _position-flipper(#{$side}) _position-flipper(#{$corner}); + } + @else if ("#{$side} #{$corner}" == "right bottom") or ("#{$side} #{$corner}" == "bottom right") { + $degree: _position-flipper(#{$side}) _position-flipper(#{$corner}); + } + @else if ("#{$side} #{$corner}" == "left bottom") or ("#{$side} #{$corner}" == "bottom left") { + $degree: _position-flipper(#{$side}) _position-flipper(#{$corner}); + } + $spec: to $side $corner; + } + @else if $length == 1 { + // Swap for backwards compatibility + @if $type == string { + $degree: $pos; + $spec: to _position-flipper($pos); + } + @else { + $degree: -270 - $pos; //rotate the gradient opposite from spec + $spec: $pos; + } + } + $degree: unquote($degree + ","); + $spec: unquote($spec + ","); + @return $degree $spec; +} + +@function _position-flipper($pos) { + @return if($pos == left, right, null) + if($pos == right, left, null) + if($pos == top, bottom, null) + if($pos == bottom, top, null); +} diff --git a/html_orig/sass/lib/bourbon/helpers/_linear-side-corner-parser.scss b/html_orig/sass/lib/bourbon/helpers/_linear-side-corner-parser.scss new file mode 100755 index 0000000..7a69125 --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_linear-side-corner-parser.scss @@ -0,0 +1,31 @@ +// Private function for linear-gradient-parser +@function _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals) { + $val-1: str-slice($first-val, 1, $has-multiple-vals - 1); + $val-2: str-slice($first-val, $has-multiple-vals + 1, str-length($first-val)); + $val-3: null; + $has-val-3: str-index($val-2, " "); + + @if $has-val-3 { + $val-3: str-slice($val-2, $has-val-3 + 1, str-length($val-2)); + $val-2: str-slice($val-2, 1, $has-val-3 - 1); + } + + $pos: _position-flipper($val-1) _position-flipper($val-2) _position-flipper($val-3); + $pos: unquote($pos + ""); + + // Use old spec for webkit + @if $val-1 == "to" { + @return ( + webkit-image: -webkit- + $prefix + $pos + $suffix, + spec-image: $image + ); + } + + // Bring the code up to spec + @else { + @return ( + webkit-image: -webkit- + $image, + spec-image: $prefix + "to " + $pos + $suffix + ); + } +} diff --git a/html_orig/sass/lib/bourbon/helpers/_radial-arg-parser.scss b/html_orig/sass/lib/bourbon/helpers/_radial-arg-parser.scss new file mode 100755 index 0000000..56c6030 --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_radial-arg-parser.scss @@ -0,0 +1,69 @@ +@function _radial-arg-parser($g1, $g2, $pos, $shape-size) { + @each $value in $g1, $g2 { + $first-val: nth($value, 1); + $pos-type: type-of($first-val); + $spec-at-index: null; + + // Determine if spec was passed to mixin + @if type-of($value) == list { + $spec-at-index: if(index($value, at), index($value, at), false); + } + @if $spec-at-index { + @if $spec-at-index > 1 { + @for $i from 1 through ($spec-at-index - 1) { + $shape-size: $shape-size nth($value, $i); + } + @for $i from ($spec-at-index + 1) through length($value) { + $pos: $pos nth($value, $i); + } + } + @else if $spec-at-index == 1 { + @for $i from ($spec-at-index + 1) through length($value) { + $pos: $pos nth($value, $i); + } + } + $g1: null; + } + + // If not spec calculate correct values + @else { + @if ($pos-type != color) or ($first-val != "transparent") { + @if ($pos-type == number) + or ($first-val == "center") + or ($first-val == "top") + or ($first-val == "right") + or ($first-val == "bottom") + or ($first-val == "left") { + + $pos: $value; + + @if $pos == $g1 { + $g1: null; + } + } + + @else if + ($first-val == "ellipse") + or ($first-val == "circle") + or ($first-val == "closest-side") + or ($first-val == "closest-corner") + or ($first-val == "farthest-side") + or ($first-val == "farthest-corner") + or ($first-val == "contain") + or ($first-val == "cover") { + + $shape-size: $value; + + @if $value == $g1 { + $g1: null; + } + + @else if $value == $g2 { + $g2: null; + } + } + } + } + } + @return $g1, $g2, $pos, $shape-size; +} diff --git a/html_orig/sass/lib/bourbon/helpers/_radial-gradient-parser.scss b/html_orig/sass/lib/bourbon/helpers/_radial-gradient-parser.scss new file mode 100755 index 0000000..5444d80 --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_radial-gradient-parser.scss @@ -0,0 +1,50 @@ +@function _radial-gradient-parser($image) { + $image: unquote($image); + $gradients: (); + $start: str-index($image, "("); + $end: str-index($image, ","); + $first-val: str-slice($image, $start + 1, $end - 1); + + $prefix: str-slice($image, 1, $start); + $suffix: str-slice($image, $end, str-length($image)); + + $is-spec-syntax: str-index($first-val, "at"); + + @if $is-spec-syntax and $is-spec-syntax > 1 { + $keyword: str-slice($first-val, 1, $is-spec-syntax - 2); + $pos: str-slice($first-val, $is-spec-syntax + 3, str-length($first-val)); + $pos: append($pos, $keyword, comma); + + $gradients: ( + webkit-image: -webkit- + $prefix + $pos + $suffix, + spec-image: $image + ); + } + + @else if $is-spec-syntax == 1 { + $pos: str-slice($first-val, $is-spec-syntax + 3, str-length($first-val)); + + $gradients: ( + webkit-image: -webkit- + $prefix + $pos + $suffix, + spec-image: $image + ); + } + + @else if str-index($image, "cover") or str-index($image, "contain") { + @warn "Radial-gradient needs to be updated to conform to latest spec."; + + $gradients: ( + webkit-image: null, + spec-image: $image + ); + } + + @else { + $gradients: ( + webkit-image: -webkit- + $image, + spec-image: $image + ); + } + + @return $gradients; +} diff --git a/html_orig/sass/lib/bourbon/helpers/_radial-positions-parser.scss b/html_orig/sass/lib/bourbon/helpers/_radial-positions-parser.scss new file mode 100755 index 0000000..3c552ad --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_radial-positions-parser.scss @@ -0,0 +1,18 @@ +@function _radial-positions-parser($gradient-pos) { + $shape-size: nth($gradient-pos, 1); + $pos: nth($gradient-pos, 2); + $shape-size-spec: _shape-size-stripper($shape-size); + + $pre-spec: unquote(if($pos, "#{$pos}, ", null)) + unquote(if($shape-size, "#{$shape-size},", null)); + $pos-spec: if($pos, "at #{$pos}", null); + + $spec: "#{$shape-size-spec} #{$pos-spec}"; + + // Add comma + @if ($spec != " ") { + $spec: "#{$spec},"; + } + + @return $pre-spec $spec; +} diff --git a/html_orig/sass/lib/bourbon/helpers/_render-gradients.scss b/html_orig/sass/lib/bourbon/helpers/_render-gradients.scss new file mode 100755 index 0000000..5765676 --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_render-gradients.scss @@ -0,0 +1,26 @@ +// User for linear and radial gradients within background-image or border-image properties + +@function _render-gradients($gradient-positions, $gradients, $gradient-type, $vendor: false) { + $pre-spec: null; + $spec: null; + $vendor-gradients: null; + @if $gradient-type == linear { + @if $gradient-positions { + $pre-spec: nth($gradient-positions, 1); + $spec: nth($gradient-positions, 2); + } + } + @else if $gradient-type == radial { + $pre-spec: nth($gradient-positions, 1); + $spec: nth($gradient-positions, 2); + } + + @if $vendor { + $vendor-gradients: -#{$vendor}-#{$gradient-type}-gradient(#{$pre-spec} $gradients); + } + @else if $vendor == false { + $vendor-gradients: "#{$gradient-type}-gradient(#{$spec} #{$gradients})"; + $vendor-gradients: unquote($vendor-gradients); + } + @return $vendor-gradients; +} diff --git a/html_orig/sass/lib/bourbon/helpers/_shape-size-stripper.scss b/html_orig/sass/lib/bourbon/helpers/_shape-size-stripper.scss new file mode 100755 index 0000000..ee5eda4 --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_shape-size-stripper.scss @@ -0,0 +1,10 @@ +@function _shape-size-stripper($shape-size) { + $shape-size-spec: null; + @each $value in $shape-size { + @if ($value == "cover") or ($value == "contain") { + $value: null; + } + $shape-size-spec: "#{$shape-size-spec} #{$value}"; + } + @return $shape-size-spec; +} diff --git a/html_orig/sass/lib/bourbon/helpers/_str-to-num.scss b/html_orig/sass/lib/bourbon/helpers/_str-to-num.scss new file mode 100755 index 0000000..3ef1d87 --- /dev/null +++ b/html_orig/sass/lib/bourbon/helpers/_str-to-num.scss @@ -0,0 +1,50 @@ +//************************************************************************// +// Helper function for linear/radial-gradient-parsers. +// Source: http://sassmeister.com/gist/9647408 +//************************************************************************// +@function _str-to-num($string) { + // Matrices + $strings: "0" "1" "2" "3" "4" "5" "6" "7" "8" "9"; + $numbers: 0 1 2 3 4 5 6 7 8 9; + + // Result + $result: 0; + $divider: 0; + $minus: false; + + // Looping through all characters + @for $i from 1 through str-length($string) { + $character: str-slice($string, $i, $i); + $index: index($strings, $character); + + @if $character == "-" { + $minus: true; + } + + @else if $character == "." { + $divider: 1; + } + + @else { + @if not $index { + $result: if($minus, $result * -1, $result); + @return _convert-units($result, str-slice($string, $i)); + } + + $number: nth($numbers, $index); + + @if $divider == 0 { + $result: $result * 10; + } + + @else { + // Move the decimal dot to the left + $divider: $divider * 10; + $number: $number / $divider; + } + + $result: $result + $number; + } + } + @return if($minus, $result * -1, $result); +} diff --git a/html_orig/sass/lib/bourbon/settings/_asset-pipeline.scss b/html_orig/sass/lib/bourbon/settings/_asset-pipeline.scss new file mode 100755 index 0000000..4c6afc5 --- /dev/null +++ b/html_orig/sass/lib/bourbon/settings/_asset-pipeline.scss @@ -0,0 +1,7 @@ +@charset "UTF-8"; + +/// A global setting to enable or disable the `$asset-pipeline` variable for all functions that accept it. +/// +/// @type Bool + +$asset-pipeline: false !default; diff --git a/html_orig/sass/lib/bourbon/settings/_prefixer.scss b/html_orig/sass/lib/bourbon/settings/_prefixer.scss new file mode 100755 index 0000000..8c39051 --- /dev/null +++ b/html_orig/sass/lib/bourbon/settings/_prefixer.scss @@ -0,0 +1,9 @@ +@charset "UTF-8"; + +/// Global variables to enable or disable vendor prefixes + +$prefix-for-webkit: true !default; +$prefix-for-mozilla: true !default; +$prefix-for-microsoft: true !default; +$prefix-for-opera: true !default; +$prefix-for-spec: true !default; diff --git a/html_orig/sass/lib/bourbon/settings/_px-to-em.scss b/html_orig/sass/lib/bourbon/settings/_px-to-em.scss new file mode 100755 index 0000000..f2f9a3e --- /dev/null +++ b/html_orig/sass/lib/bourbon/settings/_px-to-em.scss @@ -0,0 +1 @@ +$em-base: 16px !default; diff --git a/html_orig/sass/lib/neat/_neat-helpers.scss b/html_orig/sass/lib/neat/_neat-helpers.scss new file mode 100755 index 0000000..9c182d2 --- /dev/null +++ b/html_orig/sass/lib/neat/_neat-helpers.scss @@ -0,0 +1,8 @@ +// Functions +@import "functions/private"; +@import "functions/new-breakpoint"; + +// Settings +@import "settings/grid"; +@import "settings/visual-grid"; +@import "settings/disable-warnings"; diff --git a/html_orig/sass/lib/neat/_neat.scss b/html_orig/sass/lib/neat/_neat.scss new file mode 100755 index 0000000..e46e169 --- /dev/null +++ b/html_orig/sass/lib/neat/_neat.scss @@ -0,0 +1,23 @@ +// Neat 1.7.2 +// http://neat.bourbon.io +// Copyright 2012-2015 thoughtbot, inc. +// MIT License + +// Helpers +@import "neat-helpers"; + +// Grid +@import "grid/private"; +@import "grid/box-sizing"; +@import "grid/omega"; +@import "grid/outer-container"; +@import "grid/span-columns"; +@import "grid/row"; +@import "grid/shift"; +@import "grid/pad"; +@import "grid/fill-parent"; +@import "grid/media"; +@import "grid/to-deprecate"; +@import "grid/visual-grid"; +@import "grid/display-context"; +@import "grid/direction-context"; diff --git a/html_orig/sass/lib/neat/functions/_new-breakpoint.scss b/html_orig/sass/lib/neat/functions/_new-breakpoint.scss new file mode 100755 index 0000000..41ab955 --- /dev/null +++ b/html_orig/sass/lib/neat/functions/_new-breakpoint.scss @@ -0,0 +1,49 @@ +@charset "UTF-8"; + +/// Returns a media context (media query / grid context) that can be stored in a variable and passed to `media()` as a single-keyword argument. Media contexts defined using `new-breakpoint` are used by the visual grid, as long as they are defined before importing Neat. +/// +/// @param {List} $query +/// A list of media query features and values. Each `$feature` should have a corresponding `$value`. +/// +/// If there is only a single `$value` in `$query`, `$default-feature` is going to be used. +/// +/// The number of total columns in the grid can be set by passing `$columns` at the end of the list (overrides `$total-columns`). For a list of valid values for `$feature`, click [here](http://www.w3.org/TR/css3-mediaqueries/#media1). +/// +/// @param {Number (unitless)} $total-columns [$grid-columns] +/// - Number of columns to use in the new grid context. Can be set as a shorthand in the first parameter. +/// +/// @example scss - Usage +/// $mobile: new-breakpoint(max-width 480px 4); +/// +/// .element { +/// @include media($mobile) { +/// @include span-columns(4); +/// } +/// } +/// +/// @example css - CSS Output +/// @media screen and (max-width: 480px) { +/// .element { +/// display: block; +/// float: left; +/// margin-right: 7.42297%; +/// width: 100%; +/// } +/// .element:last-child { +/// margin-right: 0; +/// } +/// } + +@function new-breakpoint($query: $feature $value $columns, $total-columns: $grid-columns) { + @if length($query) == 1 { + $query: $default-feature nth($query, 1) $total-columns; + } @else if is-even(length($query)) { + $query: append($query, $total-columns); + } + + @if is-not(belongs-to($query, $visual-grid-breakpoints)) { + $visual-grid-breakpoints: append($visual-grid-breakpoints, $query, comma) !global; + } + + @return $query; +} diff --git a/html_orig/sass/lib/neat/functions/_private.scss b/html_orig/sass/lib/neat/functions/_private.scss new file mode 100755 index 0000000..872d4dc --- /dev/null +++ b/html_orig/sass/lib/neat/functions/_private.scss @@ -0,0 +1,114 @@ +// Not function for Libsass compatibility +// https://github.com/sass/libsass/issues/368 +@function is-not($value) { + @return if($value, false, true); +} + +// Checks if a number is even +@function is-even($int) { + @return $int % 2 == 0; +} + +// Checks if an element belongs to a list or not +@function belongs-to($tested-item, $list) { + @return is-not(not-belongs-to($tested-item, $list)); +} + +@function not-belongs-to($tested-item, $list) { + @return is-not(index($list, $tested-item)); +} + +// Contains display value +@function contains-display-value($query) { + @return belongs-to(table, $query) + or belongs-to(block, $query) + or belongs-to(inline-block, $query) + or belongs-to(inline, $query); +} + +// Parses the first argument of span-columns() +@function container-span($span: $span) { + @if length($span) == 3 { + $container-columns: nth($span, 3); + @return $container-columns; + } @else if length($span) == 2 { + $container-columns: nth($span, 2); + @return $container-columns; + } + + @return $grid-columns; +} + +@function container-shift($shift: $shift) { + $parent-columns: $grid-columns !default !global; + + @if length($shift) == 3 { + $container-columns: nth($shift, 3); + @return $container-columns; + } @else if length($shift) == 2 { + $container-columns: nth($shift, 2); + @return $container-columns; + } + + @return $parent-columns; +} + +// Generates a striped background +@function gradient-stops($grid-columns, $color: $visual-grid-color) { + $transparent: transparent; + + $column-width: flex-grid(1, $grid-columns); + $gutter-width: flex-gutter($grid-columns); + $column-offset: $column-width; + + $values: ($transparent 0, $color 0); + + @for $i from 1 to $grid-columns*2 { + @if is-even($i) { + $values: append($values, $transparent $column-offset, comma); + $values: append($values, $color $column-offset, comma); + $column-offset: $column-offset + $column-width; + } @else { + $values: append($values, $color $column-offset, comma); + $values: append($values, $transparent $column-offset, comma); + $column-offset: $column-offset + $gutter-width; + } + } + + @return $values; +} + +// Layout direction +@function get-direction($layout, $default) { + $direction: null; + + @if to-upper-case($layout) == "LTR" or to-upper-case($layout) == "RTL" { + $direction: direction-from-layout($layout); + } @else { + $direction: direction-from-layout($default); + } + + @return $direction; +} + +@function direction-from-layout($layout) { + $direction: null; + + @if to-upper-case($layout) == "LTR" { + $direction: right; + } @else { + $direction: left; + } + + @return $direction; +} + +@function get-opposite-direction($direction) { + $opposite-direction: left; + + @if $direction == "left" { + $opposite-direction: right; + } + + @return $opposite-direction; +} diff --git a/html_orig/sass/lib/neat/grid/_box-sizing.scss b/html_orig/sass/lib/neat/grid/_box-sizing.scss new file mode 100755 index 0000000..b6d3fec --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_box-sizing.scss @@ -0,0 +1,15 @@ +@charset "UTF-8"; + +@if $border-box-sizing == true { + html { // http://bit.ly/1qk2tVR + box-sizing: border-box; + } + + * { + &, + &::after, + &::before { + box-sizing: inherit; + } + } +} diff --git a/html_orig/sass/lib/neat/grid/_direction-context.scss b/html_orig/sass/lib/neat/grid/_direction-context.scss new file mode 100755 index 0000000..7b0d46e --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_direction-context.scss @@ -0,0 +1,33 @@ +@charset "UTF-8"; + +/// Changes the direction property used by other mixins called in the code block argument. +/// +/// @param {String} $direction [left-to-right] +/// Layout direction to be used within the block. Can be `left-to-right` or `right-to-left`. +/// +/// @example scss - Usage +/// @include direction-context(right-to-left) { +/// .right-to-left-block { +/// @include span-columns(6); +/// } +/// } +/// +/// @example css - CSS Output +/// .right-to-left-block { +/// float: right; +/// ... +/// } + +@mixin direction-context($direction: left-to-right) { + $scope-direction: $layout-direction; + + @if to-lower-case($direction) == "left-to-right" { + $layout-direction: LTR !global; + } @else if to-lower-case($direction) == "right-to-left" { + $layout-direction: RTL !global; + } + + @content; + + $layout-direction: $scope-direction !global; +} diff --git a/html_orig/sass/lib/neat/grid/_display-context.scss b/html_orig/sass/lib/neat/grid/_display-context.scss new file mode 100755 index 0000000..ed9b063 --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_display-context.scss @@ -0,0 +1,28 @@ +@charset "UTF-8"; + +/// Changes the display property used by other mixins called in the code block argument. +/// +/// @param {String} $display [block] +/// Display value to be used within the block. Can be `table` or `block`. +/// +/// @example scss +/// @include display-context(table) { +/// .display-table { +/// @include span-columns(6); +/// } +/// } +/// +/// @example css +/// .display-table { +/// display: table-cell; +/// ... +/// } + +@mixin display-context($display: block) { + $scope-display: $container-display-table; + $container-display-table: $display == table !global; + + @content; + + $container-display-table: $scope-display !global; +} diff --git a/html_orig/sass/lib/neat/grid/_fill-parent.scss b/html_orig/sass/lib/neat/grid/_fill-parent.scss new file mode 100755 index 0000000..415f0b1 --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_fill-parent.scss @@ -0,0 +1,22 @@ +@charset "UTF-8"; + +/// Forces the element to fill its parent container. +/// +/// @example scss - Usage +/// .element { +/// @include fill-parent; +/// } +/// +/// @example css - CSS Output +/// .element { +/// width: 100%; +/// box-sizing: border-box; +/// } + +@mixin fill-parent() { + width: 100%; + + @if $border-box-sizing == false { + box-sizing: border-box; + } +} diff --git a/html_orig/sass/lib/neat/grid/_media.scss b/html_orig/sass/lib/neat/grid/_media.scss new file mode 100755 index 0000000..bd516e9 --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_media.scss @@ -0,0 +1,92 @@ +@charset "UTF-8"; + +/// Outputs a media-query block with an optional grid context (the total number of columns used in the grid). +/// +/// @param {List} $query +/// A list of media query features and values, where each `$feature` should have a corresponding `$value`. +/// For a list of valid values for `$feature`, click [here](http://www.w3.org/TR/css3-mediaqueries/#media1). +/// +/// If there is only a single `$value` in `$query`, `$default-feature` is going to be used. +/// +/// The number of total columns in the grid can be set by passing `$columns` at the end of the list (overrides `$total-columns`). +/// +/// +/// @param {Number (unitless)} $total-columns [$grid-columns] +/// - Number of columns to use in the new grid context. Can be set as a shorthand in the first parameter. +/// +/// @example scss - Usage +/// .responsive-element { +/// @include media(769px) { +/// @include span-columns(6); +/// } +/// } +/// +/// .new-context-element { +/// @include media(min-width 320px max-width 480px, 6) { +/// @include span-columns(6); +/// } +/// } +/// +/// @example css - CSS Output +/// @media screen and (min-width: 769px) { +/// .responsive-element { +/// display: block; +/// float: left; +/// margin-right: 2.35765%; +/// width: 48.82117%; +/// } +/// +/// .responsive-element:last-child { +/// margin-right: 0; +/// } +/// } +/// +/// @media screen and (min-width: 320px) and (max-width: 480px) { +/// .new-context-element { +/// display: block; +/// float: left; +/// margin-right: 4.82916%; +/// width: 100%; +/// } +/// +/// .new-context-element:last-child { +/// margin-right: 0; +/// } +/// } + +@mixin media($query: $feature $value $columns, $total-columns: $grid-columns) { + @if length($query) == 1 { + @media screen and ($default-feature: nth($query, 1)) { + $default-grid-columns: $grid-columns; + $grid-columns: $total-columns !global; + @content; + $grid-columns: $default-grid-columns !global; + } + } @else { + $loop-to: length($query); + $media-query: "screen and "; + $default-grid-columns: $grid-columns; + $grid-columns: $total-columns !global; + + @if is-not(is-even(length($query))) { + $grid-columns: nth($query, $loop-to) !global; + $loop-to: $loop-to - 1; + } + + $i: 1; + @while $i <= $loop-to { + $media-query: $media-query + "(" + nth($query, $i) + ": " + nth($query, $i + 1) + ") "; + + @if ($i + 1) != $loop-to { + $media-query: $media-query + "and "; + } + + $i: $i + 2; + } + + @media #{$media-query} { + @content; + $grid-columns: $default-grid-columns !global; + } + } +} diff --git a/html_orig/sass/lib/neat/grid/_omega.scss b/html_orig/sass/lib/neat/grid/_omega.scss new file mode 100755 index 0000000..80f918a --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_omega.scss @@ -0,0 +1,87 @@ +@charset "UTF-8"; + +/// Removes the element's gutter margin, regardless of its position in the grid hierarchy or display property. It can target a specific element, or every `nth-child` occurrence. Works only with `block` layouts. +/// +/// @param {List} $query [block] +/// List of arguments. Supported arguments are `nth-child` selectors (targets a specific pseudo element) and `auto` (targets `last-child`). +/// +/// When passed an `nth-child` argument of type `*n` with `block` display, the omega mixin automatically adds a clear to the `*n+1` th element. Note that composite arguments such as `2n+1` do not support this feature. +/// +/// **Deprecation warning**: The omega mixin will no longer take a `$direction` argument. To change the layout direction, use `row($direction)` or set `$default-layout-direction` instead. +/// +/// @example scss - Usage +/// .element { +/// @include omega; +/// } +/// +/// .nth-element { +/// @include omega(4n); +/// } +/// +/// @example css - CSS Output +/// .element { +/// margin-right: 0; +/// } +/// +/// .nth-element:nth-child(4n) { +/// margin-right: 0; +/// } +/// +/// .nth-element:nth-child(4n+1) { +/// clear: left; +/// } + +@mixin omega($query: block, $direction: default) { + $table: belongs-to(table, $query); + $auto: belongs-to(auto, $query); + + @if $direction != default { + @include -neat-warn("The omega mixin will no longer take a $direction argument. To change the layout direction, use the direction(){...} mixin."); + } @else { + $direction: get-direction($layout-direction, $default-layout-direction); + } + + @if $table { + @include -neat-warn("The omega mixin no longer removes padding in table layouts."); + } + + @if length($query) == 1 { + @if $auto { + &:last-child { + margin-#{$direction}: 0; + } + } + + @else if contains-display-value($query) and $table == false { + margin-#{$direction}: 0; + } + + @else { + @include nth-child($query, $direction); + } + } @else if length($query) == 2 { + @if $auto { + &:last-child { + margin-#{$direction}: 0; + } + } @else { + @include nth-child(nth($query, 1), $direction); + } + } @else { + @include -neat-warn("Too many arguments passed to the omega() mixin."); + } +} + +@mixin nth-child($query, $direction) { + $opposite-direction: get-opposite-direction($direction); + + &:nth-child(#{$query}) { + margin-#{$direction}: 0; + } + + @if type-of($query) == number and unit($query) == "n" { + &:nth-child(#{$query}+1) { + clear: $opposite-direction; + } + } +} diff --git a/html_orig/sass/lib/neat/grid/_outer-container.scss b/html_orig/sass/lib/neat/grid/_outer-container.scss new file mode 100755 index 0000000..5a375bb --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_outer-container.scss @@ -0,0 +1,38 @@ +@charset "UTF-8"; + +/// Makes an element a outer container by centring it in the viewport, clearing its floats, and setting its `max-width`. +/// Although optional, using `outer-container` is recommended. The mixin can be called on more than one element per page, as long as they are not nested. +/// +/// @param {Number [unit]} $local-max-width [$max-width] +/// Max width to be applied to the element. Can be a percentage or a measure. +/// +/// @example scss - Usage +/// .element { +/// @include outer-container(100%); +/// } +/// +/// @example css - CSS Output +/// .element { +/// *zoom: 1; +/// max-width: 100%; +/// margin-left: auto; +/// margin-right: auto; +/// } +/// +/// .element:before, .element:after { +/// content: " "; +/// display: table; +/// } +/// +/// .element:after { +/// clear: both; +/// } + +@mixin outer-container($local-max-width: $max-width) { + @include clearfix; + max-width: $local-max-width; + margin: { + left: auto; + right: auto; + } +} diff --git a/html_orig/sass/lib/neat/grid/_pad.scss b/html_orig/sass/lib/neat/grid/_pad.scss new file mode 100755 index 0000000..d697e1b --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_pad.scss @@ -0,0 +1,25 @@ +@charset "UTF-8"; + +/// Adds padding to the element. +/// +/// @param {List} $padding [flex-gutter()] +/// A list of padding value(s) to use. Passing `default` in the list will result in using the gutter width as a padding value. +/// +/// @example scss - Usage +/// .element { +/// @include pad(30px -20px 10px default); +/// } +/// +/// @example css - CSS Output +/// .element { +/// padding: 30px -20px 10px 2.35765%; +/// } + +@mixin pad($padding: flex-gutter()) { + $padding-list: null; + @each $value in $padding { + $value: if($value == 'default', flex-gutter(), $value); + $padding-list: join($padding-list, $value); + } + padding: $padding-list; +} diff --git a/html_orig/sass/lib/neat/grid/_private.scss b/html_orig/sass/lib/neat/grid/_private.scss new file mode 100755 index 0000000..4c4e18c --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_private.scss @@ -0,0 +1,35 @@ +$parent-columns: $grid-columns !default; +$fg-column: $column; +$fg-gutter: $gutter; +$fg-max-columns: $grid-columns; +$container-display-table: false !default; +$layout-direction: LTR !default; + +@function flex-grid($columns, $container-columns: $fg-max-columns) { + $width: $columns * $fg-column + ($columns - 1) * $fg-gutter; + $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter; + @return percentage($width / $container-width); +} + +@function flex-gutter($container-columns: $fg-max-columns, $gutter: $fg-gutter) { + $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter; + @return percentage($gutter / $container-width); +} + +@function grid-width($n) { + @return $n * $gw-column + ($n - 1) * $gw-gutter; +} + +@function get-parent-columns($columns) { + @if $columns != $grid-columns { + $parent-columns: $columns !global; + } @else { + $parent-columns: $grid-columns !global; + } + + @return $parent-columns; +} + +@function is-display-table($container-is-display-table, $display) { + @return $container-is-display-table == true or $display == table; +} diff --git a/html_orig/sass/lib/neat/grid/_row.scss b/html_orig/sass/lib/neat/grid/_row.scss new file mode 100755 index 0000000..4d913a9 --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_row.scss @@ -0,0 +1,52 @@ +@charset "UTF-8"; + +/// Designates the element as a row of columns in the grid layout. It clears the floats on the element and sets its display property. Rows can't be nested, but there can be more than one row element—with different display properties—per layout. +/// +/// @param {String} $display [default] +/// Sets the display property of the element and the display context that will be used by its children. Can be `block` or `table`. +/// +/// @param {String} $direction [$default-layout-direction] +/// Sets the layout direction. Can be `LTR` (left-to-right) or `RTL` (right-to-left). +/// +/// @example scss - Usage +/// .element { +/// @include row(); +/// } +/// +/// @example css - CSS Output +/// .element { +/// *zoom: 1; +/// display: block; +/// } +/// +/// .element:before, .element:after { +/// content: " "; +/// display: table; +/// } +/// +/// .element:after { +/// clear: both; +/// } + +@mixin row($display: default, $direction: $default-layout-direction) { + @if $direction != $default-layout-direction { + @include -neat-warn("The $direction argument will be deprecated in future versions in favor of the direction(){...} mixin."); + } + + $layout-direction: $direction !global; + + @if $display != default { + @include -neat-warn("The $display argument will be deprecated in future versions in favor of the display(){...} mixin."); + } + + @if $display == table { + display: table; + @include fill-parent; + table-layout: fixed; + $container-display-table: true !global; + } @else { + @include clearfix; + display: block; + $container-display-table: false !global; + } +} diff --git a/html_orig/sass/lib/neat/grid/_shift.scss b/html_orig/sass/lib/neat/grid/_shift.scss new file mode 100755 index 0000000..c0f24cd --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_shift.scss @@ -0,0 +1,50 @@ +@charset "UTF-8"; + +/// Translates an element horizontally by a number of columns. Positive arguments shift the element to the active layout direction, while negative ones shift it to the opposite direction. +/// +/// @param {Number (unitless)} $n-columns [1] +/// Number of columns by which the element shifts. +/// +/// @example scss - Usage +/// .element { +/// @include shift(-3); +/// } +/// +/// @example css - CSS output +/// .element { +/// margin-left: -25.58941%; +/// } + +@mixin shift($n-columns: 1) { + @include shift-in-context($n-columns); +} + +/// Translates an element horizontally by a number of columns, in a specific nesting context. +/// +/// @param {List} $shift +/// A list containing the number of columns to shift (`$columns`) and the number of columns of the parent element (`$container-columns`). +/// +/// The two values can be separated with any string such as `of`, `/`, etc. +/// +/// @example scss - Usage +/// .element { +/// @include shift(-3 of 6); +/// } +/// +/// @example css - CSS output +/// .element { +/// margin-left: -52.41458%; +/// } + +@mixin shift-in-context($shift: $columns of $container-columns) { + $n-columns: nth($shift, 1); + $parent-columns: container-shift($shift) !global; + + $direction: get-direction($layout-direction, $default-layout-direction); + $opposite-direction: get-opposite-direction($direction); + + margin-#{$opposite-direction}: $n-columns * flex-grid(1, $parent-columns) + $n-columns * flex-gutter($parent-columns); + + // Reset nesting context + $parent-columns: $grid-columns !global; +} diff --git a/html_orig/sass/lib/neat/grid/_span-columns.scss b/html_orig/sass/lib/neat/grid/_span-columns.scss new file mode 100755 index 0000000..f128399 --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_span-columns.scss @@ -0,0 +1,94 @@ +@charset "UTF-8"; + +/// Specifies the number of columns an element should span. If the selector is nested the number of columns of its parent element should be passed as an argument as well. +/// +/// @param {List} $span +/// A list containing `$columns`, the unitless number of columns the element spans (required), and `$container-columns`, the number of columns the parent element spans (optional). +/// +/// If only one value is passed, it is assumed that it's `$columns` and that that `$container-columns` is equal to `$grid-columns`, the total number of columns in the grid. +/// +/// The values can be separated with any string such as `of`, `/`, etc. +/// +/// `$columns` also accepts decimals for when it's necessary to break out of the standard grid. E.g. Passing `2.4` in a standard 12 column grid will divide the row into 5 columns. +/// +/// @param {String} $display [block] +/// Sets the display property of the element. By default it sets the display propert of the element to `block`. +/// +/// If passed `block-collapse`, it also removes the margin gutter by adding it to the element width. +/// +/// If passed `table`, it sets the display property to `table-cell` and calculates the width of the element without taking gutters into consideration. The result does not align with the block-based grid. +/// +/// @example scss - Usage +/// .element { +/// @include span-columns(6); +/// +/// .nested-element { +/// @include span-columns(2 of 6); +/// } +/// } +/// +/// @example css - CSS Output +/// .element { +/// display: block; +/// float: left; +/// margin-right: 2.35765%; +/// width: 48.82117%; +/// } +/// +/// .element:last-child { +/// margin-right: 0; +/// } +/// +/// .element .nested-element { +/// display: block; +/// float: left; +/// margin-right: 4.82916%; +/// width: 30.11389%; +/// } +/// +/// .element .nested-element:last-child { +/// margin-right: 0; +/// } + +@mixin span-columns($span: $columns of $container-columns, $display: block) { + $columns: nth($span, 1); + $container-columns: container-span($span); + + $parent-columns: get-parent-columns($container-columns) !global; + + $direction: get-direction($layout-direction, $default-layout-direction); + $opposite-direction: get-opposite-direction($direction); + + $display-table: is-display-table($container-display-table, $display); + + @if $display-table { + display: table-cell; + width: percentage($columns / $container-columns); + } @else { + float: #{$opposite-direction}; + + @if $display != no-display { + display: block; + } + + @if $display == collapse { + @include -neat-warn("The 'collapse' argument will be deprecated. Use 'block-collapse' instead."); + } + + @if $display == collapse or $display == block-collapse { + width: flex-grid($columns, $container-columns) + flex-gutter($container-columns); + + &:last-child { + width: flex-grid($columns, $container-columns); + } + + } @else { + margin-#{$direction}: flex-gutter($container-columns); + width: flex-grid($columns, $container-columns); + + &:last-child { + margin-#{$direction}: 0; + } + } + } +} diff --git a/html_orig/sass/lib/neat/grid/_to-deprecate.scss b/html_orig/sass/lib/neat/grid/_to-deprecate.scss new file mode 100755 index 0000000..aeea079 --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_to-deprecate.scss @@ -0,0 +1,97 @@ +@charset "UTF-8"; + +@mixin breakpoint($query:$feature $value $columns, $total-columns: $grid-columns) { + @include -neat-warn("The breakpoint() mixin was renamed to media() in Neat 1.0. Please update your project with the new syntax before the next version bump."); + + @if length($query) == 1 { + @media screen and ($default-feature: nth($query, 1)) { + $default-grid-columns: $grid-columns; + $grid-columns: $total-columns; + @content; + $grid-columns: $default-grid-columns; + } + } @else if length($query) == 2 { + @media screen and (nth($query, 1): nth($query, 2)) { + $default-grid-columns: $grid-columns; + $grid-columns: $total-columns; + @content; + $grid-columns: $default-grid-columns; + } + } @else if length($query) == 3 { + @media screen and (nth($query, 1): nth($query, 2)) { + $default-grid-columns: $grid-columns; + $grid-columns: nth($query, 3); + @content; + $grid-columns: $default-grid-columns; + } + } @else if length($query) == 4 { + @media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) { + $default-grid-columns: $grid-columns; + $grid-columns: $total-columns; + @content; + $grid-columns: $default-grid-columns; + } + } @else if length($query) == 5 { + @media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) { + $default-grid-columns: $grid-columns; + $grid-columns: nth($query, 5); + @content; + $grid-columns: $default-grid-columns; + } + } @else { + @include -neat-warn("Wrong number of arguments for breakpoint(). Read the documentation for more details."); + } +} + +@mixin nth-omega($nth, $display: block, $direction: default) { + @include -neat-warn("The nth-omega() mixin is deprecated. Please use omega() instead."); + @include omega($nth $display, $direction); +} + +/// Resets the active display property to `block`. Particularly useful when changing the display property in a single row. +/// +/// @example scss - Usage +/// .element { +/// @include row(table); +/// // Context changed to table display +/// } +/// +/// @include reset-display; +/// // Context is reset to block display + +@mixin reset-display { + $container-display-table: false !global; + @include -neat-warn("Resetting $display will be deprecated in future versions in favor of the display(){...} mixin."); +} + +/// Resets the active layout direction to the default value set in `$default-layout-direction`. Particularly useful when changing the layout direction in a single row. +/// +/// @example scss - Usage +/// .element { +/// @include row($direction: RTL); +/// // Context changed to right-to-left +/// } +/// +/// @include reset-layout-direction; +/// // Context is reset to left-to-right + +@mixin reset-layout-direction { + $layout-direction: $default-layout-direction !global; + @include -neat-warn("Resetting $direction will be deprecated in future versions in favor of the direction(){...} mixin."); +} + +/// Resets both the active layout direction and the active display property. +/// +/// @example scss - Usage +/// .element { +/// @include row(table, RTL); +/// // Context changed to table table and right-to-left +/// } +/// +/// @include reset-all; +/// // Context is reset to block display and left-to-right + +@mixin reset-all { + @include reset-display; + @include reset-layout-direction; +} diff --git a/html_orig/sass/lib/neat/grid/_visual-grid.scss b/html_orig/sass/lib/neat/grid/_visual-grid.scss new file mode 100755 index 0000000..1192d82 --- /dev/null +++ b/html_orig/sass/lib/neat/grid/_visual-grid.scss @@ -0,0 +1,42 @@ +@charset "UTF-8"; + +@mixin grid-column-gradient($values...) { + background-image: -webkit-linear-gradient(left, $values); + background-image: -moz-linear-gradient(left, $values); + background-image: -ms-linear-gradient(left, $values); + background-image: -o-linear-gradient(left, $values); + background-image: unquote("linear-gradient(to left, #{$values})"); +} + +@if $visual-grid == true or $visual-grid == yes { + body:before { + @include grid-column-gradient(gradient-stops($grid-columns)); + content: ""; + display: inline-block; + height: 100%; + left: 0; + margin: 0 auto; + max-width: $max-width; + opacity: $visual-grid-opacity; + pointer-events: none; + position: fixed; + right: 0; + width: 100%; + + @if $visual-grid-index == back { + z-index: -1; + } + + @else if $visual-grid-index == front { + z-index: 9999; + } + + @each $breakpoint in $visual-grid-breakpoints { + @if $breakpoint { + @include media($breakpoint) { + @include grid-column-gradient(gradient-stops($grid-columns)); + } + } + } + } +} diff --git a/html_orig/sass/lib/neat/settings/_disable-warnings.scss b/html_orig/sass/lib/neat/settings/_disable-warnings.scss new file mode 100755 index 0000000..3f9b92a --- /dev/null +++ b/html_orig/sass/lib/neat/settings/_disable-warnings.scss @@ -0,0 +1,13 @@ +@charset "UTF-8"; + +/// Disable all deprecation warnings. Defaults to `false`. Set with a `!global` flag. +/// +/// @type Bool + +$disable-warnings: false !default; + +@mixin -neat-warn($message) { + @if $disable-warnings == false { + @warn "#{$message}"; + } +} diff --git a/html_orig/sass/lib/neat/settings/_grid.scss b/html_orig/sass/lib/neat/settings/_grid.scss new file mode 100755 index 0000000..c4e55dc --- /dev/null +++ b/html_orig/sass/lib/neat/settings/_grid.scss @@ -0,0 +1,51 @@ +@charset "UTF-8"; + +/// Sets the relative width of a single grid column. The unit used should be the same one used to define `$gutter`. To learn more about modular-scale() see [Bourbon docs](http://bourbon.io/docs/#modular-scale). Set with a `!global` flag. +/// +/// @type Number (Unit) + +$column: modular-scale(3, 1em, $golden) !default; + +/// Sets the relative width of a single grid gutter. The unit used should be the same one used to define `$column`. To learn more about modular-scale() see [Bourbon docs](http://bourbon.io/docs/#modular-scale). Set with the `!global` flag. +/// +/// @type Number (Unit) + +$gutter: modular-scale(1, 1em, $golden) !default; + +/// Sets the total number of columns in the grid. Its value can be overridden inside a media query using the `media()` mixin. Set with the `!global` flag. +/// +/// @type Number (Unitless) + +$grid-columns: 12 !default; + +/// Sets the max-width property of the element that includes `outer-container()`. To learn more about `em()` see [Bourbon docs](http://bourbon.io/docs/#px-to-em). Set with the `!global` flag. +/// +/// @type Number (Unit) +/// +$max-width: em(1088) !default; + +/// When set to true, it sets the box-sizing property of all elements to `border-box`. Set with a `!global` flag. +/// +/// @type Bool +/// +/// @example css - CSS Output +/// html { +/// box-sizing: border-box; } +/// +/// *, *::after, *::before { +/// box-sizing: inherit; +/// } + +$border-box-sizing: true !default; + +/// Sets the default [media feature](http://www.w3.org/TR/css3-mediaqueries/#media) that `media()` and `new-breakpoint()` revert to when only a breakpoint value is passed. Set with a `!global` flag. +/// +/// @type String + +$default-feature: min-width; // Default @media feature for the breakpoint() mixin + +///Sets the default layout direction of the grid. Can be `LTR` or `RTL`. Set with a `!global` flag. +/// +///@type String + +$default-layout-direction: LTR !default; diff --git a/html_orig/sass/lib/neat/settings/_visual-grid.scss b/html_orig/sass/lib/neat/settings/_visual-grid.scss new file mode 100755 index 0000000..9cd1815 --- /dev/null +++ b/html_orig/sass/lib/neat/settings/_visual-grid.scss @@ -0,0 +1,27 @@ +@charset "UTF-8"; + +/// Displays the visual grid when set to true. The overlaid grid may be few pixels off depending on the browser's rendering engine and pixel rounding algorithm. Set with the `!global` flag. +/// +/// @type Bool + +$visual-grid: false !default; + +/// Sets the visual grid color. Set with `!global` flag. +/// +/// @type Color + +$visual-grid-color: #eee !default; + +/// Sets the `z-index` property of the visual grid. Can be `back` (behind content) or `front` (in front of content). Set with `!global` flag. +/// +/// @type String + +$visual-grid-index: back !default; + +/// Sets the opacity property of the visual grid. Set with `!global` flag. +/// +/// @type Number (unitless) + +$visual-grid-opacity: 0.4 !default; + +$visual-grid-breakpoints: () !default; diff --git a/html_orig/sass/pages/_term.scss b/html_orig/sass/pages/_term.scss new file mode 100755 index 0000000..3e9893a --- /dev/null +++ b/html_orig/sass/pages/_term.scss @@ -0,0 +1,39 @@ +.page-term { + #screen { + font-family: monospace; + font-size: 16pt; + white-space: nowrap; + background: #111213; + padding: 6px; + display: inline-block; + + border: 2px solid #3983CD;//#1bc249; + + span { + white-space: pre; + cursor: pointer; + &:hover { + outline: 1px solid rgba(#ffffff,0.5); + } + } + } + + #buttons { + margin-top: 10px; + white-space: nowrap; + + button { + margin: 0 3px; + padding: 10px 0; + width: 18%; + max-width: 65px; + min-width: initial; + cursor: pointer; + font-weight: bold; + } + } +} + +#termwrap { + text-align: center; +} diff --git a/html_orig/sass/pages/_wifi.scss b/html_orig/sass/pages/_wifi.scss new file mode 100755 index 0000000..7e60844 --- /dev/null +++ b/html_orig/sass/pages/_wifi.scss @@ -0,0 +1,89 @@ +#ap-list { + column-count: 3; + column-gap: 0; + + @include media($tablet) { + column-count: 2; + } + + @include media($phone) { + column-count: 1; + } + + margin: 0 (- dist(-3)); +} + +#ap-loader { + background: rgba(white, .1); + border-radius: 5px; + padding: dist(-2); + margin-bottom: dist(-2); +} + +#ap-box { + padding-bottom: dist(-2); +} + +.AP { + // can't use margins inside a column + + break-inside: avoid-column; + max-width: 500px; + padding: dist(-3); + + &.selected .inner {//#70dfa3 + background: #42a6f9 !important; // override the hover effect #43de81 + cursor: default; + top: 0 !important; // no click effect + } + + // the actual silver box + .inner { + cursor: pointer; + @include noselect; + + position: relative; + &:active { + left: 0; + top: 1px; + } + + border-radius: 3px; + color: #222; + + background: #afafaf; + transition: background-color 0.5s; + &:hover { background: white } + + display: flex; + + & > * { + padding: dist(-1); + @include nowrap; + } + + .rssi { + min-width: 2.5rem; + flex: 0 0 15%; + text-align: right; + + &:after { + padding-left: dist(-5); + content: '%'; + font-size: fsize(-1); + } + } + + .essid { + flex: 1 1 70%; + min-width: 0; + text-overflow: ellipsis; + overflow: hidden; + font-weight: bold; + } + + .auth { + flex: 0 0 15%; + } + } +} diff --git a/html_orig/script.js b/html_orig/script.js deleted file mode 100644 index c3fc583..0000000 --- a/html_orig/script.js +++ /dev/null @@ -1,328 +0,0 @@ -function mk(e) {return document.createElement(e)} -function q1(s) {return document.querySelector(s)} -function qa(s) {return document.querySelectorAll(s)} - -// -// Terminal class -// -(function () { - var W, H; - var cursor = {a: false, x: 0, y: 0, suppress: false, hidden: false}; - var screen = []; - - /** Colors table */ - var CLR = [// dark gray #2E3436 - // 0 black, 1 red, 2 green, 3 yellow - // 4 blue, 5 mag, 6 cyan, 7 white - '#111213','#CC0000','#4E9A06','#C4A000', - '#3465A4','#75507B','#06989A','#D3D7CF', - // BRIGHT - // 8 black, 9 red, 10 green, 11 yellow - // 12 blue, 13 mag, 14 cyan, 15 white - '#555753','#EF2929','#8AE234','#FCE94F', - '#729FCF','#AD7FA8','#34E2E2','#EEEEEC' - ]; - - /** Clear screen */ - function cls() { - screen.forEach(function(cell, i) { - cell.t = ' '; - cell.fg = 7; - cell.bg = 0; - blit(cell); - }); - } - - /** Set text and color at XY */ - function cellAt(y, x) { - return screen[y*W+x]; - } - - /** Get cell under cursor */ - function cursorCell() { - return cellAt(cursor.y, cursor.x); - } - - /** Enable or disable cursor visibility */ - function cursorEnable(enable) { - cursor.hidden = !enable; - cursor.a &= enable; - blit(cursorCell(), cursor.a); - } - - /** Safely move cursor */ - function cursorSet(y, x) { - // Hide and prevent from showing up during the move - cursor.suppress = true; - blit(cursorCell(), false); - - cursor.x = x; - cursor.y = y; - - // Show again - cursor.suppress = false; - blit(cursorCell(), cursor.a); - } - - /** Update cell on display. inv = invert (for cursor) */ - function blit(cell, inv) { - var e = cell.e, fg, bg; - // Colors - fg = inv ? cell.bg : cell.fg; - bg = inv ? cell.fg : cell.bg; - // Update - e.innerText = (cell.t+' ')[0]; - e.style.color = colorHex(fg); - e.style.backgroundColor = colorHex(bg); - e.style.fontWeight = fg > 7 ? 'bold' : 'normal'; - } - - /** Show entire screen */ - function blitAll() { - screen.forEach(function(cell, i) { - /* Invert if under cursor & cursor active */ - var inv = cursor.a && (i == cursor.y*W+cursor.x); - blit(cell, inv); - }); - } - - /** Load screen content from a 'binary' sequence */ - function load(obj) { - cursor.x = obj.x; - cursor.y = obj.y; - - // full re-init if size changed - if (obj.w != W || obj.h != H) { - Term.init(obj); - return; - } - - // Simple compression - hexFG hexBG 'ASCII' (r/s/t/u NUM{1,2,3,4})? - // comma instead of both colors = same as before - - var i = 0, ci = 0, str = obj.screen; - var fg = 7, bg = 0; - while(i < str.length && ci 0) { - var rep = parseInt(str.substr(i+1,repchars)); - i = i + repchars + 1; - for (; rep>0 && ci 15) c = 0; - return CLR[c]; - } - - /** Init the terminal */ - function init(obj) { - W = obj.w; - H = obj.h; - - /* Build screen & show */ - var e, cell, scr = q1('#screen'); - - // Empty the screen node - while (scr.firstChild) scr.removeChild(scr.firstChild); - - screen = []; - - for(var i = 0; i < W*H; i++) { - e = mk('span'); - - (function() { - var x = i % W; - var y = Math.floor(i / W); - e.addEventListener('click', function () { - Kinp.onTap(y, x); - }); - })(); - - /* End of line */ - if ((i > 0) && (i % W == 0)) { - scr.appendChild(mk('br')); - } - /* The cell */ - scr.appendChild(e); - - cell = {t: ' ', fg: 7, bg: 0, e: e}; - screen.push(cell); - blit(cell); - } - - /* Cursor blinking */ - setInterval(function() { - cursor.a = !cursor.a; - if (cursor.hidden) { - cursor.a = false; - } - - if (!cursor.suppress) { - blit(cursorCell(), cursor.a); - } - }, 500); - - load(obj); - } - - // publish - window.Term = { - init: init, - load: load, - setCursor: cursorSet, - enableCursor: cursorEnable, - clear: cls - }; -})(); - -// -// Connection class -// -(function() { - var wsUri = "ws://"+window.location.host+"/ws/update.cgi"; - var ws; - - function onOpen(evt) { - console.log("CONNECTED"); - } - - function onClose(evt) { - console.error("SOCKET CLOSED"); - } - - function onMessage(evt) { - try { - console.log("RX: ", evt.data); - // Assume all our messages are screen updates - Term.load(JSON.parse(evt.data)); - } catch(e) { - console.error(e); - } - } - - function onError(evt) { - console.error(evt.data); - } - - function doSend(message) { - console.log("TX: ", message); - if (ws.readyState != 1) { - console.error("Socket not ready"); - return; - } - if (typeof message != "string") { - message = JSON.stringify(message); - } - ws.send(message); - } - - function init() { - ws = new WebSocket(wsUri); - ws.onopen = onOpen; - ws.onclose = onClose; - ws.onmessage = onMessage; - ws.onerror = onError; - - console.log("Opening socket."); - } - - window.Conn = { - ws: null, - init: init, - send: doSend - }; -})(); - -// -// Keyboard (& mouse) input -// -(function() { - function sendStrMsg(str) { - Conn.send("STR:"+str); - } - - function sendPosMsg(y, x) { - Conn.send("TAP:"+y+','+x); - } - - function sendBtnMsg(n) { - Conn.send("BTN:"+n); - } - - function init() { - window.addEventListener('keypress', function(e) { - var code = +e.which; - if (code >= 32 && code < 127) { - var ch = String.fromCharCode(code); - //console.log("Typed ", ch, "code", code, e); - sendStrMsg(ch); - } - }); - - window.addEventListener('keydown', function(e) { - var code = e.keyCode; - //console.log("Down ", code, e); - switch(code) { - case 8: sendStrMsg('\x08'); break; - case 13: sendStrMsg('\x0d\x0a'); break; - case 27: sendStrMsg('\x1b'); break; // this allows to directly enter control sequences - case 37: sendStrMsg('\x1b[D'); break; - case 38: sendStrMsg('\x1b[A'); break; - case 39: sendStrMsg('\x1b[C'); break; - case 40: sendStrMsg('\x1b[B'); break; - } - }); - - qa('#buttons button').forEach(function(s) { - s.addEventListener('click', function() { - sendBtnMsg(+this.dataset['n']); - }); - }); - } - - window.Kinp = { - init: init, - onTap: sendPosMsg - }; -})(); - - -function init(obj) { - Term.init(obj); - Conn.init(); - Kinp.init(); -} diff --git a/html_orig/style.css b/html_orig/style.css deleted file mode 100644 index 57385e5..0000000 --- a/html_orig/style.css +++ /dev/null @@ -1,46 +0,0 @@ -html, body { - background: #48505F; - color: #eee; - font-family: monospace; - font-size: 16pt; - text-align: center; -} - -header { - font-weight: bold; - font-size: 14pt; - padding: 6px; - display: block; -} - -#screen { - white-space: nowrap; - background: #111213; - border-radius: 3px; - padding: 6px; - box-shadow: inset 0 0 5px black; - display: inline-block; -} - -#screen span { - white-space: pre; - cursor: pointer; -} - -#screen span:hover { - outline: 1px solid rgba(255,255,255,0.5); -} - -#buttons { - margin-top: 10px; - white-space: nowrap; -} - -button { - margin: 0 3px; - padding: 10px 0; - width: 18%; - max-width: 65px; - cursor: pointer; - font-weight: bold; -} diff --git a/html_orig/term.html b/html_orig/term.html index 8934a8e..6a2f909 100644 --- a/html_orig/term.html +++ b/html_orig/term.html @@ -1,21 +1,33 @@ + + + + ESP8266 Remote Terminal + - -ESP8266 Remote Terminal - - - + + + + -
ESP8266 Remote Terminal
+

ESP8266 Remote Terminal

-
+
+
-
- +
+ +
- + + + + diff --git a/html_orig/termtest.html b/html_orig/termtest.html deleted file mode 100644 index 7e42167..0000000 --- a/html_orig/termtest.html +++ /dev/null @@ -1,21 +0,0 @@ - - - -ESP8266 Remote Terminal - - - - -
ESP8266 Remote Terminal
- -
- -
- -
- - diff --git a/html_orig/wifi.html b/html_orig/wifi.html new file mode 100644 index 0000000..60a4669 --- /dev/null +++ b/html_orig/wifi.html @@ -0,0 +1,60 @@ + + + + + + + WiFi Settings - ESP8266 Remote Terminal + + + + + + +Loading… + +

WiFi settings

+ +
+ + + + + + + + + + + + + + + + + +
WiFi mode:%WiFiMode%
%WiFiapwarn%
+
+   + +
+
+
+   + +
+
+
+ +
+

Select AP to join

+
Scanning.
+ +
+ + + + diff --git a/html_orig/wifi1.html b/html_orig/wifi1.html new file mode 100644 index 0000000..92eb127 --- /dev/null +++ b/html_orig/wifi1.html @@ -0,0 +1,60 @@ + + + + + + + WiFi Settings - ESP8266 Remote Terminal + + + + + + +Loading… + +

WiFi settings

+ +
+ + + + + + + + + + + + + + + + + +
WiFi mode:%WiFiMode%
%WiFiapwarn%
+
+   + +
+
+
+   + +
+
+
+ +
+

Select AP to join

+
Scanning.
+ +
+ + + + diff --git a/libesphttpd b/libesphttpd index e594412..c0c0518 160000 --- a/libesphttpd +++ b/libesphttpd @@ -1 +1 @@ -Subproject commit e5944123376d0d0a4f8547cd27b3aa7bef166f2a +Subproject commit c0c05189a68730bc4ad0326071750cec2e372ec2 diff --git a/user/cgi_sockets.c b/user/cgi_sockets.c index 4d92bf2..e27fb77 100644 --- a/user/cgi_sockets.c +++ b/user/cgi_sockets.c @@ -32,8 +32,12 @@ void ICACHE_FLASH_ATTR screen_notifyChange() /** Socket received a message */ void ICACHE_FLASH_ATTR updateSockRx(Websock *ws, char *data, int len, int flags) { + // Add terminator if missing (seems to randomly happen) + data[len] = 0; + dbg("Sock RX str: %s, len %d", data, len); + if (strstarts(data, "STR:")) { // pass string verbatim UART_WriteString(UART0, data+4, UART_TIMEOUT_US); diff --git a/user/routes.c b/user/routes.c index 40d409f..0d36411 100644 --- a/user/routes.c +++ b/user/routes.c @@ -12,24 +12,21 @@ #include "cgi_main.h" #include "cgi_sockets.h" -#define WIFI_PROTECT 1 -#define WIFI_AUTH_NAME "admin" -#define WIFI_AUTH_PASS "password" +#define WIFI_PROTECT 0 +#define WIFI_AUTH_NAME "wifi" +#define WIFI_AUTH_PASS "nicitel" -#if WIFI_PROTECT -static int ICACHE_FLASH_ATTR wifiPassFn(HttpdConnData *connData, int no, char *user, int userLen, char *pass, - int passLen); -#endif +static int wifiPassFn(HttpdConnData *connData, int no, char *user, int userLen, char *pass, int passLen); /** * Application routes */ -HttpdBuiltInUrl builtInUrls[] = { +HttpdBuiltInUrl routes[] = { // redirect func for the captive portal - ROUTE_CGI_ARG("*", cgiRedirectApClientToHostname, "esp8266.nonet"), + ROUTE_CGI_ARG("*", cgiRedirectApClientToHostname, "esp-remote-term.ap"), // --- Web pages --- - ROUTE_TPL_FILE("/", tplScreen, "term.tpl"), + ROUTE_TPL_FILE("/", tplScreen, "/term.tpl"), // --- Sockets --- ROUTE_WS(URL_WS_UPDATE, updateSockConnect), @@ -42,15 +39,15 @@ HttpdBuiltInUrl builtInUrls[] = { #if WIFI_PROTECT ROUTE_AUTH("/wifi*", wifiPassFn), #endif - // TODO add those pages -// ROUTE_REDIRECT("/wifi/", "/wifi"), -// ROUTE_TPL_FILE("/wifi", tplWlan, "/pages/wifi.tpl"), + ROUTE_REDIRECT("/wifi/", "/wifi"), + ROUTE_TPL_FILE("/wifi", tplWlan, "/wifi.tpl"), ROUTE_CGI("/wifi/scan", cgiWiFiScan), ROUTE_CGI("/wifi/connect", cgiWiFiConnect), ROUTE_CGI("/wifi/connstatus", cgiWiFiConnStatus), ROUTE_CGI("/wifi/setmode", cgiWiFiSetMode), ROUTE_CGI("/wifi/setchannel", cgiWiFiSetChannel), + ROUTE_CGI("/wifi/setname", cgiWiFiSetSSID), ROUTE_FILESYSTEM(), ROUTE_END(), @@ -58,38 +55,15 @@ HttpdBuiltInUrl builtInUrls[] = { // --- Wifi password protection --- -#if WIFI_PROTECT /** - * @brief BasicAuth name/password checking function. - * - * It's invoked by the authBasic() built-in route handler - * until it returns 0. Each time it populates the provided - * name and password buffer. - * - * @param connData : connection context - * @param no : user number (incremented each time it's called) - * @param user : user buffer - * @param userLen : user buffer size - * @param pass : password buffer - * @param passLen : password buffer size - * @return 0 to end, 1 if more users are available. + * Password for WiFi config */ static int ICACHE_FLASH_ATTR wifiPassFn(HttpdConnData *connData, int no, char *user, int userLen, char *pass, int passLen) { - (void)connData; - (void)userLen; - (void)passLen; - if (no == 0) { os_strcpy(user, WIFI_AUTH_NAME); os_strcpy(pass, WIFI_AUTH_PASS); return 1; -//Add more users this way. Check against incrementing no for each user added. -// } else if (no==1) { -// os_strcpy(user, "user1"); -// os_strcpy(pass, "something"); -// return 1; } return 0; } -#endif diff --git a/user/routes.h b/user/routes.h index 4006d53..cc266c0 100644 --- a/user/routes.h +++ b/user/routes.h @@ -4,7 +4,7 @@ #include #include -extern HttpdBuiltInUrl builtInUrls[]; +extern HttpdBuiltInUrl routes[]; /** Broadcast screen state to sockets */ void screen_notifyChange(); diff --git a/user/user_main.c b/user/user_main.c index 39cf182..305c195 100644 --- a/user/user_main.c +++ b/user/user_main.c @@ -23,7 +23,7 @@ #include "screen.h" #include "routes.h" -#define FIRMWARE_VERSION "0.1" +#define FIRMWARE_VERSION "0.2" #ifdef ESPFS_POS CgiUploadFlashDef uploadParams={ @@ -50,11 +50,14 @@ static ETSTimer prHeapTimer; /** Periodically show heap usage */ static void ICACHE_FLASH_ATTR prHeapTimerCb(void *arg) { - static unsigned int cnt = 0; + static uint32_t cnt = 0; + static uint32_t last = 0; if (cnt == 5) { - dbg("HEAP: %ld bytes free", (unsigned long) system_get_free_heap_size()); + uint32_t heap = system_get_free_heap_size(); + dbg("Free heap: %d bytes (~ %d)", heap, (heap-last)); cnt = 0; + last = heap; } cnt++; @@ -89,7 +92,7 @@ void ICACHE_FLASH_ATTR user_init(void) captdnsInit(); // Server - httpdInit(builtInUrls, 80); + httpdInit(routes, 80); // Heap use timer & blink os_timer_disarm(&prHeapTimer);