Commit 6cbeabea authored by Sven Schneider's avatar Sven Schneider

fixed that the footer was shown above the cesiumviewer. missing </div>...

parent f2023a2f
Pipeline #1106 passed with stages
in 11 seconds
...@@ -20,14 +20,14 @@ ...@@ -20,14 +20,14 @@
integrity="sha256-0rguYS0qgS6L4qVzANq4kjxPLtvnp5nn2nB5G1lWRv4=" crossorigin="anonymous"></script> integrity="sha256-0rguYS0qgS6L4qVzANq4kjxPLtvnp5nn2nB5G1lWRv4=" crossorigin="anonymous"></script>
<script src="https://cesium.com/downloads/cesiumjs/releases/1.69/Build/Cesium/Cesium.js"></script> <script src="https://cesium.com/downloads/cesiumjs/releases/1.69/Build/Cesium/Cesium.js"></script>
<script src="https://d3js.org/d3-dsv.v1.min.js"></script> <script src="https://d3js.org/d3-dsv.v1.min.js"></script>
<script src="https://d3js.org/d3-fetch.v1.min.js"></script> <script src="https://d3js.org/d3-fetch.v1.min.js"></script>
</head> </head>
<body> <body>
<header> <header>
<img src="imgs/icity.png" class="titleFigure"> <img src="imgs/icity.png" class="titleFigure">
...@@ -39,26 +39,31 @@ ...@@ -39,26 +39,31 @@
<script src="polylineStreams.js"></script> <script src="polylineStreams.js"></script>
<div id="cesiumContainer" class="pagecesium"> <div id="cesiumContainer" class="pagecesium">
<div id="legend"> <div id="legend">
<!-- <p>Wind speed (m/s)</p> <table>
<div class="inner"></div> <tr style="height: 30px;vertical-align: top;">
</div> --> <td colspan="2">Wind speed (m/s) </td>
<table> <td></td>
<tr style="height: 30px;vertical-align: top;"> </tr>
<td colspan="2">Wind speed (m/s) </td> <tr>
<td></td> <td rowspan="1" style="height:100px;text-align:right;"><img src="imgs/colorbarJET.png" height="100"
</tr> width="20"> </td>
<tr> <td>- 3.5<p style="margin-top: 78px;">
<td rowspan="1" style="height:100px;text-align:right;"><img src="imgs/colorbarJET.png" height="100" width="20"> </td> <p> - 0
<td>- 3.5<p style="margin-top: 78px;"><p> - 0</td> </td>
</tr> </tr>
</table> </table>
</div>
</div> </div>
<footer> <footer>
<p align="center"> <p align="center">
<h5>Copyright &copy; 2018 - 2020, HFT-Stuttgart. All rights reserved</h5> <h5>Copyright &copy; 2018 - 2020, HFT-Stuttgart. All rights reserved</h5>
</p> </p>
</footer> </footer>
</body> </body>
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
/* font: 1em "Fira Sans", sans-serif; */ /* font: 1em "Fira Sans", sans-serif; */
} }
.mytab { .mytab {
display:inline-block; display:inline-block;
margin-left: 35px; margin-left: 35px;
......
...@@ -52,6 +52,21 @@ body{ ...@@ -52,6 +52,21 @@ body{
} }
a {
color: black;
}
a:hover{
color: white;
}
a:visited {
color: black;
}
.myBtn { .myBtn {
color: #fff; color: #fff;
background-color: tomato; background-color: tomato;
......
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
</body> </body>
</body>
</html> </html>
\ No newline at end of file
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<td>- 113006<p style="margin-top: 78px;"><p> - 112976</td> <td>- 113006<p style="margin-top: 78px;"><p> - 112976</td>
</tr> </tr>
</table> </table>
</div>
</div> </div>
...@@ -61,7 +62,7 @@ ...@@ -61,7 +62,7 @@
</body> </body>
</body>
</html> </html>
\ No newline at end of file
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<td>- 113006<p style="margin-top: 78px;"><p> - 112976</td> <td>- 113006<p style="margin-top: 78px;"><p> - 112976</td>
</tr> </tr>
</table> </table>
</div>
</div> </div>
...@@ -61,7 +62,7 @@ ...@@ -61,7 +62,7 @@
</body> </body>
</body>
</html> </html>
\ No newline at end of file
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
<td>- 113006<p style="margin-top: 78px;"><p> - 112976</td> <td>- 113006<p style="margin-top: 78px;"><p> - 112976</td>
</tr> </tr>
</table> </table>
</div>
<!-- <div id="legend"> <!-- <div id="legend">
<p>Pressure (Pa) <br> <p>Pressure (Pa) <br>
...@@ -62,7 +63,4 @@ ...@@ -62,7 +63,4 @@
</body> </body>
</body>
</html> </html>
\ No newline at end of file
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
</tr> </tr>
</table> </table>
</div> </div>
</div>
<footer> <footer>
<p align="center"> <p align="center">
...@@ -57,7 +58,7 @@ ...@@ -57,7 +58,7 @@
</body> </body>
</body>
</html> </html>
\ No newline at end of file
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<ul class="list-unstyled"> <ul class="list-unstyled">
<!-- <li><a href="#" class="text-white">Follow on Twitter</a></li> --> <!-- <li><a href="#" class="text-white">Follow on Twitter</a></li> -->
<!-- <li><a href="#" class="text-white">Like on Facebook</a></li> --> <!-- <li><a href="#" class="text-white">Like on Facebook</a></li> -->
<li><a href="mailto:sven.schneider[at]hft-stuttgart.de" class="text-white">Email me</a></li> <li><a href="mailto:sven.schneider[at]hft-stuttgart.de">Email me</a></li>
</ul> </ul>
</div> </div>
</div> </div>
......
...@@ -160,7 +160,7 @@ d3.dsv(",", "results/polylines.csv").then(function(text) { ...@@ -160,7 +160,7 @@ d3.dsv(",", "results/polylines.csv").then(function(text) {
positions: positions, positions: positions,
width: 5.0, width: 5.0,
vertexFormat: Cesium.PolylineColorAppearance.VERTEX_FORMAT, vertexFormat: Cesium.PolylineColorAppearance.VERTEX_FORMAT,
colors: colors, colors: colors,
colorsPerVertex: true, colorsPerVertex: true,
}), }),
}), }),
...@@ -172,6 +172,24 @@ d3.dsv(",", "results/polylines.csv").then(function(text) { ...@@ -172,6 +172,24 @@ d3.dsv(",", "results/polylines.csv").then(function(text) {
}) })
// This adds a large arrow to the viewer. Works fine. for testing
// var purpleArrow = viewer.entities.add({
// name: "Purple straight arrow at height",
// polyline: {
// positions: Cesium.Cartesian3.fromDegreesArrayHeights([
// 9.187290, 48.784567, 400,
// 9.195991, 48.790575, 400
// ]),
// width: 50,
// arcType: Cesium.ArcType.NONE,
// material: new Cesium.PolylineArrowMaterialProperty(
// Cesium.Color.PURPLE
// ),
// },
// });
// var f = new File([""], "results/singlePolyline.csv", {type: "text/plain", lastModified: Date()}) // var f = new File([""], "results/singlePolyline.csv", {type: "text/plain", lastModified: Date()})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment