From dfaed30cab45bbbf9040f7984cb3f4a8e4743a9c Mon Sep 17 00:00:00 2001 From: cubedro Date: Thu, 23 Apr 2015 23:05:22 +0300 Subject: [PATCH] moved table higher --- public/css/style.css | 7 ++- views/index.jade | 104 ++++++++++++++++++++++--------------------- 2 files changed, 58 insertions(+), 53 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index db5b9f5..1d0cb1d 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -85,8 +85,8 @@ table td { } .big-info { - padding-bottom: 15px; padding-top: 15px; + padding-bottom: 15px; } .big-info .icon-full-width i { @@ -193,6 +193,10 @@ div.small-title-miner { opacity: .8; } +.tableHolder { + padding-top: 20px; + padding-right: 20px; +} table i { -webkit-font-smoothing: subpixel-antialiased; -moz-font-smoothing: subpixel-antialiased; @@ -272,7 +276,6 @@ table td.peerPropagationChart { overflow: hidden; max-width: 100%; height: auto; - margin: 10px auto; } #mapHolder > svg { diff --git a/views/index.jade b/views/index.jade index 4213fe3..26bfa66 100644 --- a/views/index.jade +++ b/views/index.jade @@ -102,54 +102,56 @@ block content div.clearfix - div.row - table.table.table-striped - thead - tr.text-info - th.th-nodename - i.icon-node(data-toggle="tooltip", data-placement="top", title="Node name", ng-click="orderTable(['-stats.active', 'info.name'], false)") - th.th-nodetype - i.icon-laptop(data-toggle="tooltip", data-placement="top", title="Node type", ng-click="orderTable(['-stats.active', 'info.node'], false)") - th.th-latency - i.icon-clock(data-toggle="tooltip", data-placement="top", title="Node latency", ng-click="orderTable(['-stats.active', 'stats.latency'], false)") - th - i.icon-mining(data-toggle="tooltip", data-placement="top", title="Is mining", ng-click="orderTable(['-stats.active', '-stats.mining'], false)") - th - i.icon-group(data-toggle="tooltip", data-placement="top", title="Peers", ng-click="orderTable(['-stats.active', '-stats.peers'], false)") - th - i.icon-network(data-toggle="tooltip", data-placement="top", title="Pending transactions", ng-click="orderTable(['-stats.active', '-stats.pending'], false)") - th - i.icon-block(data-toggle="tooltip", data-placement="top", title="Last block", ng-click="orderTable(['-stats.active', '-stats.block.number', 'stats.block.propagation'], false)") - th.th-blockhash #[ ] - th - i.icon-check-o(data-toggle="tooltip", data-placement="top", title="Block transactions", ng-click="orderTable(['-stats.active', '-stats.block.transactions.length'], false)") - th.th-blocktime - i.icon-time(data-toggle="tooltip", data-placement="top", title="Last block time", ng-click="orderTable(['-stats.active', '-stats.block.received'], false)") - th.th-peerPropagationTime - i.icon-gas(data-toggle="tooltip", data-placement="top", title="Propagation time", ng-click="orderTable(['-stats.active', '-stats.block.number', 'stats.block.propagation'], false)") - th.th-peerPropagationChart - th - i.icon-bulb(data-toggle="tooltip", data-placement="top", title="Up-time", ng-click="orderTable(['-stats.active', '-stats.uptime'], false)") - tbody(ng-cloak) - tr(ng-repeat='node in nodes | orderBy:predicate:reverse', class="{{ node.stats | mainClass : bestBlock }}") - td.nodeInfo(rel="{{node.id}}") - span.small(data-toggle="tooltip", data-placement="top", data-html="true", data-original-title="{{node | geoTooltip}}") {{node.info.name}} - span.small #[ ]({{node.info.ip}}) - td - div.small(ng-bind-html="node.info.node | nodeVersion") - //- div.small {{node.info.os}}, {{node.info.os_v}} - td.small(class="{{ node.stats | latencyClass }}") {{node.stats | latencyFilter}} - td(class="{{ node.stats.mining | miningClass : node.stats.active }}") - i(class="{{ node.stats.mining | miningIconClass }}") - td(class="{{ node.stats.peers | peerClass : node.stats.active }}", style="padding-left: 11px;") {{node.stats.peers}} - td(style="padding-left: 15px;") {{node.stats.pending}} - td(class="{{ node.stats | blockClass : bestBlock }}") {{'#'}}{{ node.stats.block.number | number }} - td(class="{{ node.stats | blockClass : bestBlock }}") - span.small {{node.stats.block.hash | hashFilter}} - td(style="padding-left: 14px;") {{node.stats.block.transactions.length || 0}} - td(class="{{ node.stats.block.arrived | timeClass : node.stats.active }}") {{node.stats.block.arrived | blockTimeFilter }} - td(class="{{ node.stats | propagationTimeClass : bestBlock }}") - div.propagationBox - span {{node.stats.block.propagation | blockPropagationFilter}} - td.peerPropagationChart(class="{{node.id}}") - td(class="{{ node.stats.uptime | upTimeClass : node.stats.active }}") {{ node.stats.uptime | upTimeFilter }} + div.row(ng-cloak) + div.col-xs-12 + div.row + table.table.table-striped + thead + tr.text-info + th.th-nodename + i.icon-node(data-toggle="tooltip", data-placement="top", title="Node name", ng-click="orderTable(['-stats.active', 'info.name'], false)") + th.th-nodetype + i.icon-laptop(data-toggle="tooltip", data-placement="top", title="Node type", ng-click="orderTable(['-stats.active', 'info.node'], false)") + th.th-latency + i.icon-clock(data-toggle="tooltip", data-placement="top", title="Node latency", ng-click="orderTable(['-stats.active', 'stats.latency'], false)") + th + i.icon-mining(data-toggle="tooltip", data-placement="top", title="Is mining", ng-click="orderTable(['-stats.active', '-stats.mining'], false)") + th + i.icon-group(data-toggle="tooltip", data-placement="top", title="Peers", ng-click="orderTable(['-stats.active', '-stats.peers'], false)") + th + i.icon-network(data-toggle="tooltip", data-placement="top", title="Pending transactions", ng-click="orderTable(['-stats.active', '-stats.pending'], false)") + th + i.icon-block(data-toggle="tooltip", data-placement="top", title="Last block", ng-click="orderTable(['-stats.active', '-stats.block.number', 'stats.block.propagation'], false)") + th.th-blockhash #[ ] + th + i.icon-check-o(data-toggle="tooltip", data-placement="top", title="Block transactions", ng-click="orderTable(['-stats.active', '-stats.block.transactions.length'], false)") + th.th-blocktime + i.icon-time(data-toggle="tooltip", data-placement="top", title="Last block time", ng-click="orderTable(['-stats.active', '-stats.block.received'], false)") + th.th-peerPropagationTime + i.icon-gas(data-toggle="tooltip", data-placement="top", title="Propagation time", ng-click="orderTable(['-stats.active', '-stats.block.number', 'stats.block.propagation'], false)") + th.th-peerPropagationChart + th + i.icon-bulb(data-toggle="tooltip", data-placement="top", title="Up-time", ng-click="orderTable(['-stats.active', '-stats.uptime'], false)") + tbody(ng-cloak) + tr(ng-repeat='node in nodes | orderBy:predicate:reverse', class="{{ node.stats | mainClass : bestBlock }}") + td.nodeInfo(rel="{{node.id}}") + span.small(data-toggle="tooltip", data-placement="top", data-html="true", data-original-title="{{node | geoTooltip}}") {{node.info.name}} + span.small #[ ]({{node.info.ip}}) + td + div.small(ng-bind-html="node.info.node | nodeVersion") + //- div.small {{node.info.os}}, {{node.info.os_v}} + td.small(class="{{ node.stats | latencyClass }}") {{node.stats | latencyFilter}} + td(class="{{ node.stats.mining | miningClass : node.stats.active }}") + i(class="{{ node.stats.mining | miningIconClass }}") + td(class="{{ node.stats.peers | peerClass : node.stats.active }}", style="padding-left: 11px;") {{node.stats.peers}} + td(style="padding-left: 15px;") {{node.stats.pending}} + td(class="{{ node.stats | blockClass : bestBlock }}") {{'#'}}{{ node.stats.block.number | number }} + td(class="{{ node.stats | blockClass : bestBlock }}") + span.small {{node.stats.block.hash | hashFilter}} + td(style="padding-left: 14px;") {{node.stats.block.transactions.length || 0}} + td(class="{{ node.stats.block.arrived | timeClass : node.stats.active }}") {{node.stats.block.arrived | blockTimeFilter }} + td(class="{{ node.stats | propagationTimeClass : bestBlock }}") + div.propagationBox + span {{node.stats.block.propagation | blockPropagationFilter}} + td.peerPropagationChart(class="{{node.id}}") + td(class="{{ node.stats.uptime | upTimeClass : node.stats.active }}") {{ node.stats.uptime | upTimeFilter }}