Moved server performance indicators; control tips working again.

client/views/index.ejs

@@ -28,7 +28,7 @@
   <%- include('panels/unitinfo.ejs') %>
   <%- include('panels/mouseinfo.ejs') %>
   <%- include('panels/connectionstatus.ejs') %>
-  <%- include('panels/serverstatus.ejs') %>
+
   <%- include('panels/hotgroup.ejs') %>
   <%- include('panels/logpanel.ejs') %>
   <%- include('panels/unitlist.ejs') %>

client/views/panels/logpanel.ejs

@@ -1,5 +1,22 @@
 <div id="log-panel" oncontextmenu="return false;">
-    <div class="ol-panel" data-on-click="toggleLogPanel"><div id="log-panel-header">Server log</div><img src="/resources/theme/images/icons/chevron-down.svg" inject-svg></div>
+    <div class="ol-panel" data-on-click="toggleLogPanel">
+        <div id="log-panel-header">Server log</div>
+        
+        <div id="log-panel-header-right">
+            <div id="server-status-panel" oncontextmenu="return false;">
+                <dl>
+                    <dt><abbr title="Server frame rate (approx)">FPS</abbr>:</dt>
+                    <dd id="server-frame-rate"></dd>
+                </dl>
+                <dl>
+                    <dt><abbr title="Server load">Load</abbr>:</dt>
+                    <dd id="server-load"></dd>
+                </dl>
+            </div>
+            <img src="/resources/theme/images/icons/chevron-down.svg" inject-svg>  
+        </div>
+
+    </div>
     <div class="ol-panel ol-scrollable closed">
     </div>
 </div>

client/views/panels/unitlist.ejs

@@ -1,4 +1,4 @@
-<div id="unit-list-panel" class="ol-panel">
+<div id="unit-list-panel" class="ol-panel hide">
     <h3>Unit List</h3>
     <div class="unit-list-unit headers">
         <div data-sort-field="unitName">Name</div>