Permalink
Browse files

More bootstrap 4 fixes

 - Prep release build
 - Cleanup index files for dev/prod versions
 - New load screen
  • Loading branch information...
verma committed Aug 6, 2018
1 parent ea06a94 commit eae2da433e8129680fff0b7b39e888fbf33cde88
@@ -46,6 +46,7 @@
"vendor/externs/extras.js"
"vendor/externs/react-dom.ext.js"
"vendor/externs/react.ext.js"
"vendor/externs/bootstrap.ext.js"
"vendor/externs/google_maps_api_v3_11.js"]
:pretty-print false}}]}
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
id="svg8"
version="1.1"
viewBox="0 0 189.64955 6.1247473"
height="6.1247473mm"
width="189.64955mm">
<defs
id="defs2">
<linearGradient
osb:paint="solid"
id="linearGradient6023">
<stop
id="stop6021"
offset="0"
style="stop-color:#ff6600;stop-opacity:1;" />
</linearGradient>
<linearGradient
osb:paint="solid"
id="linearGradient6015">
<stop
id="stop6013"
offset="0"
style="stop-color:#00bed6;stop-opacity:0.27058825;" />
</linearGradient>
</defs>
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
transform="translate(-7.8430052,-165.31054)"
id="layer1">
<g
id="g47">
<path
style="fill:none;stroke:#00bcd6;stroke-width:0.25506079px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 113.01489,170.56696 c 84.6533,0 84.47767,0 84.47767,0"
id="path10" />
<path
style="fill:none;stroke:#00bcd6;stroke-width:0.22472669px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 7.8430052,171.32292 H 73.42187"
id="path10-6" />
<path
style="fill:none;fill-opacity:1;stroke:#00bcd6;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 73.42187,171.32292 3.023812,-4.15774 4.724702,1.32292 2.645833,-3.02381 9.449407,3.2128 4.34673,-3.21281 15.402536,5.10268"
id="path42" />
</g>
</g>
</svg>

This file was deleted.

Oops, something went wrong.
@@ -29,12 +29,19 @@
margin-top: 6em;
font-weight: bold;
color: #888;
position: relative;
left: -3rem;
}
.bootup .speckly-startup-logo {
color: #0097a7;
border-bottom: 1px solid #00BCD6;
margin: 5rem 10rem;
margin: 5rem 10rem 0 10rem;
}
.bootup .speckly-border-image {
position: relative;
top: -2rem;
left: 2rem;
}
.bootup .entwine-startup-logo {
@@ -66,6 +73,8 @@
<div id="app">
<div class="bootup">
<div class="speckly-startup-logo">speck.ly</div>
<img class="speckly-border-image" src="img/speckly_bottom_border.svg">
<div>
<div class="powered-by">Powered by </div>
<div class="entwine-startup-logo"></div>
@@ -121,7 +130,10 @@
{
"name": "ept://na.entwine.io/nyc",
"displayName": "New York City",
"default": true
"default": true,
"params": {
"c0s": "remote://imagery?url=http%3A%2F%2Fserver.arcgisonline.com%2FArcGIS%2Frest%2Fservices%2FWorld_Imagery%2FMapServer%2Ftile%2F%7B%7Bz%7D%7D%2F%7B%7By%7D%7D%2F%7B%7Bx%7D%7D.jpg"
}
},
{
"displayName": "AHN & DK",
@@ -1,16 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<link href='https://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet" type="text/css">
<style>
body {
font-family: 'Lato', 'Lucida Grande', sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-size: 14px;
margin: 0px;
padding: 0px;
margin: 0;
padding: 0;
overflow: hidden;
line-height: 1.42857143;
line-height: 1.5;
color: #666;
}
@@ -19,23 +17,39 @@
left: 0; right: 0; top: 0; bottom: 0;
text-align: center;
padding-top: 30px;
font-family: sans-serif;
color: #444;
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif
font-size: 60px;
letter-spacing: -5px;
margin: 0;
}
.bootup h3 {
font-family: Impact, Charcoal, sans-serif;
font-size: 80px;
margin: 0px;
.bootup .powered-by {
font-size: 14px;
letter-spacing: 0;
margin-top: 6em;
font-weight: bold;
color: #888;
position: relative;
left: -3rem;
}
.bootup .speckly-startup-logo {
color: #0097a7;
margin: 5rem 10rem 0 10rem;
}
.bootup .speckly-border-image {
position: relative;
top: -2rem;
left: 2rem;
}
.bootup .entwine-startup-logo {
background: url(img/entwine.png);
height: 50px;
margin: 0px;
padding: 0px;
height: 40px;
width: auto;
margin: 0;
padding: 0;
background-size: contain;
background-position: center center;
background-repeat: no-repeat no-repeat;
@@ -58,7 +72,9 @@
<body class="noselect">
<div id="app">
<div class="bootup">
<h3>speck.ly</h3>
<div class="speckly-startup-logo">speck.ly</div>
<img class="speckly-border-image" src="img/speckly_bottom_border.svg">
<div>
<div class="powered-by">Powered by </div>
<div class="entwine-startup-logo"></div>
@@ -71,13 +87,24 @@ <h3>speck.ly</h3>
var createUI = function() {
plasioUI = plasio_ui.core.createUI(document.getElementById("app"), {
includeExternalDependencies: true,
ignoreDependencies: ["bootstrap"],
googleMapsAPIKey: "AIzaSyCdLqz1ZxiO2woQ4B4wbYtcR2EtYEYnHxg",
useBrowserHistory: true,
rememberUIState: true,
allowGreyhoundCredentials: false,
// in case the browser is empty, use the following resource
availableResources: [
["Autzen", "autzen-h", "http://cache.greyhound.io/"],
["Half Dome", "half-dome-h", "http://cache.greyhound.io/"],
["Iowa", "iowa-h", "http://cache.greyhound.io/"],
["Iowa Bridge", "iowa-bridge-h", "http://cache.greyhound.io/"],
["Lake Isabella", "isa-h", "http://cache.greyhound.io/"],
["Lone Star Geyser", "lone-star-h", "http://cache.greyhound.io/"],
["Minnesota", "mn-h", "http://cache.greyhound.io/"],
["Nepal", "nepal-h", "http://cache.greyhound.io/"],
["New York City", "nyc-h", "http://cache.greyhound.io/"],
["Red Rock Amphitheatre", "redrock-h", "http://cache.greyhound.io/"],
["Space Shuttle", "shuttle-h", "http://cache.greyhound.io/"]
],
additionalInformation:
'Powered by: <a href="https://github.com/connormanning/entwine" target="_blank">entwine</a>' +
', 3D Point Cloud viewer: <a href="https://github.com/verma/plasio-ui" target="_blank">plasio</a>' +
@@ -87,15 +114,14 @@ <h3>speck.ly</h3>
["Red", 5]
],
defaultColorChannelIndex: 2,
deriveColorChannelsFromAddonFields: true,
defaultColorChannelIndex: 0,
colorSources: [
["remote://imagery?url=" + encodeURIComponent("http://api.tiles.mapbox.com/v4/mapbox.satellite/{{z}}/{{x}}/{{y}}.jpg70?access_token=pk.eyJ1IjoiaG9idSIsImEiOiItRUhHLW9NIn0.RJvshvzdstRBtmuzSzmLZw"), "Mapbox Satellite Imagery"],
["remote://imagery?url=" + encodeURIComponent("http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{{z}}/{{y}}/{{x}}.jpg"), "ArcGIS Satellite Imagery"],
["local://ramp?field=Z", "Elevation"],
["local://ramp?field=Z&start=#FF0000&end=#00FF00", "Elevation RED -> GREEN"],
["local://ramp?field=Z&start=#FFFFFF&end=#0000FF", "Elevation WHITE -> BLUE"],
["local://ramp?field=Z", "Elevation"],
["local://color", "Color"],
["local://field-color?field=Classification", "Classification"],
["local://ramp?field=Intensity", "Intensity"],
@@ -31,6 +31,7 @@ cp -v $RESOURCES/lib/dist/laz-perf.js $DEST/js/
cp -v $RESOURCES/lib/dist/laz-perf.wasm $DEST/js/
cp -v $RESOURCES/js/plasio-renderer.cljs.js $DEST/js/plasio-renderer.cljs.js
cp -v $RESOURCES/img/entwine.png $DEST/img/entwine.png
cp -v $RESOURCES/img/speckly_bottom_border.svg $DEST/img/speckly_bottom_border.svg
cp -v $RESOURCES/css/style.css $DEST/css/style.css
echo ":: staging latest resources.json ..."
@@ -1053,7 +1053,7 @@
points (om/observe owner plasio-state/clicked-point-info)]
(d/div
{:class "point-info-container"}
(d/h4 "Point Information")
(d/h5 "Point Information")
(if (> (count resources) 1)
(d/p {:class "text-danger"} "Point information is not available when multiple resources are loaded.")
(d/div
@@ -1062,11 +1062,11 @@
(if-not (seq @points)
(d/div {:class "no-items"} "Click on a point to see its information here.")
(d/div
(d/h5 "Following resources responded to point info query:")
(d/p "Following resources responded to point info query:")
(for [point @points
:when (seq point)]
(d/div
(d/h5 {:class "resource"}
(d/p {:class "resource"}
(if (contains? point :eptRootUrl)
(str (util/ept-url->name (:eptRootUrl point)) " [EPT]")
(str (:resource point) "@" (:server point))))
Oops, something went wrong.

0 comments on commit eae2da4

Please sign in to comment.