FIX Update HTML markup for bootstrap 5

silverstripe · Jan 22, 2025 · 79f36e8 · 79f36e8
1 parent 48332e2
commit 79f36e8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/src/Forms/GridField/GridFieldBlogPostState.php b/src/Forms/GridField/GridFieldBlogPostState.php
@@ -32,7 +32,7 @@ public function getColumnContent($gridField, $record, $columnName)
                      */
                     $lastEdited = $record->dbObject('LastEdited');
 
-                    return '<i class="font-icon-edit mr-2"></i> '  . _t(
+                    return '<i class="font-icon-edit me-2"></i> '  . _t(
                         __CLASS__ . '.Draft',
                         'Saved as Draft on {date}',
                         'State for when a post is saved.',
@@ -48,7 +48,7 @@ public function getColumnContent($gridField, $record, $columnName)
                 $publishDate = $record->dbObject('PublishDate');
 
                 if (strtotime($record->PublishDate ?? '') > time()) {
-                    return '<i class="font-icon-clock mr-2"></i> ' . _t(
+                    return '<i class="font-icon-clock me-2"></i> ' . _t(
                         __CLASS__ . '.Timer',
                         'Publish at {date}',
                         'State for when a post is published.',
@@ -58,7 +58,7 @@ public function getColumnContent($gridField, $record, $columnName)
                     ) . $modifiedLabel;
                 }
 
-                return '<i class="font-icon-check-mark-circle text-success mr-2"></i> ' . _t(
+                return '<i class="font-icon-check-mark-circle text-success me-2"></i> ' . _t(
                     __CLASS__ . '.Published',
                     'Published on {date}',
                     'State for when a post is published.',

diff --git a/templates/SilverStripe/Blog/Forms/GridField/GridFieldAddByDBField.ss b/templates/SilverStripe/Blog/Forms/GridField/GridFieldAddByDBField.ss
@@ -1,13 +1,7 @@
-<div class="add-existing-autocompleter">
-    <div class="input-group">
-        <% loop $Fields %>
-            <% if $Type == 'action' %>
-                <div class="input-group-append">
-                    $Field
-                </div>
-            <% else %>
-                $Field
-            <% end_if %>
-        <% end_loop %>
-	</div>
-</div>
+<div class="add-existing-autocompleter">
+    <div class="input-group">
+        <% loop $Fields %>
+            $Field
+        <% end_loop %>
+	</div>
+</div>