Quick and dirty load free form archive..
diff --git a/release/cut_release.py b/release/cut_release.py --- a/release/cut_release.py +++ b/release/cut_release.py @@ -65,9 +65,9 @@ PUBLIC_SITE = "USK@kRM~jJVREwnN2qnA8R0Vt ############################################################ # Indexes of refereneced USK sites -FREENET_DOC_WIKI_IDX = 30 -FNIKI_IDX = 81 -REPO_IDX = 14 +FREENET_DOC_WIKI_IDX = 31 +FNIKI_IDX = 84 +REPO_IDX = 15 ############################################################ diff --git a/src/fniki/wiki/HtmlUtils.java b/src/fniki/wiki/HtmlUtils.java --- a/src/fniki/wiki/HtmlUtils.java +++ b/src/fniki/wiki/HtmlUtils.java @@ -177,7 +177,7 @@ public class HtmlUtils { public static String gotoPageFormHtml(String basePath, String defaultPage) { final String fmt = "<form method=\"get\" action=\"%s\" accept-charset=\"UTF-8\"> \n" + - " <input type=submit value=\"Goto or Create Page\"> \n" + + " <input type=submit value=\"Goto or Create Page\"/> \n" + " <input type=\"text\" name=\"title\" value=\"%s\"/> \n" + "</form> \n"; return String.format(fmt, makeHref(basePath), defaultPage); diff --git a/src/fniki/wiki/child/WikiContainer.java b/src/fniki/wiki/child/WikiContainer.java --- a/src/fniki/wiki/child/WikiContainer.java +++ b/src/fniki/wiki/child/WikiContainer.java @@ -259,15 +259,23 @@ public class WikiContainer implements Ch buffer.append(makeLocalLink(context, "fniki/config", "view", "View")); buffer.append(" configuration.<p/>\n"); + buffer.append(gotoPageFormHtml(context.makeLink("/" + name), + context.getString("default_page", "Front_Page"))); + buffer.append("<hr>\n"); buffer.append(makeLocalLink(context, "fniki/resettoempty", "view", "Create Wiki!")); buffer.append(" (<em>careful:</em> This deletes all content and history without confirmation.)<p/>\n"); - buffer.append(gotoPageFormHtml(context.makeLink("/" + name), - context.getString("default_page", "Front_Page"))); + // LATER: Quick hack. Clean this up. + buffer.append(String.format("<p><form method=\"get\" action=\"%s\" accept-charset=\"UTF-8\">\n", + context.makeLink("/fniki/loadarchive"), null, null, null, null)); + buffer.append(" <table><tr>\n"); + buffer.append(" <td><input type=submit value=\"Load Archive\"/></td>\n"); + buffer.append(" <td><input style=\"font-size:60%;\" type=text name=\"uri\" size=\"140\" value=\"\"/></td>\n"); + buffer.append(" </tr></table>\n"); + buffer.append("</form>\n"); - - buffer.append("</body></html>"); + buffer.append("</body></html>\n"); } private String getEditorHtml(WikiContext context, String name) throws IOException {