Author: Jogy
Date: 2006-05-15 00:01:48 +0000 (Mon, 15 May 2006)
New Revision: 8704
Added:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/alert.gif
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/error.gif
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/information.gif
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/query.gif
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/success.gif
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/warning.gif
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
trunk/freenet/src/freenet/node/UserAlertManager.java
Log:
UI Tweaks... :)
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2006-05-14
16:15:45 UTC (rev 8703)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2006-05-15
00:01:48 UTC (rev 8704)
@@ -68,10 +68,20 @@
StringBuffer outbuf = new StringBuffer();
ctx.getPageMaker().makeHead(outbuf, "Configuration Applied");
- outbuf.append("<div class=\"infobox\">\n");
+
if (errbuf.length() == 0) {
+ outbuf.append("<div class=\"infobox
infobox-success\">\n");
+ outbuf.append("<div class=\"infobox-header\">\n");
+ outbuf.append("Configuration Applied\n");
+ outbuf.append("</div>\n");
+ outbuf.append("<div class=\"infobox-content\">\n");
outbuf.append("Your configuration changes were applied
successfully<br />\n");
} else {
+ outbuf.append("<div class=\"infobox
infobox-error\">\n");
+ outbuf.append("<div class=\"infobox-header\">\n");
+ outbuf.append("Configuration Could Not Be Applied\n");
+ outbuf.append("</div>\n");
+ outbuf.append("<div class=\"infobox-content\">\n");
outbuf.append("Your configuration changes were applied
with the following exceptions:<br />\n");
outbuf.append(errbuf.toString());
outbuf.append("<br />\n");
@@ -81,6 +91,7 @@
outbuf.append("<a href=\"/\" title=\"Node
Homepage\">Homepage</a>\n");
outbuf.append("</div>\n");
+ outbuf.append("</div>\n");
ctx.getPageMaker().makeTail(outbuf);
writeReply(ctx, 200, "text/html", "OK", outbuf.toString());
@@ -93,8 +104,13 @@
//HTTPRequest request = new HTTPRequest(uri);
ctx.getPageMaker().makeHead(buf, "Freenet Node Configuration");
+
+ buf.append("<div class=\"infobox infobox-normal\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
+ buf.append("Freenet Node Configuration\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
buf.append("<form method=\"post\" action=\".\">");
- buf.append("<div class=\"config\">\n");
//String last = null;
@@ -133,11 +149,11 @@
buf.append("</ul>\n");
}
- buf.append("<br />");
buf.append("<input type=\"submit\" value=\"Apply\" />");
buf.append("<input type=\"reset\" value=\"Reset\" />");
+ buf.append("</form>");
buf.append("</div>\n");
- buf.append("</form>");
+ buf.append("</div>\n");
ctx.getPageMaker().makeTail(buf);
@@ -154,4 +170,4 @@
public String supportedMethods() {
return "GET, PUT";
}
-}
\ No newline at end of file
+}
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-05-14 16:15:45 UTC (rev 8703)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-05-15 00:01:48 UTC (rev 8704)
@@ -69,25 +69,31 @@
ctx.getPageMaker().makeHead(buf, "Darknet Connections");
// our reference
- buf.append("<div class=\"infobox\">\n");
- buf.append("<h2><a href=\"myref.txt\">My Reference</a></h2>\n");
+ buf.append("<div class=\"infobox infobox-normal\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
+ buf.append("<a href=\"myref.txt\">My Reference</a>\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
buf.append("<pre id=\"reference\">\n");
buf.append(this.node.exportPublicFieldSet());
buf.append("</pre>\n");
buf.append("</div>\n");
+ buf.append("</div>\n");
// FIXME! We need some nice images
PeerNode[] peerNodes = node.getDarknetConnections();
long now = System.currentTimeMillis();
- buf.append("<div class=\"infobox\">\n");
- buf.append("<h2>My Connections");
+ buf.append("<div class=\"infobox infobox-normal\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
+ buf.append("My Connections");
if (!path.endsWith("displaymessagetypes.html"))
{
buf.append(" <a href=\"displaymessagetypes.html\">(more
detailed)</a>");
}
- buf.append("</h2>\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
buf.append("<form action=\".\" method=\"post\"
enctype=\"multipart/form-data\">\n");
buf.append("<table class=\"darknet_connections\">\n");
buf.append("<tr><th>Status</th><th>Name</th><th> <span
title=\"Address:Port\" style=\"border-bottom:1px
dotted;cursor:help;\">Address</span></th><th>Version</th><th>Location</th><th>
<span title=\"Temporarily disconnected. Other node busy? Wait time(s)
remaining/total\" style=\"border-bottom:1px
dotted;cursor:help;\">Backoff</span></th><th> <span title=\"Number of minutes
since the node was last seen in this session\" style=\"border-bottom:1px
dotted;cursor:help;\">Idle</span></th><th></th></tr>\n");
@@ -193,13 +199,15 @@
buf.append("<input type=\"submit\" name =\"disconnect\"
value=\"Disconnect from selected Peers\" />");
buf.append("</form>");
buf.append("</div>");
+ buf.append("</div>");
// new connection box
- buf.append("<div class=\"infobox\">\n");
+ buf.append("<div class=\"infobox infobox-normal\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
+ buf.append("Connect to another node\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
buf.append("<form action=\".\" method=\"post\"
enctype=\"multipart/form-data\">\n");
- buf.append("<h2>\n");
- buf.append("Connect to another node\n");
- buf.append("</h2>\n");
buf.append("Reference:<br />\n");
buf.append("<textarea name=\"ref\" rows=\"8\"
cols=\"74\"></textarea>\n");
buf.append("<br />\n");
@@ -212,6 +220,7 @@
buf.append("<input type=\"submit\" name=\"connect\"
value=\"Connect\" />\n");
buf.append("</form>\n");
buf.append("</div>\n");
+ buf.append("</div>\n");
ctx.getPageMaker().makeTail(buf);
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-05-14
16:15:45 UTC (rev 8703)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-05-15
00:01:48 UTC (rev 8704)
@@ -64,30 +64,33 @@
if (request.getParam("shutdownconfirm").length() > 0) {
// false for no navigation bars, because that would be
very silly
- ctx.getPageMaker().makeHead(buf, "Node Shut down",
false);
- buf.append("<div class=\"infobox\">\n");
+ ctx.getPageMaker().makeHead(buf, "Node Shutdown",
false);
+ buf.append("<div class=\"infobox
infobox-information\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
buf.append("The Freenet node has been successfully shut
down\n");
- buf.append("<br />\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
buf.append("Thank you for using Freenet\n");
buf.append("</div>\n");
+ buf.append("</div>\n");
ctx.getPageMaker().makeTail(buf);
writeReply(ctx, 200, "text/html", "OK", buf.toString());
this.node.exit();
} else if (request.getParam("exit").equalsIgnoreCase("true")) {
ctx.getPageMaker().makeHead(buf, "Node Shutdown");
+ buf.append("<div class=\"infobox infobox-query\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
+ buf.append("Node Shutdown?\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
+ buf.append("Are you sure you wish to shut down your
Freenet node?\n");
buf.append("<form action=\"/\" method=\"post\">\n");
- buf.append("<div class=\"infobox\">\n");
- buf.append("Are you sure you wish to shut down your
Freenet node?<br />\n");
- buf.append("<div class=\"cancel\">\n");
buf.append("<input type=\"submit\" name=\"cancel\"
value=\"Cancel\" />\n");
- buf.append("</div>\n");
- buf.append("<div class=\"confirm\">\n");
buf.append("<input type=\"submit\"
name=\"shutdownconfirm\" value=\"Shut Down\" />\n");
+ buf.append("</form>\n");
buf.append("</div>\n");
- buf.append("<br style=\"clear: all;\">\n");
buf.append("</div>\n");
- buf.append("</form>\n");
ctx.getPageMaker().makeTail(buf);
writeReply(ctx, 200, "text/html", "OK", buf.toString());
} else if (request.isParameterSet("addbookmark")) {
@@ -147,7 +150,11 @@
alerts[i].isValid(false);
ctx.getPageMaker().makeHead(buf,
"Configuration Applied");
- buf.append("<div class=\"infobox\">\n");
+ buf.append("<div class=\"infobox
infobox-success\">\n");
+ buf.append("<div
class=\"infobox-header\">\n");
+ buf.append("Configuration Applied\n");
+ buf.append("</div>\n");
+ buf.append("<div
class=\"infobox-content\">\n");
buf.append("Your configuration changes
were applied successfully<br />\n");
buf.append("<a href=\"/\" title=\"Node
Homepage\">Homepage</a>\n");
buf.append("</div>\n");
@@ -168,12 +175,20 @@
InsertBlock block = new InsertBlock(bucket,
contentType, key);
try {
ctx.getPageMaker().makeHead(buf,
"Insertion");
- buf.append("<div class=\"infobox\">\n");
key = this.insert(block, false);
+ buf.append("<div class=\"infobox
infobox-success\">\n");
+ buf.append("<div
class=\"infobox-header\">\n");
+ buf.append("Insert Succeeded\n");
+ buf.append("</div>\n");
+ buf.append("<div
class=\"infobox-content\">\n");
buf.append("The key : <a href=\"/" +
key.getKeyType() + "@" + key.getGuessableKey() + "\">" +
key.getKeyType() + "@"
+ key.getGuessableKey() +"</a> has been inserted successfully.<br>");
} catch (InserterException e) {
-
+ buf.append("<div class=\"infobox
infobox-error\">\n");
+ buf.append("<div
class=\"infobox-header\">\n");
+ buf.append("Insert Failed\n");
+ buf.append("</div>\n");
+ buf.append("<div
class=\"infobox-content\">\n");
buf.append("Error:
"+e.getMessage()+"<br>");
if(e.uri != null)
buf.append("URI would have
been: "+e.uri+"<br>");
@@ -184,8 +199,9 @@
}
buf.append("<br><a href=\"javascript:back()\"
title=\"Back\">Back</a>\n");
- buf.append("<br><a href=\"/\" title=\"Node
Homepage\">Homepage</a>\n");
+ buf.append("<br><a href=\"/\" title=\"Node
Homepage\">Homepage</a>\n");
buf.append("</div>\n");
+ buf.append("</div>\n");
ctx.getPageMaker().makeTail(buf);
writeReply(ctx, 200, "text/html", "OK",
buf.toString());
@@ -201,10 +217,14 @@
HTTPRequest request = new HTTPRequest(uri);
if (request.getParam("newbookmark").length() > 0) {
- ctx.getPageMaker().makeHead(buf, "Add a Bookmark");
+ ctx.getPageMaker().makeHead(buf, "Add A Bookmark");
+ buf.append("<div class=\"infobox infobox-query\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
+ buf.append("Confirm action\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
buf.append("<form action=\".\" method=\"post\">\n");
- buf.append("<div>\n");
buf.append("Please confirm that you wish to add the
key:<br />\n");
buf.append("<i>"+request.getParam("newbookmark")+"</i><br />");
buf.append("To your bookmarks, and enter the
description that you would prefer:<br />\n");
@@ -212,8 +232,9 @@
buf.append("<input type=\"text\" name=\"name\"
value=\""+HTMLEncoder.encode(request.getParam("desc"))+"\" style=\"width: 100%;
\" />\n");
buf.append("<input type=\"hidden\" name=\"key\"
value=\""+HTMLEncoder.encode(request.getParam("newbookmark"))+"\" />\n");
buf.append("<input type=\"submit\" name=\"addbookmark\"
value=\"Add Bookmark\" />\n");
+ buf.append("</form>\n");
buf.append("</div>\n");
- buf.append("</form>\n");
+ buf.append("</div>\n");
ctx.getPageMaker().makeTail(buf);
@@ -223,9 +244,12 @@
ctx.getPageMaker().makeHead(buf, "Bookmark Manager");
// existing bookmarks
+ buf.append("<div class=\"infobox infobox-normal\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
+ buf.append("My Bookmarks\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
buf.append("<form action=\".\" method=\"post\">\n");
- buf.append("<div class=\"infobox\">\n");
- buf.append("<h2>My Bookmarks</h2>\n");
Enumeration e = bookmarks.getBookmarks();
if (!e.hasMoreElements()) {
buf.append("<i>You currently have no bookmarks
defined</i>");
@@ -246,8 +270,9 @@
buf.append("</ul>\n");
}
buf.append("<input type=\"hidden\"
name=\"managebookmarks\" value=\"yes\" />\n");
+ buf.append("</form>\n");
buf.append("</div>\n");
- buf.append("</form>\n");
+ buf.append("</div>\n");
// new bookmark
this.makeBookmarkEditForm(buf, MODE_ADD, null, "", "",
null);
@@ -260,15 +285,30 @@
ctx.getPageMaker().makeHead(buf, "Freenet FProxy Homepage");
- if(node.isTestnetEnabled())
- buf.append("<div style=\"color: red; font-size: 200%;
\">WARNING: TESTNET MODE ENABLED</div>");
+ if(node.isTestnetEnabled()) {
+ buf.append("<div class=\"infobox infobox-alert\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
+ buf.append("Testnet mode!\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
+ buf.append("This node runs in testnet node. This WILL
seriously jeopardize your anonymity!\n");
+ buf.append("</div>\n");
+ buf.append("</div>\n");
+ }
String useragent = (String)ctx.getHeaders().get("user-agent");
if (useragent != null) {
useragent = useragent.toLowerCase();
if (useragent.indexOf("msie") > -1 &&
useragent.indexOf("opera") == -1) {
- buf.append("<div style=\"color:
darkred\"><b>Warning</b>: You appear to be using Internet Explorer. This means
that some sites within Freenet may be able to compromise your
anonymity.</div>");
+ buf.append("<div class=\"infobox
infobox-alert\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
+ buf.append("Security risk!\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
+ buf.append("You appear to be using Internet
Explorer. This means that some sites within Freenet may be able to compromise
your anonymity!\n");
+ buf.append("</div>\n");
+ buf.append("</div>\n");
}
}
@@ -277,18 +317,24 @@
node.alerts.toHtml(buf);
// Fetch-a-key box
- buf.append("<br style=\"clear: all; \" />\n");
+ buf.append("<div class=\"infobox infobox-normal\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
+ buf.append("Fetch a Key\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
buf.append("<form action=\"/\" method=\"get\">\n");
- buf.append("<div class=\"infobox\">\n");
- buf.append("<h2>Fetch a Key</h2>\n");
buf.append("Key: <input type=\"text\" size=\"80\"
name=\"key\"/>\n");
buf.append("<input type=\"submit\" value=\"Fetch\" />\n");
+ buf.append("</form>\n");
buf.append("</div>\n");
- buf.append("</form>\n");
+ buf.append("</div>\n");
// Bookmarks
- buf.append("<div class=\"infobox\">\n");
- buf.append("<h2>My Bookmarks</h2>");
+ buf.append("<div class=\"infobox infobox-normal\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
+ buf.append("My Bookmarks\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
Enumeration e = bookmarks.getBookmarks();
if (!e.hasMoreElements()) {
@@ -308,16 +354,21 @@
buf.append("<a href=\"?managebookmarks\"
class=\"interfacelink\">Edit My Bookmarks</a>\n");
buf.append("</div>\n");
buf.append("</div>\n");
+ buf.append("</div>\n");
// Version info
- buf.append("<div class=\"infobox\">\n");
- buf.append("<h2>Version</h2>");
+ 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);
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");
@@ -327,14 +378,18 @@
buf.append("</form>\n");
// Activity
- buf.append("<div class=\"infobox\">\n");
- buf.append("<h2>Current Activity</h2>\n");
+ buf.append("<div class=\"infobox infobox-information\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
+ buf.append("Current Activity\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
buf.append("<ul id=\"activity\">\n"
+ "<li>Inserts:
"+this.node.getNumInserts()+"</li>\n"
+ "<li>Requests:
"+this.node.getNumRequests()+"</li>\n"
+ "<li>Transferring Requests:
"+this.node.getNumTransferringRequests()+"</li>\n"
+ "</ul>\n");
buf.append("</div>\n");
+ buf.append("</div>\n");
ctx.getPageMaker().makeTail(buf);
@@ -354,10 +409,15 @@
ctx.getPageMaker().makeHead(buf, "Edit a Bookmark");
}
- if (message != null) {
- buf.append("<div class=\"infobox\">\n");
+ if (message != null) { // only used for error messages so
far...
+ buf.append("<div class=\"infobox infobox-error\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
+ buf.append("An Error Occured\n");
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
buf.append(message);
buf.append("</div>\n");
+ buf.append("</div>\n");
}
this.makeBookmarkEditForm(buf, mode, b, origKey, origDesc,
message);
@@ -367,14 +427,19 @@
}
private void makeBookmarkEditForm(StringBuffer buf, int mode, Bookmark
b, String origKey, String origDesc, String message) {
- buf.append("<form action=\".\" method=\"post\">\n");
- buf.append("<div class=\"infobox\">\n");
+ buf.append("<div class=\"infobox infobox-normal\">\n");
+ buf.append("<div class=\"infobox-header\">\n");
if (mode == MODE_ADD) {
- buf.append("<h2>New Bookmark</h2>\n");
+ buf.append("New Bookmark\n");
} else {
- buf.append("<h2>Update Bookmark</h2>\n");
+ buf.append("Update Bookmark\n");
}
+ buf.append("</div>\n");
+ buf.append("<div class=\"infobox-content\">\n");
+
+ buf.append("<form action=\".\" method=\"post\">\n");
buf.append("<div style=\"text-align: right; \">\n");
+
buf.append("Key: \n");
buf.append("<input type=\"text\" name=\"key\"
value=\""+origKey+"\" size=\"80\" />\n");
buf.append("<br />\n");
@@ -390,14 +455,12 @@
}
buf.append("<input type=\"submit\" value=\"Cancel\"
class=\"cancel\" />\n");
-
- buf.append("<br style=\"clear: all;\" />\n");
-
buf.append("<input type=\"hidden\" name=\"managebookmarks\"
value=\"yes\" />\n");
+ buf.append("</div>\n");
+ buf.append("</form>\n");
buf.append("</div>\n");
buf.append("</div>\n");
- buf.append("</form>\n");
}
public String supportedMethods() {
Added: trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/alert.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/alert.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/error.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/error.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/information.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/information.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/query.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/query.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/success.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/success.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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-14 16:15:45 UTC (rev 8703)
+++ trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
2006-05-15 00:01:48 UTC (rev 8704)
@@ -117,6 +117,64 @@
color: green;
}
+/* infoboxes */
+
+div.infobox {
+ margin: 0 0 5px 0;
+ padding: 10px;
+ background-color: #f0f0f0;
+ border: 1px solid #d0d0d0;
+}
+
+div.infobox div.infobox-header {
+ margin: -10px -10px 10px -10px;
+ padding: 10px;
+ border-bottom: 1px dotted #a0a0a0;
+ font-weight: bold;
+ font-size: 11pt;
+ background-color: #e8e8e8;
+ background-repeat: no-repeat;
+ background-position: right;
+}
+
+div.infobox-information div.infobox-header {
+ background-color: #e8e8f0;
+ background-image: url(information.gif);
+}
+
+div.infobox-warning div.infobox-header {
+ background-color: #f8f8c0;
+ background-image: url(warning.gif);
+}
+
+div.infobox-alert {
+ background-color: #f0e8e8;
+}
+
+div.infobox-alert div.infobox-header {
+ background-color: #ffd0d0;
+ background-image: url(alert.gif);
+}
+
+div.infobox-error {
+ background-color: #f0e8e8;
+}
+
+div.infobox-error div.infobox-header {
+ background-color: #ffd0d0;
+ background-image: url(error.gif);
+}
+
+div.infobox-query div.infobox-header {
+ background-color: #f0f0e8;
+ background-image: url(query.gif);
+}
+
+div.infobox-success div.infobox-header {
+ background-color: #e8f0e8;
+ background-image: url(success.gif);
+}
+
/* content */
#content {
@@ -134,22 +192,6 @@
color: #ff0000;
}
-.infobox {
- margin: 0 0 5px 0;
- padding: 10px;
- background-color: #f0f0f0;
- border: 1px solid #d0d0d0;
-}
-
-.infobox h2 {
- margin: -10px -10px 10px -10px;
- padding: 10px;
- border-bottom: 1px dotted #a0a0a0;
- font-weight: bold;
- font-size: 11pt;
- background-color: #e8e8e8;
-}
-
.interfacelink {
color: #000000;
text-decoration: underline;
@@ -163,40 +205,41 @@
/* configuration page */
-.config ul {
+ul.config {
margin: 0 0 5px 0;
padding: 0;
border: 1px solid #d0d0d0;
}
-.config li {
+ul.config li {
margin: 0;
padding: 15px;
list-style: none;
text-align: right;
}
-.config span.configdesc {
+ul.config span.configdesc {
display: block;
text-align: center;
font-weight: bold;
}
-.config span.configkey {
+ul.config span.configkey {
padding: 0 10px 0 0;
}
-.config span.configprefix {
+ul.config span.configprefix {
margin: 0 0 0 15px;
font-variant: small-caps;
font-size: 16pt;
font-weight: bold;
}
-.config input[type=text] {
+ul.config input[type=text] {
width: 300px;
}
+/*
.cancel {
float: left;
}
@@ -204,6 +247,7 @@
.confirm {
float: right;
}
+*/
/* darknet page */
@@ -247,4 +291,3 @@
table.sentmessagetypes th, table.sentmessagetypes td,
table.receivedmessagetypes th, table.receivedmessagetypes td {
font-size: 7pt;
}
-
Added:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/warning.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/warning.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/freenet/src/freenet/node/UserAlertManager.java
===================================================================
--- trunk/freenet/src/freenet/node/UserAlertManager.java 2006-05-14
16:15:45 UTC (rev 8703)
+++ trunk/freenet/src/freenet/node/UserAlertManager.java 2006-05-15
00:01:48 UTC (rev 8704)
@@ -49,25 +49,30 @@
UserAlert alert = a[i];
synchronized(alert) {
if(!alert.isValid()) return;
- buf.append("<p><b>");
+ //
short level = a[i].getPriorityClass();
if(level <= UserAlert.CRITICAL_ERROR)
- buf.append("<span color=\"darkred\">");
+ buf.append("<div class=\"infobox
infobox-error\">\n");
else if(level <= UserAlert.ERROR)
- buf.append("<span
class=\"alert-error\">");
+ buf.append("<div class=\"infobox
infobox-alert\">\n");
else if(level <= UserAlert.WARNING)
- buf.append("<span
class=\"alert-warning\">");
+ buf.append("<div class=\"infobox
infobox-warning\">\n");
else if(level <= UserAlert.MINOR)
- buf.append("<span
class=\"alert-minor\">");
+ buf.append("<div class=\"infobox
infobox-information\">\n");
+ //
+ buf.append("<div class=\"infobox-header\">\n");
buf.append(a[i].getTitle());
+ buf.append("</div>\n");
+ //
+ buf.append("<div class=\"infobox-content\">\n");
+ buf.append(a[i].getText());
+ //
if(a[i].userCanDismiss())
buf.append("<form method=\"post\"
action=\".\"><input type=\"hidden\" name=\"disable\" value=\""+
a[i].hashCode()+"\" /><input
type=\"submit\" value=\"Hide\" /></form>");
- if(level <= UserAlert.MINOR)
- buf.append("</span>");
- buf.append("</b><br />\n");
- buf.append(a[i].getText());
- buf.append("</p>\n");
+ //
+ buf.append("</div>\n");
+ buf.append("</div>\n");
}
}
}
