Skip to content

GitLab

Commit e89c0133 authored by Patrick's avatar Patrick
Browse files

some more updates

parent 04aed368
Hide whitespace changes
Inline Side-by-side
vcm/config.json
View file @ e89c0133
......@@ -130,11 +130,6 @@
"startingmap": true,
"type": "vcs.vcm.maps.Cesium",
"webGLaa": false
},
{
"name": "Openlayers Map",
"startingmap": false,
"type": "vcs.vcm.maps.Openlayers"
}
],
"widgets": [
......@@ -692,7 +687,7 @@
{
"template": [
"<div class='balloon' onclick='showbereich(\"TSVW\")' id='myBalloon'>",
" <h1 class='balloon-title'>TSV Weilimdorf (in Giebel ansässig, ggf. Fusion mit SG Weilimdorf)</h1>",
" <h1 class='balloon-title'>Sportvereine SG Weilimdorf, TSV Weilimdorf und BBC</h1>",
" <div class='balloon-content' style='height:100px; margin-right: 0px;'",
" </div>",
"<p class='balloon-text'><span>Text fehlt...</span><br></p>",
......@@ -799,7 +794,7 @@
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
"<p class='balloon-text'><span>hier geht es um die Erschließung des Plangebiets</span><br></p>",
"<img style='padding-top:10px' src='images/content/contentboeckingerstrasse/fehlt.jpg' alt='noch kein bild' width='375'>",
"<img style='padding-top:10px' src='images/MK_Images/Info_U13.jpg' alt='noch kein bild' width='375'>",
"</div>",
"<% showbereich(\"plangebiet\") %>",
......@@ -882,7 +877,7 @@
"template": [
"<div class='balloon' onclick='showbereich(\"burgerhaus\")' id='myBalloon'>",
" <h1 class='balloon-title'>Bürgerhaus</h1>",
" <div class='balloon-content' style='height:50px; margin-right: 0px;'",
" <div class='balloon-content' margin-right: 0px;'",
" </div>",
"<p class='balloon-text'><span>hier stehen Infos zum Bürgerhaus</span><br></p>",
......@@ -891,10 +886,10 @@
"<% showbereich(\"burgerhaus\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
"minTop": "balloonHeight",
"minLeft": "70",
"layerTypes": [
""
"vcs.vcm.layer.GeoJSON"
],
"layerNames": [
"MK_Buergerhaus"
......@@ -1579,7 +1574,7 @@
"url": "./marker/mult_SGW.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": true,
"activeOnStartup": false,
"exclusive": false,
"projection": { "epsg": "4326", "proj4": ""},
"altitudeMode": "relativeToGround",
......
vcm/config_mobile.json
View file @ e89c0133
......@@ -1189,7 +1189,7 @@
"url": "./marker/mult_SGW.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": true,
"activeOnStartup": false,
"exclusive": false,
"projection": { "epsg": "4326", "proj4": ""},
"altitudeMode": "relativeToGround",
......
vcm/config_safari.json
View file @ e89c0133
......@@ -130,11 +130,6 @@
"startingmap": true,
"type": "vcs.vcm.maps.Cesium",
"webGLaa": false
},
{
"name": "Openlayers Map",
"startingmap": false,
"type": "vcs.vcm.maps.Openlayers"
}
],
"widgets": [
......@@ -713,7 +708,7 @@
{
"template": [
"<div class='balloon' onclick='showbereich(\"TSVW\")' id='myBalloon'>",
" <h1 class='balloon-title'>TSV Weilimdorf (in Giebel ansässig, ggf. Fusion mit SG Weilimdorf)</h1>",
" <h1 class='balloon-title'>Sportvereine SG Weilimdorf, TSV Weilimdorf und BBC</h1>",
" <div class='balloon-content' style='height:100px; margin-right: 0px;'",
" </div>",
"<p class='balloon-text'><span>Text fehlt...</span><br></p>",
......@@ -821,7 +816,7 @@
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
"<p class='balloon-text'><span>Für mehr Informationen zum Plangebiet klicken Sie bitte hier!</span><br></p>",
"<img style='padding-top:10px' src='images/content/contentboeckingerstrasse/fehlt.jpg' alt='noch kein bild' width='375'>",
"<img style='padding-top:10px' src='images/MK_Images/Info_U13.jpg' alt='noch kein bild' width='375'>",
"</div>",
"<% %>",
......@@ -1603,7 +1598,7 @@
"url": "./marker/mult_SGW.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": true,
"activeOnStartup": false,
"exclusive": false,
"projection": { "epsg": "4326", "proj4": ""},
"altitudeMode": "relativeToGround",
......
vcm/marker/Jugendhaus.geojson
View file @ e89c0133
......@@ -17,8 +17,8 @@
"geometry": {
"type": "Point",
"coordinates": [
9.105584203581357,
48.80806377818237
9.105658231054166,
48.8080836169583
]
}
}
......
vcm/marker/pot_bereichB.geojson
View file @ e89c0133
......@@ -17,8 +17,8 @@
"geometry": {
"type": "Point",
"coordinates": [
9.102202813831935,
48.80564488219619
9.10249717951644,
48.80544908196225
]
}
}
......
vcm/marker/pot_bereichC.geojson
View file @ e89c0133
......@@ -17,8 +17,8 @@
"geometry": {
"type": "Point",
"coordinates": [
9.102316432268935,
48.805317373834185
9.101964728372085,
48.80474875864465
]
}
}
......
vcm/marker/walz.geojson
View file @ e89c0133
......@@ -17,8 +17,8 @@
"geometry": {
"type": "Point",
"coordinates": [
9.101964728372085,
48.80474875864465
9.102419327387652,
48.80492388681412
]
}
}
......
vcm/templates/custom.css
View file @ e89c0133
......@@ -213,7 +213,7 @@
.contentOne{
font-family: "Cambria", Georgia, serif;
font-weight: bold;
/* font-weight: bold; */
line-height: 1.6;
}
......@@ -249,8 +249,8 @@
h1.sticky {
position: -webkit-sticky;
position: sticky;
height:35px;
top: 30px;
height:2em;
top: 0em;
font-size: 20px;
padding:5px;
padding-bottom:15px;
......@@ -263,6 +263,7 @@ div.tour-top-navi {
position: -webkit-sticky;
position: sticky;
height:30px;
float:right;
top:0;
margin-bottom:10px;
background-color: white;
......
vcm/templates/custom.js
View file @ e89c0133
......@@ -22,8 +22,19 @@ var showEinleitung = function(){
document.getElementById("iconlist").style.display = "block";
document.getElementById("detAnleitung").style.display = "block";
document.getElementById("einlP02").scrollIntoView();
document.getElementById("back-btn").style.display = "block";
// startVCM();
}
var showTexte = function() {
document.getElementById("einlP01").style.display = "block";
document.getElementById("einlP02").style.display = "none";
document.getElementById("tourstart-btn").style.display = "none";
document.getElementById("iconlist").style.display = "none";
document.getElementById("detAnleitung").style.display = "none";
document.getElementById("einlP01").scrollIntoView();
document.getElementById("back-btn").style.display = "none";
}
// $(function () {
// $('[data-toggle="tooltip"]').tooltip()
......@@ -69,7 +80,7 @@ function stopStory() {
function showbereich(bereich) {
var allBereiche = ["UmfrageOne", "WeilimdorfAreas", "projektOne", "bereichB", "bereichC", "bereichD","InfoWalz","burgerhaus","bereichA","fluchtling","kindertag",
"jugendhaus","plangebiet","potA","potB","potC", "schule", "SGW", "chloroplast", "mk_jugendhaus", "forum", "mk_kinder"];
"jugendhaus","plangebiet","potA","potB","potC", "schule", "SGW", "chloroplast", "mk_jugendhaus", "forum", "mk_kinder","TSVW"];
for (x of allBereiche){
document.getElementById(x).style.display = "none";
......@@ -82,7 +93,7 @@ function showbereich(bereich) {
}
if (bereich == "TSVW"){
document.getElementById("projektOne").style.display = "block";
document.getElementById("TSVW").style.display = "block";
if (mobile == false){
// document.getElementById("").style.display = "block";
}
......@@ -160,7 +171,7 @@ function showbereich(bereich) {
} else if (bereich == "plangebiet"){
document.getElementById("plangebiet").style.display = "block";
if (mobile == false){
// document.getElementById("plangebiet_bild").style.display = "none";
document.getElementById("plangebiet_bild").style.display = "none";
}
} else if (bereich == "potA"){
document.getElementById("potA").style.display = "block";
......
vcm/templates/story/story.css
View file @ e89c0133
......@@ -133,7 +133,7 @@ div.title-fill {
top: 10%;
left: 0;
bottom: 0;
padding: 3rem 2rem 1rem 3rem;
padding: 0rem 2rem 1rem 0.5rem;
}
#story-frame.tour-stop {
top: 100%;
......@@ -223,7 +223,7 @@ div.title-fill {
/* tour-frame */
#tour-frame{
position: absolute;
/* position: absolute; */
top: 1rem;
bottom: 1rem;
left: 0;
......@@ -311,6 +311,33 @@ div.title-fill {
.tour-inactive > #tour-button > i:before{
content: "\f060";
}
@media screen and (max-width:48em /*768px*/) {
h1.sticky {
position: -webkit-sticky;
position: relative;
height:2em;
top: 0em;
font-size: 20px;
padding:5px;
padding-bottom:15px;
background-color: white;
z-index: 99;
}
div.tour-top-navi {
position: -webkit-sticky;
position: relative;
height:30px;
float:right;
top:0;
margin-bottom:10px;
background-color: white;
padding-left:10px;
margin:0px;
}
}
@media screen and (min-width:48em /*768px*/) {
.vcs_map_container{
bottom: 0px;
......
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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal