diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/css/bootstrap-grid.css b/css/bootstrap-grid.css old mode 100644 new mode 100755 diff --git a/css/bootstrap-grid.css.map b/css/bootstrap-grid.css.map old mode 100644 new mode 100755 diff --git a/css/bootstrap-grid.min.css b/css/bootstrap-grid.min.css old mode 100644 new mode 100755 diff --git a/css/bootstrap-grid.min.css.map b/css/bootstrap-grid.min.css.map old mode 100644 new mode 100755 diff --git a/css/bootstrap-reboot.css b/css/bootstrap-reboot.css old mode 100644 new mode 100755 diff --git a/css/bootstrap-reboot.css.map b/css/bootstrap-reboot.css.map old mode 100644 new mode 100755 diff --git a/css/bootstrap-reboot.min.css b/css/bootstrap-reboot.min.css old mode 100644 new mode 100755 diff --git a/css/bootstrap-reboot.min.css.map b/css/bootstrap-reboot.min.css.map old mode 100644 new mode 100755 diff --git a/css/bootstrap.css b/css/bootstrap.css old mode 100644 new mode 100755 diff --git a/css/bootstrap.css.map b/css/bootstrap.css.map old mode 100644 new mode 100755 diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css old mode 100644 new mode 100755 diff --git a/css/bootstrap.min.css.map b/css/bootstrap.min.css.map old mode 100644 new mode 100755 diff --git a/css/tv.css b/css/tv.css old mode 100644 new mode 100755 diff --git a/images/.DS_Store b/images/.DS_Store old mode 100644 new mode 100755 diff --git a/images/3DModell_Wermelskirchen_Startseite.jpg b/images/3DModell_Wermelskirchen_Startseite.jpg old mode 100644 new mode 100755 diff --git a/images/Lupe.png b/images/Lupe.png old mode 100644 new mode 100755 diff --git a/images/Lupe_grau.png b/images/Lupe_grau.png old mode 100644 new mode 100755 diff --git a/images/M4_LAB_LOGO_TV_1.jpg b/images/M4_LAB_LOGO_TV_1.jpg old mode 100644 new mode 100755 diff --git a/images/M4_LAB_LOGO_TV_2.jpg b/images/M4_LAB_LOGO_TV_2.jpg old mode 100644 new mode 100755 diff --git a/images/M4_LAB_LOGO_TV_3.jpg b/images/M4_LAB_LOGO_TV_3.jpg old mode 100644 new mode 100755 diff --git a/images/M4_LAB_LOGO_TV_4.jpg b/images/M4_LAB_LOGO_TV_4.jpg old mode 100644 new mode 100755 diff --git a/images/M4_LAB_Projekt/.DS_Store b/images/M4_LAB_Projekt/.DS_Store old mode 100644 new mode 100755 diff --git a/images/M4_LAB_Projekt/BOX-gif.gif b/images/M4_LAB_Projekt/BOX-gif.gif old mode 100644 new mode 100755 diff --git a/images/M4_LAB_Projekt/bbf_logo.png b/images/M4_LAB_Projekt/bbf_logo.png old mode 100644 new mode 100755 diff --git a/images/M4_LAB_Projekt/ihs_logo.jpg b/images/M4_LAB_Projekt/ihs_logo.jpg old mode 100644 new mode 100755 diff --git a/images/M4_LAB_Projekt/transferstrategie.pdf b/images/M4_LAB_Projekt/transferstrategie.pdf old mode 100644 new mode 100755 diff --git a/images/M4_LAB_Vision.gif b/images/M4_LAB_Vision.gif old mode 100644 new mode 100755 diff --git a/images/SmartPollen_Projekt/JoeSanthanavanich_PatrickWuerstle_Group.jpg b/images/SmartPollen_Projekt/JoeSanthanavanich_PatrickWuerstle_Group.jpg old mode 100644 new mode 100755 diff --git a/images/SmartPollen_Projekt/JoeSanthanavanich_PatrickWuerstle_Group_web.jpg b/images/SmartPollen_Projekt/JoeSanthanavanich_PatrickWuerstle_Group_web.jpg old mode 100644 new mode 100755 diff --git a/images/SmartPollen_Projekt/PatrickHogan_PatrickWuerstle_JoeSanthanavanich_MikkoJaervilehto_CollaborationAward.jpg b/images/SmartPollen_Projekt/PatrickHogan_PatrickWuerstle_JoeSanthanavanich_MikkoJaervilehto_CollaborationAward.jpg old mode 100644 new mode 100755 diff --git a/images/SmartPollen_Projekt/PatrickHogan_PatrickWuerstle_JoeSanthanavanich_MikkoJaervilehto_CollaborationAward_web.jpg b/images/SmartPollen_Projekt/PatrickHogan_PatrickWuerstle_JoeSanthanavanich_MikkoJaervilehto_CollaborationAward_web.jpg old mode 100644 new mode 100755 diff --git a/images/SmartPollen_Projekt/PatrickWuerstle_JoeSanthanavanich_Pitch.jpg b/images/SmartPollen_Projekt/PatrickWuerstle_JoeSanthanavanich_Pitch.jpg old mode 100644 new mode 100755 diff --git a/images/SmartPollen_Projekt/PatrickWuerstle_JoeSanthanavanich_Pitch_web.jpg b/images/SmartPollen_Projekt/PatrickWuerstle_JoeSanthanavanich_Pitch_web.jpg old mode 100644 new mode 100755 diff --git a/images/SmartPollen_Projekt/SmartPollenM2GIF.gif b/images/SmartPollen_Projekt/SmartPollenM2GIF.gif old mode 100644 new mode 100755 diff --git a/images/SmartPollen_Projekt/SmartPollen_Logo.png b/images/SmartPollen_Projekt/SmartPollen_Logo.png old mode 100644 new mode 100755 diff --git a/images/SmartPollen_Projekt/SmartPollen_Projektbeschreibung.docx b/images/SmartPollen_Projekt/SmartPollen_Projektbeschreibung.docx old mode 100644 new mode 100755 diff --git a/images/SmartPollen_Projekt/VolkerCoors_JoeSanthanavanich_PatrickWuerstle_Group.jpg b/images/SmartPollen_Projekt/VolkerCoors_JoeSanthanavanich_PatrickWuerstle_Group.jpg old mode 100644 new mode 100755 diff --git a/images/SmartPollen_Projekt/VolkerCoors_JoeSanthanavanich_PatrickWuerstle_Group_web.jpg b/images/SmartPollen_Projekt/VolkerCoors_JoeSanthanavanich_PatrickWuerstle_Group_web.jpg old mode 100644 new mode 100755 diff --git a/images/SmartPollen_Projekt/~$artPollen_Projektbeschreibung.docx b/images/SmartPollen_Projekt/~$artPollen_Projektbeschreibung.docx old mode 100644 new mode 100755 diff --git a/images/arrow.gif b/images/arrow.gif old mode 100644 new mode 100755 diff --git a/images/demo/.DS_Store b/images/demo/.DS_Store old mode 100644 new mode 100755 diff --git a/images/demo/130x130.gif b/images/demo/130x130.gif old mode 100644 new mode 100755 diff --git a/images/demo/630x300.gif b/images/demo/630x300.gif old mode 100644 new mode 100755 diff --git a/images/demo/bbf_logo.png b/images/demo/bbf_logo.png old mode 100644 new mode 100755 diff --git a/images/demo/f_logo.png b/images/demo/f_logo.png old mode 100644 new mode 100755 diff --git a/images/demo/hft_logo.jpg b/images/demo/hft_logo.jpg old mode 100644 new mode 100755 diff --git a/images/demo/i_logo.png b/images/demo/i_logo.png old mode 100644 new mode 100755 diff --git a/images/demo/ihs_logo.jpg b/images/demo/ihs_logo.jpg old mode 100644 new mode 100755 diff --git a/images/demo/m4lab_logo.jpg b/images/demo/m4lab_logo.jpg old mode 100644 new mode 100755 diff --git a/images/demo/map_logo.png b/images/demo/map_logo.png old mode 100644 new mode 100755 diff --git a/images/demo/search_logo.png b/images/demo/search_logo.png old mode 100644 new mode 100755 diff --git a/images/demo/t_logo.png b/images/demo/t_logo.png old mode 100644 new mode 100755 diff --git a/images/demo/y_logo.png b/images/demo/y_logo.png old mode 100644 new mode 100755 diff --git a/includes/.DS_Store b/includes/.DS_Store old mode 100644 new mode 100755 diff --git a/includes/footer.php b/includes/footer.php old mode 100644 new mode 100755 diff --git a/includes/header.php b/includes/header.php old mode 100644 new mode 100755 diff --git a/index.html b/index.html old mode 100644 new mode 100755 diff --git a/index.php b/index.php old mode 100644 new mode 100755 diff --git a/index_Projektseite_M4_LAB.html b/index_Projektseite_M4_LAB.html old mode 100644 new mode 100755 diff --git a/index_Projektseite_SmartPollen.html b/index_Projektseite_SmartPollen.html old mode 100644 new mode 100755 diff --git a/index_Projektseite_agqual3d.html b/index_Projektseite_agqual3d.html old mode 100644 new mode 100755 diff --git a/js/.DS_Store b/js/.DS_Store old mode 100644 new mode 100755 diff --git a/js/bootstrap.bundle.js b/js/bootstrap.bundle.js old mode 100644 new mode 100755 diff --git a/js/bootstrap.bundle.js.map b/js/bootstrap.bundle.js.map old mode 100644 new mode 100755 diff --git a/js/bootstrap.bundle.min.js b/js/bootstrap.bundle.min.js old mode 100644 new mode 100755 diff --git a/js/bootstrap.bundle.min.js.map b/js/bootstrap.bundle.min.js.map old mode 100644 new mode 100755 diff --git a/js/bootstrap.js b/js/bootstrap.js old mode 100644 new mode 100755 diff --git a/js/bootstrap.js.map b/js/bootstrap.js.map old mode 100644 new mode 100755 diff --git a/js/bootstrap.min.js b/js/bootstrap.min.js old mode 100644 new mode 100755 diff --git a/js/bootstrap.min.js.map b/js/bootstrap.min.js.map old mode 100644 new mode 100755 diff --git a/js/headfoot.js b/js/headfoot.js old mode 100644 new mode 100755 index a238337831857b03d504e456100183aa6f513571..506744d09bd851134206643360cce2ca098a7f73 --- a/js/headfoot.js +++ b/js/headfoot.js @@ -1,4 +1,4 @@ -var menu = [{'name':'Informationen', 'combos':[{'name':'Projekte', 'link':'./project'}, {'name':'Über das M4_LAB', 'link':'./index_Projektseite_M4_LAB.html'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'#'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'...', 'link':'#'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},{'name':'Bürgerbeteiligung', 'combos':[{'name':'...', 'link':'#'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},{'name':'Login', 'combos':[], 'type':'', 'link':'./user/login'}]; +var menu = [{'name':'Informationen', 'combos':[{'name':'Projekte', 'link':'/project'}, {'name':'Über das M4_LAB', 'link':'/index_Projektseite_M4_LAB.html'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'#'},{'name':'Videokonferenzen', 'link':'/videoconference.html'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'...', 'link':'#'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},{'name':'Bürgerbeteiligung', 'combos':[{'name':'...', 'link':'#'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},{'name':'Login', 'combos':[], 'type':'', 'link':'/user/login'}]; var hft_links = [{'url':'#', 'name':'Kontakt'},{'url':'#', 'name':'Impressum'},{'url':'#', 'name':'Datenschutz'}] @@ -41,7 +41,7 @@ function head(){ navelements.id="navelemente"; let logos = document.createElement('li'); let link_m4lab = document.createElement('a'); - link_m4lab.href = "https://transfer.hft-stuttgart.de/"; + link_m4lab.href = "/"; link_m4lab.innerHTML = "<img src='images/demo/m4lab_logo.jpg' alt='Logo Innovationslabor M4_LAB'>"; logos.appendChild(link_m4lab); navelements.appendChild(logos); diff --git a/js/landing.js b/js/landing.js old mode 100644 new mode 100755 diff --git a/videoconference.html b/videoconference.html new file mode 100755 index 0000000000000000000000000000000000000000..eae525a38544941ff72c1d0d2027b34407267352 --- /dev/null +++ b/videoconference.html @@ -0,0 +1,71 @@ +<!DOCTYPE html> +<html lang="en" dir="ltr"> +<head> +<title>Transferportal M4_LAB HFT STUTTGART</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="css/bootstrap.css" type="text/css"> +<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous"> + + +<style> +.collapse {display: none;} +.collapse.in {display: block;} +.collapsing {position: relative;height: 0;overflow: hidden;-webkit-transition-timing-function: ease;-o-transition-timing-function: ease;transition-timing-function: ease;-webkit-transition-duration: .35s;-o-transition-duration: .35s;transition-duration: .35s;-webkit-transition-property: height,visibility;-o-transition-property: height,visibility;transition-property: height,visibility;} +</style> + +</head> + + +<body> + +<!-- content --> + + +<!-- The flexible grid (content) --> +<div class="flex-container"> + <div class="main"> + <h1>Videokonferenzen</h1> + + <h2> Jitsi </h2> + <p> <a href="https://jitsi.org">Jitsi</a> ist ein Opensource Videokonferenz-System, welches es jedermann ermöglicht, direkt aus dem Browser heraus Videokonferenzen abzuhalten.</p> + + <p> Da die Hauptlast bei diesem System Clientseitig getragen wird, raten wir zu einer Nutzung auf Desktopsystemen bzw. Laptops. </p> + + <p> Um eine Videokonferenz starten zu können, muss der Organisator sich zunächst am System anmelden. Weitere Teilnehmer können dann ohne Anmeldung einfach über einen Link hinzugefügt werden. </p> + + <p> Der Zugang zu Jitsi befindet sich <a href="/jitsi/">hier</a> + + + <h2> GoToMeeting </h2> + <p> Eine weitere Option, die wir anbieten werden, ist die Organisation von Videokonferenzen via GoToMeeting</p> + <p> Mehr Informationen darüber erhalten Sie zu gegebener Zeit an dieser Stelle </p> + + + + </div> + +</div> + + + + + +<!-- main content --> + + <!-- ########################################################################################## --> + <!-- ########################################################################################## --> + <!-- ########################################################################################## --> + <!-- ########################################################################################## --> + + + <!-- / content body --> + </div> +</div> + + +<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script> +<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script> +<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script> +<script src="./js/headfoot.js"></script> +</body> +</html>