Merge branch 'MLAB-223' into 'testing'

Mlab 223 See merge request !26

Merge branch 'MLAB-223' into 'testing'
Mlab 223 See merge request !26
b07163e3 · Wolfgang Knopki · 8bba9e12 · f5a7267a · b07163e3 · b07163e3
Commit b07163e3 authored 4 years ago by Wolfgang Knopki
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- a/mymodule/themes/fancytheme/default/includes/footer.php
+++ b/mymodule/themes/fancytheme/default/includes/footer.php
@@ -6,7 +6,6 @@ if (!empty($this->data['htmlinject']['htmlContentPost'])) {
 }
 ?>

-    <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>



--- a/mymodule/themes/fancytheme/default/includes/header.php
+++ b/mymodule/themes/fancytheme/default/includes/header.php
@@ -51,7 +51,8 @@ header('X-Frame-Options: SAMEORIGIN');
 <link rel="stylesheet" type="text/css"  href="/css/Login-Form-Clean.css"/>
 <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous">
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+    
 <?php

 if (!empty($jquery)) {