Merge pull request #48 from intersystems/more-boostrap4-compatibility-fixes

Popper version downgrade

Author: isc-tleavitt

csp/gitprojectsettings.csp

@@ -71,7 +71,7 @@ hr {
         <h3>Settings for namespace #(..EscapeHTML(namespace))#</h3><br/>
 
         <div class="form-group row mb-3">
-            <label for="gitBinPath" class="col-sm-3 col-form-label" data-toggle="tooltip" title="Absolute path to the Git executable">Path to git.exe</label>
+            <label for="gitBinPath" class="col-sm-3 col-form-label"  data-toggle="tooltip" data-placement="top" title="Absolute path to the Git executable">Path to git.exe</label>
             <div class="col-sm-7">
                 <input type="text" class="form-control" id="gitBinPath" name="gitBinPath" value='#(..EscapeHTML(settings.gitBinPath))#' placeholder="(e.g. C:\Program Files\Git\bin\git.exe)">
                 <csp:if condition='$D(%request.Data("gitsettings",1)) && (##class(SourceControl.Git.Utils).GitBinExists()=0)'>
@@ -81,22 +81,22 @@ hr {
         </div>
 
         <div class="form-group row mb-3">
-            <label for="namespaceTemp" class="col-sm-3 col-form-label" data-toggle="tooltip" title="Absolute path to you project">Temp folder for this namespace<br/></label>
+            <label for="namespaceTemp" class="col-sm-3 col-form-label"  data-toggle="tooltip" data-placement="top" title="Absolute path to you project">Temp folder for this namespace<br/></label>
             <div class="col-sm-7">
                 <input type="text" class="form-control" id="namespaceTemp" name="namespaceTemp" value='#(..EscapeHTML(settings.namespaceTemp))#' placeholder="e.g. C:\someproj\"/>
             </div>
         </div>
 
         <div class="form-group row mb-3">
-            <label for="privateKeyFile" class="col-sm-3 col-form-label" data-toggle="tooltip" title="Absolute path to your private SSH key file">SSH Private Key File</label>
+            <label for="privateKeyFile" class="col-sm-3 col-form-label"  data-toggle="tooltip" data-placement="top" title="Absolute path to your private SSH key file">SSH Private Key File</label>
             <div class="col-sm-7">
                 <input type="text" class="form-control" id="privateKeyFile" name="privateKeyFile" value='#(..EscapeHTML(settings.privateKeyFile))#' placeholder="C:\Users\ExampleUser\.ssh\id_rsa"/>
 
             </div>
         </div>
 
         <div class="form-group row mb-3">
-            <label for="pullEventClass" class="col-sm-3 col-form-label" data-toggle="tooltip" title="Handler class for git pull">Pull Event Class</label>
+            <label for="pullEventClass" class="col-sm-3 col-form-label"  data-toggle="tooltip" data-placement="top" title="Handler class for git pull">Pull Event Class</label>
             <div class="col-sm-7">
                 <select class="form-control" id="pullEventClass" name="pullEventClass">
                     <option value="SourceControl.Git.PullEventHandler.Default" #($Case(settings.pullEventClass,"SourceControl.Git.PullEventHandler.Default":"selected",:""))#>Default</option>
@@ -107,7 +107,7 @@ hr {
 
         <div class="form-group row mb-3 mapping-input-group">
             <div class="col-sm-3">
-                <label for="MappingsPath" class="col-form-label" data-toggle="tooltip" title="Relative paths mapping the files in your project">Mappings</label>
+                <label for="MappingsPath" class="col-form-label"  data-toggle="tooltip" data-placement="top" title="Relative paths mapping the files in your project">Mappings</label>
                 <button type="button" class="btn btn-default btn-add" >
                 <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="#198754" class="bi bi-plus-circle-fill" viewBox="0 0 16 16">
                         <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM8.5 4.5a.5.5 0 0 0-1 0v3h-3a.5.5 0 0 0 0 1h3v3a.5.5 0 0 0 1 0v-3h3a.5.5 0 0 0 0-1h-3v-3z"></path>
@@ -162,14 +162,14 @@ hr {
         <br/><br/><br/>
 
         <div class="form-group row mb-3">
-            <label for="gitUserName" class="col-sm-3 col-form-label" data-toggle="tooltip" title="Firstname Lastname">Git Committer Name </label>
+            <label for="gitUserName" class="col-sm-3 col-form-label"  data-toggle="tooltip" data-placement="top" title="Firstname Lastname">Git Committer Name </label>
             <div class="col-sm-7">
                 <input type="text" class="form-control" id="gitUserName" name="gitUserName" value='#(..EscapeHTML(settings.gitUserName))#'/>
             </div>
         </div>
 
         <div class="form-group row mb-3">
-            <label for="gitUserEmail" class="col-sm-3 col-form-label" data-toggle="tooltip" title="<git-username-on-remote>@remote.com">Git Committer Email </label>
+            <label for="gitUserEmail" class="col-sm-3 col-form-label"  data-toggle="tooltip" data-placement="top" title="<git-username-on-remote>@remote.com">Git Committer Email </label>
             <div class="col-sm-7">
                 <input type="email" class="form-control" id="gitUserEmail" name="gitUserEmail" value='#(..EscapeHTML(settings.gitUserEmail))#'/>
             </div>

git-webui/Gruntfile.js

@@ -24,7 +24,7 @@ module.exports = function(grunt) {
             popperjs: {
                 expand: true,
                 flatten: true,
-                src: 'node_modules/@popperjs/core/dist/umd/popper.min.js',
+                src: 'node_modules/popper.js/dist/umd/popper.min.js',
                 dest: 'dist/share/git-webui/webui/js/',
             },
             git_webui: {

git-webui/package.json

@@ -24,8 +24,8 @@
     "grunt-contrib-watch": "^1.1.0"
   },
   "dependencies": {
-    "@popperjs/core": "^2.10.2",
-    "bootstrap": "^4.6.0",
-    "jquery": "^3.6.0"
+    "jquery": "^3.5.1",
+    "popper.js": "^1.16.1-lts",
+    "bootstrap": "^4.6.0"    
   }
 }