Author: nextgens
Date: 2006-03-31 20:39:01 +0000 (Fri, 31 Mar 2006)
New Revision: 8417
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
trunk/freenet/src/freenet/node/Version.java
Log:
604: Small CSS improvments from Jogy
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-03-31 20:16:59 UTC (rev 8416)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-03-31 20:39:01 UTC (rev 8417)
@@ -156,8 +156,8 @@
buf.append("</div>");
// new connection box
+ buf.append("<div class=\"infobox\">\n");
buf.append("<form action=\".\" method=\"post\"
enctype=\"multipart/form-data\">\n");
- buf.append("<div class=\"infobox\">\n");
buf.append("<h2>\n");
buf.append("Connect to another node\n");
buf.append("</h2>\n");
@@ -171,8 +171,8 @@
buf.append("<input type=\"file\" name=\"reffile\" />\n");
buf.append("<br />\n");
buf.append("<input type=\"submit\" name=\"connect\"
value=\"Connect\" />\n");
+ buf.append("</form>\n");
buf.append("</div>\n");
- buf.append("</form>\n");
ctx.getPageMaker().makeTail(buf);
Modified:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
===================================================================
--- trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
2006-03-31 20:16:59 UTC (rev 8416)
+++ trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
2006-03-31 20:39:01 UTC (rev 8417)
@@ -1,201 +1,209 @@
-/* overall settings */
-
-p, span, div, td, th, li, h1, h2, h3, h4, h5 {
- font-family: Arial;
- font-weight: normal;
- font-size: 11pt;
-}
-
-th {
- font-weight: bold;
-}
-
-pre, textarea {
- font-family: Courier;
- font-weight: normal;
- font-size: 8pt;
-}
-
-pre#reference {
- overflow:auto;
-}
-
-/* body and page header */
-
-body {
- margin: 0;
- padding: 0;
- background-color: #f0f0f0;
-}
-
-#page {
-}
-
-/* page's topbar */
-
-#topbar {
- margin: 0;
- padding: 5px;
- min-height: 50px;
- background-color: #e8e8e8;
- background-image: url(logo.png);
- background-repeat: no-repeat;
- background-position: 30px 3px;
- border-bottom: 1px solid #d0d0d0;
-}
-
-#topbar h1 {
- margin: 0;
- padding: 7px 0 0 0;
- text-align: center;
- font-size: 20pt;
-}
-
-/* navigation */
-
-#navbar {
- margin: 5px 5px 0 0;
- padding: 10px;
- position: absolute;
- width: 150px;
- background-color: #e8e8e8;
- border: 1px solid #d0d0d0;
-}
-
-#navbar ul {
- margin: 0 0 0 30px;
- padding: 0;
-}
-
-#navbar li {
- margin: 0;
- padding: 0;
- list-style-type: none;
-}
-
-#navbar a {
- color: #000000;
- text-decoration: none;
-}
-
-#navbar a:hover {
- color: #ff0000;
-}
-
-/* content */
-
-#content {
- margin: 0 5px 5px 0;
- padding: 0;
- position: absolute;
- left: 177px;
-}
-
-a {
- color: #000000;
-}
-
-a:hover {
- color: #ff0000;
-}
-
-.infobox {
- margin: 5px 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;
-}
-
-#activity {
- margin: 0;
- padding: 0;
- list-style: none;
-}
-
-/* configuration page */
-
-.config ul {
- margin: 5px 0 5px 0;
- padding: 0;
- border: 1px solid #d0d0d0;
-}
-
-.config li {
- margin: 0;
- padding: 15px;
- list-style: none;
- text-align: right;
-}
-
-.config span.configdesc {
- display: block;
- text-align: center;
- font-weight: bold;
-}
-
-.config span.configkey {
- padding: 0 10px 0 0;
- font-family: Courier;
-}
-
-.config input[type=text] {
- width: 300px;
-}
-
-.cancel {
- float: left;
-}
-
-.confirm {
- float: right;
-}
-
-/* darknet page */
-
-table.darknet_connections {
- margin: 0;
- padding: 0;
- border-collapse: collapse;
-}
-
-table.darknet_connections th, table.darknet_connections td {
- margin: 0;
- padding: 5px;
- border: 1px solid #d0d0d0;
- font-size: 8pt;
-}
-
-table.darknet_connections span {
- font-weight: bold;
- font-size: 8pt;
-}
-
-table.darknet_connections span.peer_connected {
- color: #008000;
-}
-
-table.darknet_connections span.peer_backedoff {
- color: #ff0000;
-}
-
-table.darknet_connections span.peer_incompatable {
- color: #d0a0d0;
-}
-
-table.darknet_connections span.peer_disconnected {
- color: #d0d0d0;
-}
+/* overall settings */
+
+p, span, div, td, th, li, h1, h2, h3, h4, h5 {
+ font-family: Arial;
+ font-weight: normal;
+ font-size: 11pt;
+}
+
+table {
+ border-collapse: collapse;
+}
+
+th {
+ font-weight: bold;
+ background-color: #e8e8e8;
+}
+
+th, td {
+ margin: 0;
+ padding: 5px;
+ border: 1px solid #d0d0d0;
+}
+
+pre, textarea {
+ font-family: Courier;
+ font-weight: normal;
+ font-size: 8pt;
+}
+
+table, pre {
+ margin: 0 0 5px 0;
+ padding: 0;
+}
+
+form {
+ margin: 0;
+ padding: 0;
+}
+
+/* body and page header */
+
+body {
+ margin: 0;
+ padding: 0;
+ background-color: #f0f0f0;
+}
+
+#page {
+}
+
+/* page's topbar */
+
+#topbar {
+ margin: 0;
+ padding: 5px;
+ min-height: 50px;
+ background-color: #e8e8e8;
+ background-image: url(logo.png);
+ background-repeat: no-repeat;
+ background-position: 30px 3px;
+ border-bottom: 1px solid #d0d0d0;
+}
+
+#topbar h1 {
+ margin: 0;
+ padding: 7px 0 0 0;
+ text-align: center;
+ font-size: 20pt;
+}
+
+/* navigation */
+
+#navbar {
+ margin: 5px 5px 0 0;
+ padding: 10px;
+ position: absolute;
+ width: 150px;
+ background-color: #e8e8e8;
+ border: 1px solid #d0d0d0;
+}
+
+#navbar ul {
+ margin: 0 0 0 30px;
+ padding: 0;
+}
+
+#navbar li {
+ margin: 0;
+ padding: 0;
+ list-style-type: none;
+}
+
+#navbar a {
+ color: #000000;
+ text-decoration: none;
+}
+
+#navbar a:hover {
+ color: #ff0000;
+}
+
+/* content */
+
+#content {
+ margin: 5px 5px 5px 0;
+ padding: 0;
+ position: absolute;
+ left: 177px;
+}
+
+a {
+ color: #000000;
+}
+
+a:hover {
+ 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;
+}
+
+#activity {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+/* configuration page */
+
+.config ul {
+ margin: 5px 0 5px 0;
+ padding: 0;
+ border: 1px solid #d0d0d0;
+}
+
+.config li {
+ margin: 0;
+ padding: 15px;
+ list-style: none;
+ text-align: right;
+}
+
+.config span.configdesc {
+ display: block;
+ text-align: center;
+ font-weight: bold;
+}
+
+.config span.configkey {
+ padding: 0 10px 0 0;
+ font-family: Courier;
+}
+
+.config input[type=text] {
+ width: 300px;
+}
+
+.cancel {
+ float: left;
+}
+
+.confirm {
+ float: right;
+}
+
+/* darknet page */
+
+table.darknet_connections th, table.darknet_connections td {
+ font-size: 8pt;
+}
+
+table.darknet_connections span {
+ font-weight: bold;
+ font-size: 8pt;
+}
+
+table.darknet_connections span.peer_connected {
+ color: #008000;
+}
+
+table.darknet_connections span.peer_backedoff {
+ color: #ff0000;
+}
+
+table.darknet_connections span.peer_incompatable {
+ color: #d0a0d0;
+}
+
+table.darknet_connections span.peer_disconnected {
+ color: #d0d0d0;
+}
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-31 20:16:59 UTC (rev
8416)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-31 20:39:01 UTC (rev
8417)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 603;
+ private static final int buildNumber = 604;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 591;
