Merge branch 'master' of github.com:owncast/owncast-admin

web/pages/components/log-table.tsx

@@ -69,6 +69,7 @@ export default function LogTable({ logs, pageSize }) {
   return (
     <div>
       <Table
+        size="middle"
         dataSource={logs}
         columns={columns}
         rowKey={(row) => row.time}

web/pages/components/main-layout.tsx

@@ -69,14 +69,11 @@ export default function MainLayout(props) {
           <SubMenu
             key="current-stream-menu"
             icon={<LineChartOutlined />}
-            title="Stream Details"
+            title="Current stream"
           >
             <Menu.Item key="viewer-info">
               <Link href="/viewer-info">Viewers</Link>
             </Menu.Item>
-            <Menu.Item key="hardware-info">
-              <Link href="/hardware-info">Hardware</Link>
-            </Menu.Item>
             {broadcastActive ? (
               <Menu.Item key="disconnect-stream" icon={<CloseCircleOutlined />}>
                 <Link href="/disconnect-stream">Disconnect Stream...</Link>
@@ -85,9 +82,9 @@ export default function MainLayout(props) {
           </SubMenu>
 
           <SubMenu
-            key="utilities-menu"
+            key="configuration"
+            title="Configuration"
             icon={<SettingOutlined />}
-            title="Utilities"
           >
             <Menu.Item key="update-server-config">
               <Link href="/update-server-config">Server Configuration</Link>
@@ -98,6 +95,16 @@ export default function MainLayout(props) {
             <Menu.Item key="storage">
               <Link href="/storage">Storage</Link>
             </Menu.Item>
+          </SubMenu>
+
+          <SubMenu
+            key="utilities-menu"
+            icon={<SettingOutlined />}
+            title="Utilities"
+          >
+            <Menu.Item key="hardware-info">
+              <Link href="/hardware-info">Hardware</Link>
+            </Menu.Item>
             <Menu.Item key="logs">
               <Link href="/logs">Logs</Link>
             </Menu.Item>