From 3f80ca926b3a442fb3bdeec2be638b11aa079ab1 Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Fri, 26 Jun 2020 09:02:27 +0000
Subject: [PATCH 1/2] Update footer.php- removed conflicting bootstrap script
definition
---
mymodule/themes/fancytheme/default/includes/footer.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/mymodule/themes/fancytheme/default/includes/footer.php b/mymodule/themes/fancytheme/default/includes/footer.php
index 36b75fc..f9da9a2 100644
--- 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>
--
GitLab
From f5a7267a3cbd4b27d8ccb5abbe8547738d4aa3c7 Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Fri, 26 Jun 2020 09:04:18 +0000
Subject: [PATCH 2/2] Update header.php - removed conflicting bootstrap
definition
---
mymodule/themes/fancytheme/default/includes/header.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mymodule/themes/fancytheme/default/includes/header.php b/mymodule/themes/fancytheme/default/includes/header.php
index 4bc0060..150b0ff 100644
--- 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)) {
--
GitLab