Skip to content
GitLab
Commit 923bc474 authored by Cholgrrr's avatar Cholgrrr
Browse files

Merge branch 'New_Structure' of https://gitlab.com/Cholgrrr/m4labplatform into New_Structure

parents 1c13f90c fc4301d6
Expand all Hide whitespace changes
Inline Side-by-side
config.json
View file @ 923bc474
......@@ -10,5 +10,5 @@
"widgets" : {
"type": "vcs.vcm.widgets.Questionnaire",
"name": "Questionnaire"
},
}
}
\ No newline at end of file
vcm/config.json
View file @ 923bc474
......@@ -657,7 +657,9 @@
" </div>",
"<p class='balloon-text'><span>Um die Umfrage zu starten klicken Sie bitte hier!</span><br></p>",
"<img style='padding-top:10px' src='images/content/contentboeckingerstrasse/Umfrage.jpg' alt='Simply Easy Learning' width='375'>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% openquestionaire() %>"
......@@ -682,7 +684,9 @@
"<input type='checkbox' name='toggle' id='chxboxDemand' onclick='checkboxDemandCampus(true);'>",
"<label for='toggle'><i></i></label>",
"<span></span>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"</div>",
"<% %>"
......@@ -703,7 +707,9 @@
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>",
"<img style='padding-top:10px' src='images/NordB/001.jpg' alt='Simply Easy Learning' width='375'>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% openquestionaire() %>"
......@@ -733,7 +739,9 @@
"<p>noise_LA_min: </p><p id='noise_lamin'>&nbsp;</p><br>",
"<p>noise_LA_max: </p><p id='noise_lamax'>&nbsp;</p><br>",
"<span></span>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>"
......@@ -764,7 +772,9 @@
"<p>noise_LA_min: </p><p id='noise_lamin'>&nbsp;</p><br>",
"<p>noise_LA_max: </p><p id='noise_lamax'>&nbsp;</p><br>",
"<span></span>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>"
......@@ -796,7 +806,9 @@
"<p>noise_LA_max: </p><p id='noise_lamax'>&nbsp;</p><br>",
"<span></span>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>"
......@@ -854,7 +866,9 @@
" </div>",
"<p class='balloon-text'><span>hier wurde eine Gartenkiosk errichtet.</span><br></p>",
"<img style='padding-top:10px' src='images/content/contentboeckingerstrasse/station2_gartenkiosk.jpg' alt='Simply Easy Learning' width='375'>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% openquestionaire() %>"
......@@ -874,6 +888,9 @@
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>",
"<p class='balloon-text'>Die Umfrage finden Sie im Bereich rechts.</p>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% zoomto(\"UmfrageNordb\") %>"
......@@ -893,6 +910,9 @@
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>",
"<p class='balloon-text'><span>Mit dem Rosenstein Viertel entsteht ein neuer, nachhaltiger und klimagerechter Stadtbaustein in Stuttgart. Die gesamte Planung umfasst die freiwerdenden Gleisflächen, den Gleisbogen sowie das Gebiet an den Wagenhallen.</span><br> <a href='https://www.stuttgart.de/leben/stadtentwicklung/rosenstein-quartier.php'>Hier geht’s zum Konzept</a></p>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>"
],
......@@ -912,6 +932,9 @@
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>",
"<p class='balloon-text'><span>Der Laden informiert über Planung und Bau des Bahnprojekts Stuttgart 21 sowie der daran anschließenden Stadt- und Landschaftsplanung und dient damit auch als Anlaufstelle.</span><br> <a href='http://infoladen-rosenstein.de/'>Hier geht’s zur Seite</a></p>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>"
],
......@@ -930,6 +953,9 @@
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>",
"<p class='balloon-text'><span>Das Gebiet rund um die sanierten Wagenhallen gilt als Ort der Kunst und Subkultur, an dem diverse Vereine und Initiativen kulturell und sozial nachhaltig aktiv sind. Der <a href='http://kunstverein-wagenhalle.de/'>Kunstverein Wagenhalle e.V.</a> betreibt die Ateliers innerhalb der Hallen sowie die Container City, während auf den anliegenden Grünflächen der <a href='https://www.stadtacker.de/'>Verein Stadtacker</a> zum Urban Gardening einlädt.</span><br> </p>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>"
],
......@@ -950,7 +976,9 @@
" </div>",
"<p class='balloon-text'><span>hier wurde eine Spielekiosk errichtet.</span><br></p>",
"<img style='padding-top:10px' src='images/content/contentboeckingerstrasse/station1_spielekiosk.jpg' alt='Simply Easy Learning' width='375'>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% openquestionaire() %>"
......@@ -972,7 +1000,9 @@
" </div>",
"<p class='balloon-text'><span>hier wurde eine Outdoorkiosk errichtet.</span><br></p>",
"<img style='padding-top:10px' src='images/content/contentboeckingerstrasse/station3_outdoorkiosk1.jpg' alt='Simply Easy Learning' width='375'>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% openquestionaire() %>"
......@@ -994,7 +1024,9 @@
" </div>",
"<p class='balloon-text'><span>hier wurde eine Infokiosk errichtet.</span><br></p>",
"<img style='padding-top:10px' src='images/content/contentboeckingerstrasse/station4_infokiosk.jpg' alt='Simply Easy Learning' width='375'>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% openquestionaire() %>"
......
vcm/css/menu.css
View file @ 923bc474
......@@ -224,6 +224,7 @@
.btn_size{
padding: 7px !important;
cursor: pointer;
}
.subcontent{
......
vcm/index.html
View file @ 923bc474
......@@ -168,7 +168,7 @@
<strong>Kesselkompass</strong> <br>Informieren, Beteiligen, Kooperieren
</h1>
<p class="contentOne">Willkommen auf der 3D-Partizipationsplattform Kesselkompass, ein Transferprojekt des M4_Lab an der Hochschule für Technik Stuttgart. Hier finden Sie Informationen und die Möglichkeit zur Beteiligung an unterschiedlichen Forschungsprojekten im Raum Stuttgart, die sich mit städtischer Planung auseinandersetzen. Über die 3D-Kartenansicht der Stadt Stuttgart können Sie verschiedene digitale Werkzeuge nutzen, wissenschaftliche Daten visualisieren, sich über Projekte und Planungen informieren, an Umfragen teilnehmen oder neue Anregungen und Kooperationspartner*innen finden. Viel Spaß beim Stöbern!</p>
<button id="tourstart-btn" onclick="removebuildings(); Introshow();" class="buttonset one"><span class="i18n_balloon_startscreen_btn">Start</span>
<button id="tourstart-btn" onclick="removebuildings(); Introshow();historyInfo();" class="buttonset one"><span class="i18n_balloon_startscreen_btn">Start</span>
</button>
<!-- stopStory(); getNAVcar(); -------Test back to start: getFlow();getFlowtest();getTraffic(); -->
</div>
......@@ -181,12 +181,12 @@
<div class="tour-top-navi" style="z-index:99">
<div id="updown" onclick="changesize()" style="display: block; font-size: 20px; padding-left: 48%; margin-right: -50%; position: -webkit-sticky; position: sticky;">&#9650</div>
<a href="#" onclick="Introshow();setpositionVAR(false);zoomto('IntroProj')" id = "btn_intro" class=" top-nav buttonset one btn_home btn_size">Info</a>
<a href="#" onclick="zoomto('ProjektePage');Projektshow()" id = "btn_intro" class=" top-nav buttonset one btn_home btn_size">Projekte</a>
<a onclick="Introshow();setpositionVAR(false);zoomtop('IntroProj');historyInfo();histInfo();" id = "btn_intro" class=" top-nav buttonset one btn_home btn_size">Info</a>
<a onclick="zoomtop('ProjektePage');Projektshow();historyProjekt();" id = "btn_intro02" class=" top-nav buttonset one btn_home btn_size">Projekte</a>
<!-- <a href="#" onclick="addcont('main_bock2');showtourSpecific('main');setpositionVAR(false);zoomto('projektOne')" id = "btn_bock" class=" top-nav buttonset one btn_home btn_size"><i class="fa fa-code-fork"></i> Böckingerstraße</a>
<a href="#" onclick="removebuildings();addcont('main_nordbstuff2');NordbahnhofText();setpositionVAR(false);zoomto('NordbahnhofInfo')" id = "btn_nord" class=" top-nav buttonset one btn_home btn_size"><i class="fa fa-code-fork"></i> Nordbahnhof</a> -->
<!-- <a href="#" onclick="NoiseText(true);setpositionVAR(false);" id = "btn_acous" class=" top-nav buttonset one btn_home btn_size"><i class="fa fa-code-fork"></i> Akkustik Projekt</a> -->
<a href="#" style="float: right; margin-right: 7px; " onclick="removebuildings();addcont('main_bock');addcont('main_heatdem');addcont('main_nordbstuff');Expert();setpositionVAR(false);zoomto('Expertenmodus');" id = "btn_expert" class=" top-nav buttonset one btn_home btn_size"><i id="icon_lock" class="fa fa-lock"></i> Toolbox</a>
<a style="float: right; margin-right: 7px; " onclick="removebuildings();addcont('main_bock');addcont('main_heatdem');addcont('main_nordbstuff');Expert();setpositionVAR(false);zoomtop('Expertenmodus');historyToolbox();histExpert();" id = "btn_expert" class=" top-nav buttonset one btn_home btn_size"><i id="icon_lock" class="fa fa-lock"></i> Toolbox</a>
<!-- style="float:right;margin-right:2em;" -->
</div>
<!-- Expertenmodus-.--------------------------
......@@ -499,7 +499,7 @@
<!-- <p class="contentOne">Unsere Projekte werden im Rahmen individueller Forschungsfragen und transdisziplinären Seminarreihen in spezifischen Gebieten erarbeitet. Hier kann man sich informieren sowie aktiv am Ideenfindungsprozess beteiligen. </p><br> -->
<h3>Aktuell</h3>
<div class="row3">
<div style="cursor:pointer;" id = "btn_nord" onclick="removebuildings();addcont('main_nordbstuff2');NordbahnhofText();setpositionVAR(false);zoomto('NordbahnhofInfo')" class="column3">
<div style="cursor:pointer;" id = "btn_nord" onclick="removebuildings();addcont('main_nordbstuff2');NordbahnhofText();setpositionVAR(false);zoomtop('NordbahnhofInfo');historyNordb()" class="column3">
<h3 class="top-left">Nordbahnhof</h3>
<img class="imagecol3" src="images/thumbnails/Nord_thumb_001.jpg" alt="Forest" style="width:100%">
</div>
......@@ -514,7 +514,7 @@
<h3>Archiv</h3>
<div class="row3">
<div style="cursor:pointer;" id = "btn_bock" onclick="addcont('main_bock2');showtourSpecific('main');setpositionVAR(false);zoomto('projektOne')"class="column3">
<div style="cursor:pointer;" id = "btn_bock" onclick="addcont('main_bock2');showtourSpecific('main');setpositionVAR(false);zoomtop('projektOne');historyBock()"class="column3">
<h3 class="top-left">Böckinger Straße</h3>
<img class="imagecol3" src="images/thumbnails/boe_thumb_001_sw.jpg" alt="Snow" style="width:100%">
</div>
......@@ -848,8 +848,11 @@
vcs.vcm.Framework.activateLogging();
vcs.vcm.Framework.loadConfig('config.json');
</script-->
<script src="lib/jquery-3.5.1.min.js"></script>
<script src='js/history.js'></script>
<script src='js/backtotop.js'></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> -->
<script src='lib/vcm_ui.js'></script>
<script src="js/SimStadtApi_stud.js"></script>
<script src="js/here.js"></script>
......
vcm/js/history.js 0 → 100644
View file @ 923bc474
function activateStoryFrame(pageN){
if (pageN == "1"){
// window.location.reload();
stopStory();
$("#story-frame").removeClass("tour-inactive");
$("#story-frame").removeClass("tour");
$("#story-frame").addClass("startscreen");
$("#balloon-startscreen").attr('style',"display:'block'!important");
} else if(pageN == "2"){
startStory();
Introshow();
setpositionVAR(false);
zoomtop('IntroProj');
} else if(pageN == "3"){
zoomtop('ProjektePage');
Projektshow();
} else if(pageN == "4"){
removebuildings();
addcont('main_bock');
addcont('main_heatdem');
addcont('main_nordbstuff');
Expert();
setpositionVAR(false);
zoomtop('Expertenmodus');
} else if(pageN == "5"){
removebuildings();
addcont('main_nordbstuff2');
NordbahnhofText();
setpositionVAR(false);
zoomtop('NordbahnhofInfo')
} else if(pageN == "6"){
addcont('main_bock2');
showtourSpecific('main');
setpositionVAR(false);
zoomtop('projektOne')
}
}
//-------------------------------------
// TEST 02
function historyInfo(){
history.pushState({id:2},'Info page','./info')
}
function historyProjekt(){
history.pushState({id:3},'Project page','./project')
}
function historyToolbox(){
history.pushState({id:4},'Info page','./toolbox')
}
function historyNordb(){
history.pushState({id:5},'Info page','./project/nordb')
}
function historyBock(){
history.pushState({id:6},'Info page','./project/bock')
}
history.replaceState({id:1}, 'Default page','./start');
window.addEventListener('popstate', e => {
if (e.state != null && e.state !== undefined){
if (typeof e.state.id !== 'undefined') {
console.log(e.state.id)
activateStoryFrame(e.state.id)
} else if(typeof e.state.key !== 'undefined') {
console.log(e.state.key)
activateStoryFrame(1)
} else {
console.log(e.state)
}
}
});
\ No newline at end of file
vcm/lib/jquery-3.5.1.min.js 0 → 100644
View file @ 923bc474
This diff is collapsed.
vcm/templates/custom.css
View file @ 923bc474
......@@ -515,6 +515,10 @@ div.tour-top-navi {
/* color: grey; */
/* padding: 12px 16px; */
/* font-size: 16px; */
position: absolute;
top: .25rem;
right: 2rem;
cursor: pointer;
float:right;
background-color:rgb(60, 60, 60);
......
vcm/templates/custom.js
View file @ 923bc474
......@@ -865,7 +865,7 @@ function Expert() {
function zoomto(where){
function zoomtop(where){
document.getElementById(where).scrollIntoView();
}
......
vcm/templates/story/story.css
View file @ 923bc474
......@@ -23,6 +23,7 @@ header{
.btn_size{
padding: 4px 12px 4px 12px !important;
cursor: pointer;
}
.buttonset.one{
background-color: #ffffff;
......
Supports Markdown
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