Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-29 04:07:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Console: migrate service tunnel sub-sections to collapsibles

Browse source
This commit is contained in:
dr|z3d 2021-08-23 02:51:20 +00:00
parent effc14aed8
commit 7c52c9b4bb
2 changed files with 51 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

62
daemon/HTTPServer.cpp
View file

@ -1351,7 +1351,21 @@ namespace http {
for (const auto& it: i2p::tunnel::tunnels.GetTransitTunnels ()) for (const auto& it: i2p::tunnel::tunnels.GetTransitTunnels ())
{ {
s << "<div class=\"listitem\"><span class=\"chain transit\">"; s << "<div class=\"listitem\"><span class=\"chain transit\">";
s << "<span class=\"sent\">" << it->GetNumTransmittedBytes () << "B</span> ";
double bytes = it->GetNumTransmittedBytes ();
s << std::fixed << std::setprecision(0);
if (bytes > 1024 * 1024 * 1024) {
s << std::fixed << std::setprecision(2);
s << "<span class=\"sent\">" << (double) (bytes / 1024 / 1024 / 1024) << "G</span> ";
} else if (bytes > 1024 * 1024) {
s << std::fixed << std::setprecision(1);
s << "<span class=\"sent\">" << (double) (bytes / 1024 / 1024) << "M</span> ";
} else if (bytes > 1024) {
s << "<span class=\"sent\">" << (int) (bytes / 1024) << "K</span> ";
} else {
s << "<span class=\"sent\">" << (int) (bytes) << "B</span> ";
}
s << "<span class=\"tunnelid\">" << it->GetTunnelID () << "</span> "; s << "<span class=\"tunnelid\">" << it->GetTunnelID () << "</span> ";
if (std::dynamic_pointer_cast<i2p::tunnel::TransitTunnelGateway>(it)) if (std::dynamic_pointer_cast<i2p::tunnel::TransitTunnelGateway>(it))
s << "<span class=\"role ibgw\" data-tooltip=\"" << tr("inbound gateway") << "\">" s << "<span class=\"role ibgw\" data-tooltip=\"" << tr("inbound gateway") << "\">"
@ -1623,14 +1637,13 @@ namespace http {
void ShowI2PTunnels (std::stringstream& s) void ShowI2PTunnels (std::stringstream& s)
{ {
std::string webroot; i2p::config::GetOption("http.webroot", webroot); std::string webroot; i2p::config::GetOption("http.webroot", webroot);
s << "<tr><th class=\"sectiontitle\" colspan=\"4\"><span>" << tr("Service Tunnels") << "</span></th></tr>";
s << "<tr><td class=\"center nopadding i2ptunnels\" colspan=\"4\">\r\n"; s << "<tr><td class=\"center nopadding i2ptunnels\" colspan=\"4\">\r\n";
s << "<div class=\"slide\">\r\n<input hidden type=\"checkbox\" class=\"toggle\" id=\"slide_servicetunnels\" />\r\n" s << "<div class=\"slide\">\r\n<input hidden type=\"checkbox\" class=\"toggle\" id=\"slide_client_tunnels\" />\r\n"
<< "<label for=\"slide_servicetunnels\">" << tr("Service Tunnels") << " <span class=\"hide\">[</span><span class=\"count\">" << "<label for=\"slide_client_tunnels\">" << tr("Client Tunnels") << " <span class=\"hide\">[</span><span class=\"count\">"
<< "in / out" << "</span><span class=\"hide\">]</span></label>\r\n"; << "in / out" << "</span><span class=\"hide\">]</span></label>\r\n";
s << "<div id=\"servicetunnels\" class=\"slidecontent list\">\r\n"; s << "<div id=\"client_tunnels\" class=\"slidecontent list\">\r\n";
// s << "<tr><th class=\"sectiontitle\" colspan=\"4\"><span>" << tr("Client Tunnels") << "</span></th></tr>";
s << "<div class=\"list\">\r\n"; s << "<div class=\"list\">\r\n";
s << "<div class=\"sectiontitle\"><span>" << tr("Client Tunnels") << "</span></div>";
for (auto& it: i2p::client::context.GetClientTunnels ()) for (auto& it: i2p::client::context.GetClientTunnels ())
{ {
auto& ident = it.second->GetLocalDestination ()->GetIdentHash(); auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
@ -1657,12 +1670,15 @@ namespace http {
s << i2p::client::context.GetAddressBook ().ToAddress(ident); s << i2p::client::context.GetAddressBook ().ToAddress(ident);
s << "</span></div>\r\n" << std::endl; s << "</span></div>\r\n" << std::endl;
} }
s << "</div>\r\n</div>\r\n"; s << "</div>\r\n</div>\r\n</div>\r\n";
auto& serverTunnels = i2p::client::context.GetServerTunnels (); auto& serverTunnels = i2p::client::context.GetServerTunnels ();
if (!serverTunnels.empty ()) { if (!serverTunnels.empty ()) {
s << "<tr><th class=\"sectiontitle\" colspan=\"4\"><span>" << tr("Server Tunnels") << "</span></th></tr>\r\n"; s << "\r\n</td></tr>\r\n<tr><td class=\"center nopadding i2ptunnels\" colspan=\"4\">\r\n";
s << "<tr><td class=\"center nopadding i2ptunnels\" colspan=\"4\">\r\n"; s << "<div class=\"slide\">\r\n<input hidden type=\"checkbox\" class=\"toggle\" id=\"slide_server_tunnels\" />\r\n"
<< "<label for=\"slide_server_tunnels\">" << tr("Server Tunnels") << " <span class=\"hide\">[</span><span class=\"count\">"
<< "in / out" << "</span><span class=\"hide\">]</span></label>\r\n";
s << "<div id=\"server_tunnels\" class=\"slidecontent list\">\r\n";
s << "<div class=\"list\">\r\n"; s << "<div class=\"list\">\r\n";
for (auto& it: serverTunnels) for (auto& it: serverTunnels)
{ {
@ -1673,14 +1689,18 @@ namespace http {
s << ":" << it.second->GetLocalPort (); s << ":" << it.second->GetLocalPort ();
s << "</span></div>\r\n" << std::endl; s << "</span></div>\r\n" << std::endl;
} }
s << "</div>\r\n</div>\r\n</td></tr>\r\n"; s << "</div>\r\n</div>\r\n</div>\r\n</td></tr>\r\n";
} }
auto& clientForwards = i2p::client::context.GetClientForwards (); auto& clientForwards = i2p::client::context.GetClientForwards ();
if (!clientForwards.empty ()) if (!clientForwards.empty ())
{ {
s << "<tr><th class=\"sectiontitle\" colspan=\"4\"><span>" << tr("Client Forwards") << "</span></th></tr>" s << "\r\n</td></tr>\r\n<tr><td class=\"center nopadding i2ptunnels\" colspan=\"4\">\r\n";
<< "<tr><td class=\"center nopadding i2ptunnels\" colspan=\"4\">\r\n<div class=\"list\">\r\n"; s << "<div class=\"slide\">\r\n<input hidden type=\"checkbox\" class=\"toggle\" id=\"slide_client_forwards\" />\r\n"
<< "<label for=\"slide_client_forwards\">" << tr("Client Forwards") << " <span class=\"hide\">[</span><span class=\"count\">"
<< "in / out" << "</span><span class=\"hide\">]</span></label>\r\n";
s << "<div id=\"client_forwards\" class=\"slidecontent list\">\r\n";
s << "<div class=\"list\">\r\n";
for (auto& it: clientForwards) for (auto& it: clientForwards)
{ {
auto& ident = it.second->GetLocalDestination ()->GetIdentHash(); auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
@ -1689,24 +1709,28 @@ namespace http {
s << i2p::client::context.GetAddressBook ().ToAddress(ident); s << i2p::client::context.GetAddressBook ().ToAddress(ident);
s << "</span></div>\r\n"<< std::endl; s << "</span></div>\r\n"<< std::endl;
} }
s << "</div></td></tr>\r\n"; s << "</div>\r\n</div>\r\n</div>\r\n</td></tr>\r\n";
} }
auto& serverForwards = i2p::client::context.GetServerForwards (); auto& serverForwards = i2p::client::context.GetServerForwards ();
if (!serverForwards.empty ()) if (!serverForwards.empty ())
{ {
s << "<tr><th class=\"sectiontitle\" colspan=\"4\"><span>" << tr("Server Forwards") << "</span></th></tr>\r\n"; s << "\r\n</td></tr>\r\n<tr><td class=\"center nopadding i2ptunnels\" colspan=\"4\">\r\n";
s << "<tr><td class=\"center nopadding i2ptunnels\" colspan=\"4\">\r\n"; s << "<div class=\"slide\">\r\n<input hidden type=\"checkbox\" class=\"toggle\" id=\"slide_server_forwards\" />\r\n"
s << "<div class=\"list\">\r\n"; << "<label for=\"slide_server_forwards\">" << tr("Server Forwards") << " <span class=\"hide\">[</span><span class=\"count\">"
<< "in / out" << "</span><span class=\"hide\">]</span></label>\r\n";
s << "<div id=\"server_forwards\" class=\"slidecontent list\">\r\n";
s << "<div class=\"list\">\r\n";
for (auto& it: serverForwards) for (auto& it: serverForwards)
{ {
auto& ident = it.second->GetLocalDestination ()->GetIdentHash(); auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
s << "<a href=\"" << webroot << "?page=" << HTTP_PAGE_LOCAL_DESTINATION << "&b32=" << ident.ToBase32 () << "\">"; s << "<div class=\"listitem\"><a href=\"" << webroot << "?page=" << HTTP_PAGE_LOCAL_DESTINATION << "&b32=" << ident.ToBase32 () << "\">";
s << it.second->GetName () << "</a> <span class=\"arrowleft\">&#8656;</span> <span class=\"b32\">"; s << it.second->GetName () << "</a> <span class=\"arrowleft\">&#8656;</span> <span class=\"b32\">";
s << i2p::client::context.GetAddressBook ().ToAddress(ident); s << i2p::client::context.GetAddressBook ().ToAddress(ident);
s << "</span></div>\r\n"<< std::endl; s << "</span></div>\r\n"<< std::endl;
} }
s << "</div></table>\r\n"; s << "</div>\r\n</div>\r\n</div>\r\n</td></tr>\r\n";
} }
// s << "</div></table>\r\n";
} }
HTTPConnection::HTTPConnection (std::string hostname, std::shared_ptr<boost::asio::ip::tcp::socket> socket): HTTPConnection::HTTPConnection (std::string hostname, std::shared_ptr<boost::asio::ip::tcp::socket> socket):

12
webconsole/style.css
View file

@ -509,7 +509,7 @@ th.sectiontitle, .sectiontitle {
display: inline-block; display: inline-block;
white-space: nowrap; white-space: nowrap;
line-height: 1.6; line-height: 1.6;
font-size: 98%; font-size: 11.5pt;
border: 1px solid var(--button-border); border: 1px solid var(--button-border);
border-top: none; border-top: none;
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
@ -1234,9 +1234,9 @@ input[type=checkbox]:checked + label::after {
padding: 1px 3px; padding: 1px 3px;
} }
.chrome a.button { .chrome a.button {
min-width: 40px; min-width: 40px;
} }
.b32, .listitem a[href*="local_destination&b32"] { .b32, .listitem a[href*="local_destination&b32"] {
max-width: 300px; max-width: 300px;
@ -1265,6 +1265,10 @@ input[type=checkbox]:checked + label::after {
vertical-align: middle; vertical-align: middle;
} }
.sectiontitle span {
font-size: 10.5pt;
}
@media screen and (-webkit-min-device-pixel-ratio: 1.5) { @media screen and (-webkit-min-device-pixel-ratio: 1.5) {
body { body {
font-size: 12pt !important; font-size: 12pt !important;