[freenet-cvs] r8559 - in trunk/freenet/src/freenet: clients/http node

[d...@freenetproject.org]

Author: dbkr
Date: 2006-04-18 11:36:29 +0000 (Tue, 18 Apr 2006)
New Revision: 8559

Modified:
   trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
   trunk/freenet/src/freenet/node/Version.java
Log:
648: Fix bookmark editing button weirdness in bug 315, thanks to ljn1981_ and 
EdwardH.


Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2006-04-17 
12:50:17 UTC (rev 8558)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2006-04-18 
11:36:29 UTC (rev 8559)
@@ -181,11 +181,13 @@
                                while (e.hasMoreElements()) {
                                        Bookmark b = (Bookmark)e.nextElement();

-                                       buf.append("<li><a 
href=\"/"+HTMLEncoder.encode(b.getKey())+"\">");
+                                       buf.append("<li style=\"clear: right; 
\">\n");
+                                       buf.append("<input type=\"submit\" 
name=\"delete_"+b.hashCode()+"\" value=\"Delete\" style=\"float: right; \" 
/>\n");
+                                       buf.append("<input type=\"submit\" 
name=\"edit_"+b.hashCode()+"\" value=\"Edit\" style=\"float: right; \" />\n");
+                                       buf.append("<a 
href=\"/"+HTMLEncoder.encode(b.getKey())+"\">");
                                        
buf.append(HTMLEncoder.encode(b.getDesc()));
                                        buf.append("</a>\n");
-                                       buf.append("<input type=\"submit\" 
name=\"delete_"+b.hashCode()+"\" value=\"Delete\" style=\"float: right; \" 
/>\n");
-                                       buf.append("<input type=\"submit\" 
name=\"edit_"+b.hashCode()+"\" value=\"Edit\" style=\"float: right; \" />\n");
+
                                        buf.append("</li>\n");
                                }
                                buf.append("</ul>\n");
@@ -339,4 +341,5 @@
        public String supportedMethods() {
                return "GET, POST";
        }
-}
\ No newline at end of file
+}
+

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-04-17 12:50:17 UTC (rev 
8558)
+++ trunk/freenet/src/freenet/node/Version.java 2006-04-18 11:36:29 UTC (rev 
8559)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 647;
+       private static final int buildNumber = 648;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 591;