From 28fa9154c7e1ae1b804c9b739ce142a4278a2a79 Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Wed, 30 Aug 2017 11:59:39 +0300
Subject: [PATCH] Enhancements to widths of elements on inspect page

---
 .../systems/info/parsing/InspectPageParser.java    |  2 +-
 Plan/src/main/resources/html/player.html           | 14 ++++++++++----
 Plan/src/main/resources/html/server.html           |  2 +-
 Plan/src/main/resources/js/worldPie.js             |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java
index c2af2c5f9..e4348dfca 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java
@@ -147,7 +147,7 @@ public class InspectPageParser {
         addValue("gmSeries", worldPieData[1]);
 
 
-        addValue("punchCardData", punchCardData);
+        addValue("punchCardSeries", punchCardData);
 
         List<Session> sessionsInLengthOrder = allSessions.stream()
                 .sorted(new SessionLengthComparator())
diff --git a/Plan/src/main/resources/html/player.html b/Plan/src/main/resources/html/player.html
index e2edc27dd..ea6916ae9 100644
--- a/Plan/src/main/resources/html/player.html
+++ b/Plan/src/main/resources/html/player.html
@@ -71,7 +71,7 @@
                             <h2><i class="fa fa-drivers-license" aria-hidden="true"></i> ${playerName}</h2>
                         </div>
                         <div class="box-footer scrollbar" style="padding: 2px;">
-                            <div class="row">
+                            <div class="row" style="flex-direction: row;">
                                 <div class="column" style="padding: 5px 0 5px 10px;"><p>Times Kicked: ${kickCount}<br>
                                 </p></div>
                                 <div class="column"><img style="padding: 10px 100px; height: 100px; width: 100px;"
@@ -101,13 +101,13 @@
                             <h2><i class="fa fa-braille" aria-hidden="true"></i> Join PunchCard</h2>
                         </div>
                         <div class="box-footer">
-                            <div id="punchcard" style="width: 100%; height: 400px;"></div>
+                            <div id="punchcard" style="width: 75%; height: 400px;"></div>
                         </div>
                         <div class="box-header">
                             <h2><i class="fa fa-pie-chart" aria-hidden="true"></i> Server Preference</h2>
                         </div>
                         <div class="box-footer">
-                            <div id="serverPie" style="width: 100%; height: 400px;"></div>
+                            <div id="serverPie" style="width: 75%; height: 400px;"></div>
                         </div>
                     </div>
                 </div>
@@ -130,7 +130,7 @@
                                 <h2><i class="fa fa-pie-chart" aria-hidden="true"></i> World Playtime</h2>
                             </div>
                             <div class="box-footer">
-                                <div id="worldPie" style="width: 100%; height: 400px;"></div>
+                                <div id="worldPie" style="height: 400px;"></div>
                             </div>
                         </div>
                         <div class="row">
@@ -189,6 +189,11 @@
              data: ${worldPieSeries}
         };
         var gmSeries = ${gmSeries};
+        var punchcardSeries = {
+            name: 'Relative Activity',
+            color: '#222',
+            data: ${punchCardSeries}
+        };
     </script>
     <script>
             var navButtons = document.getElementsByClassName("nav-button");
@@ -207,6 +212,7 @@
             x.style.opacity = "1";
 
             worldPie('worldPie', worldSeries, gmSeries);
+            punchCard('punchcard', punchcardSeries);
 
             openFunc(slideIndex)();
 
diff --git a/Plan/src/main/resources/html/server.html b/Plan/src/main/resources/html/server.html
index 5084e9e69..ab9e53dea 100644
--- a/Plan/src/main/resources/html/server.html
+++ b/Plan/src/main/resources/html/server.html
@@ -373,7 +373,7 @@
             tooltip: {
                 valueDecimals: 2
             },
-        yAxis: 1
+            yAxis: 1
         };
         var cpuSeries = {
             name: 'CPU Usage',
diff --git a/Plan/src/main/resources/js/worldPie.js b/Plan/src/main/resources/js/worldPie.js
index 96b8c2554..f587f2f8a 100644
--- a/Plan/src/main/resources/js/worldPie.js
+++ b/Plan/src/main/resources/js/worldPie.js
@@ -22,7 +22,7 @@ function worldPie(id, worldSeries, gmSeries) {
         },
         tooltip: {
             formatter: function() {
-                return '<b>'+this.point.name+':</b> ' + formatTimeAmount(this.y) + '<br>('+this.percentage.toFixed(2)+'%)';
+                return '<b>'+this.point.name+':</b> ' + formatTimeAmount(this.y) + ' ('+this.percentage.toFixed(2)+'%)';
             }
         },
         series: [worldSeries],