Merge pull request #1428 from OpenGeoscience/bootstrap-5

docs: Switch to bootstrap 5, keeping bootstrap 3 css

Author: manthey

examples/annotations/index.pug

@@ -60,7 +60,7 @@ block append mainContent
     .modal-dialog
       form.modal-content
         .modal-header
-          button.close(type='button', data-dismiss='modal') ×
+          button.close(type='button', data-bs-dismiss='modal') ×
           h4.modal-title Edit Annotation
         .modal-body
           .row
@@ -196,4 +196,4 @@ block append mainContent
             #edit-validation-error
         .modal-footer
           button.btn.btn-sm.btn-primary#edit-update(type='submit') Update
-          button.btn.btn-sm.btn-secondary(data-dismiss='modal') Cancel
+          button.btn.btn-sm.btn-secondary(data-bs-dismiss='modal') Cancel

examples/annotations/main.js

@@ -1,4 +1,4 @@
-/* globals $, geo, utils */
+/* globals $, geo, utils, bootstrap */
 
 var annotationDebug = {};
 
@@ -489,7 +489,7 @@ function show_edit_dialog(id) {
   dlg.one('shown.bs.modal', function () {
     $('[option="name"]', dlg).focus();
   });
-  dlg.modal();
+  new bootstrap.Modal(dlg[0]).show();
 }
 
 /**

examples/common/index.pug

@@ -18,7 +18,7 @@ html(lang="en")
       nav.navbar.navbar-default(role="navigation")
         .container-fluid
           .navbar-header
-            button.navbar-toggle(type="button", data-toggle="collapse", data-target="gj-navbar-collapse")
+            button.navbar-toggle(type="button", data-bs-toggle="collapse", data-bs-target="gj-navbar-collapse")
               span.sr-only Toggle navigation
               span.icon-bar
               span.icon-bar
@@ -44,7 +44,7 @@ html(lang="en")
                       | Source
               if !about.hidden
                 li
-                  a.gj-show-about-link(href="#", data-toggle="modal", data-target="#about-modal")
+                  a.gj-show-about-link(href="#", data-bs-toggle="modal", data-bs-target="#about-modal")
                     | About
 
       if ! about.hidden
@@ -58,7 +58,7 @@ html(lang="en")
                 p.text-left !{about.text}
                 p.text-right © Kitware, Inc.
               .modal-footer
-                button.btn.btn-primary(data-dismiss="modal", data-target="#about-modal") Close
+                button.btn.btn-primary(data-bs-dismiss="modal") Close
 
     // Add the default main content element
     block mainContent

examples/index.js

@@ -2,9 +2,10 @@ require('../src/vendor');
 window.geo = require('../src/index');
 
 // bootstrap and themes
-require('bootstrap/dist/css/bootstrap.css');
-require('bootswatch/flatly/bootstrap.css');
-require('bootstrap');
+require('../website/legacycss/bootstrap3.min.css');
+require('../website/legacycss/bootswatch_flatly3.min.css');
+require('@fontsource/lato');
+window.bootstrap = require('bootstrap/dist/js/bootstrap.bundle');
 
 // codemirror and plugins
 window.jsonlint = require('jsonlint-mod');

examples/index.pug

@@ -14,7 +14,7 @@ mixin thumbnail(ex)
 block prepend headerButtons
   ul.nav.navbar-nav.navbar-right
     li.dropdown
-      a.dropdown-toggle(href="#", data-toggle="dropdown") Resources
+      a.dropdown-toggle(href="#", data-bs-toggle="dropdown") Resources
         span.caret
       ul.dropdown-menu(role="menu")
         li

examples/layerEvents/index.pug

@@ -1,4 +1,4 @@
 extends ../common/index.pug
 
 block append mainContent
-  button.btn.btn-default.layer-toggle(type="button", data-toggle="button")
+  button.btn.btn-default.layer-toggle(type="button", data-bs-toggle="button")

examples/measure/index.pug

@@ -64,7 +64,7 @@ block append mainContent
     .modal-dialog
       form.modal-content
         .modal-header
-          button.close(type='button', data-dismiss='modal') ×
+          button.close(type='button', data-bs-dismiss='modal') ×
           h4.modal-title Edit Annotation
         .modal-body
           .row
@@ -200,4 +200,4 @@ block append mainContent
             #edit-validation-error
         .modal-footer
           button.btn.btn-sm.btn-primary#edit-update(type='submit') Update
-          button.btn.btn-sm.btn-secondary(data-dismiss='modal') Cancel
+          button.btn.btn-sm.btn-secondary(data-bs-dismiss='modal') Cancel

examples/measure/main.js

@@ -1,4 +1,4 @@
-/* globals $, geo, utils */
+/* globals $, geo, utils, bootstrap */
 
 // This is extensively based on the Annotation example.
 
@@ -697,7 +697,7 @@ function show_edit_dialog(id) {
   dlg.one('shown.bs.modal', function () {
     $('[option="name"]', dlg).focus();
   });
-  dlg.modal();
+  new bootstrap.Modal(dlg[0]).show();
 }
 
 /**

examples/transitions/main.js

@@ -1,4 +1,4 @@
-/* globals $, d3, geo, utils */
+/* globals $, d3, geo, utils, bootstrap */
 
 // Run after the DOM loads
 $(function () {
@@ -101,7 +101,7 @@ $(function () {
       var modal = $(
         '<div class="modal fade"><div class="modal-dialog">' +
         '<div class="modal-content"><div class="modal-header">' +
-        '<button type="button" class="close" data-dismiss="modal">&times;' +
+        '<button type="button" class="close" data-bs-dismiss="modal">&times;' +
         '</button><h4 class="modal-title">Test Results</h4></div>' +
         '<div class="modal-body"/></div></div></div>'
       );
@@ -115,7 +115,7 @@ $(function () {
       };
       $('.modal-body', modal).append($('<div/>').text(
         JSON.stringify(report, undefined, 2)));
-      modal.modal();
+      new bootstrap.Modal(modal[0]).show();
     }, maxrepeat * list.length * 2250);
   });
 });