Merge branch 'prepare_prod' into 'master'

deploy to production

See merge request !143

js/generalFunction.js

@@ -6,4 +6,33 @@ function checkPasswordReq(pwd) {
         isBest = true;
     }
     return isBest
-}
+}
\ No newline at end of file
+
+// to get the queries of the URL
+function getQueryStringParams(params, url) {
+    // first decode URL to get readable data
+    var href = decodeURIComponent(url || window.location.href);
+    // regular expression to get value
+    var regEx = new RegExp('[?&]' + params + '=([^&#]*)', 'i');
+    var value = regEx.exec(href);
+    // return the value if exist
+    return value ? value[1] : null;
+}
+
+/**  GO TO TOP Button **/
+//Get the button:
+var myTopBtn = document.getElementById("topBtn");
+// When the user scrolls down 20px from the top of the document, show the button
+window.onscroll = function() { scrollFunction() };
+function scrollFunction() {
+    if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {
+        myTopBtn.style.display = "block";
+    } else {
+        myTopBtn.style.display = "none";
+    }
+}
+// When the user clicks on the button, scroll to the top of the document
+function topFunction() {
+    document.body.scrollTop = 0; // For Safari
+    document.documentElement.scrollTop = 0; // For Chrome, Firefox, IE and Opera
+} 
\ No newline at end of file

js/headfoot.js

-var menu = [{'name':'Informationen', 'combos':[{'name':'Über das M4_LAB', 'link':'/projectoverview?projectID=1'},{'name':'Kontakt', 'link':'/account/contact'}], 'type':'dropdown', 'link':'#'},{'name':'Projekte', 'combos':[{'name':'Projektinformationen', 'link':'/projektinformationen'},{'name':'Projektcode und -daten', 'link':'/projektdaten'},{'name':'High-Performance Computing', 'link':'/info_hpc.html'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'/mailinglists'},{'name':'Videokonferenzen', 'link':'/videoconference.html'},{'name':'Wissensaustausch', 'link':'/confluence.html'},{'name':'Aufgabenmanagement', 'link':'/jira.html'},{'name':'Dateibearbeitung', 'link':'/bwcloud.html'}], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/'},{'name':'Veranstaltungen der HfT Forschung', 'link':'https://www.hft-stuttgart.de/forschung/veranstaltungen'}], 'type':'dropdown', 'link':'#'},{'name':'Bürgerbeteiligung', 'combos':[{'name':'Infos zur Bürgerbeteiligung', 'link':'/info_partizipation.html'},{'name':'Zum M4_Lab Showcase', 'link':'/partizipation/'}], 'type':'dropdown', 'link':'#'},{'name':'<i class="fa fa-question-circle" aria-hidden="true"></i>', 'combos': [], 'type':'', 'link':'/help/'},{'name':'<i class="fa fa-user-circle" aria-hidden="true"></i>', 'combos': [], 'type':'', 'link':'/account/'}];
+var menu = [{'name':'Informationen', 'combos':[{'name':'Über das M4_LAB', 'link':'/projectoverview?projectID=1'},{'name':'Kontakt', 'link':'/account/contact'}], 'type':'dropdown', 'link':'#'},{'name':'Projekte', 'combos':[{'name':'Projektinformationen', 'link':'/projektinformationen'},{'name':'Projektcode und -daten', 'link':'/projektdaten'},{'name':'High-Performance Computing', 'link':'/info_hpc.html'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'/mailinglists'},{'name':'Videokonferenzen', 'link':'/videoconference.html'},{'name':'Wissensaustausch', 'link':'/confluence.html'},{'name':'Aufgabenmanagement', 'link':'/jira.html'},{'name':'Dateibearbeitung', 'link':'/bwcloud.html'}], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/'},{'name':'Veranstaltungen der HfT Forschung', 'link':'https://www.hft-stuttgart.de/forschung/veranstaltungen'}], 'type':'dropdown', 'link':'#'},{'name':'Beteiligungsplattform', 'combos':[{'name':'Informationen', 'link':'/info_partizipation.html'},{'name':'Zum M4_Lab Showcase', 'link':'/partizipation/'}], 'type':'dropdown', 'link':'#'},{'name':'<i class="fa fa-question-circle" aria-hidden="true"></i> Hilfe', 'combos': [], 'type':'', 'link':'/help/'},{'name':'<i class="fa fa-user-circle" aria-hidden="true"></i> Konto', 'combos': [], 'type':'', 'link':'/account/'}];
 
 
 var hft_links = [{'url':'/account/contact', 'name':'Kontakt'},{'url':'https://www.hft-stuttgart.de/impressum', 'name':'Impressum'},{'url':'https://www.hft-stuttgart.de/datenschutz', 'name':'Datenschutz'}]
@@ -68,16 +68,37 @@ function head() {
     let togglebutton = document.createElement('button');
     togglebutton.classList.add("navbar-toggler")
     togglebutton.type = "button";
-    togglebutton.setAttribute("data-toggle", "collapse");
-    togglebutton.setAttribute("data-target", "#navbarCollapse");
+    // togglebutton.setAttribute("data-toggle", "collapse");
+    togglebutton.setAttribute("data-target", "#mainNav");
     togglebutton.setAttribute("aria-controls", "navbarCollapse");
     togglebutton.setAttribute("aria-expanded", "false");
     togglebutton.setAttribute("aria-label", "Toggle navigation");
     togglebutton.innerHTML = "<span class='navbar-toggler-icon'></span>";
+
+    // main nav
+    let mainNav = document.createElement('div');
+    mainNav.setAttribute("id", "mainNav");
+    mainNav.classList.add("navbar-collapse");
+
+    // offcanvasHeader
+    let offcanvasHeader = document.createElement('div');
+    offcanvasHeader.classList.add("offcanvas-header", "mt-3");
+
+    // close button
+    let closeButton = document.createElement('button');
+    closeButton.classList.add("btn", "btn-outline-danger", "btn-close", "float-right");
+    closeButton.innerHTML = "&times Schließen";
+
+    // offcanvas title
+    let offcanvasTitle = document.createElement('h5');
+    offcanvasTitle.classList.add("py-2");
+    offcanvasTitle.innerHTML = "Hauptnavigation";
+
     // nav menu
     let navelements = document.createElement('ul');
-    navelements.id="navbarCollapse";
-    navelements.classList.add("collapse", "nav", "navbar-collapse", "navbar-nav", "justify-content-end");
+    // navelements.id="navbarCollapse";
+    // navelements.classList.add("collapse", "nav", "navbar-collapse", "navbar-nav", "justify-content-end");
+    navelements.classList.add("nav", "navbar-nav", "justify-content-end");
     for(let j = 0; j<menu.length; j++){
         let headitem = document.createElement('li');
         let itemtype = menu[j].type;
@@ -108,6 +129,9 @@ function head() {
                 combolink.classList.add("dropdown-item");
                 combolink.href = menu[j].combos[k].link;
                 combolink.innerHTML = menu[j].combos[k].name;
+                if(menu[j].name == "Zusammenarbeit"){
+                    combolink.setAttribute("target", "_blank");
+                } 
                 combodiv.appendChild(combolink);
             }
             headitem.appendChild(combodiv);
@@ -118,7 +142,11 @@ function head() {
 
     navbarcontainer.appendChild(navbarheader);
     navbarcontainer.appendChild(togglebutton);
-    navbarcontainer.appendChild(navelements);
+    offcanvasHeader.appendChild(closeButton);
+    offcanvasHeader.appendChild(offcanvasTitle);
+    mainNav.appendChild(offcanvasHeader);
+    mainNav.appendChild(navelements);
+    navbarcontainer.appendChild(mainNav);
     navbar.appendChild(navbarcontainer)
 
     navheader.appendChild(navbar);
@@ -206,11 +234,36 @@ function foot() {
     containerdivrow.appendChild(m4labgrau);
     containerdivrow.appendChild(socialdiv);
     containerdivrow.appendChild(contactdiv);
-
+    
     containerdiv.appendChild(containerdivrow);
     footerdiv.appendChild(containerdiv);
+    
+    // cookiebanner
+    let cookiediv = document.createElement("div");
+    cookiediv.classList.add("alert", "alert-info", "alert-dismissible", "hidden", "cookie-banner" );
+    cookiediv.style = "text-align:center;";
+    cookiediv.id="cookiediv";
+    cookiediv.innerHTML="<strong>Cookie-Benachrichtigung</strong><br/> Diese Webseite nutzt technisch notwendige Session-Cookies und gegebenenfalls Cookies zur Authentifizierung. Mit der Benutzung der Webseite erklären Sie sich damit einverstanden. <br/> Weitere Informationen finden Sie in unserer <a href='https://www.hft-stuttgart.de/datenschutz'> Datenschutzerklärung </a>"
+    let cookiebutton = document.createElement("button");
+    cookiebutton.type = "button";
+    cookiebutton.classList.add("close");
+    cookiebutton.setAttribute("data-dismiss", "alert");
+    cookiebutton.innerHTML = "&times;";
+    prependChild(cookiediv, cookiebutton);
+
+    footerdiv.appendChild(cookiediv);
+    
     document.body.appendChild(footerdiv);
 }
 
+function setCookieSeen(){
+    if (localStorage.getItem("cookieSeen") != "shown") {
+        document.getElementById("cookiediv").classList.remove("hidden");
+        document.getElementById("cookiediv").classList.add("show");
+        localStorage.setItem("cookieSeen","shown")
+    };
+}
+
 head();
 foot();
+setCookieSeen();

js/mobile.js

+
+// show offcanvas menu
+$(".navbar-toggler").on("click", function () {
+  $("#mainNav").toggleClass("show");
+  $('body').toggleClass("offcanvas-active");
+});
+
+// close if press ESC button 
+$(document).on('keydown', function (event) {
+  if (event.keyCode === 27) {
+    $(".navbar-collapse").removeClass("show");
+    $("body").removeClass("overlay-active");
+  }
+});
+
+// close button 
+$(".btn-close").click(function (e) {
+  $(".navbar-collapse").removeClass("show");
+  $("body").removeClass("offcanvas-active");
+});
\ No newline at end of file

videoconference.html

@@ -7,6 +7,7 @@
     <title>Videokonferenzen</title>
     <link rel="stylesheet" href="/css/bootstrap.min.css">
     <link rel="stylesheet" href="/css/m4lab.css">
+    <link rel="stylesheet" href="/css/m4lab-mobile.css">
     <link rel="stylesheet" href="/fonts/font-awesome.min.css">
     <link rel="stylesheet" href="/fonts/ionicons.min.css">
     <link rel="stylesheet" href="/css/Testimonials.css">
@@ -149,6 +150,7 @@
         integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
         crossorigin="anonymous"></script>
     <script src="/js/headfoot.js"></script>
+    <script src="/js/mobile.js"></script>
 </body>
 
 </html>