Bootstrap 5

src/main/java/sirius/biz/analytics/explorer/TimeSeriesChartFactory.java

@@ -30,7 +30,7 @@
  */
 public abstract class TimeSeriesChartFactory<O> extends ChartFactory<O> {
 
-    private static final String[] ICONS = {"fas fa-chart-line", "fas fa-chart-area", "fas fa-chart-bar"};
+    private static final String[] ICONS = {"fa-solid fa-chart-line", "fa-solid fa-chart-area", "fa-solid fa-chart-bar"};
     private static final String OUTPUT_TYPE = "type";
     private static final String OUTPUT_LABELS = "labels";
     private static final String OUTPUT_RANGE = "range";

src/main/java/sirius/biz/analytics/reports/Cells.java

@@ -82,7 +82,7 @@ public Cell rightAligned(Object value) {
 
         return new Cell(Json.createObject()
                             .put(KEY_TYPE, CSSCellFormat.TYPE)
-                            .put(CSSCellFormat.KEY_CLASSES, "text-right")
+                            .put(CSSCellFormat.KEY_CLASSES, "text-end")
                             .put(CSSCellFormat.KEY_VALUE, NLS.toUserString(value)));
     }
 
@@ -170,7 +170,7 @@ public Cell colored(Amount value, @Nullable NumberFormat formatter) {
 
         return new Cell(Json.createObject()
                             .put(KEY_TYPE, CSSCellFormat.TYPE)
-                            .put(CSSCellFormat.KEY_CLASSES, "text-right " + color)
+                            .put(CSSCellFormat.KEY_CLASSES, "text-end " + color)
                             .put(CSSCellFormat.KEY_VALUE, safeFormat(value, formatter)));
     }
 
@@ -251,11 +251,11 @@ public Cell valueAndTrendIcon(Amount value, Amount comparisonValue, @Nullable Nu
             return of(safeFormat(value, formatter));
         }
 
-        String icon = "fa fa-arrow-right";
+        String icon = "fa-solid fa-arrow-right";
         if (delta.isPositive()) {
-            icon = "fa fa-arrow-up";
+            icon = "fa-solid fa-arrow-up";
         } else if (delta.isNegative()) {
-            icon = "fa fa-arrow-down";
+            icon = "fa-solid fa-arrow-down";
         }
 
         String color = computeCellColor(delta);

src/main/java/sirius/biz/analytics/reports/SparklineCellFormat.java

@@ -28,7 +28,7 @@ public String format(ObjectNode data) {
         String value = data.path(KEY_VALUE).asText();
         String values = data.path(KEY_VALUES).asText();
 
-        StringBuilder sb = new StringBuilder("<div class=\"text-right\">");
+        StringBuilder sb = new StringBuilder("<div class=\"text-end\">");
         sb.append(value);
         sb.append(" ");
         sb.append("<canvas width=\"40\" height=\"20\" class=\"sparkline-js\" data-sparkline=\"");

src/main/java/sirius/biz/analytics/reports/TrendCellFormat.java

@@ -36,7 +36,7 @@ public String format(ObjectNode data) {
         String hint = data.path(KEY_HINT).asText();
         String icon = data.path(KEY_ICON).asText();
 
-        StringBuilder sb = new StringBuilder("<div class=\"text-right\"");
+        StringBuilder sb = new StringBuilder("<div class=\"text-end\"");
         if (Strings.isFilled(hint)) {
             sb.append(" title=\"");
             sb.append(Strings.cleanup(hint, StringCleanup::escapeXml));

src/main/java/sirius/biz/codelists/LookupTableMessageExpander.java

@@ -33,7 +33,7 @@ public String expand(String message) {
             LookupTable table = lookupTables.fetchTable(tableName);
             return Strings.apply("""
                                          <span class="d-inline-flex flex-row align-items-baseline">
-                                             <i class="fa fa-bolt"></i><a class="pl-1" href="javascript:openLookupTable('%s')">%s</a>
+                                             <i class="fa-solid fa-bolt"></i><a class="ps-1" href="javascript:openLookupTable('%s')">%s</a>
                                          </span>
                                          """, tableName, table.getTitle());
         });

src/main/java/sirius/biz/jobs/batch/BatchProcessJobFactory.java

@@ -73,7 +73,7 @@ public abstract class BatchProcessJobFactory extends BasicJobFactory {
 
     @Override
     public String getIcon() {
-        return "fa fa-cogs";
+        return "fa-solid fa-cogs";
     }
 
     @Override

src/main/java/sirius/biz/jobs/batch/CheckBatchProcessFactory.java

@@ -33,8 +33,6 @@ protected Class<? extends DistributedTaskExecutor> getExecutor() {
 
     @Override
     public String getIcon() {
-        return "far fa-check-square";
+        return "fa-regular fa-check-square";
     }
-
-
 }

src/main/java/sirius/biz/jobs/batch/ExportBatchProcessFactory.java

@@ -39,7 +39,7 @@ protected Class<? extends DistributedTaskExecutor> getExecutor() {
 
     @Override
     public String getIcon() {
-        return "fa fa-download";
+        return "fa-solid fa-download";
     }
 
     @Override

src/main/java/sirius/biz/jobs/batch/ImportBatchProcessFactory.java

@@ -38,7 +38,7 @@ protected Class<? extends DistributedTaskExecutor> getExecutor() {
 
     @Override
     public String getIcon() {
-        return "fa fa-upload";
+        return "fa-solid fa-upload";
     }
 
     @Override

src/main/java/sirius/biz/jobs/batch/ReportBatchProcessFactory.java

@@ -35,6 +35,6 @@ protected Class<? extends DistributedTaskExecutor> getExecutor() {
 
     @Override
     public String getIcon() {
-        return "fas fa-chart-line";
+        return "fa-solid fa-chart-line";
     }
 }

src/main/java/sirius/biz/jobs/batch/SimpleReportBatchProcessFactory.java

@@ -30,6 +30,6 @@ protected PersistencePeriod getPersistencePeriod() {
 
     @Override
     public String getIcon() {
-        return "fas fa-chart-line";
+        return "fa-solid fa-chart-line";
     }
 }

src/main/java/sirius/biz/jobs/batch/file/LineBasedExportJobFactory.java

@@ -34,7 +34,6 @@ protected void collectAcceptedFileExtensions(Consumer<String> fileExtensionConsu
 
     @Override
     public String getIcon() {
-        return "far fa-file-excel";
+        return "fa-regular fa-file-excel";
     }
-
 }

src/main/java/sirius/biz/jobs/batch/file/LineBasedImportJobFactory.java

@@ -34,7 +34,7 @@ protected void collectAcceptedFileExtensions(Consumer<String> fileExtensionConsu
 
     @Override
     public String getIcon() {
-        return "far fa-file-excel";
+        return "fa-regular fa-file-excel";
     }
 
     @Override

src/main/java/sirius/biz/jobs/batch/file/XMLExportJobFactory.java

@@ -42,7 +42,7 @@ protected void collectAcceptedFileExtensions(Consumer<String> fileExtensionConsu
 
     @Override
     public String getIcon() {
-        return "fa fa-code";
+        return "fa-solid fa-code";
     }
 
     /**

src/main/java/sirius/biz/jobs/batch/file/XMLImportJobFactory.java

@@ -42,7 +42,7 @@ protected void collectAcceptedFileExtensions(Consumer<String> fileExtensionConsu
 
     @Override
     public String getIcon() {
-        return "fa fa-code";
+        return "fa-solid fa-code";
     }
 
     /**

src/main/java/sirius/biz/jobs/interactive/LinearChartJobFactory.java

@@ -39,7 +39,7 @@ public abstract class LinearChartJobFactory extends InteractiveJobFactory {
 
     @Override
     public String getIcon() {
-        return "fas fa-chart-area";
+        return "fa-solid fa-chart-area";
     }
 
     @Override

src/main/java/sirius/biz/jobs/interactive/PolarAreaChartJobFactory.java

@@ -15,7 +15,7 @@ public abstract class PolarAreaChartJobFactory extends SingleDatasetChartJobFact
 
     @Override
     public String getIcon() {
-        return "fas fa-chart-pie";
+        return "fa-solid fa-chart-pie";
     }
 
     @Override

src/main/java/sirius/biz/jobs/interactive/ReportJobFactory.java

@@ -28,7 +28,7 @@ public abstract class ReportJobFactory extends InteractiveJobFactory {
 
     @Override
     public String getIcon() {
-        return "fas fa-table";
+        return "fa-solid fa-table";
     }
 
     @Override

src/main/java/sirius/biz/process/output/ChartProcessOutputType.java

@@ -48,7 +48,7 @@ public String getName() {
 
     @Override
     public String getIcon() {
-        return "fas fa-chart-line";
+        return "fa-solid fa-chart-line";
     }
 
     /**

src/main/java/sirius/biz/process/output/LogsProcessOutputType.java

@@ -51,7 +51,7 @@ public String getName() {
 
     @Override
     public String getIcon() {
-        return "fa fa-bars";
+        return "fa-solid fa-bars";
     }
 
     @Override

src/main/java/sirius/biz/process/output/ProcessOutput.java

@@ -65,15 +65,15 @@ public class ProcessOutput extends Nested {
 
     public String getIcon() {
         if (isSystemOutput()) {
-            return "fa fa-lock";
+            return "fa-solid fa-lock";
         }
         return typeToIcons.computeIfAbsent(type, this::computeIcon);
     }
 
     private String computeIcon(String outputType) {
         return Optional.of(globalContext.getPart(outputType, ProcessOutputType.class))
                        .map(ProcessOutputType::getIcon)
-                       .orElse("fa fa-bars");
+                       .orElse("fa-solid fa-bars");
     }
 
     /**

src/main/java/sirius/biz/process/output/TableProcessOutputType.java

@@ -59,7 +59,7 @@ public String getName() {
 
     @Override
     public String getIcon() {
-        return "fa fa-table";
+        return "fa-solid fa-table";
     }
 
     /**

src/main/java/sirius/biz/storage/layer3/ExtractArchiveJob.java

@@ -246,7 +246,7 @@ protected void collectFilesToLock(Map<String, String> context, Consumer<VirtualF
 
     @Override
     public String getIcon() {
-        return "far fa-file-archive";
+        return "fa-regular fa-file-archive";
     }
 
     @Override

src/main/java/sirius/biz/storage/layer3/JobFileQuickActionProvider.java

@@ -56,7 +56,7 @@ public Stream<JobFactory> getAvailableJobs() {
     public void computeQuickAction(VirtualFile virtualFile, Consumer<QuickAction> consumer) {
         String uri = WebContext.getCurrent().getRequest().uri();
         getAvailableJobs().filter(jobFactory -> jobFactory.generatePresetUrl(uri, virtualFile) != null)
-                          .forEach(jobFactory -> consumer.accept(new QuickAction().withIcon("fa fa-cogs")
+                          .forEach(jobFactory -> consumer.accept(new QuickAction().withIcon("fa-solid fa-cogs")
                                                                                   .withLabel(jobFactory.getLabel())
                                                                                   .withUrl(jobFactory.generatePresetUrl(
                                                                                           uri,

src/main/java/sirius/biz/storage/layer3/TransferFilesJob.java

@@ -89,7 +89,7 @@ public String toString() {
 
     @Override
     public String getIcon() {
-        return "far fa-copy";
+        return "fa-regular fa-copy";
     }
 
     @Override

src/main/java/sirius/biz/tycho/kb/KnowledgeBaseMessageExpander.java

@@ -34,7 +34,7 @@ public String expand(String message) {
             return knowledgeBase.resolve(NLS.getCurrentLanguage(), match.group(2), false).map(kba -> {
                 return match.group(1) + Strings.apply("""
                                                               <span class="d-inline-flex flex-row align-items-baseline">
-                                                                  <i class="fa fa-lightbulb"></i><a class="pl-1" href="/kba/%s/%s">%s</a>
+                                                                  <i class="fa-solid fa-lightbulb"></i><a class="ps-1" href="/kba/%s/%s">%s</a>
                                                               </span>
                                                               """,
                                                       kba.getLanguage(),
@@ -46,7 +46,7 @@ public String expand(String message) {
             return knowledgeBase.resolve(NLS.getCurrentLanguage(), match.group(1), true).map(kba -> {
                 return Strings.apply("""
                                              <span class="d-inline-flex flex-row align-items-baseline">
-                                                 <i class="fa fa-lightbulb"></i><a class="pl-1" href="/kba/%s/%s">%s</a>
+                                                 <i class="fa-solid fa-lightbulb"></i><a class="ps-1" href="/kba/%s/%s">%s</a>
                                              </span>
                                              """, kba.getLanguage(), kba.getArticleId(), kba.getTitle());
             }).orElse("kba:" + match.group());

src/main/java/sirius/biz/tycho/kb/OpenKbaLogHandler.java

@@ -50,7 +50,7 @@ public String formatMessage(ProcessLog log) {
     public List<ProcessLogAction> getActions(ProcessLog log) {
         return resolveArticleId(log).map(article -> {
             ProcessLogAction action = new ProcessLogAction(log, ACTION_OPEN_ARTICLE).withLabel(article.getTitle())
-                                                                                    .withIcon("fa fa-lightbulb");
+                                                                                    .withIcon("fa-solid fa-lightbulb");
             return Collections.singletonList(action);
         }).orElse(Collections.emptyList());
     }

src/main/java/sirius/biz/tycho/smart/EmailSmartValueProvider.java

@@ -29,7 +29,7 @@ public class EmailSmartValueProvider implements SmartValueProvider {
     public void collectValues(String type, Object payload, Consumer<SmartValue> valueCollector) {
         if (Strings.isFilled(payload) && VALUE_TYPE_EMAIL.equals(type)) {
             String email = payload.toString();
-            valueCollector.accept(new SmartValue("fa fa-envelope", email, "mailto:" + Strings.urlEncode(email), email));
+            valueCollector.accept(new SmartValue("fa-solid fa-envelope", email, "mailto:" + Strings.urlEncode(email), email));
         }
     }
 

src/main/java/sirius/biz/tycho/smart/UserAccountSmartValueProvider.java

@@ -35,14 +35,14 @@ public void collectValues(String type, Object payload, Consumer<SmartValue> valu
             if (tenants != null
                 && UserContext.getCurrentUser().hasPermission("permission-select-tenant")
                 && !Strings.areEqual(user.getTenantAsString(), UserContext.getCurrentUser().getTenantId())) {
-                valueCollector.accept(new SmartValue("fa fa-exchange-alt",
+                valueCollector.accept(new SmartValue("fa-solid fa-exchange-alt",
                                                      tenants.fetchCachedTenantName(user.getTenantAsString()),
                                                      "/tenants/select/" + user.getTenantAsString(),
                                                      null));
             }
             if (UserContext.getCurrentUser().hasPermission("permission-select-user-account")
                 && !Strings.areEqual(user.getUniqueName(), UserContext.getCurrentUser().getUserId())) {
-                valueCollector.accept(new SmartValue("fa fa-exchange-alt",
+                valueCollector.accept(new SmartValue("fa-solid fa-exchange-alt",
                                                      user.getUserAccountData().getShortName(),
                                                      "/user-accounts/select/" + user.getIdAsString(),
                                                      null));

src/main/resources/default/assets/javascript/blobreffield.js

@@ -23,7 +23,7 @@ function initBlobSoftRefField(element, blobKeyField, blobStorageSpace, originalU
         '{{/previewImage}}' +
         '{{^previewImage}}' +
         '    {{#icon}}' +
-        '        <i class="fa fa-3x {{icon}}" aria-hidden="true"></i>' +
+        '        <i class="fa-solid fa-3x {{icon}}" aria-hidden="true"></i>' +
         '    {{/icon}}' +
         '{{/previewImage}}' +
         '{{#url}}' +

src/main/resources/default/assets/scripts/blob-upload-url-popover.js

@@ -12,16 +12,19 @@
 function initUrlUploadPopover(_triggerElement, _uploadContainer, _resetButton, _fileNameContainer, i18n, updateCallback) {
     const body = buildBody(_triggerElement, _uploadContainer, _resetButton);
     const container = buildContainer(_triggerElement.parentElement);
-    $(_triggerElement).popover({
-        html: true,
-        trigger: 'manual',
-        content: body._container,
-        container: container,
-        placement: 'top'
-    });
 
-    _triggerElement.addEventListener('click', function() {
-        $(_triggerElement).popover('toggle');
+    if (!_triggerElement.popover) {
+        _triggerElement.popover = new bootstrap.Tooltip(_triggerElement, {
+            html: true,
+            trigger: 'manual',
+            content: body._container,
+            container: container,
+            placement: 'top'
+        });
+    }
+
+    _triggerElement.addEventListener('click', () => {
+        _triggerElement.popover.toggle();
     });
 
     _resetButton.addEventListener('click', function() {
@@ -56,6 +59,7 @@ function initUrlUploadPopover(_triggerElement, _uploadContainer, _resetButton, _
 
         body._formGroup = document.createElement('div');
         body._formGroup.classList.add('form-group');
+        body._formGroup.classList.add('mb-3');
         body._formGroup.append(body._inputLabel, body._inputField);
 
         body._inputCol = document.createElement('div');
@@ -82,7 +86,7 @@ function initUrlUploadPopover(_triggerElement, _uploadContainer, _resetButton, _
         body._buttonCancel.classList.add('btn', 'btn-block', 'btn-close', 'btn-outline-secondary');
         body._buttonCancel.innerHTML = i18n.cancel + ' <i class="fa-solid fa-close"></i>';
         body._buttonCancel.addEventListener('click', function () {
-            $(_triggerElement).popover('toggle');
+            _triggerElement.popover.toggle();
         });
         body._rightCol = document.createElement('div');
         body._rightCol.classList.add('col', 'col-12', 'col-md-6');
@@ -111,7 +115,7 @@ function initUrlUploadPopover(_triggerElement, _uploadContainer, _resetButton, _
             _resetButton.classList.remove('d-none');
             body._errorCol.innerHTML = '';
             _fileNameContainer.innerHTML = '<a href="' + url + '">' + fetchFileName(url) + ' <i class="fa-regular fa-arrow-up-right-from-square"></i></a>';
-            $(_triggerElement).popover('hide');
+            _triggerElement.popover.hide();
             if (typeof updateCallback === 'function') {
                 updateCallback(url);
             }
@@ -150,7 +154,6 @@ function initUrlUploadPopover(_triggerElement, _uploadContainer, _resetButton, _
         _msg.querySelector('.msgContent').textContent = message;
         body._errorCol.innerHTML = '';
         body._errorCol.appendChild(_msg);
-        $(_triggerElement).popover('update');
+        _triggerElement.popover.update();
     }
 }
-