echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

introduce divs to allow selecting buttons on /home by category

Browse Source
This commit is contained in:
hankhill19580
2019-11-08 17:42:53 +00:00
parent 552100da17
commit ff293d50a9
29 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i2psnark/i2psnark.config
View File

@ -1,7 +1,7 @@
# NOTE: This I2P config file must use UTF-8 encoding
#
# If you have a 'split' directory installation, with configuration
# files in ~/.i2p (Linux), %APPDATA%\I2P (Windows),
# files in ~/.i2p (Linux), %LOCALAPPDATA%\I2P (Windows),
# or /Users/(user)/Library/Application Support/i2p (Mac), be sure to
# edit the file in the configuration directory, NOT the install directory.
# When running as a Linux daemon, the configuration directory is /var/lib/i2p

4
apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java
View File

@ -184,7 +184,6 @@ public class ConfigUIHelper extends HelperBase {
current = "en";
}
StringBuilder buf = new StringBuilder(512);
//buf.append("<fieldset>\n");
buf.append(" <select name=\"lang\" id=\"langsettings\">\n");
for (int i = 0; i < langs.length; i++) {
String lang = langs[i][0];
@ -197,10 +196,8 @@ public class ConfigUIHelper extends HelperBase {
buf.append(" value=\"").append(lang).append("\"");
buf.append(" id=\"").append(lang).append("\"").append(">");
//buf.append(" style=\"").append("background-image:url(/flags.jsp?s=48&amp;c=").append(langs[i][1]).append("\">\n");
int under = lang.indexOf('_');
String slang = (under > 0) ? lang.substring(0, under) : lang;
//buf.append(" ");
buf.append(langs[i][2]);
String name = langs[i][3];
if (name != null) {
@ -211,7 +208,6 @@ public class ConfigUIHelper extends HelperBase {
buf.append("</option>\n");
}
buf.append(" </select>\n");
//buf.append("</fieldset>\n");
return buf.toString();
}

8
apps/routerconsole/jsp/home.jsp
View File

@ -87,13 +87,17 @@
%>
<div class="ag2">
<h4 class="app2"><%=intl._t("Hidden Services of Interest")%></h4>
<jsp:getProperty name="homehelper" property="favorites" /><br>
<div class="homesites">
<jsp:getProperty name="homehelper" property="favorites" /><br>
<div class="clearer">&nbsp;</div>
</div>
</div>
<div class="ag2">
<h4 class="app"><%=intl._t("Applications and Configuration")%></h4>
<jsp:getProperty name="homehelper" property="services" /><br>
<div class="homeapps">
<jsp:getProperty name="homehelper" property="services" /><br>
<div class="clearer">&nbsp;</div>
</div>
</div>
</div>
</div>

1
apps/routerconsole/jsp/welcome.jsp
View File

@ -92,7 +92,6 @@
<%
}
%>
<!--<h2><%=intl._t("New Install Wizard")%> <%=ipg%>/<%=LAST_PAGE%></h2>-->
<div id="wizard" class="overlay">
<jsp:useBean class="net.i2p.router.web.helpers.WizardHandler" id="formhandler" scope="request" />

2
installer/java/src/net/i2p/installer/FixWinPaths.java
View File

@ -14,7 +14,7 @@ import java.io.PrintStream;
/**
* <p>This class is used by the installer in Windows to process the <code>wrapper.config</code> file. It
* <ul>
* <li>rewrites the applicable wrapper config options to point to <code>%APPDATA%\I2P</code></li>
* <li>rewrites the applicable wrapper config options to point to <code>%LOCALAPPDATA%\I2P</code></li>
* <li>corrects the paths, rewriting <code>/</code> to <code>\</code></li>
* </ul>
* <p>

2
installer/resources/blocklist.txt
View File

@ -1,6 +1,6 @@
#
# If you have a 'split' directory installation, with configuration
# files in ~/.i2p (Linux), %APPDATA%\I2P (Windows),
# files in ~/.i2p (Linux), %LOCALAPPDATA%\I2P (Windows),
# or /Users/(user)/Library/Application Support/i2p (Mac), be sure to
# edit the file in the configuration directory, NOT the install directory.
# When running as a Linux daemon, the configuration directory is /var/lib/i2p

2
installer/resources/clients.config
View File

@ -1,7 +1,7 @@
# NOTE: This I2P config file must use UTF-8 encoding
#
# If you have a 'split' directory installation, with configuration
# files in ~/.i2p (Linux), %APPDATA%\I2P (Windows),
# files in ~/.i2p (Linux), %LOCALAPPDATA%\I2P (Windows),
# or /Users/(user)/Library/Application Support/i2p (Mac), be sure to
# edit the file in the configuration directory, NOT the install directory.
# When running as a Linux daemon, the configuration directory is /var/lib/i2p

2
installer/resources/eepsite/docroot/help/index.html
View File

@ -48,7 +48,7 @@
Package install, running as a service: <code>/var/lib/i2p/i2p-config/eepsite/docroot/</code>
</li>
<li><b>Windows</b><br>
<code>%APPDATA%\I2P\eepsite\docroot\</code>
<code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code>
</li>
<li><b>Mac</b><br>
<code>/Users/(user)/Library/Application Support/i2p</code>

2
installer/resources/eepsite/docroot/help/index_ar.html
View File

@ -36,7 +36,7 @@
تثبيت عادي: <code>~/.i2p/eepsite/docroot/ </code><br>
تثبيت الحزمة، وتشغيلها كخدمة: <code>/var/lib/i2p/i2p-config/eepsite/docroot/ </code> </li>
<li>
<b> ويندوز </b><br><code>%APPDATA%\I2P\eepsite\docroot\</code> </li>
<b> ويندوز </b><br><code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code> </li>
<li>
<b> ماك </b><br><code>/Users/(user)/Library/Application Support/i2p</code>
</li>

2
installer/resources/eepsite/docroot/help/index_az.html
View File

@ -35,7 +35,7 @@
Standart quraşdırma:<code>~/.i2p/eepsite/docroot/</code><br>
Xidmət kimi çalışan Paket quraşdırma: /var/lib/i2p/i2p-config/eepsite/docroot/</code></li>
<li>
<b>Windows</b><br><code>%APPDATA%\I2P\eepsite\docroot\</code>
<b>Windows</b><br><code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code>
</li>
<li>
<b>Mac</b><br><code>/Users/(user)/Library/Application Support/i2p</code>

2
installer/resources/eepsite/docroot/help/index_de.html
View File

@ -37,7 +37,7 @@ Um Ihre eigenen Daten anzubieten, ändern Sie einfach die Dateien im Wurzelverze
Paket Installation, laufend als Service: <code>/var/lib/i2p/i2p-config/eepsite/docroot/</code>
</li>
<li>
<b>Windows</b><br><code>%APPDATA%\I2P\eepsite\docroot\</code>
<b>Windows</b><br><code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code>
</li>
<li>
<b>Mac</b><br><code>/Users/(user)/Library/Application Support/i2p</code>

4
installer/resources/eepsite/docroot/help/index_es.html
View File

@ -24,7 +24,7 @@
<h1>Servidor web anónimo I2P</h1>
<h2>Guía rápida para crear el servidor web en I2P</h2>
<p>Esta es tu eepsite, tu propio servidor web anónimo en I2P - simplemente edita los archivos dentro de <code>~/.i2p/eepsite/docroot/</code> (en Linux),
<code>%APPDATA%\I2P\eepsite\docroot\</code> (en Windows),
<code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code> (en Windows),
o <code>/Users/(user)/Library/Application Support/i2p</code> (en Mac),
y podrá ser vistas por otras personas una vez que hayas seguido lo pasos de más abajo.
En I2P las eepsites se indican con una 'key o 'clave', la cual se representa como una larga cadena de texto en Base64.
@ -68,7 +68,7 @@
verla inmediatamente.</li></ul>
<p>Antes de anunciar tu nueva eepsite al mundo, deberías añadir contenido.
Ves a <code>~/.i2p/eepsite/docroot/</code> (en Linux),
<code>%APPDATA%\I2P\eepsite\docroot\</code> (en Windows),
<code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code> (en Windows),
o <code>/Users/(user)/Library/Application Support/i2p</code> (en Mac),
y reemplaza la página de redirección index.html con tu contenido. Las carpetas virtuales funcionan, por lo que puedes hospedar
archivos desde un subdirectorio sin la necesidad de proveer explícitamente una página con enlaces a los archivos.

2
installer/resources/eepsite/docroot/help/index_fr.html
View File

@ -37,7 +37,7 @@ Pour servir votre propre contenu, modifiez simplement les fichiers situés dans
Installation par un paquet, exécuté comme service : <code>/var/lib/i2p/i2p-config/eepsite/docroot/</code>
</li>
<li>
<b>Windows</b><br><code>%APPDATA%\I2P\eepsite\docroot\</code>
<b>Windows</b><br><code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code>
</li>
<li>
<b>macOS</b><br><code>/Users/(user)/Library/Application Support/i2p</code>

2
installer/resources/eepsite/docroot/help/index_hu.html
View File

@ -37,7 +37,7 @@
Csomag telepítése, szolgáltatásként futtatva: <code>/var/lib/i2p/i2p-config/eepsite/docroot/</code>
</li>
<li>
<b>Windows</b><br><code>%APPDATA%\I2P\eepsite\docroot\</code>
<b>Windows</b><br><code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code>
</li>
<li>
<b>Mac</b><br><code>/Users/(felhasználó)/Library/Application Support/i2p</code>

2
installer/resources/eepsite/docroot/help/index_in.html
View File

@ -34,7 +34,7 @@
<b>Linux</b><br> Standard install: <code>~/.i2p/eepsite/docroot/</code><br> Package install, dijalankan sebagai service: <code>/var/lib/i2p/i2p-config/eepsite/docroot/</code>
</li>
<li>
<b>Windows</b><br><code>%APPDATA%\I2P\eepsite\docroot\</code>
<b>Windows</b><br><code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code>
</li>
<li>
<b>Mac</b><br><code>/Users/(user)/Library/Application Support/i2p</code>

2
installer/resources/eepsite/docroot/help/index_it.html
View File

@ -37,7 +37,7 @@
Package install, running as a service: <code>/var/lib/i2p/i2p-config/eepsite/docroot/</code>
</li>
<li>
<b>Windows</b><br><code>%APPDATA%\I2P\eepsite\docroot\</code>
<b>Windows</b><br><code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code>
</li>
<li>
<b>Mac</b><br><code>/Users/(user)/Library/Application Support/i2p</code>

4
installer/resources/eepsite/docroot/help/index_nl.html
View File

@ -25,7 +25,7 @@
<h2>Korte Handleiding voor Anoniem Webhosten op I2P</h2>
<p>Dit is je eepsite, je eigen anonieme I2P webserver - pas de bestanden onder <code>~/.i2p/eepsite/docroot/</code> (Linux),
<code>%APPDATA%\I2P\eepsite\docroot\</code> (Windows),
<code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code> (Windows),
of <code>/Users/(user)/Library/Application Support/i2p</code> (Mac), simpelweg aan
en ze zijn bereikbaar door anderen zodra je onderstaande instructies hebt opgevolgd.
In I2P worden eepsites aangeduid met een 'destination', dit is een erg lange Base64 string.
@ -69,7 +69,7 @@
<li>In je browser, voel je eepsite naam in (<i>mijnsite</i>.i2p) en je komt hier hopelijk weer terug.</li></ul>
<p>Voordat je de rest van de wereld over je nieuwe eepsite vertelt, zorg eerst voor wat content.
Ga naar <code>~/.i2p/eepsite/docroot/</code> (Linux),
<code>%APPDATA%\I2P\eepsite\docroot\</code> (Windows),
<code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code> (Windows),
of <code>/Users/(user)/Library/Application Support/i2p</code> (Mac), en vervang de index.html verwijs pagina met je eigen content. Virtual folders werken, dus kan je bestanden vanuit een subdirectory hosten zonder dat je een pagina met links naar deze files moet maken. Mocht je een template nodig hebben voor een basis site, weer vrij om <a href="pagetemplate.html">deze pagina</a> en <a href="lib/">deze content</a> te gebruiken en aan te passen!</p>
<h2>Registreer je eigen .I2P Domein</h2>
<p>Nu is het tijd om je eepsite toe te voegen aan een I2P adresboek gehost door een site

2
installer/resources/eepsite/docroot/help/index_pl.html
View File

@ -36,7 +36,7 @@
Instalacja z paczek, działa jako usługa: <code>/var/lib/i2p/i2p-config/eepsite/docroot/</code>
</li>
<li>
<b>Windows</b><br><code>%APPDATA%\I2P\eepsite\docroot\</code>
<b>Windows</b><br><code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code>
</li>
<li>
<b>Mac</b><br><code>/Users/(użytkownik)/Library/Application Support/i2p</code>

2
installer/resources/eepsite/docroot/help/index_pt.html
View File

@ -37,7 +37,7 @@
Pacote de instalação, em execução como um serviço: <code>/var/lib/i2p/i2p-config/eepsite/docroot/</code>
</li>
<li>
<b>Windows</b><br><code>%APPDATA%\I2P\eepsite\docroot\</code>
<b>Windows</b><br><code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code>
</li>
<li>
<b>Mac</b><br><code>/Users/(user)/Library/Application Support/i2p</code>

2
installer/resources/eepsite/docroot/help/index_ro.html
View File

@ -37,7 +37,7 @@ Pentru a vă servi propriul conținut, pur și simplu editați fișierele din di
Instalarea pachetului, care rulează ca serviciu: <code>/var/lib/i2p/i2p-config/eepsite/docroot/</code>
</li>
<li>
<b>Windows</b><br><code>%APPDATA%\I2P\eepsite\docroot\</code>
<b>Windows</b><br><code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code>
</li>
<li>
<b>Mac</b><br><code>/Users/(user)/Library/Application Support/i2p</code>

2
installer/resources/eepsite/docroot/help/index_ru.html
View File

@ -37,7 +37,7 @@
Для установленного пакета, запущенного в виде сервиса: <code>/var/lib/i2p/i2p-config/eepsite/docroot/</code>
</li>
<li>
<b>Windows</b><br><code>%APPDATA%\I2P\eepsite\docroot\</code>
<b>Windows</b><br><code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code>
</li>
<li>
<b>Mac</b><br><code>/Users/(user)/Library/Application Support/i2p</code>

4
installer/resources/eepsite/docroot/help/index_sv.html
View File

@ -26,7 +26,7 @@
<p>Det här är din eepsite, din egen anonyma I2P-webbserver - redigera bara filerna
under <code>~/.i2p/eepsite/docroot/</code> (Linux),
<code>%APPDATA%\I2P\eepsite\docroot\</code> (Windows),
<code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code> (Windows),
eller <code>/Users/(user)/Library/Application Support/i2p</code> (Mac),
så kommer andra kunna nå dem efter att du följt instruktionerna nedan.
I I2P så adresseras eepsajter med en 'nyckel', som representeras som en väldigt lång Base64-sträng.
@ -70,7 +70,7 @@
Förhoppningsvis fungerade det.</li>
<li>Innan du berättar för världen om den nya eepsajt borde du lägga till lite innehåll.
Gå till <code>~/.i2p/eepsite/docroot/</code> (Linux),
<code>%APPDATA%\I2P\eepsite\docroot\</code> (Windows),
<code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code> (Windows),
eller <code>/Users/(user)/Library/Application Support/i2p</code> (Mac),
och ersätt omdirigeringssidan index.html med ditt eget innehåll. Virtuella mappar fungerar, så du kan serva filer från en
underkatalog utan att behöva ge en sida med länkar till filer. Om du behöver en mall för en enkel sajt så

2
installer/resources/eepsite/docroot/help/index_tr.html
View File

@ -37,7 +37,7 @@
Paket kurulumu, hizmet olarak çalıştırmak: <code>/var/lib/i2p/i2p-config/eepsite/docroot/</code>
</li>
<li>
<b>Windows</b><br><code>%APPDATA%\I2P\eepsite\docroot\</code>
<b>Windows</b><br><code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code>
</li>
<li>
<b>Mac</b><br><code>/Users/(user)/Library/Application Support/i2p</code>

4
installer/resources/eepsite/docroot/help/index_zh.html
View File

@ -26,7 +26,7 @@
<h2>I2P匿名网页服务快速指南</h2>
<p>这是您的eepsite，您自己的匿名I2P网络服务器 - 只要编辑 <code>~/.i2p/eepsite/docroot/</code> (Linux),
<code>%APPDATA%\I2P\eepsite\docroot\</code> (Windows),
<code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code> (Windows),
或 <code>/Users/(user)/Library/Application Support/i2p</code> (Mac), 下的文件,并且按照以下说明操作后,别人就可以访问了.
在I2P,eepsites是用一个很长的Base64字串"密钥"来寻址访问的.
(这"密钥"有点类似于IP地址,且会显示在eepsite的I2PTunnel上
@ -61,7 +61,7 @@
<li>在您的浏览器内，输入您的 eepsite名称 (<i>something</i>.i2p)您应该会立刻返回这里. 希望它能生效.</li>
<li>在您向全世界宣告您的新eepsite前，您应该增加一些内容.
到<code>~/.i2p/eepsite/docroot/</code> (Linux),
<code>%APPDATA%\I2P\eepsite\docroot\</code> (Windows),
<code>%LOCALAPPDATA%\I2P\eepsite\docroot\</code> (Windows),
或 <code>/Users/(user)/Library/Application Support/i2p</code> (Mac), 并用自己的内容替换掉index.html重定向页面.虚拟文件夹会起作用，这样您就可以从一个子目录中提供文件服务而不用明确需要提供链接到文件的一个页面.如果您需要一个基本的网站模板, 请自由借来并适用 <a href="pagetemplate.html">本页</a> 和 <a href="lib/">内容</a> !</li>
</ul>
<h2>注册自己的.I2P域名</h2>

2
installer/resources/eepsite/docroot/index.html
View File

@ -2,7 +2,7 @@
<!--
#
# If you have a 'split' directory installation, with configuration
# files in ~/.i2p (Linux), %APPDATA%\I2P (Windows),
# files in ~/.i2p (Linux), %LOCALAPPDATA%\I2P (Windows),
# or /Users/(user)/Library/Application Support/i2p (Mac), be sure to
# edit the file in the configuration directory, NOT the install directory.
# When running as a Linux daemon, the configuration directory is /var/lib/i2p

2
installer/resources/eepsite/jetty-ssl.xml
View File

@ -5,7 +5,7 @@
<!-- ========================================================================= -->
<!-- If you have a 'split' directory installation, with configuration -->
<!-- files in ~/.i2p (Linux), %APPDATA%\I2P (Windows), -->
<!-- files in ~/.i2p (Linux), %LOCALAPPDATA%\I2P (Windows), -->
<!-- or /Users/(user)/Library/Application Support/i2p (Mac), be sure to -->
<!-- edit the file in the configuration directory, NOT the install directory. -->
<!-- When running as a Linux daemon, the configuration directory is -->

2
installer/resources/eepsite/jetty.xml
View File

@ -32,7 +32,7 @@
<!-- Note that the XML encoding for this file is UTF-8. -->
<!-- -->
<!-- If you have a 'split' directory installation, with configuration -->
<!-- files in ~/.i2p (Linux), %APPDATA%\I2P (Windows), -->
<!-- files in ~/.i2p (Linux), %LOCALAPPDATA%\I2P (Windows), -->
<!-- or /Users/(user)/Library/Application Support/i2p (Mac), be sure to -->
<!-- edit the file in the configuration directory, NOT the install directory. -->
<!-- When running as a Linux daemon, the configuration directory is -->

2
installer/resources/i2ptunnel.config
View File

@ -1,7 +1,7 @@
# NOTE: This I2P config file must use UTF-8 encoding
#
# If you have a 'split' directory installation, with configuration
# files in ~/.i2p (Linux), %APPDATA%\I2P (Windows),
# files in ~/.i2p (Linux), %LOCALAPPDATA%\I2P (Windows),
# or /Users/(user)/Library/Application Support/i2p (Mac), be sure to
# edit the file in the configuration directory, NOT the install directory.
# When running as a Linux daemon, the configuration directory is /var/lib/i2p

4
router/java/src/net/i2p/router/startup/WorkingDir.java
View File

@ -19,7 +19,7 @@ import net.i2p.util.SystemVersion;
* Get a working directory for i2p.
*
* For the location, first try the system property i2p.dir.config
* Next try $HOME/.i2p on linux or %APPDATA%\I2P on Windows.
* Next try $HOME/.i2p on linux or %LOCALAPPDATA%\I2P on Windows.
*
* If the dir exists, return it.
* Otherwise, attempt to create it, and copy files from the base directory.
@ -80,7 +80,7 @@ public class WorkingDir {
} else {
String home = System.getProperty("user.home");
if (isWindows) {
String appdata = System.getenv("APPDATA");
String appdata = System.getenv("LOCALAPPDATA");
if (appdata != null)
home = appdata;
dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_WINDOWS);