Revert accidental changes to plugin tab rendering

plan-player-analytics · Apr 10, 2022 · 6bbf054 · 6bbf054
1 parent 2056c88
commit 6bbf054
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPluginTab.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPluginTab.java
@@ -124,13 +124,23 @@ private String generatePageTab() {
     }
 
     private String wrapInWideTab(String serverName, String content) {
-        return "<div class=\"tab\" id=\"" + NavLink.format("plugins-" + serverName) + "\">" +
-                "<div class=\"row\"><div class=\"col-md-12\">" + content + "</div></div></div>";
+        return "<div class=\"tab\" id=\"" + NavLink.format("plugins-" + serverName) + "\"><div class=\"container-fluid mt-4\">" +
+                // Page heading
+                "<div class=\"d-sm-flex align-items-center justify-content-between mb-4\">" +
+                "<h1 class=\"h3 mb-0 text-gray-800\"><i class=\"sidebar-toggler fa fa-fw fa-bars\"></i>" + serverName + " &middot; Plugins Overview</h1>${backButton}" +
+                "</div>" +
+                // End Page heading
+                "<div class=\"row\"><div class=\"col-md-12\">" + content + "</div></div></div></div>";
     }
 
     private String wrapInCardColumnsTab(String serverName, String content) {
-        return "<div class=\"tab\" id=\"" + NavLink.format("plugins-" + serverName) + "\">" +
-                "<div class=\"row\" data-masonry='{\"percentPosition\": true}'>" + content + "</div></div>";
+        return "<div class=\"tab\" id=\"" + NavLink.format("plugins-" + serverName) + "\"><div class=\"container-fluid mt-4\">" +
+                // Page heading
+                "<div class=\"d-sm-flex align-items-center justify-content-between mb-4\">" +
+                "<h1 class=\"h3 mb-0 text-gray-800\"><i class=\"sidebar-toggler fa fa-fw fa-bars\"></i>" + serverName + " &middot; Plugins Overview</h1>${backButton}" +
+                "</div>" +
+                // End Page heading
+                "<div class=\"row\" data-masonry='{\"percentPosition\": true}'>" + content + "</div></div></div>";
     }
 
     private TabsElement.Tab wrapToTabElementTab(ExtensionTabData tabData) {

diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPluginTabs.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPluginTabs.java
@@ -150,14 +150,23 @@ private String generateOverviewTab() {
     }
 
     private String wrapInWideColumnTab(String tabName, String content) {
-        return "<div class=\"tab\" id=\"" + NavLink.format("plugins-" + tabName) + "\">" +
-                "<div class=\"row\"><div class=\"col-md-12\">" + content + "</div></div></div>";
+        return "<div class=\"tab\" id=\"" + NavLink.format("plugins-" + tabName) + "\"><div class=\"container-fluid mt-4\">" +
+                // Page heading
+                "<div class=\"d-sm-flex align-items-center justify-content-between mb-4\">" +
+                "<h1 class=\"h3 mb-0 text-gray-800\"><i class=\"sidebar-toggler fa fa-fw fa-bars\"></i>${serverName} &middot; " + tabName + "</h1>${backButton}" +
+                "</div>" +
+                // End Page heading
+                "<div class=\"row\"><div class=\"col-md-12\">" + content + "</div></div></div></div>";
     }
 
     private String wrapInOverviewTab(String content) {
-        return "<div class=\"tab\" id=\"" + NavLink.format("plugins-overview") + "\">" +
-
-                "<div class=\"row\" data-masonry='{\"percentPosition\": true}'>" + content + "</div></div>";
+        return "<div class=\"tab\" id=\"" + NavLink.format("plugins-overview") + "\"><div class=\"container-fluid mt-4\">" +
+                // Page heading
+                "<div class=\"d-sm-flex align-items-center justify-content-between mb-4\">" +
+                "<h1 class=\"h3 mb-0 text-gray-800\"><i class=\"sidebar-toggler fa fa-fw fa-bars\"></i>${serverName} &middot; Plugins Overview</h1>${backButton}" +
+                "</div>" +
+                // End Page heading
+                "<div class=\"row\" data-masonry='{\"percentPosition\": true}'>" + content + "</div></div></div>";
     }
 
     private TabsElement.Tab wrapToTabElementTab(ExtensionTabData tabData) {