merge of '25ef664ae94fb608b457b601780f6774ede7b39a'
and 'c71ada3c23327bd4f17070d019a448c0289bae63'
This commit is contained in:
z3d
@ -4,7 +4,7 @@
|
||||
|
||||
<info>
|
||||
<appname>i2p</appname>
|
||||
<appversion>0.7.4</appversion>
|
||||
<appversion>0.7.5</appversion>
|
||||
<authors>
|
||||
<author name="I2P" email="http://forum.i2p2.de/"/>
|
||||
</authors>
|
||||
@ -102,12 +102,14 @@
|
||||
<description>Base installation files</description>
|
||||
<fileset dir="pkg-temp" includes="**/*" targetdir="$INSTALL_PATH"/>
|
||||
<!--
|
||||
Do variable substitution in the wrapper.config and i2prouter files. See:
|
||||
Do variable substitution in these files. See:
|
||||
http://www.javalobby.org/forums/thread.jspa?threadID=15967&tstart=0
|
||||
and the izpack docs for some guidance.
|
||||
-->
|
||||
<parsable targetfile="$INSTALL_PATH/wrapper.config" type="javaprop" />
|
||||
<parsable targetfile="$INSTALL_PATH/wrapper.config" type="plain" />
|
||||
<parsable targetfile="$INSTALL_PATH/i2prouter" type="shell" os="unix|mac" />
|
||||
<parsable targetfile="$INSTALL_PATH/eepget" type="shell" os="unix|mac" />
|
||||
<parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell" os="unix|mac" />
|
||||
|
||||
<!-- postinstall stuff for windows -->
|
||||
<executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
|
||||
|
||||
@ -4,45 +4,24 @@ Cache-control: no-cache
|
||||
Connection: close
|
||||
Proxy-Connection: close
|
||||
|
||||
<html><head>
|
||||
<title>Destination key conflict</title>
|
||||
<link rel="shortcut icon" href="http://127.0.0.1:7657/favicon.ico" />
|
||||
<style type='text/css'>
|
||||
div.warning {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffefef;
|
||||
border: medium solid #ffafaf;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
div.logo {
|
||||
float: left;
|
||||
width: 200px;
|
||||
left: 1em;
|
||||
top: 1em;
|
||||
margin: 0em;
|
||||
padding: .5em;
|
||||
text-align: left;
|
||||
border: medium solid #efefff;
|
||||
background-color: #fafaff;
|
||||
color: inherit;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class=logo>
|
||||
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://127.0.0.1:7657/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
|
||||
[<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
|
||||
</div>
|
||||
<div class=warning id=warning>
|
||||
The addresshelper link you followed specifies a different destination key
|
||||
than a host entry in your host database.
|
||||
Someone could be trying to impersonate another eepsite,
|
||||
or people have given two eepsites identical names.
|
||||
<P/>
|
||||
You can resolve the conflict by considering which key you trust,
|
||||
and either discarding the addresshelper link,
|
||||
discarding the host entry from your host database,
|
||||
or naming one of them differently.
|
||||
<P/>
|
||||
<html><head>
|
||||
<title>Destination key conflict</title>
|
||||
<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
|
||||
<link href="http://proxy.i2p/themes/console/console.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<div class=logo>
|
||||
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
|
||||
[<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
|
||||
</div>
|
||||
<div class=warning id=warning>
|
||||
The addresshelper link you followed specifies a different destination key
|
||||
than a host entry in your host database.
|
||||
Someone could be trying to impersonate another eepsite,
|
||||
or people have given two eepsites identical names.
|
||||
<P/>
|
||||
You can resolve the conflict by considering which key you trust,
|
||||
and either discarding the addresshelper link,
|
||||
discarding the host entry from your host database,
|
||||
or naming one of them differently.
|
||||
<P/>
|
||||
|
||||
@ -6,33 +6,12 @@ Proxy-Connection: close
|
||||
|
||||
<html><head>
|
||||
<title>Eepsite not reachable</title>
|
||||
<link rel="shortcut icon" href="http://127.0.0.1:7657/favicon.ico" />
|
||||
<style type='text/css'>
|
||||
div.warning {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffefef;
|
||||
border: medium solid #ffafaf;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
div.logo {
|
||||
float: left;
|
||||
width: 200px;
|
||||
left: 1em;
|
||||
top: 1em;
|
||||
margin: 0em;
|
||||
padding: .5em;
|
||||
text-align: left;
|
||||
border: medium solid #efefff;
|
||||
background-color: #fafaff;
|
||||
color: inherit;
|
||||
}
|
||||
</style>
|
||||
<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
|
||||
<link href="http://proxy.i2p/themes/console/console.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<div class=logo>
|
||||
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://127.0.0.1:7657/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
|
||||
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
|
||||
[<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
|
||||
</div>
|
||||
<div class=warning id=warning>
|
||||
|
||||
@ -6,33 +6,12 @@ Proxy-Connection: close
|
||||
|
||||
<html><head>
|
||||
<title>Invalid eepsite destination</title>
|
||||
<link rel="shortcut icon" href="http://127.0.0.1:7657/favicon.ico" />
|
||||
<style type='text/css'>
|
||||
div.warning {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffefef;
|
||||
border: medium solid #ffafaf;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
div.logo {
|
||||
float: left;
|
||||
width: 200px;
|
||||
left: 1em;
|
||||
top: 1em;
|
||||
margin: 0em;
|
||||
padding: .5em;
|
||||
text-align: left;
|
||||
border: medium solid #efefff;
|
||||
background-color: #fafaff;
|
||||
color: inherit;
|
||||
}
|
||||
</style>
|
||||
<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
|
||||
<link href="http://proxy.i2p/themes/console/console.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<div class=logo>
|
||||
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://127.0.0.1:7657/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
|
||||
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
|
||||
[<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
|
||||
</div>
|
||||
<div class=warning id=warning>
|
||||
|
||||
@ -6,33 +6,12 @@ Proxy-Connection: close
|
||||
|
||||
<html><head>
|
||||
<title>Eepsite unknown</title>
|
||||
<link rel="shortcut icon" href="http://127.0.0.1:7657/favicon.ico" />
|
||||
<style type='text/css'>
|
||||
div.warning {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffefef;
|
||||
border: medium solid #ffafaf;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
div.logo {
|
||||
float: left;
|
||||
width: 200px;
|
||||
left: 1em;
|
||||
top: 1em;
|
||||
margin: 0em;
|
||||
padding: .5em;
|
||||
text-align: left;
|
||||
border: medium solid #efefff;
|
||||
background-color: #fafaff;
|
||||
color: inherit;
|
||||
}
|
||||
</style>
|
||||
<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
|
||||
<link href="http://proxy.i2p/themes/console/console.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<div class=logo>
|
||||
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://127.0.0.1:7657/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
|
||||
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
|
||||
[<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
|
||||
</div>
|
||||
<div class=warning id=warning>
|
||||
|
||||
@ -4,47 +4,25 @@ Cache-control: no-cache
|
||||
Connection: close
|
||||
Proxy-Connection: close
|
||||
|
||||
<html><head>
|
||||
<title>Outproxy Not Found</title>
|
||||
<link rel="shortcut icon" href="http://127.0.0.1:7657/favicon.ico" />
|
||||
<style type='text/css'>
|
||||
div.warning {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffefef;
|
||||
border: medium solid #ffafaf;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
div.logo {
|
||||
float: left;
|
||||
width: 200px;
|
||||
left: 1em;
|
||||
top: 1em;
|
||||
margin: 0em;
|
||||
padding: .5em;
|
||||
text-align: left;
|
||||
border: medium solid #efefff;
|
||||
background-color: #fafaff;
|
||||
color: inherit;
|
||||
}
|
||||
</style>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<div class=logo>
|
||||
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://127.0.0.1:7657/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
|
||||
[<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
|
||||
</div>
|
||||
<div class=warning id=warning>
|
||||
The WWW Outproxy was not found.
|
||||
It is offline, there is network congestion,
|
||||
or your router is not yet well-integrated with peers.
|
||||
You may want to
|
||||
<a href="javascript: parent.window.location.reload()">retry</a>
|
||||
as this will randomly reselect an outproxy from the pool you have defined
|
||||
<a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">here</a>
|
||||
(if you have more than one configured).
|
||||
If you continue to have trouble you may want to edit your outproxy list
|
||||
<a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=0">here</a>.
|
||||
<BR><BR>Could not find the following destination:<BR><BR>
|
||||
<html><head>
|
||||
<title>Outproxy Not Found</title>
|
||||
<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
|
||||
<link href="http://proxy.i2p/themes/console/console.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<div class=logo>
|
||||
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
|
||||
[<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
|
||||
</div>
|
||||
<div class=warning id=warning>
|
||||
The WWW Outproxy was not found.
|
||||
It is offline, there is network congestion,
|
||||
or your router is not yet well-integrated with peers.
|
||||
You may want to
|
||||
<a href="javascript: parent.window.location.reload()">retry</a>
|
||||
as this will randomly reselect an outproxy from the pool you have defined
|
||||
<a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">here</a>
|
||||
(if you have more than one configured).
|
||||
If you continue to have trouble you may want to edit your outproxy list
|
||||
<a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=0">here</a>.
|
||||
<BR><BR>Could not find the following destination:<BR><BR>
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
#!/bin/sh
|
||||
#export I2P=~i2p/i2p
|
||||
export I2P=`dirname $0`
|
||||
java -cp $I2P/lib/i2p.jar net.i2p.util.EepGet $*
|
||||
I2P="%INSTALL_PATH"
|
||||
java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
|
||||
|
||||
@ -8,28 +8,31 @@
|
||||
# if you have changed the default location set in the
|
||||
# wrapper configuration file.
|
||||
#
|
||||
# Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
|
||||
# should have been replaced by
|
||||
# the izpack installer. If you did not run the installer,
|
||||
# replace them with the appropriate path.
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# These settings can be modified to fit the needs of your application
|
||||
|
||||
# Paths
|
||||
# Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
|
||||
# should have been replaced by the izpack installer.
|
||||
# If you did not run the installer, replace them with the appropriate path.
|
||||
I2P="%INSTALL_PATH"
|
||||
I2PTEMP="%SYSTEM_java_io_tmpdir"
|
||||
|
||||
# Application
|
||||
APP_NAME="i2p"
|
||||
APP_LONG_NAME="I2P Service"
|
||||
|
||||
# Wrapper
|
||||
WRAPPER_CMD="%INSTALL_PATH/i2psvc"
|
||||
WRAPPER_CONF="%INSTALL_PATH/wrapper.config"
|
||||
WRAPPER_CMD="$I2P/i2psvc"
|
||||
WRAPPER_CONF="$I2P/wrapper.config"
|
||||
|
||||
# Priority at which to run the wrapper. See "man nice" for valid priorities.
|
||||
# nice is only used if a priority is specified.
|
||||
PRIORITY=
|
||||
|
||||
# Location of the pid file.
|
||||
PIDDIR="%SYSTEM_java_io_tmpdir"
|
||||
PIDDIR="$I2PTEMP"
|
||||
|
||||
# If uncommented, causes the Wrapper to be shutdown using an anchor file.
|
||||
# When launched with the 'start' command, it will also ignore all INT and
|
||||
@ -51,40 +54,6 @@ PIDDIR="%SYSTEM_java_io_tmpdir"
|
||||
# Do not modify anything beyond this point
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
# Get the fully qualified path to the script
|
||||
case $0 in
|
||||
/*)
|
||||
SCRIPT="$0"
|
||||
;;
|
||||
*)
|
||||
PWD=`pwd`
|
||||
SCRIPT="$PWD/$0"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Change spaces to ":" so the tokens can be parsed.
|
||||
SCRIPT=`echo $SCRIPT | sed -e 's; ;:;g'`
|
||||
# Get the real path to this script, resolving any symbolic links
|
||||
TOKENS=`echo $SCRIPT | sed -e 's;/; ;g'`
|
||||
REALPATH=
|
||||
for C in $TOKENS; do
|
||||
REALPATH="$REALPATH/$C"
|
||||
while [ -h "$REALPATH" ] ; do
|
||||
LS="`ls -ld "$REALPATH"`"
|
||||
LINK="`expr "$LS" : '.*-> \(.*\)$'`"
|
||||
if expr "$LINK" : '/.*' > /dev/null; then
|
||||
REALPATH="$LINK"
|
||||
else
|
||||
REALPATH="`dirname "$REALPATH"`""/$LINK"
|
||||
fi
|
||||
done
|
||||
done
|
||||
# Change ":" chars back to spaces.
|
||||
REALPATH=`echo $REALPATH | sed -e 's;:; ;g'`
|
||||
|
||||
# Change the current directory to the location of the script
|
||||
cd "`dirname "$REALPATH"`"
|
||||
|
||||
# Process ID
|
||||
ANCHORFILE="$PIDDIR/$APP_NAME.anchor"
|
||||
PIDFILE="$PIDDIR/$APP_NAME.pid"
|
||||
|
||||
@ -5,9 +5,17 @@
|
||||
# probably not enough for i2p.
|
||||
# You should really use the i2prouter script instead.
|
||||
#
|
||||
export CP=. ; for j in lib/* ; do export CP=$CP:$j ; done;
|
||||
|
||||
# Paths
|
||||
# Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
|
||||
# should have been replaced by the izpack installer.
|
||||
# If you did not run the installer, replace them with the appropriate path.
|
||||
I2P="%INSTALL_PATH"
|
||||
I2PTEMP="%SYSTEM_java_io_tmpdir"
|
||||
|
||||
export CP="$I2P" ; for j in "$I2P/lib/*" ; do export CP="$CP:$j" ; done;
|
||||
JAVA=java
|
||||
|
||||
JAVAOPTS="-Djava.library.path=.:lib -DloggerFilenameOverride=logs/log-router-@.txt"
|
||||
nohup $JAVA -cp $CP $JAVAOPTS net.i2p.router.RouterLaunch > /dev/null 2>&1 &
|
||||
echo $! > router.pid
|
||||
JAVAOPTS="-Djava.library.path=$I2P:$I2P/lib -Di2p.dir.base=$I2P -DloggerFilenameOverride=logs/log-router-@.txt"
|
||||
nohup $JAVA -cp "$CP" $JAVAOPTS net.i2p.router.RouterLaunch > /dev/null 2>&1 &
|
||||
echo $! > "$I2PTEMP/router.pid"
|
||||
|
||||
112
installer/resources/themes/console/classic/console.css
Normal file
112
installer/resources/themes/console/classic/console.css
Normal file
@ -0,0 +1,112 @@
|
||||
body {
|
||||
font-family: Verdana, Tahoma, Helvetica, sans-serif;
|
||||
margin: 1em 0em;
|
||||
padding: 0em;
|
||||
text-align: center;
|
||||
background-color: white;
|
||||
color: black;
|
||||
font-size: 100%;
|
||||
}
|
||||
|
||||
.hide {
|
||||
display: none;
|
||||
}
|
||||
|
||||
img {
|
||||
border: none;
|
||||
}
|
||||
|
||||
pre {
|
||||
width: 100%;
|
||||
overflow-x: scroll;
|
||||
}
|
||||
|
||||
div.logo {
|
||||
float: left;
|
||||
width: 200px;
|
||||
left: 1em;
|
||||
top: 1em;
|
||||
margin: 0em;
|
||||
padding: .5em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
div.toolbar {
|
||||
margin: 0em 0em 2em 0em;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
div.routersummaryouter {
|
||||
float: left;
|
||||
width: 215px;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
clear: left; /* fixes a bug in Opera */
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
div.routersummary {
|
||||
background-color: #fafaff;
|
||||
width: 195px;
|
||||
color: inherit;
|
||||
margin: 0em;
|
||||
padding: 5px;
|
||||
text-align: left;
|
||||
border: medium solid #efefff;
|
||||
font-size: 0.82em;
|
||||
}
|
||||
|
||||
div.warning {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffefef;
|
||||
border: medium solid #ffafaf;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
div.main {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffffef;
|
||||
border: medium solid #ffffd0;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
div.main textarea {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
div.news {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffffc0;
|
||||
border: medium solid #ffffa0;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
div.confignav {
|
||||
padding: 1em;
|
||||
background-color: #efefff;
|
||||
}
|
||||
|
||||
div.configure {
|
||||
padding: 1em;
|
||||
background-color: #ffffc0;
|
||||
}
|
||||
|
||||
div.messages {
|
||||
padding: 1em;
|
||||
background-color: #fafaff;
|
||||
}
|
||||
|
||||
div.messages span.error {
|
||||
color: #d00000;
|
||||
}
|
||||
|
||||
div.messages span.notice {
|
||||
font-style: italic;
|
||||
}
|
||||
182
installer/resources/themes/console/classic/default.css
Normal file
182
installer/resources/themes/console/classic/default.css
Normal file
@ -0,0 +1,182 @@
|
||||
body {
|
||||
margin : 0px;
|
||||
padding : 0px;
|
||||
text-align : center;
|
||||
font-family : Arial, Helvetica, sans-serif;
|
||||
background-color : #ffffff;
|
||||
color : #000000;
|
||||
font-size : 100%;
|
||||
|
||||
/* we've avoided Tantek Hacks so far,
|
||||
** but we can't avoid using the non-w3c method of
|
||||
** box rendering. (and therefore one of mozilla's
|
||||
** proprietry -moz properties (which hopefully they'll
|
||||
** drop soon).
|
||||
*/
|
||||
-moz-box-sizing : border-box;
|
||||
box-sizing : border-box;
|
||||
}
|
||||
|
||||
div {
|
||||
-moz-box-sizing : border-box;
|
||||
box-sizing : border-box;
|
||||
}
|
||||
|
||||
h4, label {
|
||||
margin : 0px;
|
||||
padding : 2px;
|
||||
float : left;
|
||||
width : 150px;
|
||||
height : 24px;
|
||||
font-weight : bold;
|
||||
text-align : right;
|
||||
font-size : 1.0em;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing : border-box;
|
||||
}
|
||||
|
||||
h4 {
|
||||
font-size : 1.2em;
|
||||
text-align : center;
|
||||
width : 750px;
|
||||
}
|
||||
|
||||
a {
|
||||
text-decoration : none;
|
||||
}
|
||||
|
||||
form {
|
||||
margin : 0px;
|
||||
}
|
||||
|
||||
textarea, input, select, button, a {
|
||||
font-family : Arial, Helvetica, sans-serif;
|
||||
-moz-box-sizing : border-box;
|
||||
box-sizing : border-box;
|
||||
font-size : 1.0em;
|
||||
float : left;
|
||||
}
|
||||
|
||||
button {
|
||||
float : none;
|
||||
}
|
||||
|
||||
textarea {
|
||||
border : 1px solid #ddddc0;
|
||||
}
|
||||
|
||||
br {
|
||||
clear : left;
|
||||
}
|
||||
|
||||
div.statusNotRunning {
|
||||
float : left;
|
||||
width : 82px;
|
||||
height : 24px;
|
||||
color : #dd0000;
|
||||
}
|
||||
div.statusRunning {
|
||||
float : left;
|
||||
width : 82px;
|
||||
height : 24px;
|
||||
color : #00dd00;
|
||||
}
|
||||
div.statusStarting {
|
||||
float : left;
|
||||
width : 82px;
|
||||
height : 24px;
|
||||
color : #339933;
|
||||
}
|
||||
|
||||
hr {
|
||||
display : none;
|
||||
}
|
||||
|
||||
.separator, .subdivider {
|
||||
clear : both;
|
||||
height : 1px;
|
||||
margin : 3px 0px 3px 0px;
|
||||
border-bottom : 1px solid #ddddc0;
|
||||
}
|
||||
|
||||
.subdivider {
|
||||
border-bottom : 1px dashed #ddddc0;
|
||||
}
|
||||
|
||||
.freetext {
|
||||
width : 150px;
|
||||
height : 22px;
|
||||
border : 1px solid #aaaac0;
|
||||
}
|
||||
|
||||
.control {
|
||||
margin : 0 4px 0 0;
|
||||
padding : 0 0 4px 0;
|
||||
overflow : hidden;
|
||||
height : 20px;
|
||||
width : 60px;
|
||||
font-weight : normal;
|
||||
background-color : #dddddd;
|
||||
color : black;
|
||||
border : 1px outset #ddddc0;
|
||||
text-align : center;
|
||||
white-space : nowrap;
|
||||
}
|
||||
|
||||
.control:hover {
|
||||
background-color : #ffffed;
|
||||
}
|
||||
|
||||
.control:active {
|
||||
border : 2px inset;
|
||||
}
|
||||
|
||||
.panel {
|
||||
width : 760px;
|
||||
margin : 16px auto 16px auto;
|
||||
overflow : hidden;
|
||||
text-align : left;
|
||||
font-size : 0.8em;
|
||||
background-color : #ffffef;
|
||||
border : 4px solid #ffffd0;
|
||||
}
|
||||
|
||||
.panel .footer {
|
||||
float : right;
|
||||
padding : 4px;
|
||||
}
|
||||
|
||||
.toolbox {
|
||||
float : right;
|
||||
}
|
||||
|
||||
.rowItem {
|
||||
width : 750px;
|
||||
float : left;
|
||||
margin : 0px;
|
||||
}
|
||||
|
||||
.comment {
|
||||
font-style : italic;
|
||||
}
|
||||
|
||||
.text {
|
||||
height : 24px;
|
||||
width : 150px;
|
||||
padding : 2px 0 0 2px;
|
||||
float : left;
|
||||
margin : 0;
|
||||
}
|
||||
|
||||
.accessKey {
|
||||
text-decoration : underline;
|
||||
}
|
||||
|
||||
#globalOperationsPanel {
|
||||
background-color : #ffefef;
|
||||
border : 4px solid #ffd0d0;
|
||||
}
|
||||
|
||||
#globalOperationsPanel .control {
|
||||
width : 100px;
|
||||
}
|
||||
178
installer/resources/themes/console/classic/i2ptunnel.css
Normal file
178
installer/resources/themes/console/classic/i2ptunnel.css
Normal file
@ -0,0 +1,178 @@
|
||||
/* I2P Tunnel Edit Page
|
||||
*/
|
||||
|
||||
#tunnelEditPage input {
|
||||
width : 458px;
|
||||
}
|
||||
|
||||
#tunnelEditPage select {
|
||||
width : 308px;
|
||||
}
|
||||
|
||||
#tunnelEditPage option[selected] {
|
||||
color: green;
|
||||
}
|
||||
|
||||
#tunnelEditPage #targetField,
|
||||
#tunnelEditPage #accessField,
|
||||
#tunnelEditPage #optionsField {
|
||||
height : 48px;
|
||||
width : 150px;
|
||||
}
|
||||
#tunnelEditPage #tunnelOptionsField {
|
||||
height : 96px;
|
||||
width : 150px;
|
||||
}
|
||||
|
||||
#tunnelEditPage #targetField label,
|
||||
#tunnelEditPage #accessField label,
|
||||
#tunnelEditPage #tunnelOptionsField label,
|
||||
#tunnelEditPage #optionsField label{
|
||||
height : 48px;
|
||||
width : 150px;
|
||||
}
|
||||
|
||||
#tunnelEditPage #reachField,
|
||||
#tunnelEditPage #hostField,
|
||||
#tunnelEditPage #depthField,
|
||||
#tunnelEditPage #countField,
|
||||
#tunnelEditPage #optionsHostField {
|
||||
width : 304px;
|
||||
margin-right: 4px;
|
||||
}
|
||||
|
||||
#tunnelEditPage #portField,
|
||||
#tunnelEditPage #optionsPortField,
|
||||
#tunnelEditPage #backupField,
|
||||
#tunnelEditPage #varianceField {
|
||||
width : 150px;
|
||||
|
||||
}
|
||||
|
||||
#tunnelEditPage #reachField label,
|
||||
#tunnelEditPage #hostField label,
|
||||
#tunnelEditPage #portField label,
|
||||
#tunnelEditPage #optionsHostField label,
|
||||
#tunnelEditPage #optionsPortField label,
|
||||
#tunnelEditPage #depthField label,
|
||||
#tunnelEditPage #countField label,
|
||||
#tunnelEditPage #backupField label,
|
||||
#tunnelEditPage #varianceField label {
|
||||
text-align : left;
|
||||
|
||||
}
|
||||
|
||||
#tunnelEditPage #otherField label {
|
||||
width : 300px;
|
||||
}
|
||||
|
||||
#tunnelEditPage #reachableByOther,
|
||||
#tunnelEditPage #tunnelDepth,
|
||||
#tunnelEditPage #tunnelQuantity,
|
||||
#tunnelEditPage #targetHost,
|
||||
#tunnelEditPage #clientHost {
|
||||
width : 306px;
|
||||
}
|
||||
|
||||
#tunnelEditPage #port {
|
||||
width : 80px;
|
||||
}
|
||||
|
||||
#tunnelEditPage #targetPort,
|
||||
#tunnelEditPage #clientPort,
|
||||
#tunnelEditPage #tunnelBackupQuantity,
|
||||
#tunnelEditPage #tunnelVariance {
|
||||
width : 150px;
|
||||
}
|
||||
|
||||
#tunnelEditPage #shared,
|
||||
#tunnelEditPage #connectDelay,
|
||||
#tunnelEditPage #startOnLoad {
|
||||
width : 16px;
|
||||
}
|
||||
|
||||
#tunnelEditPage label {
|
||||
width : 150px;
|
||||
font-weight : bold;
|
||||
text-align : right;
|
||||
float : left;
|
||||
}
|
||||
|
||||
/* I2P Tunnel List Page
|
||||
*/
|
||||
|
||||
#tunnelListPage .rowItem {
|
||||
width : 150px;
|
||||
}
|
||||
|
||||
#tunnelListPage select {
|
||||
width : 150px;
|
||||
}
|
||||
|
||||
#tunnelListPage textarea {
|
||||
width : 750px;
|
||||
height : 100px;
|
||||
padding : 0 0 0 4px;
|
||||
}
|
||||
|
||||
#tunnelListPage .footer .control {
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
#tunnelListPage .footer label {
|
||||
text-align : right;
|
||||
height : 24px;
|
||||
width : 360px;
|
||||
float : left;
|
||||
|
||||
}
|
||||
|
||||
/* Use Leary and Langridge content replacement methods (LIR)
|
||||
** to embed accessibility information into the document.
|
||||
** Should allow the lists to be rendered nicely by
|
||||
** screen readers. (and lynx!)
|
||||
*/
|
||||
|
||||
#tunnelListPage label {
|
||||
height : 0;
|
||||
width : 0;
|
||||
overflow : hidden;
|
||||
}
|
||||
|
||||
#tunnelListPage .nameHeaderField label,
|
||||
#tunnelListPage .portHeaderField label,
|
||||
#tunnelListPage .typeHeaderField label,
|
||||
#tunnelListPage .interfaceHeaderField label,
|
||||
#tunnelListPage .targetHeaderField label,
|
||||
#tunnelListPage .previewHeaderField label,
|
||||
#tunnelListPage .statusHeaderField label {
|
||||
text-align : left;
|
||||
width : 150px;
|
||||
height : 24px;
|
||||
float : left;
|
||||
}
|
||||
|
||||
#tunnelListPage .targetField,
|
||||
#tunnelListPage .targetField .text,
|
||||
#tunnelListPage .targetHeaderField,
|
||||
#tunnelListPage .targetHeaderField label {
|
||||
width : 300px;
|
||||
}
|
||||
|
||||
#tunnelListPage .descriptionField,
|
||||
#tunnelListPage .destinationField {
|
||||
width : 750px;
|
||||
}
|
||||
|
||||
#tunnelListPage .descriptionField .text,
|
||||
#tunnelListPage .destinationField input {
|
||||
width : 450px;
|
||||
}
|
||||
|
||||
#tunnelListPage .descriptionField label,
|
||||
#tunnelListPage .destinationField label {
|
||||
text-align : right;
|
||||
width : 150px;
|
||||
height : 24px;
|
||||
float : left;
|
||||
}
|
||||
112
installer/resources/themes/console/console.css
Normal file
112
installer/resources/themes/console/console.css
Normal file
@ -0,0 +1,112 @@
|
||||
body {
|
||||
font-family: Verdana, Tahoma, Helvetica, sans-serif;
|
||||
margin: 1em 0em;
|
||||
padding: 0em;
|
||||
text-align: center;
|
||||
background-color: white;
|
||||
color: black;
|
||||
font-size: 100%;
|
||||
}
|
||||
|
||||
.hide {
|
||||
display: none;
|
||||
}
|
||||
|
||||
img {
|
||||
border: none;
|
||||
}
|
||||
|
||||
pre {
|
||||
width: 100%;
|
||||
overflow-x: scroll;
|
||||
}
|
||||
|
||||
div.logo {
|
||||
float: left;
|
||||
width: 200px;
|
||||
left: 1em;
|
||||
top: 1em;
|
||||
margin: 0em;
|
||||
padding: .5em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
div.toolbar {
|
||||
margin: 0em 0em 2em 0em;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
div.routersummaryouter {
|
||||
float: left;
|
||||
width: 215px;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
clear: left; /* fixes a bug in Opera */
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
div.routersummary {
|
||||
background-color: #fafaff;
|
||||
width: 195px;
|
||||
color: inherit;
|
||||
margin: 0em;
|
||||
padding: 5px;
|
||||
text-align: left;
|
||||
border: medium solid #efefff;
|
||||
font-size: 0.82em;
|
||||
}
|
||||
|
||||
div.warning {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffefef;
|
||||
border: medium solid #ffafaf;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
div.main {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffffef;
|
||||
border: medium solid #ffffd0;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
div.main textarea {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
div.news {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffffc0;
|
||||
border: medium solid #ffffa0;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
div.confignav {
|
||||
padding: 1em;
|
||||
background-color: #efefff;
|
||||
}
|
||||
|
||||
div.configure {
|
||||
padding: 1em;
|
||||
background-color: #ffffc0;
|
||||
}
|
||||
|
||||
div.messages {
|
||||
padding: 1em;
|
||||
background-color: #fafaff;
|
||||
}
|
||||
|
||||
div.messages span.error {
|
||||
color: #d00000;
|
||||
}
|
||||
|
||||
div.messages span.notice {
|
||||
font-style: italic;
|
||||
}
|
||||
112
installer/resources/themes/console/defCon1/console.css
Normal file
112
installer/resources/themes/console/defCon1/console.css
Normal file
@ -0,0 +1,112 @@
|
||||
body {
|
||||
font-family: Verdana, Tahoma, Helvetica, sans-serif;
|
||||
margin: 1em 0em;
|
||||
padding: 0em;
|
||||
text-align: center;
|
||||
background-color: white;
|
||||
color: black;
|
||||
font-size: 100%;
|
||||
}
|
||||
|
||||
.hide {
|
||||
display: none;
|
||||
}
|
||||
|
||||
img {
|
||||
border: none;
|
||||
}
|
||||
|
||||
pre {
|
||||
width: 100%;
|
||||
overflow-x: scroll;
|
||||
}
|
||||
|
||||
div.logo {
|
||||
float: left;
|
||||
width: 200px;
|
||||
left: 1em;
|
||||
top: 1em;
|
||||
margin: 0em;
|
||||
padding: .5em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
div.toolbar {
|
||||
margin: 0em 0em 2em 0em;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
div.routersummaryouter {
|
||||
float: left;
|
||||
width: 215px;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
clear: left; /* fixes a bug in Opera */
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
div.routersummary {
|
||||
background-color: #fafaff;
|
||||
width: 195px;
|
||||
color: inherit;
|
||||
margin: 0em;
|
||||
padding: 5px;
|
||||
text-align: left;
|
||||
border: medium solid #efefff;
|
||||
font-size: 0.82em;
|
||||
}
|
||||
|
||||
div.warning {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffefef;
|
||||
border: medium solid #ffafaf;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
div.main {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffffef;
|
||||
border: medium solid #ffffd0;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
div.main textarea {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
div.news {
|
||||
margin: 0em 1em 1em 224px;
|
||||
padding: .5em 1em;
|
||||
background-color: #ffffc0;
|
||||
border: medium solid #ffffa0;
|
||||
text-align: left;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
div.confignav {
|
||||
padding: 1em;
|
||||
background-color: #efefff;
|
||||
}
|
||||
|
||||
div.configure {
|
||||
padding: 1em;
|
||||
background-color: #ffffc0;
|
||||
}
|
||||
|
||||
div.messages {
|
||||
padding: 1em;
|
||||
background-color: #fafaff;
|
||||
}
|
||||
|
||||
div.messages span.error {
|
||||
color: #d00000;
|
||||
}
|
||||
|
||||
div.messages span.notice {
|
||||
font-style: italic;
|
||||
}
|
||||
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
BIN
installer/resources/themes/console/images/i2plogo.png
Normal file
BIN
installer/resources/themes/console/images/i2plogo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.4 KiB |
@ -51,11 +51,13 @@ wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
|
||||
wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
|
||||
wrapper.java.additional.3=-Dorg.mortbay.util.FileResource.checkAliases=false
|
||||
wrapper.java.additional.4=-Dorg.mortbay.xml.XmlParser.NotValidating=true
|
||||
wrapper.java.additional.5=-Di2p.dir.base="$INSTALL_PATH"
|
||||
wrapper.java.additional.5.stripquotes=TRUE
|
||||
# Uncomment this for better performance.
|
||||
# If it doesn't work, server mode is not available in your JVM.
|
||||
# This may not be required if your machine is already "server-class".
|
||||
# See http://java.sun.com/j2se/1.5.0/docs/guide/vm/server-class.html
|
||||
#wrapper.java.additional.5=-server
|
||||
#wrapper.java.additional.6=-server
|
||||
|
||||
# Initial Java Heap Size (in MB)
|
||||
#wrapper.java.initmemory=4
|
||||
@ -86,7 +88,13 @@ wrapper.console.format=PM
|
||||
wrapper.console.loglevel=INFO
|
||||
|
||||
# Log file to use for wrapper output logging.
|
||||
wrapper.logfile=wrapper.log
|
||||
# You may wish to change this on linux so the log is
|
||||
# preserved across OS restarts.
|
||||
# If you do change it, add the following line above to
|
||||
# tell the router where to find the wrapper log
|
||||
# (change X to the next available number)
|
||||
# wrapper.java.additional.X=-Dwrapper.logfile=/path/to/wrapper.log
|
||||
wrapper.logfile=$SYSTEM_java_io_tmpdir/wrapper.log
|
||||
|
||||
# Format of output for the log file. (See docs for formats)
|
||||
wrapper.logfile.format=LPTM
|
||||
|
||||
Reference in New Issue
Block a user