diff --git a/apps/routerconsole/jsp/help-configuration.jsi b/apps/routerconsole/jsp/help-configuration.jsi index d19e0ba50c..077890f57b 100644 --- a/apps/routerconsole/jsp/help-configuration.jsi +++ b/apps/routerconsole/jsp/help-configuration.jsi @@ -13,12 +13,12 @@ <%=intl._t("UPnP support is beta, and may not work for any number of reasons")%>:
<%=intl._t("UPnP may be enabled or disabled on the Network Configuration page, but a change requires a router restart to take effect.")%> diff --git a/apps/routerconsole/jsp/help-legal.jsi b/apps/routerconsole/jsp/help-legal.jsi index b243607220..986379ae0f 100644 --- a/apps/routerconsole/jsp/help-legal.jsi +++ b/apps/routerconsole/jsp/help-legal.jsi @@ -2,32 +2,32 @@
The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with a few notable exceptions:
On top of the I2P router are a series of client applications, each with their own set of licenses and dependencies:
For details on other applications available, as well as their licenses, please see the diff --git a/apps/routerconsole/jsp/help-reachability.jsi b/apps/routerconsole/jsp/help-reachability.jsi index fe39de12b4..54c8d7827d 100644 --- a/apps/routerconsole/jsp/help-reachability.jsi +++ b/apps/routerconsole/jsp/help-reachability.jsi @@ -5,10 +5,10 @@ <%=intl._t("If there is an error, the logs may also help diagnose the problem.")%>
-Many of the stats on the summary bar may be -configured to be -graphed for further analysis. -
Should be self-explanatory. All values are in bytes per second, not bits per second. -Change your bandwidth limits on the configuration page. -Bandwidth is graphed by default.
-The local applications connecting through your router. -These may be clients started through I2PTunnel -or external programs connecting through SAM, BOB, or directly to I2CP.
+The actual tunnels are shown on the the tunnels page.
-Many of the stats on the summary bar may be configured to be graphed for further analysis. You may also customize the sections that appear on the Summary Bar and their positioning on the Summary Bar Configuration page. +
+ +wrapper.config
file which is normally located in the I2P application directory. You will need to edit the wrapper.java.maxmemory
parameter, which by default is set to 128(MB). Note: Memory usage is only displayed in the Router Information (advanced) section or on the Memory Usage Bar, both of which may be added to your Summary Bar on the Summary Bar Configuration page.
+This section indicates your average bandwidth speeds and total usage for the session. All values are in bytes per second, not bits per second. You may change your bandwidth limits on the Bandwidth Configuration page. The more bandwidth you make available, the more you help the network and improve your own anonymity, so please take the time to review the settings. If you are unsure of your network's speed, using a service such as SpeedTest or similar will give you a good indication of your bandwidth capability. Your upstream share amount (KBps Out) will determine your overall contribution to the network. Bandwidth is graphed by default.
+ +These are the local services provided by your router. They may be clients started through the Tunnel Manager or external programs connecting through SAM, BOB, or directly to I2CP. By default, most of your client services (mail, http proxy, IRC) will share the same set of tunnels (for performance reasons) and be listed as Shared Clients and Shared Clients(DSA). However, if you experience a tunnel failure, all your services will go offline at the same time, so in some scenarios you may wish to configure client services to use their own set of tunnels. This can be done by unchecking the Share tunnels with other clients… option listed under Shared Clients on the configuration page of the relevant client service in the Tunnel Manager, after which you will need to restart the client service from the main Tunnel Manager page.
+ +The actual tunnels are shown on the Tunnels page.
+ +router.maxParticipatingTunnels=nnn
on the Advanced configuration page. [Enable graphing].
+Some basic indications of router overload:
Note: This section is not enabled by default. You may enable it on the Summary Bar Configuration page.
+Some basic indications of router overload:
+ +If you'd like to help improve or translate the documentation, or help with other aspects of the project, please see the documentation for volunteers.
Further assistance is available here:
You may also try zzz's developer forum, or I2P's IRC network.
diff --git a/apps/routerconsole/jsp/help_ar.jsp b/apps/routerconsole/jsp/help_ar.jsp index 0c33d9ddd1..3f8320259e 100644 --- a/apps/routerconsole/jsp/help_ar.jsp +++ b/apps/routerconsole/jsp/help_ar.jsp @@ -42,37 +42,37 @@ تتغير لكي تظهر على شكل رسم بياني للمزيد من التحاليلاو برامج خارجية متصلة SAM, BOB, او مباشرة بـ I2CP.
الأنفاق الحالية موجودة في صفحة الأنفاق.
بعض مشرات ازدحام الموجه
The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with a few notable exceptions:
On top of the I2P router are a series of client applications, each with their own set of diff --git a/apps/routerconsole/jsp/help_fr.jsp b/apps/routerconsole/jsp/help_fr.jsp index dd39613e3a..00ff153747 100644 --- a/apps/routerconsole/jsp/help_fr.jsp +++ b/apps/routerconsole/jsp/help_fr.jsp @@ -33,8 +33,8 @@ la page consacrée aux volontaires.
D'autres détails sont disponibles ici:Les tunnels actuels sont affichés sur la page tunnels.
Indications de base sur la charge du routeur:
Le routeur I2P (router.jar) et le SDK (i2p.jar) sont presque entièrement dans le domaine public, à quelques notobles exceptions près:
Verdere ondersteuning is hier beschikbaar:
De tunnels zelf worden getoond op de tunnels pagina.
Een aantal basis indicatoren voor een router overbelasting:
De I2P router (router.jar) en SDK (i2p.jar) zijn bijna geheel in het publieke domein, met een aantal noemenswaardige uitzonderingen:
Bovenop de I2P router zijn een aantal client applicaties gemaakt, elk met diff --git a/apps/routerconsole/jsp/help_ru.jsp b/apps/routerconsole/jsp/help_ru.jsp index 5050460e55..d9b2375ce5 100644 --- a/apps/routerconsole/jsp/help_ru.jsp +++ b/apps/routerconsole/jsp/help_ru.jsp @@ -46,20 +46,20 @@
Некоторые базовые индикаторы перегруженности маршрутизатора:
Код I2P-маршрутизатора (router.jar) и его SDK (i2p.jar) находятся в общественном достоянии с некоторыми исключениями:
Поверх I2P маршрутизатора работают различные приложения-клиенты, каждое со своим набором лицензий и зависимостей. Например, эта страница входит в приложение консоли маршрутизатора, которое сделано из усеченной версии Jetty (в сборку не включены демонстрационные приложения и прочие дополнения, настройки упрощены). Jetty позволяет запускать в составе маршрутизатора стандартные JSP/сервлеты. Jetty использует javax.servlet.jar разработанный в составе проекта Apache (http://www.apache.org/). diff --git a/history.txt b/history.txt index 563a656159..13b643ee2c 100644 --- a/history.txt +++ b/history.txt @@ -25,6 +25,9 @@ - /configui: - Add option to embed Susimail and I2PSnark in console - Use larger flags for language selection + - /help: + - Update sidebar help section (en) + - Remove redundant CSS class from all help section files (li.tidylist) * I2PTunnel: Add hostname / destination (b32) information to server section on index page (for parity with client tunnels section) * I2PSnark diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index 175b3238ae..cf74033b68 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -2039,7 +2039,7 @@ div.welcome { min-width: 550px; } -.main#help { +#help { background: linear-gradient(to bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.1)), url(images/bg0.png) !important; } @@ -5504,26 +5504,26 @@ h3.stats { margin-bottom: 5px !important; } -.main#help h2 { +#help h2 { margin: -16px -16px 0; } -.main#help h3 { +#help h3 { margin: -5px -16px 3px; } -.main#help p { +#help p { padding: 5px 0 0; margin-top: 0; } -.main#help ul { +#help ul { margin-bottom: 5px; margin-top: -5px; padding-left: 15px; } -.main#help ul li:first-child { +#help ul li:first-child { padding-top: 0; margin-top: 10px !important; } @@ -5537,6 +5537,12 @@ ul#reachability { padding-left: 15px; } +#help li { + text-align: justify; + margin-left: 20px; + margin-right: 0; +} + #configinfo th { box-shadow: inset 0 0 0 1px #fff; } @@ -5551,7 +5557,7 @@ ul#reachability { margin: -1px -1px 5px !important; } -.main#help pre { +#help pre { padding-left: 0; padding-bottom: 20px; margin: -5px 0 5px 10px; @@ -5582,7 +5588,7 @@ p#fullhistory { background-size: 14px auto; } -.main#help td.infohelp, .main#help td.infowarn, .main#help td.infohelp, .main#help p.infohelp { +#help td.infohelp, #help td.infowarn, #help td.infohelp, #help p.infohelp { background-size: 24px 24px !important; padding-left: 46px !important; } @@ -5759,7 +5765,7 @@ p#fullhistory { background: rgba(230,230,255,0.5); } -.main#help #configinfo td.infowarn { +#help #configinfo td.infowarn { padding: 10px 10px 10px 38px !important; border: 1px solid #89f; background: #fffff5 url(/themes/console/images/info/infowarn.png) 10px center no-repeat !important; @@ -7138,7 +7144,7 @@ table.sybil_routerinfo:last-child { } /* end whitespace reduction */ -.main#help h3, #faq h3 { +#help h3, #faq h3 { font-size: 10pt !important; } @@ -7174,7 +7180,7 @@ table.sybil_routerinfo:last-child { letter-spacing: -0.3em; } -.main#help h3, #faq h3 { +#help h3, #faq h3 { font-size: 10.5pt !important; } } @@ -7193,7 +7199,7 @@ table.sybil_routerinfo:last-child { } @media screen and (min-width: 1400px) { -.main#help #changelog pre:not(old) { +#help #changelog pre:not(old) { columns: 560px auto; column-gap: 40px; column-rule: 1px dotted #abf; diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index 0b62f50511..a8faad8c88 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -4013,6 +4013,10 @@ ul#upnphelp li:last-child, #legal ul li:last-child { padding: 7px 10px 7px 36px !important; } +#help li { + text-align: justify; +} + /* mini faq */ #faq h3 { diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index b77624d763..eb70c1d1cc 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -256,6 +256,7 @@ pre { line-height: 110%; } +/* h3#helpfaq { margin-bottom: -9px; } @@ -265,6 +266,7 @@ h3#helpfaq { margin-bottom: -10px; } } +*/ .routersummary h4 { border: none; @@ -1633,7 +1635,7 @@ h1, .confignav { position: relative; } -.confignav, .main#help div.confignav { +.confignav, #help div.confignav { padding: 8px; margin: -1px -15px 5px -15px; border: 1px solid #7778bf; @@ -6108,42 +6110,42 @@ h3#ntcpcon, h3#udpcon { white-space: pre-wrap; } -.main#help h2 { +#help h2 { margin: -1px -11px 10px !important; border-radius: 2px 2px 0 0; text-transform: uppercase; filter: none; } -.main#help h3 { +#help h3 { margin-bottom: -3px; } -.main#help #changelog h2 { +#help #changelog h2 { margin-right: -1px !important; } -.main#help div, .logtable tr:nth-child(n+2) td, .main#console, .debug_container { +#help div, .logtable tr:nth-child(n+2) td, .main#console, .debug_container { background: linear-gradient(to bottom, rgba(248,248,255,0.5), rgba(250,250,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #fafaff !important; margin-bottom: 13px; box-shadow: inset 0 0 0 1px #fff; } -.main#help #volunteer, #wrapperlogs pre { +#help #volunteer, #wrapperlogs pre { background: linear-gradient(to bottom, #fafaff, rgba(248,248,255,0.3)), url(/themes/snark/ubergine/images/hat.png) no-repeat right -3px bottom -3px / auto 80%, repeating-linear-gradient(135deg, rgba(252,252,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fafaff 5px) #fafaff !important; box-shadow: inset 0 0 0 1px #fff; } -.main#help p { +#help p { padding-left: 10px; padding-right: 10px; } -.main#help p.infohelp { +#help p.infohelp { padding-left: 50px; } -.main#help td.infohelp, .main#help td.infowarn, .main#help td.infohelp:hover, .main#help td.infowarn:hover { +#help td.infohelp, #help td.infowarn, #help td.infohelp:hover, #help td.infowarn:hover { background-size: 24px 24px !important; padding-left: 46px !important; color: #33333f !important; @@ -6155,10 +6157,23 @@ h3#ntcpcon, h3#udpcon { margin-bottom: 0 !important; } +#sidebarhelp ul:last-child { + margin-bottom: 5px !important; +} + #sidebarhelp p + ul { margin-top: -15px !important; } +#help li { + text-align: justify; +} + +#help li code { + font-weight: bold; + color: #050; +} + /* mini faq */ #faq h3 { @@ -7291,7 +7306,7 @@ input[name="pluginURL"] { white-space: normal; } -.main#help h3, #faq h3, #leasesetdebug th, table#leasesetsummary th { +#help h3, #faq h3, #leasesetdebug th, table#leasesetsummary th { font-size: 10pt !important; } @@ -7372,7 +7387,7 @@ body { } @media screen and (min-width: 1400px) { -.main#help #changelog pre:not(old) { +#help #changelog pre:not(old) { columns: 550px auto; column-gap: 25px; column-rule: 1px solid rgba(64, 64, 128, 0.5); diff --git a/installer/resources/themes/console/light/console_ar.css b/installer/resources/themes/console/light/console_ar.css index 54f60e631d..d03ab5c263 100644 --- a/installer/resources/themes/console/light/console_ar.css +++ b/installer/resources/themes/console/light/console_ar.css @@ -388,6 +388,10 @@ div[lang="ar"] ul, div[lang="ar"] p { margin: 10px; } +#help li { + margin-left: 20px !important; +} + .links li:first-child { margin-top: 15px !important; } @@ -397,11 +401,15 @@ div[lang="ar"] ul, div[lang="ar"] p { } .main#help .links li { - margin-right: 70px !important; + margin: 5px 50px 5px 20px; } -.main#help .links li { - margin: 5px 50px 5px 20px; +#fullhistory { + text-align: left; +} + +#fullhistory::before { + margin-left: 10px; } .links li code { diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css index 0d41d2a01c..30a08ca7d9 100644 --- a/installer/resources/themes/console/midnight/console.css +++ b/installer/resources/themes/console/midnight/console.css @@ -4447,7 +4447,7 @@ table#externali2cp { /* /help */ -.main#help h3 { +#help h3 { padding: 7px 10px; font-size: 10pt; } @@ -4555,12 +4555,12 @@ ul#upnphelp li:last-child, #legal ul li:last-child { padding-bottom: 0; } -.main#help td.infohelp, .main#help td.infowarn { +#help td.infohelp, #help td.infowarn { background-size: 24px 24px !important; padding-left: 46px !important; } -.main#help #configinfo .infowarn { +#help #configinfo .infowarn { border: none; border-bottom: 1px inset #010008; box-shadow: none; @@ -4568,6 +4568,10 @@ ul#upnphelp li:last-child, #legal ul li:last-child { padding: 7px 10px 7px 40px !important; } +#help li { + text-align: justify; +} + /* mini faq */ #faq h3 { @@ -7532,7 +7536,7 @@ table#i2pupdates td:first-child { white-space: normal; } -.main#help h3, #faq h3 { +#help h3, #faq h3 { font-size: 10pt !important; } } @@ -7584,7 +7588,7 @@ table#i2pupdates td:first-child { margin-bottom: 5px; } -.main#help h3, #faq h3 { +#help h3, #faq h3 { font-size: 10.5pt !important; } @@ -7594,7 +7598,7 @@ table#i2pupdates td:first-child { } @media screen and (min-width: 1400px) { -.main#help #changelog pre:not(old) { +#help #changelog pre:not(old) { columns: 550px auto; column-gap: 40px; column-rule: 1px dotted #443da0;