Author: dbkr
Date: 2006-03-07 02:05:40 +0000 (Tue, 07 Mar 2006)
New Revision: 8174
Added:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/aqua/
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/logo.png
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
Removed:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/default/
trunk/freenet/src/freenet/clients/http/staticfiles/xhtml11.dtd
Modified:
trunk/freenet/src/freenet/clients/http/PageMaker.java
trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
trunk/freenet/src/freenet/clients/http/staticfiles/themes/aqua/theme.css
trunk/freenet/src/freenet/node/Version.java
Log:
502: Theme support for FProxy (via Cookies), albeit currently set via slightly
ugly Javascript. Added CSS theme from Jogy (dubbed 'clean'). Existing theme
renamed to 'aqua'. Also removed the DTD altogether since it's not strictly
necessary and avoids any issues with external links.
Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java 2006-03-06
20:02:41 UTC (rev 8173)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java 2006-03-07
02:05:40 UTC (rev 8174)
@@ -1,19 +1,30 @@
package freenet.clients.http;
+import java.util.Vector;
+import java.util.Collection;
+import java.util.Iterator;
+
/** Simple class to output standard heads and tail for web interface pages.
*/
public class PageMaker {
- // TODO: make this...err... not a constant.
- private final String theme = new String("default");
-
+ private final String defaulttheme = new String("aqua");
+ public String theme;
+
+ PageMaker(String t) {
+ if (t == null || !this.getThemes().contains(t)) {
+ this.theme = this.defaulttheme;
+ } else {
+ this.theme = t;
+ }
+ }
+
public void makeTopHead(StringBuffer buf) {
buf.append("<!DOCTYPE\n"
- + " html PUBLIC \"-//W3C//DTD XHTML
1.1//EN\"\n"
- + " \"/static/xhtml11.dtd\">\n"
+ + " html PUBLIC \"-//W3C//DTD XHTML
1.1//EN\">\n"
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\";
xml:lang=\"en\">\n"
+ "<head>\n"
+ "<meta http-equiv=\"Content-Type\"
content=\"text/html;\" />\n"
- + "<link rel=\"stylesheet\"
href=\"/static/themes/"+theme+"/theme.css\" type=\"text/css\" />\n");
+ +"<link rel=\"stylesheet\"
href=\"/static/themes/"+this.theme+"/theme.css\" type=\"text/css\" />\n");
}
public void makeBottomHead(StringBuffer buf, String title) {
@@ -34,13 +45,27 @@
}
public void makeTail(StringBuffer buf) {
- buf.append("<br style=\"clear: all;\"/>"
+ buf.append("<br style=\"clear: all;\"/>\n"
+ "</div>\n"
+ + "<div id=\"themeselect\">\n");
+ this.makeThemeSelect(buf);
+ buf.append("</div>\n"
+"</div>\n"
+"</body>\n"
+ "</html>\n");
}
+ public Collection getThemes() {
+ // Sadly I can't find a way to enumerate the contents of the
themes directory
+ // (since it may or may not be in a jar file)
+ Vector themes = new Vector();
+
+ themes.add("aqua");
+ themes.add("clean");
+
+ return themes;
+ }
+
private void makeNavBar(StringBuffer buf) {
buf.append("<div id=\"navbar\">\n"
+ "<ul id=\"navlist\">\n"
@@ -49,4 +74,27 @@
+ "</ul>\n"
+ "</div>\n");
}
+
+ private void makeThemeSelect(StringBuffer buf) {
+ Collection themes = this.getThemes();
+
+ Iterator i = themes.iterator();
+
+ buf.append("Theme: <ul>\n");
+ String liclass = new String("");
+ while (i.hasNext()) {
+ String t = (String) i.next();
+
+ if (t.equals(this.theme)) {
+ liclass = "currentthemeitem";
+ } else {
+ liclass = "themeitem";
+ }
+ buf.append("<li class=\""+liclass+"\">\n"
+ +"<a href=\"javascript:document.cookie
= 'theme="+t+"; expires=Mon, 04 Mar 2030 00:00:00 GMT;
path=/';window.location.reload(true)\" title=\""+t+" theme\">\n"
+ + t+"</a>\n"
+ + "</li>\n");
+ }
+ buf.append("</ul>\n");
+ }
}
Modified: trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
2006-03-06 20:02:41 UTC (rev 8173)
+++ trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
2006-03-07 02:05:40 UTC (rev 8174)
@@ -40,7 +40,22 @@
this.headers = headers;
this.closed = false;
sockOutputStream = sock.getOutputStream();
- pagemaker = new PageMaker();
+
+ Enumeration cookieheaders = headers.getAll("Cookie");
+ String current;
+ String theme = new String("");
+ while (cookieheaders.hasMoreElements()) {
+ current = (String) cookieheaders.nextElement();
+ String[] parts = current.split("=");
+ if (parts.length == 2 && parts[0].equals("theme")) {
+ theme = parts[1];
+ }
+ }
+ if (theme.equals("")) {
+ pagemaker = new PageMaker(null);
+ } else {
+ pagemaker = new PageMaker(theme);
+ }
}
private void close() {
Copied: trunk/freenet/src/freenet/clients/http/staticfiles/themes/aqua (from
rev 8173, trunk/freenet/src/freenet/clients/http/staticfiles/themes/default)
Modified:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/aqua/theme.css
===================================================================
--- trunk/freenet/src/freenet/clients/http/staticfiles/themes/default/theme.css
2006-03-06 20:02:41 UTC (rev 8173)
+++ trunk/freenet/src/freenet/clients/http/staticfiles/themes/aqua/theme.css
2006-03-07 02:05:40 UTC (rev 8174)
@@ -1,17 +1,21 @@
body {
margin: 10px;
border: 3px double #356ace;
- background-image: url(/static/themes/default/background.png);
+ background-image: url(background.png);
background-repeat: repeat;
padding: 10px;
padding-top: 0px;
min-height: 400px;
+ position: relative;
}
+#page {
+}
+
#topbar {
margin: 0px;
margin-bottom: 10px;
- background-image: url(/static/themes/default/logo.png);
+ background-image: url(logo.png);
background-repeat: no-repeat;
background-position: top left;
min-height: 51px;
@@ -60,7 +64,36 @@
.infobox {
border: 1px solid #5e88d8;
padding: 5px;
- float: left;
margin-bottom: 10px;
+ display: table-cell;
}
+#themeselect {
+ position: absolute;
+ bottom: 0px;
+ right: 0px;
+}
+
+#themeselect ul {
+ display: inline;
+ margin: 0;
+ padding: 0;
+}
+
+#themeselect ul li {
+ display: inline;
+ margin: 0;
+ padding: 0;
+ list-style-type: none;
+ list-style-position: outside;
+}
+
+.themeitem a {
+ text-decoration: none;
+ color: black;
+}
+
+.currentthemeitem a {
+ color: #356ace;
+ font-weight: bold;
+}
Added: trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/logo.png
===================================================================
(Binary files differ)
Property changes on:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
===================================================================
--- trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
2006-03-06 20:02:41 UTC (rev 8173)
+++ trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
2006-03-07 02:05:40 UTC (rev 8174)
@@ -0,0 +1,94 @@
+body {
+ margin:0;
+ padding:0;
+ background-color:#f0f0f0;
+ position: relative;
+}
+
+#topbar {
+ margin:0 0 5px 0;
+ padding:5px;
+ height:50px;
+ background-color:#e8e8e8;
+ background-image:url(logo.png);
+ background-repeat:no-repeat;
+ background-position:30px 3px;
+ border-bottom:1px solid #d0d0d0;
+ font-family:Arial;
+}
+
+#topbar h1 {
+ margin:0;
+ padding:7px 0 0 0;
+ text-align:center;
+ font-weight:normal;
+ font-size:20pt;
+}
+
+#navbar {
+ margin:0 5px 0 0;
+ padding:10px;
+ width:150px;
+ float:left;
+ background-color:#e8e8e8;
+ border:1px solid #d0d0d0;
+}
+
+#navbar a {
+ font-family:Arial;
+ color:#000000;
+ text-decoration:underline;
+}
+
+#navbar a:hover {
+ color:#ff0000;
+}
+
+#content {
+ float:left;
+}
+
+.infobox {
+ margin:0 0 5px 0;
+ padding:10px;
+ background-color:#f0f0f0;
+ border:1px solid #d0d0d0;
+}
+
+.infobox h2 {
+ margin:0 0 15px 0;
+ padding:0;
+ border-bottom:1px dotted #000000;
+ font-family:Arial;
+ font-weight:normal;
+ font-size:13pt;
+}
+
+#themeselect {
+ position: absolute;
+ top: 0px;
+ right: 0px;
+}
+
+#themeselect ul {
+ display: inline;
+ margin: 0;
+ padding: 0;
+}
+
+#themeselect ul li {
+ display: inline;
+ margin: 0;
+ padding: 0;
+ list-style-type: none;
+ list-style-position: outside;
+}
+
+.themeitem a {
+ text-decoration: none;
+ color: black;
+}
+
+.currentthemeitem a {
+ font-weight: bold;
+}
Deleted: trunk/freenet/src/freenet/clients/http/staticfiles/xhtml11.dtd
===================================================================
--- trunk/freenet/src/freenet/clients/http/staticfiles/xhtml11.dtd
2006-03-06 20:02:41 UTC (rev 8173)
+++ trunk/freenet/src/freenet/clients/http/staticfiles/xhtml11.dtd
2006-03-07 02:05:40 UTC (rev 8174)
@@ -1,294 +0,0 @@
-<!-- .......................................................................
-->
-<!-- XHTML 1.1 DTD ........................................................
-->
-<!-- file: xhtml11.dtd
--->
-
-<!-- XHTML 1.1 DTD
-
- This is XHTML, a reformulation of HTML as a modular XML application.
-
- The Extensible HyperText Markup Language (XHTML)
- Copyright 1998-2001 World Wide Web Consortium
- (Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University).
- All Rights Reserved.
-
- Permission to use, copy, modify and distribute the XHTML DTD and its
- accompanying documentation for any purpose and without fee is hereby
- granted in perpetuity, provided that the above copyright notice and
- this paragraph appear in all copies. The copyright holders make no
- representation about the suitability of the DTD for any purpose.
-
- It is provided "as is" without expressed or implied warranty.
-
- Author: Murray M. Altheim <altheim at eng.sun.com>
- Revision: $Id: xhtml11.dtd,v 1.21 2001/05/29 16:37:01 ahby Exp $
-
--->
-<!-- This is the driver file for version 1.1 of the XHTML DTD.
-
- Please use this formal public identifier to identify it:
-
- "-//W3C//DTD XHTML 1.1//EN"
--->
-<!ENTITY % XHTML.version "-//W3C//DTD XHTML 1.1//EN" >
-
-<!-- Use this URI to identify the default namespace:
-
- "http://www.w3.org/1999/xhtml";
-
- See the Qualified Names module for information
- on the use of namespace prefixes in the DTD.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix "" >
-
-<!-- Reserved for use with the XLink namespace:
--->
-<!ENTITY % XLINK.xmlns "" >
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- For example, if you are using XHTML 1.1 directly, use the FPI
- in the DOCTYPE declaration, with the xmlns attribute on the
- document element to identify the default namespace:
-
- <?xml version="1.0"?>
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "xhtml11.dtd">
- <html xmlns="http://www.w3.org/1999/xhtml";
- xml:lang="en">
- ...
- </html>
-
- Revisions:
- (none)
--->
-
-<!-- reserved for future use with document profiles -->
-<!ENTITY % XHTML.profile "" >
-
-<!-- Bidirectional Text features
- This feature-test entity is used to declare elements
- and attributes used for bidirectional text support.
--->
-<!ENTITY % XHTML.bidi "INCLUDE" >
-
-<?doc type="doctype" role="title" { XHTML 1.1 } ?>
-
-<!-- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-->
-
-<!-- Pre-Framework Redeclaration placeholder .................... -->
-<!-- this serves as a location to insert markup declarations
- into the DTD prior to the framework declarations.
--->
-<!ENTITY % xhtml-prefw-redecl.module "IGNORE" >
-<![%xhtml-prefw-redecl.module;[
-%xhtml-prefw-redecl.mod;
-<!-- end of xhtml-prefw-redecl.module -->]]>
-
-<!ENTITY % xhtml-events.module "INCLUDE" >
-
-<!-- Inline Style Module ........................................ -->
-<!ENTITY % xhtml-inlstyle.module "INCLUDE" >
-<![%xhtml-inlstyle.module;[
-<!ENTITY % xhtml-inlstyle.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
-
"http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod"; >
-%xhtml-inlstyle.mod;]]>
-
-<!-- declare Document Model module instantiated in framework
--->
-<!ENTITY % xhtml-model.mod
- PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
- "xhtml11-model-1.mod" >
-
-<!-- Modular Framework Module (required) ......................... -->
-<!ENTITY % xhtml-framework.module "INCLUDE" >
-<![%xhtml-framework.module;[
-<!ENTITY % xhtml-framework.mod
- PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-
"http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod"; >
-%xhtml-framework.mod;]]>
-
-<!-- Post-Framework Redeclaration placeholder ................... -->
-<!-- this serves as a location to insert markup declarations
- into the DTD following the framework declarations.
--->
-<!ENTITY % xhtml-postfw-redecl.module "IGNORE" >
-<![%xhtml-postfw-redecl.module;[
-%xhtml-postfw-redecl.mod;
-<!-- end of xhtml-postfw-redecl.module -->]]>
-
-<!-- Text Module (Required) ..................................... -->
-<!ENTITY % xhtml-text.module "INCLUDE" >
-<![%xhtml-text.module;[
-<!ENTITY % xhtml-text.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod"; >
-%xhtml-text.mod;]]>
-
-<!-- Hypertext Module (required) ................................. -->
-<!ENTITY % xhtml-hypertext.module "INCLUDE" >
-<![%xhtml-hypertext.module;[
-<!ENTITY % xhtml-hypertext.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-
"http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod"; >
-%xhtml-hypertext.mod;]]>
-
-<!-- Lists Module (required) .................................... -->
-<!ENTITY % xhtml-list.module "INCLUDE" >
-<![%xhtml-list.module;[
-<!ENTITY % xhtml-list.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod"; >
-%xhtml-list.mod;]]>
-
-<!-- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-->
-
-<!-- Edit Module ................................................ -->
-<!ENTITY % xhtml-edit.module "INCLUDE" >
-<![%xhtml-edit.module;[
-<!ENTITY % xhtml-edit.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Editing Elements 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod"; >
-%xhtml-edit.mod;]]>
-
-<!-- BIDI Override Module ....................................... -->
-<!ENTITY % xhtml-bdo.module "%XHTML.bidi;" >
-<![%xhtml-bdo.module;[
-<!ENTITY % xhtml-bdo.mod
- PUBLIC "-//W3C//ELEMENTS XHTML BIDI Override Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod"; >
-%xhtml-bdo.mod;]]>
-
-<!-- Ruby Module ................................................ -->
-<!ENTITY % Ruby.common.attlists "INCLUDE" >
-<!ENTITY % Ruby.common.attrib "%Common.attrib;" >
-<!ENTITY % xhtml-ruby.module "INCLUDE" >
-<![%xhtml-ruby.module;[
-<!ENTITY % xhtml-ruby.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Ruby 1.0//EN"
- "http://www.w3.org/TR/ruby/xhtml-ruby-1.mod"; >
-%xhtml-ruby.mod;]]>
-
-<!-- Presentation Module ........................................ -->
-<!ENTITY % xhtml-pres.module "INCLUDE" >
-<![%xhtml-pres.module;[
-<!ENTITY % xhtml-pres.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Presentation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod"; >
-%xhtml-pres.mod;]]>
-
-<!-- Link Element Module ........................................ -->
-<!ENTITY % xhtml-link.module "INCLUDE" >
-<![%xhtml-link.module;[
-<!ENTITY % xhtml-link.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod"; >
-%xhtml-link.mod;]]>
-
-<!-- Document Metainformation Module ............................ -->
-<!ENTITY % xhtml-meta.module "INCLUDE" >
-<![%xhtml-meta.module;[
-<!ENTITY % xhtml-meta.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod"; >
-%xhtml-meta.mod;]]>
-
-<!-- Base Element Module ........................................ -->
-<!ENTITY % xhtml-base.module "INCLUDE" >
-<![%xhtml-base.module;[
-<!ENTITY % xhtml-base.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod"; >
-%xhtml-base.mod;]]>
-
-<!-- Scripting Module ........................................... -->
-<!ENTITY % xhtml-script.module "INCLUDE" >
-<![%xhtml-script.module;[
-<!ENTITY % xhtml-script.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod";
>
-%xhtml-script.mod;]]>
-
-<!-- Style Sheets Module ......................................... -->
-<!ENTITY % xhtml-style.module "INCLUDE" >
-<![%xhtml-style.module;[
-<!ENTITY % xhtml-style.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod"; >
-%xhtml-style.mod;]]>
-
-<!-- Image Module ............................................... -->
-<!ENTITY % xhtml-image.module "INCLUDE" >
-<![%xhtml-image.module;[
-<!ENTITY % xhtml-image.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod"; >
-%xhtml-image.mod;]]>
-
-<!-- Client-side Image Map Module ............................... -->
-<!ENTITY % xhtml-csismap.module "INCLUDE" >
-<![%xhtml-csismap.module;[
-<!ENTITY % xhtml-csismap.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN"
-
"http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod"; >
-%xhtml-csismap.mod;]]>
-
-<!-- Server-side Image Map Module ............................... -->
-<!ENTITY % xhtml-ssismap.module "INCLUDE" >
-<![%xhtml-ssismap.module;[
-<!ENTITY % xhtml-ssismap.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN"
-
"http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod"; >
-%xhtml-ssismap.mod;]]>
-
-<!-- Param Element Module ....................................... -->
-<!ENTITY % xhtml-param.module "INCLUDE" >
-<![%xhtml-param.module;[
-<!ENTITY % xhtml-param.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod"; >
-%xhtml-param.mod;]]>
-
-<!-- Embedded Object Module ..................................... -->
-<!ENTITY % xhtml-object.module "INCLUDE" >
-<![%xhtml-object.module;[
-<!ENTITY % xhtml-object.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod";
>
-%xhtml-object.mod;]]>
-
-<!-- Tables Module ............................................... -->
-<!ENTITY % xhtml-table.module "INCLUDE" >
-<![%xhtml-table.module;[
-<!ENTITY % xhtml-table.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Tables 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod"; >
-%xhtml-table.mod;]]>
-
-<!-- Forms Module ............................................... -->
-<!ENTITY % xhtml-form.module "INCLUDE" >
-<![%xhtml-form.module;[
-<!ENTITY % xhtml-form.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod"; >
-%xhtml-form.mod;]]>
-
-<!-- Legacy Markup ............................................... -->
-<!ENTITY % xhtml-legacy.module "IGNORE" >
-<![%xhtml-legacy.module;[
-<!ENTITY % xhtml-legacy.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Legacy Markup 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-legacy-1.mod";
>
-%xhtml-legacy.mod;]]>
-
-<!-- Document Structure Module (required) ....................... -->
-<!ENTITY % xhtml-struct.module "INCLUDE" >
-<![%xhtml-struct.module;[
-<!ENTITY % xhtml-struct.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod";
>
-%xhtml-struct.mod;]]>
-
-<!-- end of XHTML 1.1 DTD .................................................
-->
-<!-- .......................................................................
-->
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-06 20:02:41 UTC (rev
8173)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-07 02:05:40 UTC (rev
8174)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 501;
+ private static final int buildNumber = 502;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 475;
