Console: finesse borders

This commit is contained in:
dr|z3d 2021-08-25 15:39:40 +00:00
parent 31cd880cfc
commit 8435e1296b
2 changed files with 15 additions and 11 deletions

View file

@ -641,7 +641,7 @@ namespace http {
else if (i2p::transport::transports.GetTotalSentBytes () > 1024*1024) else if (i2p::transport::transports.GetTotalSentBytes () > 1024*1024)
s << std::fixed << std::setprecision(1); s << std::fixed << std::setprecision(1);
ShowTraffic (s, i2p::transport::transports.GetTotalSentBytes ()); ShowTraffic (s, i2p::transport::transports.GetTotalSentBytes ());
s << "</span></td</tr>\r\n"; s << "</span></td></tr>\r\n";
if (i2p::context.AcceptsTunnels () && i2p::tunnel::tunnels.CountTransitTunnels()) { if (i2p::context.AcceptsTunnels () && i2p::tunnel::tunnels.CountTransitTunnels()) {
s << "<tr><td>" << tr("Transit") << "</td><td><span class=\"transit sent\">"; s << "<tr><td>" << tr("Transit") << "</td><td><span class=\"transit sent\">";
s << std::fixed << std::setprecision(0); s << std::fixed << std::setprecision(0);
@ -670,9 +670,13 @@ namespace http {
clientTunnelCount += i2p::tunnel::tunnels.CountInboundTunnels(); clientTunnelCount += i2p::tunnel::tunnels.CountInboundTunnels();
std::string webroot; i2p::config::GetOption("http.webroot", webroot); std::string webroot; i2p::config::GetOption("http.webroot", webroot);
s << "<tr><td>" << tr("Local Tunnels") << "</td><td>" << std::to_string(clientTunnelCount) << "</td></tr>\r\n"; if (!(i2p::context.AcceptsTunnels () || i2p::tunnel::tunnels.CountTransitTunnels()))
s << "<tr id=\"last\">";
else
s << "<tr>";
s << "<td>" << tr("Local Tunnels") << "</td><td>" << std::to_string(clientTunnelCount) << "</td></tr>\r\n";
if (i2p::context.AcceptsTunnels () || i2p::tunnel::tunnels.CountTransitTunnels()) { if (i2p::context.AcceptsTunnels () || i2p::tunnel::tunnels.CountTransitTunnels()) {
s << "<tr><td>" << tr("Transit Tunnels") << "</td><td>" s << "<tr id=\"last\"><td>" << tr("Transit Tunnels") << "</td><td>"
<< std::to_string(i2p::tunnel::tunnels.CountTransitTunnels()) << "</td></tr>\r\n"; << std::to_string(i2p::tunnel::tunnels.CountTransitTunnels()) << "</td></tr>\r\n";
} }
@ -684,8 +688,9 @@ namespace http {
bool i2cp = i2p::client::context.GetI2CPServer () ? true : false; bool i2cp = i2p::client::context.GetI2CPServer () ? true : false;
bool i2pcontrol; i2p::config::GetOption("i2pcontrol.enabled", i2pcontrol); bool i2pcontrol; i2p::config::GetOption("i2pcontrol.enabled", i2pcontrol);
if (httpproxy || socksproxy || bob || sam || i2cp || i2pcontrol) { if (httpproxy || socksproxy || bob || sam || i2cp || i2pcontrol) {
s << "<tr class=\"sectiontitle configuration\"><th colspan=\"2\"><span>" << tr("Router Services") << "</span></th></tr>"; s << "<tr class=\"center sectiontitle configuration\">"
s << "<tr><td id=\"routerservices\" class=\"center\" colspan=\"2\">"; << "<th colspan=\"2\"><span>" << tr("Router Services") << "</span></th></tr>\r\n";
s << "<tr><td colspan=\"2\" class=\"center\">";
if (httpproxy) if (httpproxy)
s << " <span class=\"routerservice\">HTTP " << tr("Proxy") << "</span> "; s << " <span class=\"routerservice\">HTTP " << tr("Proxy") << "</span> ";
if (socksproxy) if (socksproxy)
@ -697,8 +702,8 @@ namespace http {
if (i2cp) if (i2cp)
s << " <span class=\"routerservice\">I2CP</span> "; s << " <span class=\"routerservice\">I2CP</span> ";
if (i2pcontrol) if (i2pcontrol)
s << " <span class=\"routerservice\">I2PControl</span> "; s << " <span class=\"routerservice\">I2PControl</span>";
s << "</tr></td>"; s << "</td></tr>\r\n";
} }
/* /*
s << "<tr><td>" << "HTTP " << tr("Proxy") << "</td><td class='" << (httpproxy ? "enabled" : "disabled") << "\">" << (httpproxy ? tr("Enabled") : tr("Disabled")) << "</td></tr>\r\n"; s << "<tr><td>" << "HTTP " << tr("Proxy") << "</td><td class='" << (httpproxy ? "enabled" : "disabled") << "\">" << (httpproxy ? tr("Enabled") : tr("Disabled")) << "</td></tr>\r\n";
@ -710,7 +715,7 @@ namespace http {
*/ */
} }
s << "</tbody>\r\n</table>\r\n</div>\r\n"; s << "</tbody>\r\n";
} }
void ShowLocalDestinations (std::stringstream& s) void ShowLocalDestinations (std::stringstream& s)

View file

@ -500,7 +500,7 @@ th, .slide label {
border-top: 1px solid var(--border) !important; border-top: 1px solid var(--border) !important;
} }
.chrome td { .chrome td, #last td {
border-bottom: 1px solid var(--border) !important; border-bottom: 1px solid var(--border) !important;
} }
@ -512,7 +512,6 @@ th, .slide label {
} }
.sectiontitle span { .sectiontitle span {
margin-top: -1px;
padding: 4px 12px; padding: 4px 12px;
min-width: 50%; min-width: 50%;
display: inline-block; display: inline-block;
@ -520,7 +519,7 @@ th, .slide label {
line-height: 1.6; line-height: 1.6;
font-size: 11.5pt; font-size: 11.5pt;
border: 1px solid var(--border); border: 1px solid var(--border);
/* border-top: none;*/ border-top: none;
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
box-shadow: var(--highlight), 0 2px 2px rgba(0,0,0,.4); box-shadow: var(--highlight), 0 2px 2px rgba(0,0,0,.4);
background: radial-gradient(at top center, rgba(64,16,64,.4), rgba(0,0,0,0) 50%), var(--sectiontitle); background: radial-gradient(at top center, rgba(64,16,64,.4), rgba(0,0,0,0) 50%), var(--sectiontitle);