Skip to content

GitLab

Commit a40ee9a9 authored by patri's avatar patri
Browse files

update history

parent e9a97956
Hide whitespace changes
Inline Side-by-side
vcm/index.html
View file @ a40ee9a9
......@@ -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();histStart();historyInfo();" 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');historyInfo();histInfo();" id = "btn_intro" class=" top-nav buttonset one btn_home btn_size">Info</a>
<a href="#" onclick="zoomto('ProjektePage');Projektshow();historyProjekt();histProjekt();" id = "btn_intro02" 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');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>
<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>
......
vcm/js/ServerorLocal.js
View file @ a40ee9a9
// Server
// var navPublicT = '/partizipation/navPublicT'
// var NavCARdata = '/partizipation/NavCARdata'
// var ROAD_CLOSURE ="https://m4lab.hft-stuttgart.de/partizipation/ROAD_CLOSURE"
// var CONSTRUCTION = "https://m4lab.hft-stuttgart.de/partizipation/CONSTRUCTION"
// var TrafficFlow ="https://m4lab.hft-stuttgart.de/partizipation/TrafficFlow"
// var NAVCAR = "https://m4lab.hft-stuttgart.de/partizipation/NAVCAR"
// var NAVPUB = "https://m4lab.hft-stuttgart.de/partizipation/NAVPUB"
// var addPointurl = "https://m4lab.hft-stuttgart.de/partizipation/addPoint"
// var routecalcurl = "https://m4lab.hft-stuttgart.de/partizipation/Routecalc2"
// var navpublict2url = "https://m4lab.hft-stuttgart.de/partizipation/navPublicT2"
// var StartpointUrl = "https://m4lab.hft-stuttgart.de/partizipation/Startpoint"
// var EndpointUrl = "https://m4lab.hft-stuttgart.de/partizipation/Endpoint"
// var FLOWdataUrl = "/partizipation/FLOWdata"
// var NavCARdataUrl = '/partizipation/NavCARdata'
// var FLOWtestUrl = '/partizipation/FLOWtest'
// var getTrafficIncidentsUrl = '/partizipation/getTrafficIncidents'
// var navPointUrl = '/partizipation/navPoint'
// var RoutecalcUrl = '/partizipation/Routecalc'
// var navPublicTUrl = '/partizipation/navPublicT'
// var NoiseRealTimeUrl = '/partizipation/NoiseRealTime'
// var FavoritePlacesUrl = "https://m4lab.hft-stuttgart.de/partizipation/FavPlacesDB"
// var getNoiseHistUrl = '/partizipation/getNoiseHist'
// var getSTANoiseHistUrl = '/partizipation/getSTANoiseHist'
// var saveFavPOINT = '/partizipation/saveFavPoint'
var navPublicT = '/partizipation/navPublicT'
var NavCARdata = '/partizipation/NavCARdata'
var ROAD_CLOSURE ="https://m4lab.hft-stuttgart.de/partizipation/ROAD_CLOSURE"
var CONSTRUCTION = "https://m4lab.hft-stuttgart.de/partizipation/CONSTRUCTION"
var TrafficFlow ="https://m4lab.hft-stuttgart.de/partizipation/TrafficFlow"
var NAVCAR = "https://m4lab.hft-stuttgart.de/partizipation/NAVCAR"
var NAVPUB = "https://m4lab.hft-stuttgart.de/partizipation/NAVPUB"
var addPointurl = "https://m4lab.hft-stuttgart.de/partizipation/addPoint"
var routecalcurl = "https://m4lab.hft-stuttgart.de/partizipation/Routecalc2"
var navpublict2url = "https://m4lab.hft-stuttgart.de/partizipation/navPublicT2"
var StartpointUrl = "https://m4lab.hft-stuttgart.de/partizipation/Startpoint"
var EndpointUrl = "https://m4lab.hft-stuttgart.de/partizipation/Endpoint"
var FLOWdataUrl = "/partizipation/FLOWdata"
var NavCARdataUrl = '/partizipation/NavCARdata'
var FLOWtestUrl = '/partizipation/FLOWtest'
var getTrafficIncidentsUrl = '/partizipation/getTrafficIncidents'
var navPointUrl = '/partizipation/navPoint'
var RoutecalcUrl = '/partizipation/Routecalc'
var navPublicTUrl = '/partizipation/navPublicT'
var NoiseRealTimeUrl = '/partizipation/NoiseRealTime'
var FavoritePlacesUrl = "https://m4lab.hft-stuttgart.de/partizipation/FavPlacesDB"
var getNoiseHistUrl = '/partizipation/getNoiseHist'
var getSTANoiseHistUrl = '/partizipation/getSTANoiseHist'
var saveFavPOINT = '/partizipation/saveFavPoint'
......@@ -31,27 +31,27 @@
//_________________________________________/
// Local
var navPublicT = '/navPublicT'
var NavCARdata = '/NavCARdata'
var ROAD_CLOSURE = "http://localhost:8083/ROAD_CLOSURE"
var CONSTRUCTION = "http://localhost:8083/CONSTRUCTION"
var TrafficFlow = "http://localhost:8083/TrafficFlow"
var NAVCAR = "http://localhost:8083/NAVCAR"
var NAVPUB = "http://localhost:8083/NAVPUB"
var addPointurl = "http://localhost:8083/addPoint"
var routecalcurl = "http://localhost:8083/Routecalc2"
var navpublict2url = "http://localhost:8083/navPublicT2"
var StartpointUrl = "http://localhost:8083/Startpoint"
var EndpointUrl = "http://localhost:8083/Endpoint"
var FLOWdataUrl = "/FLOWdata"
var NavCARdataUrl = '/NavCARdata'
var FLOWtestUrl = '/FLOWtest'
var getTrafficIncidentsUrl = '/getTrafficIncidents'
var navPointUrl = '/navPoint'
var RoutecalcUrl = '/Routecalc'
var navPublicTUrl = '/navPublicT'
var NoiseRealTimeUrl = '/NoiseRealTime'
var FavoritePlacesUrl = 'http://localhost:8083/FavPlacesDB'
var getNoiseHistUrl = '/getNoiseHist'
var getSTANoiseHistUrl = '/getSTANoiseHist'
var saveFavPOINT = '/saveFavPoint'
\ No newline at end of file
// var navPublicT = '/navPublicT'
// var NavCARdata = '/NavCARdata'
// var ROAD_CLOSURE = "http://localhost:8083/ROAD_CLOSURE"
// var CONSTRUCTION = "http://localhost:8083/CONSTRUCTION"
// var TrafficFlow = "http://localhost:8083/TrafficFlow"
// var NAVCAR = "http://localhost:8083/NAVCAR"
// var NAVPUB = "http://localhost:8083/NAVPUB"
// var addPointurl = "http://localhost:8083/addPoint"
// var routecalcurl = "http://localhost:8083/Routecalc2"
// var navpublict2url = "http://localhost:8083/navPublicT2"
// var StartpointUrl = "http://localhost:8083/Startpoint"
// var EndpointUrl = "http://localhost:8083/Endpoint"
// var FLOWdataUrl = "/FLOWdata"
// var NavCARdataUrl = '/NavCARdata'
// var FLOWtestUrl = '/FLOWtest'
// var getTrafficIncidentsUrl = '/getTrafficIncidents'
// var navPointUrl = '/navPoint'
// var RoutecalcUrl = '/Routecalc'
// var navPublicTUrl = '/navPublicT'
// var NoiseRealTimeUrl = '/NoiseRealTime'
// var FavoritePlacesUrl = 'http://localhost:8083/FavPlacesDB'
// var getNoiseHistUrl = '/getNoiseHist'
// var getSTANoiseHistUrl = '/getSTANoiseHist'
// var saveFavPOINT = '/saveFavPoint'
\ No newline at end of file
vcm/js/history.js
View file @ a40ee9a9
/***************************************************************
* Copyright (C) 2016 punkt.de GmbH
* Authors: Christoph Heidenreich
*
* This script is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This script is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
// window.addEventListener("load", function(event) {
var StateofHist = "start01"
var stateObj = {info: "start01"};
// history.replaceState(stateObj, "neuerChronikEintrag", "https://transfer.hft-stuttgart.de/partizipation/weilimdorf/#/");
history.replaceState(stateObj, "neuerChronikEintrag", "http://localhost:8083/");
console.log("start01")
// document.body.style.backgroundColor = "yellow";
// });
function historyInfo(){
console.log(StateofHist)
console.log("info01")
StateofHist = "info01"
var stateObj = {info: StateofHist};
// history.pushState(stateObj, "neuerChronikEintrag", "https://transfer.hft-stuttgart.de/partizipation/weilimdorf/#/");
history.pushState(stateObj, "neuerChronikEintrag", "http://localhost:8083/");
}
function historyProjekt(){
console.log("project01")
console.log(StateofHist)
StateofHist = "project01"
var stateObj = {info: StateofHist};
// history.pushState(stateObj, "neuerChronikEintrag", "https://transfer.hft-stuttgart.de/partizipation/weilimdorf/#/");
history.pushState(stateObj, "neuerChronikEintrag", "http://localhost:8083/");
}
function historyToolbox(){
console.log("toolbox01")
console.log(StateofHist)
StateofHist = "toolbox01"
var stateObj = {info: StateofHist};
// history.pushState(stateObj, "neuerChronikEintrag", "https://transfer.hft-stuttgart.de/partizipation/weilimdorf/#/");
history.pushState(stateObj, "neuerChronikEintrag", "http://localhost:8083/");
}
function histStart() {
// StateofHist = "intro01"
}
function histInfo() {
// StateofHist = "intro01"
}
function histProjekt() {
// StateofHist = "project01"
}
function histExpert() {
// StateofHist = "toolbox01"
}
jQuery(document).ready(function() {
var $ = jQuery;
//--------------------------------------------------------------------------
// handle history.back functionality in event
// replace html and set active menu to restore dynamic made changes on page
//--------------------------------------------------------------------------
window.addEventListener('popstate', function(event) {
console.log(event.state)
if (event.state !== null && event.state !== undefined) {
// alert(event.state.info)
if (event.state.info == "start01"){
activateStoryFrame("1")
console.log("start01_a")
} else if (event.state.info == "info01"){
activateStoryFrame("2")
console.log("info01_a")
} else if (event.state.info == "project01"){
activateStoryFrame("3")
console.log("project01_a")
} else if (event.state.info == "toolbox01") {
activateStoryFrame("4")
console.log("toolbox01_a")
} else {
activateStoryFrame("1")
}
}
});
});
function activateStoryFrame(pageN){
if (pageN == "1"){
......@@ -120,36 +9,80 @@ var StateofHist = "start01"
$("#story-frame").removeClass("tour");
$("#story-frame").addClass("startscreen");
$("#balloon-startscreen").attr('style',"display:'block'!important");
// $("#navi").attr('style',"display:'none'!important");
// // $("#einlPO1").css('display') = 'block'
// 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";
} else if(pageN == "2"){
// var button = document.getElementById("tourstart-btn");
// button.click();
startStory();
Introshow();
setpositionVAR(false);
zoomto('IntroProj');
zoomtop('IntroProj');
} else if(pageN == "3"){
// var button = document.getElementById("btn_intro02");
// button.click();
zoomto('ProjektePage');
zoomtop('ProjektePage');
Projektshow();
} else if(pageN == "4"){
// var button = document.getElementById("btn_expert");
// button.click();
removebuildings();
addcont('main_bock');
addcont('main_heatdem');
addcont('main_nordbstuff');
Expert();
setpositionVAR(false);
zoomto('Expertenmodus');
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')
}
}
\ No newline at end of file
}
//-------------------------------------
// 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/templates/custom.js
View file @ a40ee9a9
......@@ -865,7 +865,7 @@ function Expert() {
function zoomto(where){
function zoomtop(where){
document.getElementById(where).scrollIntoView();
}
......
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