Author: Jogy
Date: 2006-05-16 17:16:44 +0000 (Tue, 16 May 2006)
New Revision: 8711
Modified:
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/alert.gif
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/warning.gif
trunk/freenet/src/freenet/node/MeaningfulNodeNameUserAlert.java
trunk/freenet/src/freenet/node/PeerManagerUserAlert.java
Log:
Only small tweaks:
- CSS: Improved alert and warning images
- CSS: hopefully politely reverted nextgen's padding-right (what was it for?
made no difference here and padding does not affect background images)
- UserAlerts: be a little more explanatory, add hint to Configuration page
- WelcomeToadlet: use uniform scheme for version display, moved shutdown button
into the version infobox so it isn't floating in empty space anymore
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-05-16
17:08:39 UTC (rev 8710)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-05-16
17:16:44 UTC (rev 8711)
@@ -361,26 +361,22 @@
buf.append("</div>\n");
buf.append("</div>\n");
- // Version info
+ // Version info and Quit Form
buf.append("<div class=\"infobox infobox-information\">\n");
buf.append("<div class=\"infobox-header\">\n");
buf.append("Version\n");
buf.append("</div>\n");
buf.append("<div class=\"infobox-content\">\n");
- buf.append("Freenet version "+Version.nodeVersion+" build
#"+Version.buildNumber()+" r"+Version.cvsRevision);
+ buf.append("Freenet "+Version.nodeVersion+" Build
#"+Version.buildNumber()+" r"+Version.cvsRevision);
if(Version.buildNumber() < Version.highestSeenBuild) {
buf.append("<br />");
buf.append("<b>A newer version is available! (Build
#"+Version.highestSeenBuild+")</b>");
}
- buf.append("</div>\n");
- buf.append("</div>\n");
-
- // Quit Form
buf.append("<form method=\"post\" action=\".\">\n");
- buf.append("<div class=\"exit\">\n");
buf.append("<input type=\"hidden\" name=\"exit\" value=\"true\"
/><input type=\"submit\" value=\"Shut down the node\" />\n");
- buf.append("</div>\n");
buf.append("</form>\n");
+ buf.append("</div>\n");
+ buf.append("</div>\n");
// Activity
buf.append("<div class=\"infobox infobox-information\">\n");
Modified:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/alert.gif
===================================================================
(Binary files differ)
Modified:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
===================================================================
--- trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
2006-05-16 17:08:39 UTC (rev 8710)
+++ trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
2006-05-16 17:16:44 UTC (rev 8711)
@@ -140,7 +140,6 @@
div.infobox-information div.infobox-header {
background-color: #e8e8f0;
background-image: url(information.gif);
- padding-right: 35px;
}
div.infobox-warning div.infobox-header {
Modified:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/warning.gif
===================================================================
(Binary files differ)
Modified: trunk/freenet/src/freenet/node/MeaningfulNodeNameUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/MeaningfulNodeNameUserAlert.java
2006-05-16 17:08:39 UTC (rev 8710)
+++ trunk/freenet/src/freenet/node/MeaningfulNodeNameUserAlert.java
2006-05-16 17:16:44 UTC (rev 8711)
@@ -14,8 +14,8 @@
public String getText() {
return "It seems that your node's name isn't defined. Setting "+
"up a node name doesn't affect your anonymity in any way but "+
- "is usefull for your peers to know who you are in case they
have "+
- "to reach you.";
+ "is useful for your peers to know who you are in case they have
"+
+ "to reach you. You can change the node's name at the
Configuration page.";
}
public short getPriorityClass() {
Modified: trunk/freenet/src/freenet/node/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManagerUserAlert.java 2006-05-16
17:08:39 UTC (rev 8710)
+++ trunk/freenet/src/freenet/node/PeerManagerUserAlert.java 2006-05-16
17:16:44 UTC (rev 8711)
@@ -37,18 +37,20 @@
String end = " log on to irc.freenode.net channel " +
"#freenet-refs and ask around for somebody to connect
to";
if(n.testnetEnabled)
- s += ", but since this is a testnet node, we suggest
that you "+end+".";
+ s += ", but since this is a testnet node, we suggest
that you " + end + ".";
else
s += ". You could " + end + ", but remember that you
are vulnerable to " +
"those you are directly connected to.
(This is especially true in this early alpha of Freenet 0.7...)";
} else if(conns == 0) {
- s = "This node has not been able to connect to any
other nodes so far; it will not be able to function normally. "+
+ s = "This node has not been able to connect to any
other nodes so far; it will not be able to function normally. " +
"Hopefully some of your peers will connect soon; if
not, try to get some more peers.";
} else if(conns == 1) {
- s = "This node only has one connection. Performance
will be impaired, and you have no anonymity nor even plausible deniability if
that one person is malicious. "+
+ s = "This node only has one connection. Performance
will be impaired, and you have no anonymity nor even plausible deniability if
that one person is malicious. " +
+ "Your node is attached to the network like a 'leaf' and
does not contribute to the network's health." +
"Try to get at least 3 connected peers at any given
time.";
} else if(conns == 2) {
- s = "This node has only two connections. Performance
and security will not be very good, and your node is not doing any routing for
other nodes."+
+ s = "This node has only two connections. Performance
and security will not be very good, and your node is not doing any routing for
other nodes. " +
+ "Your node is enbedded like a 'chain' in the network
and does not contribute to the network's health." +
"Try to get at least 3 connected peers at any given
time.";
} else throw new IllegalArgumentException("Not valid");
return s;
